diff --git a/frontend/package.json b/frontend/package.json index 1fc19d72..aa2fb67a 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -24,10 +24,10 @@ "@uniswap/token-lists": "^1.0.0-beta.19", "@unstoppabledomains/resolution": "8.5.0", "@web3-onboard/coinbase": "2.2.7", - "@web3-onboard/core": "2.21.6", + "@web3-onboard/core": "2.21.2", "@web3-onboard/injected-wallets": "2.10.16", - "@web3-onboard/trezor": "2.4.4", - "@web3-onboard/walletconnect": "2.5.5", + "@web3-onboard/trezor": "2.4.3", + "@web3-onboard/walletconnect": "2.5.4", "bnc-notify": "^1.5.1", "core-js": "^3.6.5", "ethers": "5.7.2", diff --git a/frontend/src/store/wallet.ts b/frontend/src/store/wallet.ts index 65cc37cb..5fbb3f6d 100644 --- a/frontend/src/store/wallet.ts +++ b/frontend/src/store/wallet.ts @@ -5,7 +5,6 @@ import injectedModule from '@web3-onboard/injected-wallets'; import walletConnectModule from '@web3-onboard/walletconnect'; import coinbaseWalletModule from '@web3-onboard/coinbase'; import trezorModule from '@web3-onboard/trezor'; -import { WalletInit } from '@web3-onboard/core/node_modules/@web3-onboard/common/dist/types'; import { KeyPair, StealthKeyRegistry, utils, Umbra } from '@umbracash/umbra-js'; import { Chain, @@ -36,7 +35,7 @@ const walletConnect = walletConnectModule({ }); const coinbaseWalletSdk = coinbaseWalletModule(); const trezor = trezorModule({ email: 'contact@umbra.cash', appUrl: 'https://app.umbra.cash/' }); -const wallets = [injected, walletConnect, coinbaseWalletSdk, trezor] as WalletInit[]; + /** * State is handled in reusable components, where each component is its own self-contained * file consisting of one function defined used the composition API. @@ -89,7 +88,7 @@ export default function useWalletStore() { // Initialize onboard.js if not yet done if (!onboard.value) { onboard.value = Onboard({ - wallets, + wallets: [injected, walletConnect, coinbaseWalletSdk, trezor], chains: supportedChains.map((chain) => { return { id: chain.chainId, diff --git a/yarn.lock b/yarn.lock index 85479ceb..d6abb7dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7150,7 +7150,7 @@ dependencies: tslib "1.14.1" -"@walletconnect/ethereum-provider@^2.12.2": +"@walletconnect/ethereum-provider@^2.11.2": version "2.12.2" resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.12.2.tgz#43195a14cd43f928b2fcbba6b1a08e17e7838c4f" integrity sha512-vBl2zCnNm2iPaomJdr5YT16cT7aa8cH2WFs6879XPngU5i7HXS3bU6TamhyhKKl13sdIfifmCkCC+RWn5GdPMw== @@ -7446,12 +7446,12 @@ ethers "5.5.4" joi "17.9.1" -"@web3-onboard/core@2.21.6": - version "2.21.6" - resolved "https://registry.yarnpkg.com/@web3-onboard/core/-/core-2.21.6.tgz#e2307fb569ef131440c2bce1a8a87d3ff16bcfae" - integrity sha512-eb9bmIK/n6U7ZpC3Bd8tXrBdc5XDh5pzhcXArqMxR2MKxoB6i7aeLO9A3AJcwwEql3eNF+UDnhzK+KXTBOVPEQ== +"@web3-onboard/core@2.21.2": + version "2.21.2" + resolved "https://registry.yarnpkg.com/@web3-onboard/core/-/core-2.21.2.tgz#962683efc87b29ee9150ab8d7ea9568ea3b41dd5" + integrity sha512-apzVi2zWqs4ktZBBJ60x1e4odI1mSoZ2c69bXUg36A0xI0iRFQ9Od44peI3mfTDEru7hWsr81Nv6l+v3HRSKLw== dependencies: - "@web3-onboard/common" "^2.3.4" + "@web3-onboard/common" "^2.3.3" bignumber.js "^9.0.0" bnc-sdk "^4.6.7" bowser "^2.11.0" @@ -7465,7 +7465,7 @@ svelte "^3.49.0" svelte-i18n "^3.3.13" -"@web3-onboard/hw-common@^2.3.1": +"@web3-onboard/hw-common@^2.3.0": version "2.3.1" resolved "https://registry.yarnpkg.com/@web3-onboard/hw-common/-/hw-common-2.3.1.tgz#1a968a0b40e64bb6b82593810c15b1fa7f620306" integrity sha512-Dbztkmr+0iN3BJmwu7f3nvk7atbJEm9AmySlyyIYTqn+kuPWk88j8s1PAyHHOej2lLrtswyj1c3ER65O5S1M2g== @@ -7485,27 +7485,27 @@ joi "17.9.1" lodash.uniqby "^4.7.0" -"@web3-onboard/trezor@2.4.4": - version "2.4.4" - resolved "https://registry.yarnpkg.com/@web3-onboard/trezor/-/trezor-2.4.4.tgz#71ae98a86f4a0978bc7b76d4b2253de2bc7effa3" - integrity sha512-4NeNAdy8Qg3cfFo35vDHBNU18cMKiHUkl0nZi9VDWSxnEzv0ydesx9n0z79BHqu046vV3m5b4mqf2jJeVAlcEQ== +"@web3-onboard/trezor@2.4.3": + version "2.4.3" + resolved "https://registry.yarnpkg.com/@web3-onboard/trezor/-/trezor-2.4.3.tgz#a509ce37eff5ee4432a85c8a62217b1b2a757f73" + integrity sha512-Um/g766/jzbSd9tBCAWqD7vJOPX+V6bxqGP2SX8Hh8G3cXtMklTUkmbrY2spp8QHPj2HcQWHVIxfjsFVFcqmUg== dependencies: "@ethereumjs/tx" "^3.4.0" "@ethersproject/providers" "^5.5.0" "@trezor/connect-web" "^9.0.11" - "@web3-onboard/common" "^2.3.4" - "@web3-onboard/hw-common" "^2.3.1" + "@web3-onboard/common" "^2.3.3" + "@web3-onboard/hw-common" "^2.3.0" buffer "^6.0.3" eth-crypto "^2.1.0" ethereumjs-util "^7.1.3" hdkey "^2.0.1" -"@web3-onboard/walletconnect@2.5.5": - version "2.5.5" - resolved "https://registry.yarnpkg.com/@web3-onboard/walletconnect/-/walletconnect-2.5.5.tgz#a0a136f2622156b1004a58d77e21c379cb16391c" - integrity sha512-+ShSG20r783R+a1bPsbA6ofPTtVz2BFR8Z2/dQKsM+alQKAzBVprWjYW+PE+Mg/IC8QspiLWz/GXXLzLxYxeKw== +"@web3-onboard/walletconnect@2.5.4": + version "2.5.4" + resolved "https://registry.yarnpkg.com/@web3-onboard/walletconnect/-/walletconnect-2.5.4.tgz#e9dcd15469b7e022c1a7bb742f0e7fddceb62e61" + integrity sha512-cvjzal9DEXkpi8TgHeszClZIRcIK6BtXYdH9w0gVOxVteRJoNQM5upK6b6Z2g+p5JK/eHBW9CwV9+Bq0eE5gFg== dependencies: - "@walletconnect/ethereum-provider" "^2.12.2" + "@walletconnect/ethereum-provider" "^2.11.2" "@web3-onboard/common" "^2.3.3" joi "17.9.1" rxjs "^7.5.2"