From 379cbda66ffe46a4cf08b22ffd0164d8e81a8f56 Mon Sep 17 00:00:00 2001 From: Danil Kovtonyuk Date: Mon, 16 May 2022 18:27:54 +1000 Subject: [PATCH 1/6] bump wallet connect --- package.json | 2 +- yarn.lock | 126 +++++++++++++++++++++++++-------------------------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/package.json b/package.json index ce57be0..d105206 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@metamask/onboarding": "^1.0.0", "@nuxtjs/moment": "^1.6.0", "@ticket721/e712": "^0.4.1", - "@walletconnect/web3-provider": "1.7.7", + "@walletconnect/web3-provider": "1.7.8", "ajv": "^6.10.2", "arraybuffer-loader": "^1.0.8", "base-path-converter": "^1.0.2", diff --git a/yarn.lock b/yarn.lock index 77eec63..070c2d4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2494,35 +2494,35 @@ dom-event-types "^1.0.0" lodash "^4.17.4" -"@walletconnect/browser-utils@^1.7.7": - version "1.7.7" - resolved "https://registry.yarnpkg.com/@walletconnect/browser-utils/-/browser-utils-1.7.7.tgz#4ae0db1ddf49be179ea556af842db3b7afce973d" - integrity sha512-6Mt7DSPaG0FKnHhuVzkU1hgtsCpGvl2nfbfRytLpyDY05iWMzMg5uK1DzV+0k4hCt9pVli0JVNt6dh9a6Xm94w== +"@walletconnect/browser-utils@^1.7.8": + version "1.7.8" + resolved "https://registry.yarnpkg.com/@walletconnect/browser-utils/-/browser-utils-1.7.8.tgz#c9e27f69d838442d69ccf53cb38ffc3c554baee2" + integrity sha512-iCL0XCWOZaABIc0lqA79Vyaybr3z26nt8mxiwvfrG8oaKUf5Y21Of4dj+wIXQ4Hhblre6SgDlU0Ffb39+1THOw== dependencies: "@walletconnect/safe-json" "1.0.0" - "@walletconnect/types" "^1.7.7" + "@walletconnect/types" "^1.7.8" "@walletconnect/window-getters" "1.0.0" "@walletconnect/window-metadata" "1.0.0" detect-browser "5.2.0" -"@walletconnect/client@^1.7.7": - version "1.7.7" - resolved "https://registry.yarnpkg.com/@walletconnect/client/-/client-1.7.7.tgz#4570475b0aeed05e53b0c7b01a352a895c0b455b" - integrity sha512-UuDkpXDc1Emx09aGXKz2Fg8omNp5J8ZRgNblnQTb8xnoQ8rgOJSyhbFR37PFIFwVpriZZDAgmy8HlqoGwLQ2ug== +"@walletconnect/client@^1.7.8": + version "1.7.8" + resolved "https://registry.yarnpkg.com/@walletconnect/client/-/client-1.7.8.tgz#62c2d7114e59495d90772ea8033831ceb29c6a78" + integrity sha512-pBroM6jZAaUM0SoXJZg5U7aPTiU3ljQAw3Xh/i2pxFDeN/oPKao7husZ5rdxS5xuGSV6YpqqRb0RxW1IeoR2Pg== dependencies: - "@walletconnect/core" "^1.7.7" - "@walletconnect/iso-crypto" "^1.7.7" - "@walletconnect/types" "^1.7.7" - "@walletconnect/utils" "^1.7.7" + "@walletconnect/core" "^1.7.8" + "@walletconnect/iso-crypto" "^1.7.8" + "@walletconnect/types" "^1.7.8" + "@walletconnect/utils" "^1.7.8" -"@walletconnect/core@^1.7.7": - version "1.7.7" - resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-1.7.7.tgz#71d0c71beda8d10c636a4eae8e81e3b7ecefbe86" - integrity sha512-XsF2x4JcBS1V2Nk/Uh38dU7ZlLmW/R5oxHp4+tVgCwTID6nZlo3vUSHBOqM7jgDRblKOHixANollm0r94bM8Cg== +"@walletconnect/core@^1.7.8": + version "1.7.8" + resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-1.7.8.tgz#97c52ea7d00126863cd37bf19bd3e87d4f30de1e" + integrity sha512-9xcQ0YNf9JUFb0YOX1Mpy4Yojt+6w2yQz/0aIEyj2X/s9D71NW0fTYsMcdhkLOI7mn2cqVbx2t1lRvdgqsbrSQ== dependencies: - "@walletconnect/socket-transport" "^1.7.7" - "@walletconnect/types" "^1.7.7" - "@walletconnect/utils" "^1.7.7" + "@walletconnect/socket-transport" "^1.7.8" + "@walletconnect/types" "^1.7.8" + "@walletconnect/utils" "^1.7.8" "@walletconnect/crypto@^1.0.2": version "1.0.2" @@ -2548,24 +2548,24 @@ resolved "https://registry.yarnpkg.com/@walletconnect/environment/-/environment-1.0.0.tgz#c4545869fa9c389ec88c364e1a5f8178e8ab5034" integrity sha512-4BwqyWy6KpSvkocSaV7WR3BlZfrxLbJSLkg+j7Gl6pTDE+U55lLhJvQaMuDVazXYxcjBsG09k7UlH7cGiUI5vQ== -"@walletconnect/http-connection@^1.7.7": - version "1.7.7" - resolved "https://registry.yarnpkg.com/@walletconnect/http-connection/-/http-connection-1.7.7.tgz#77bcce7c4c067e1e745da1a1c6174ff0daa76018" - integrity sha512-MmhVJfBjvjYcZnrJYnDx4VBwpYM6yh7eX4/8szo6sGwzG4E+8V4YBKU2NF6fA6YXpdAyEYayElqXhB0YBEZFJA== +"@walletconnect/http-connection@^1.7.8": + version "1.7.8" + resolved "https://registry.yarnpkg.com/@walletconnect/http-connection/-/http-connection-1.7.8.tgz#98bcc726c29751ddc791ff151742aa712bf679a7" + integrity sha512-31gjBw46MRU9hFMTNXAqh+f8qpDNzVeV9BJehzVWKiNC3ciL1JCZkbvsY0djwajduE6TB2ujaML0XDXS9HgBRA== dependencies: - "@walletconnect/types" "^1.7.7" - "@walletconnect/utils" "^1.7.7" + "@walletconnect/types" "^1.7.8" + "@walletconnect/utils" "^1.7.8" eventemitter3 "4.0.7" xhr2-cookies "1.1.0" -"@walletconnect/iso-crypto@^1.7.7": - version "1.7.7" - resolved "https://registry.yarnpkg.com/@walletconnect/iso-crypto/-/iso-crypto-1.7.7.tgz#a7f703f9c2a05aafe5b8cced8941c7732701e579" - integrity sha512-t8RKJZkFtFyWMFrl0jPz/3RAGhM5yext+MLFq3L/KTPxLgMZuT1yFHRUiV7cAN3+LcCmk6Sy/rV1yQPTiB158Q== +"@walletconnect/iso-crypto@^1.7.8": + version "1.7.8" + resolved "https://registry.yarnpkg.com/@walletconnect/iso-crypto/-/iso-crypto-1.7.8.tgz#41f09326d129faa09beae213e78614c19d90bbd6" + integrity sha512-Qo6qDcMG0Ac+9fpWE0h/oE55NHLk6eM2vlXpWlQDN/me7RZGrkvk+LXsAkQ3UiYPEiPfq4eswcyRWC9AcrAscg== dependencies: "@walletconnect/crypto" "^1.0.2" - "@walletconnect/types" "^1.7.7" - "@walletconnect/utils" "^1.7.7" + "@walletconnect/types" "^1.7.8" + "@walletconnect/utils" "^1.7.8" "@walletconnect/jsonrpc-types@^1.0.0": version "1.0.0" @@ -2587,14 +2587,14 @@ resolved "https://registry.yarnpkg.com/@walletconnect/mobile-registry/-/mobile-registry-1.4.0.tgz#502cf8ab87330841d794819081e748ebdef7aee5" integrity sha512-ZtKRio4uCZ1JUF7LIdecmZt7FOLnX72RPSY7aUVu7mj7CSfxDwUn6gBuK6WGtH+NZCldBqDl5DenI5fFSvkKYw== -"@walletconnect/qrcode-modal@^1.7.7": - version "1.7.7" - resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.7.7.tgz#a7567370bf915a50fb8edc99f6ceb70ce9be2bfc" - integrity sha512-HRzw6g4P8/C4ClJYJShaGfdvjfrTfkXv+eb+IylWGWvC8IQhuiSXCq5+F3t0CXxuZs3ir26abgviEMRFQxGKdA== +"@walletconnect/qrcode-modal@^1.7.8": + version "1.7.8" + resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.7.8.tgz#52b3d15922f3e371ddc92fd0f49f93ff40241365" + integrity sha512-LqNJMLWO+ljvoRSdq8tcEslW0imKrrb+ugs3bw4w/jEI1FSJzVeinEsgVpyaMv8wsUcyTcSCXSkXpT1SXHtcpw== dependencies: - "@walletconnect/browser-utils" "^1.7.7" + "@walletconnect/browser-utils" "^1.7.8" "@walletconnect/mobile-registry" "^1.4.0" - "@walletconnect/types" "^1.7.7" + "@walletconnect/types" "^1.7.8" copy-to-clipboard "^3.3.1" preact "10.4.1" qrcode "1.4.4" @@ -2613,43 +2613,43 @@ resolved "https://registry.yarnpkg.com/@walletconnect/safe-json/-/safe-json-1.0.0.tgz#12eeb11d43795199c045fafde97e3c91646683b2" integrity sha512-QJzp/S/86sUAgWY6eh5MKYmSfZaRpIlmCJdi5uG4DJlKkZrHEF7ye7gA+VtbVzvTtpM/gRwO2plQuiooIeXjfg== -"@walletconnect/socket-transport@^1.7.7": - version "1.7.7" - resolved "https://registry.yarnpkg.com/@walletconnect/socket-transport/-/socket-transport-1.7.7.tgz#2cf68b95c4c10f257189370d2456d99c9c206a0f" - integrity sha512-RxeFkT+5BqdaZzPtPYIw6+KSVh6Q1NaYqTiAzWWh9RPuvuTajIEsi+fUXizfkpmyi9UTYBvdFXnKcB+eSImpDg== +"@walletconnect/socket-transport@^1.7.8": + version "1.7.8" + resolved "https://registry.yarnpkg.com/@walletconnect/socket-transport/-/socket-transport-1.7.8.tgz#a4ef50d8054293991dbfde7f9c66788030182ec3" + integrity sha512-bqEjLxfSzG79v2OT7XVOZoyUkg6g3yng0fURrdLusWs42fYHWnrSrIZDejFn8N5PiZk5R2edrggkQ7w0VUUAfw== dependencies: - "@walletconnect/types" "^1.7.7" - "@walletconnect/utils" "^1.7.7" + "@walletconnect/types" "^1.7.8" + "@walletconnect/utils" "^1.7.8" ws "7.5.3" -"@walletconnect/types@^1.7.7": - version "1.7.7" - resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.7.7.tgz#71c623b36a93e373370b1772e82fea2d801adf54" - integrity sha512-yXJrLxwLLCXtWgd/e8FjfY9v5DKds12Z7EEPzUrPSq6v7WtXpqate577KwlFQ6UYzioQzIEDE8+98j+0aiZbsw== +"@walletconnect/types@^1.7.8": + version "1.7.8" + resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.7.8.tgz#ec397e6fbdc8147bccc17029edfeb41c50a5ca09" + integrity sha512-0oSZhKIrtXRJVP1jQ0EDTRtotQY6kggGjDcmm/LLQBKnOZXdPeo0sPkV/7DjT5plT3O7Cjc6JvuXt9WOY0hlCA== -"@walletconnect/utils@^1.7.7": - version "1.7.7" - resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-1.7.7.tgz#684522fa20ccf9ec2944f0497ca70254cb6d4729" - integrity sha512-slNlnROS4DEusGFx53hshIBylYhzd5JtGF+AJpza+Tc616+u8ozjQ9aKKUaV85bucnv5Q42bTwLYrYrXiydmuw== +"@walletconnect/utils@^1.7.8": + version "1.7.8" + resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-1.7.8.tgz#f94572bca5eb6b5f81daf8a35268f249f9c6b1ec" + integrity sha512-DSpfH6Do0TQmdrgzu+SyjVhupVjN0WEMvNWGK9K4VlSmLFpCWfme7qxzrvuxBZ47gDqs1kGWvjyJmviWqvOnAg== dependencies: - "@walletconnect/browser-utils" "^1.7.7" + "@walletconnect/browser-utils" "^1.7.8" "@walletconnect/encoding" "^1.0.1" "@walletconnect/jsonrpc-utils" "^1.0.0" - "@walletconnect/types" "^1.7.7" + "@walletconnect/types" "^1.7.8" bn.js "4.11.8" js-sha3 "0.8.0" query-string "6.13.5" -"@walletconnect/web3-provider@1.7.7": - version "1.7.7" - resolved "https://registry.yarnpkg.com/@walletconnect/web3-provider/-/web3-provider-1.7.7.tgz#3d2f8d7a0fcdc118615283978c6a7c9f2a852b71" - integrity sha512-hUhDyaMu93e7e82OVCu3KnYOn6m6wQO9YObbhi3PexppCANe/Y9eDrw/37S+7jbjLIx5nS1et2JU+taKR7OSOw== +"@walletconnect/web3-provider@1.7.8": + version "1.7.8" + resolved "https://registry.yarnpkg.com/@walletconnect/web3-provider/-/web3-provider-1.7.8.tgz#fe9b66a4010ee831db664a3fe5014d67a758a1fc" + integrity sha512-2VxGo7KPfQTWRJ+rygt3ok/u04InkVE+H9LBIF/RMUwcwyGf2nsP3CcYZVcg3yYpacgN7bAZCersCEYwU8AeeA== dependencies: - "@walletconnect/client" "^1.7.7" - "@walletconnect/http-connection" "^1.7.7" - "@walletconnect/qrcode-modal" "^1.7.7" - "@walletconnect/types" "^1.7.7" - "@walletconnect/utils" "^1.7.7" + "@walletconnect/client" "^1.7.8" + "@walletconnect/http-connection" "^1.7.8" + "@walletconnect/qrcode-modal" "^1.7.8" + "@walletconnect/types" "^1.7.8" + "@walletconnect/utils" "^1.7.8" web3-provider-engine "16.0.1" "@walletconnect/window-getters@1.0.0", "@walletconnect/window-getters@^1.0.0": From a8a497a8a3d2072a9d5157a9a87bcfbc1dff40f1 Mon Sep 17 00:00:00 2001 From: Danil Kovtonyuk Date: Mon, 13 Jun 2022 21:25:31 +1000 Subject: [PATCH 2/6] fix: gnosis rpc --- networkConfig.js | 4 ++-- store/metamask.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/networkConfig.js b/networkConfig.js index 545b661..01436c8 100644 --- a/networkConfig.js +++ b/networkConfig.js @@ -361,8 +361,8 @@ export default { echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4', rpcUrls: { publicRpc: { - name: 'xDAI Chain RPC', - url: 'https://rpc.xdaichain.com/tornado' + name: 'Gnosis Chain RPC', + url: 'https://rpc.gnosischain.com/tornado' } }, tokens: { diff --git a/store/metamask.js b/store/metamask.js index c03b1e8..9d8abae 100644 --- a/store/metamask.js +++ b/store/metamask.js @@ -551,7 +551,7 @@ const actions = { }, 100: { chainId: '0x64', - chainName: 'Gnosis Chain (formerly xDai)', + chainName: 'Gnosis', rpcUrls: ['https://rpc.gnosischain.com'], nativeCurrency: { name: 'xDAI', From 4cac9d663f209f524f6fc9598d35e4a7a6f965b6 Mon Sep 17 00:00:00 2001 From: Pasha8914 Date: Mon, 16 May 2022 22:08:17 +1000 Subject: [PATCH 3/6] feat: data-test --- components/Deposit.vue | 40 +++++++++++++++---- components/DepositModalBox.vue | 5 ++- components/EncryptedTx.vue | 16 +++++++- components/Job.vue | 7 +++- components/Loaders/Loader.vue | 2 +- components/Navbar.vue | 15 +++++-- components/NetworkModal.vue | 4 +- components/NetworkNavbarIcon.vue | 4 +- components/Notices.vue | 2 +- components/Settings.vue | 14 +++++-- components/Tx.vue | 16 +++++++- components/settings/tabs/RelayerTab.vue | 14 +++++-- components/settings/tabs/WalletTab.vue | 2 +- components/web3Connect/Modal.vue | 9 ++++- components/withdraw/Withdraw.vue | 23 +++++++++-- components/withdraw/WithdrawModalBox.vue | 6 +-- components/withdraw/WithdrawTotal.vue | 8 ++-- .../account/components/Control/Actions.vue | 21 +++++++--- modules/account/components/Control/Header.vue | 2 +- .../account/components/Settings/Actions.vue | 20 ++++++++-- modules/account/components/Setup/Actions.vue | 30 ++++++++++---- modules/account/components/Setup/Header.vue | 2 +- modules/account/modals/DecryptInfo.vue | 4 +- modules/account/modals/RecoverAccount.vue | 2 + modules/account/modals/SetupAccount.vue | 1 + 25 files changed, 207 insertions(+), 62 deletions(-) diff --git a/components/Deposit.vue b/components/Deposit.vue index d66fa63..e2865e2 100644 --- a/components/Deposit.vue +++ b/components/Deposit.vue @@ -1,14 +1,20 @@ @@ -30,13 +36,24 @@ @input="changeAmount" > - - + + {{ $t('depositButton') }} @@ -79,7 +96,14 @@ export default { } }, tokens() { - return this.networkConfig.tokens + return Object.keys(this.networkConfig.tokens).reduce((acc, curr) => { + const item = this.networkConfig.tokens[curr] + acc[curr] = { + ...item, + dataTest: `token_list_${item.symbol.toLowerCase()}` + } + return acc + }, {}) }, selectedToken: { get() { diff --git a/components/DepositModalBox.vue b/components/DepositModalBox.vue index bcced6e..b40c24f 100644 --- a/components/DepositModalBox.vue +++ b/components/DepositModalBox.vue @@ -46,7 +46,9 @@