diff --git a/App.tsx b/App.tsx index 2583cfc44..3eaa14749 100644 --- a/App.tsx +++ b/App.tsx @@ -319,6 +319,7 @@ export default class App extends React.PureComponent { ref={(nav) => { if (nav != null) { NavigationService.setTopLevelNavigator( + // @ts-ignore:next-line nav ); } @@ -1038,6 +1039,10 @@ export default class App extends React.PureComponent { EcashSettings } /> + Promise; - }, + }; swaps: { createClaimTransaction: ({ endpoint, diff --git a/package.json b/package.json index 1e49a832d..fd4f8151f 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "@tradle/react-native-http": "2.0.1", "@types/dateformat": "5.0.0", "@types/humanize-duration": "3.27.1", + "aez": "1.0.1", "assert": "1.5.0", "asyncstorage-down": "4.2.0", "bech32": "2.0.0", diff --git a/views/Swaps/Refund.tsx b/views/Swaps/Refund.tsx index 8b50709b0..48596e043 100644 --- a/views/Swaps/Refund.tsx +++ b/views/Swaps/Refund.tsx @@ -267,8 +267,8 @@ export default class RefundSwap extends React.Component< console.log( 'Refund transaction created successfully.' ); - } catch (error) { - console.error('Error in refund process:', error); + } catch (e) { + console.error('Error in refund process:', e); } finally { this.setState({ loading: false }); } diff --git a/views/Swaps/Settings.tsx b/views/Swaps/Settings.tsx index 81f6e779e..620a27479 100644 --- a/views/Swaps/Settings.tsx +++ b/views/Swaps/Settings.tsx @@ -84,14 +84,14 @@ export default class LSPS1Settings extends React.Component< : 'https://api.boltz.exchange/v2'; this.setState({ serviceProvider: 'Boltz', - host: host + host }); } else if (value === 'ZEUS') { // zeus endpoints are in WIP const host = isTestnet ? '' : ''; this.setState({ serviceProvider: 'ZEUS', - host: host + host }); } else if (value === 'SwapMarket') { const host = isTestnet @@ -99,7 +99,7 @@ export default class LSPS1Settings extends React.Component< : 'https://api.middleway.space/v2/swap/submarine'; this.setState({ serviceProvider: 'SwapMarket', - host: host + host }); } else { this.setState({ diff --git a/views/Swaps/index.tsx b/views/Swaps/index.tsx index ad8302b3f..34376d0d5 100644 --- a/views/Swaps/index.tsx +++ b/views/Swaps/index.tsx @@ -672,10 +672,10 @@ export default class SwapPane extends React.PureComponent< this.setState({ fetchingInvoice: false }); - } catch (error: any) { + } catch (e: any) { console.error( 'Error generating invoice:', - error + e ); this.setState({ error: 'Failed to generate invoice', diff --git a/yarn.lock b/yarn.lock index b9bd3264d..f13ae7df4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3196,6 +3196,14 @@ aes-js@^3.1.2: resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.1.2.tgz#db9aabde85d5caabbfc0d4f2a4446960f627146a" integrity sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ== +aez@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/aez/-/aez-1.0.1.tgz#e4efbef7113a92102f03754bfdf08380c4b0dec8" + integrity sha512-AtZEVcZcOLBAcNevz2e+Zu1zSLuPjtUA6CFY+ie8tF0IshKfcpJ0LiwnTqePOKaNidQQM/MfvtzUFOfAvHz5wQ== + dependencies: + blakejs "^1.1.0" + safe-buffer "^5.1.1" + ajv@^6.10.0, ajv@^6.12.4: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -3725,6 +3733,11 @@ bl@~0.8.1: dependencies: readable-stream "~1.0.26" +blakejs@^1.1.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.2.1.tgz#5057e4206eadb4a97f7c0b6e197a505042fc3814" + integrity sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ== + bluebird@^3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" diff --git a/zeus_modules/noble_ecc.ts b/zeus_modules/noble_ecc.ts index 061b259c4..365c40ec2 100644 --- a/zeus_modules/noble_ecc.ts +++ b/zeus_modules/noble_ecc.ts @@ -10,7 +10,7 @@ import { TinySecp256k1Interface as TinySecp256k1InterfaceBIP32 } from 'bip32/typ import { XOnlyPointAddTweakResult } from 'bitcoinjs-lib/src/types'; import createHash from 'create-hash'; import { createHmac } from 'crypto'; -import { TinySecp256k1Interface } from 'ecpair/src/ecpair'; +import { TinySecp256k1Interface } from 'ecpair'; export interface TinySecp256k1InterfaceExtended { pointMultiply(p: Uint8Array, tweak: Uint8Array, compressed?: boolean): Uint8Array | null;