diff --git a/package.json b/package.json index 78414963d4..41b3b100a6 100644 --- a/package.json +++ b/package.json @@ -134,16 +134,16 @@ "@uniswap/v3-periphery": "^1.1.1", "@uniswap/v3-sdk": "^3.9.0", "@walletconnect/ethereum-provider": "1.7.1", - "@web3-react/coinbase-wallet": "^8.0.33-beta.0", - "@web3-react/core": "^8.0.33-beta.0", - "@web3-react/eip1193": "^8.0.25-beta.0", - "@web3-react/empty": "^8.0.19-beta.0", - "@web3-react/gnosis-safe": "^8.0.5-beta.0", - "@web3-react/metamask": "^8.0.26-beta.0", - "@web3-react/network": "^8.0.26-beta.0", - "@web3-react/types": "^8.0.19-beta.0", - "@web3-react/url": "^8.0.24-beta.0", - "@web3-react/walletconnect": "^8.0.34-beta.0", + "@web3-react/coinbase-wallet": "^8.0.34-beta.0", + "@web3-react/core": "^8.0.35-beta.0", + "@web3-react/eip1193": "^8.0.26-beta.0", + "@web3-react/empty": "^8.0.20-beta.0", + "@web3-react/gnosis-safe": "^8.0.6-beta.0", + "@web3-react/metamask": "^8.0.27-beta.0", + "@web3-react/network": "^8.0.27-beta.0", + "@web3-react/types": "^8.0.20-beta.0", + "@web3-react/url": "^8.0.25-beta.0", + "@web3-react/walletconnect": "^8.0.35-beta.0", "ajv": "^6.12.3", "array.prototype.flat": "^1.2.4", "array.prototype.flatmap": "^1.2.4", diff --git a/src/components/AccountDetails/index.tsx b/src/components/AccountDetails/index.tsx index 47b408947e..565f1e75e6 100644 --- a/src/components/AccountDetails/index.tsx +++ b/src/components/AccountDetails/index.tsx @@ -1,7 +1,6 @@ import { Trans } from '@lingui/macro' import { useWeb3React } from '@web3-react/core' import CopyHelper from 'components/AccountDetails/Copy' -import { coinbaseWalletConnection } from 'connection' import { getConnection, getConnectionName, getIsCoinbaseWallet, getIsMetaMask } from 'connection/utils' import { useCallback, useContext } from 'react' import { ExternalLink as LinkIcon } from 'react-feather' @@ -247,13 +246,6 @@ export default function AccountDetails({ onClick={() => { if (connector.deactivate) { connector.deactivate() - - // Coinbase Wallet SDK does not emit a disconnect event to the provider, - // which is what web3-react uses to reset state. As a workaround we manually - // reset state. - if (connector === coinbaseWalletConnection.connector) { - connector.resetState() - } } else { connector.resetState() } diff --git a/src/components/Web3Provider/index.tsx b/src/components/Web3Provider/index.tsx index 817d380909..19a02ae549 100644 --- a/src/components/Web3Provider/index.tsx +++ b/src/components/Web3Provider/index.tsx @@ -1,11 +1,21 @@ -import { Web3ReactProvider } from '@web3-react/core' -import useConnectors from 'hooks/useConnectors' +import { Web3ReactHooks, Web3ReactProvider } from '@web3-react/core' +import { Connector } from '@web3-react/types' +import { Connection } from 'connection' +import { getConnectionName } from 'connection/utils' import useEagerlyConnect from 'hooks/useEagerlyConnect' -import { ReactNode } from 'react' +import useOrderedConnections from 'hooks/useOrderedConnections' +import { ReactNode, useMemo } from 'react' export default function Web3Provider({ children }: { children: ReactNode }) { useEagerlyConnect() - const connectors = useConnectors() + const connections = useOrderedConnections() + const connectors: [Connector, Web3ReactHooks][] = connections.map(({ hooks, connector }) => [connector, hooks]) - return {children} + const key = useMemo(() => connections.map(({ type }: Connection) => getConnectionName(type)).join('-'), [connections]) + + return ( + + {children} + + ) } diff --git a/src/connection/utils.ts b/src/connection/utils.ts index bc0e650cec..011848cf2e 100644 --- a/src/connection/utils.ts +++ b/src/connection/utils.ts @@ -9,15 +9,6 @@ import { walletConnectConnection, } from 'connection' -const CONNECTIONS = [ - coinbaseWalletConnection, - fortmaticConnection, - injectedConnection, - networkConnection, - walletConnectConnection, - gnosisSafeConnection, -] - export function getIsInjected(): boolean { return Boolean(window.ethereum) } @@ -30,6 +21,14 @@ export function getIsCoinbaseWallet(): boolean { return window.ethereum?.isCoinbaseWallet ?? false } +const CONNECTIONS = [ + gnosisSafeConnection, + injectedConnection, + coinbaseWalletConnection, + walletConnectConnection, + fortmaticConnection, + networkConnection, +] export function getConnection(c: Connector | ConnectionType) { if (c instanceof Connector) { const connection = CONNECTIONS.find((connection) => connection.connector === c) diff --git a/src/hooks/useConnectors.ts b/src/hooks/useOrderedConnections.ts similarity index 73% rename from src/hooks/useConnectors.ts rename to src/hooks/useOrderedConnections.ts index 665f745307..afdb74c45f 100644 --- a/src/hooks/useConnectors.ts +++ b/src/hooks/useOrderedConnections.ts @@ -1,5 +1,3 @@ -import { Web3ReactHooks } from '@web3-react/core' -import { Connector } from '@web3-react/types' import { ConnectionType } from 'connection' import { getConnection } from 'connection/utils' import { useMemo } from 'react' @@ -8,7 +6,7 @@ import { useAppSelector } from 'state/hooks' const SELECTABLE_WALLETS = [...BACKFILLABLE_WALLETS, ConnectionType.FORTMATIC] -export default function useConnectors() { +export default function useOrderedConnections() { const selectedWallet = useAppSelector((state) => state.user.selectedWallet) return useMemo(() => { const orderedConnectionTypes: ConnectionType[] = [] @@ -25,10 +23,6 @@ export default function useConnectors() { // Add network connection last as it should be the fallback. orderedConnectionTypes.push(ConnectionType.NETWORK) - // Convert to web3-react's representation of connectors. - const web3Connectors: [Connector, Web3ReactHooks][] = orderedConnectionTypes - .map(getConnection) - .map(({ connector, hooks }) => [connector, hooks]) - return web3Connectors + return orderedConnectionTypes.map(getConnection) }, [selectedWallet]) } diff --git a/src/lib/hooks/useBlockNumber.tsx b/src/lib/hooks/useBlockNumber.tsx index bcfea85dd2..35a9632abf 100644 --- a/src/lib/hooks/useBlockNumber.tsx +++ b/src/lib/hooks/useBlockNumber.tsx @@ -48,23 +48,30 @@ export function BlockNumberProvider({ children }: { children: ReactNode }) { const windowVisible = useIsWindowVisible() useEffect(() => { + let stale = false + if (provider && activeChainId && windowVisible) { // If chainId hasn't changed, don't clear the block. This prevents re-fetching still valid data. setChainBlock((chainBlock) => (chainBlock.chainId === activeChainId ? chainBlock : { chainId: activeChainId })) provider .getBlockNumber() - .then(onBlock) + .then((block) => { + if (!stale) onBlock(block) + }) .catch((error) => { console.error(`Failed to get block number for chainId ${activeChainId}`, error) }) provider.on('block', onBlock) + return () => { + stale = true provider.removeListener('block', onBlock) } } - return undefined + + return void 0 }, [activeChainId, provider, onBlock, setChainBlock, windowVisible]) const value = useMemo( diff --git a/src/state/connection/constants.ts b/src/state/connection/constants.ts index 2cd26750a1..90bb531377 100644 --- a/src/state/connection/constants.ts +++ b/src/state/connection/constants.ts @@ -1,7 +1,7 @@ import { ConnectionType } from 'connection' export const BACKFILLABLE_WALLETS = [ + ConnectionType.INJECTED, ConnectionType.COINBASE_WALLET, ConnectionType.WALLET_CONNECT, - ConnectionType.INJECTED, ] diff --git a/yarn.lock b/yarn.lock index a2a05835c8..f1b74c571a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1292,10 +1292,10 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@ethersproject/abi@5.6.3", "@ethersproject/abi@^5.0.12", "@ethersproject/abi@^5.5.0", "@ethersproject/abi@^5.6.3": - version "5.6.3" - resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.3.tgz#2d643544abadf6e6b63150508af43475985c23db" - integrity sha512-CxKTdoZY4zDJLWXG6HzNH6znWK0M79WzzxHegDoecE3+K32pzfHOzuXg2/oGSTecZynFgpkjYXNPOqXVJlqClw== +"@ethersproject/abi@5.6.4", "@ethersproject/abi@^5.0.12", "@ethersproject/abi@^5.5.0", "@ethersproject/abi@^5.6.3": + version "5.6.4" + resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.4.tgz#f6e01b6ed391a505932698ecc0d9e7a99ee60362" + integrity sha512-TTeZUlCeIHG6527/2goZA6gW5F8Emoc7MrZDC7hhP84aRGvW3TEdTnZR08Ls88YXM1m2SuK42Osw/jSi3uO8gg== dependencies: "@ethersproject/address" "^5.6.1" "@ethersproject/bignumber" "^5.6.2" @@ -1469,10 +1469,10 @@ resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.6.0.tgz#d7db1bfcc22fd2e4ab574cba0bb6ad779a9a3e7a" integrity sha512-BiBWllUROH9w+P21RzoxJKzqoqpkyM1pRnEKG69bulE9TSQD8SAIvTQqIMZmmCO8pUNkgLP1wndX1gKghSpBmg== -"@ethersproject/networks@5.6.3", "@ethersproject/networks@^5.6.3": - version "5.6.3" - resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.3.tgz#3ee3ab08f315b433b50c99702eb32e0cf31f899f" - integrity sha512-QZxRH7cA5Ut9TbXwZFiCyuPchdWi87ZtVNHWZd0R6YFgYtes2jQ3+bsslJ0WdyDe0i6QumqtoYqvY3rrQFRZOQ== +"@ethersproject/networks@5.6.4", "@ethersproject/networks@^5.6.3": + version "5.6.4" + resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.4.tgz#51296d8fec59e9627554f5a8a9c7791248c8dc07" + integrity sha512-KShHeHPahHI2UlWdtDMn2lJETcbtaJge4k7XSjDR9h79QTd6yQJmv6Cp2ZA4JdqWnhszAOLSuJEd9C0PRw7hSQ== dependencies: "@ethersproject/logger" "^5.6.0" @@ -2012,26 +2012,26 @@ resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-4.5.1.tgz#058d8a02354f3c78e369d452c15d33557ec1b705" integrity sha512-mvtOvXNNVLlF1p/UbLgLrmz2RCOl6Ow+TqyiK10SosoLKX7edsXYiHFHb7XIZdjII6F2sJVPPsJXWhBnbXT2DQ== -"@gnosis.pm/safe-apps-provider@^0.11.0": - version "0.11.0" - resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-provider/-/safe-apps-provider-0.11.0.tgz#e8fece9bb09dc5179895bb8f3a75f8cddcfdf18c" - integrity sha512-XTEXa5iCk0XOZQkgwHcpzP3sOmT9kYsieY5Bfmlrj7GSuApxnn8PnA7tQuzCOrrH2PbT+nspY04h4aBDDJaKrw== +"@gnosis.pm/safe-apps-provider@^0.11.3": + version "0.11.3" + resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-provider/-/safe-apps-provider-0.11.3.tgz#9e1ec2fb69a7fae8127631330f630662bd07a580" + integrity sha512-vER+vuf44f40KfwqTRjU8rdVMDnGZMmgQcGetlMxq+MTI7VD2Cr3CrCuABFGE/DZK80SxZ+IvQ9yjkemo/ywmQ== dependencies: - "@gnosis.pm/safe-apps-sdk" "7.3.0" + "@gnosis.pm/safe-apps-sdk" "7.5.0" events "^3.3.0" -"@gnosis.pm/safe-apps-sdk@7.3.0", "@gnosis.pm/safe-apps-sdk@^7.3.0": - version "7.3.0" - resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-sdk/-/safe-apps-sdk-7.3.0.tgz#3a3ed38b75657a7d5cd58d5a6884ec60087b05a8" - integrity sha512-1f6VHJWqPRKAEg/m+fbO1XiaDrsTcI3PQg31A0ciHATlVVoh35BYXryijaQxXblLzz4eDgbbIXQdNAH683j87Q== +"@gnosis.pm/safe-apps-sdk@7.5.0", "@gnosis.pm/safe-apps-sdk@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-sdk/-/safe-apps-sdk-7.5.0.tgz#59033c62726abacbf988286ea57250e7581444e8" + integrity sha512-OaF2agv2zfPExzedv1eOGtt3W+rnwGFwtuP37epofhsnDgqS/JMPoqyDLRSvyWYlU22OeKvtghTppvRfaEnUTw== dependencies: - "@gnosis.pm/safe-react-gateway-sdk" "^2.10.0" - ethers "^5.4.7" + "@gnosis.pm/safe-react-gateway-sdk" "^3.1.3" + ethers "^5.6.8" -"@gnosis.pm/safe-react-gateway-sdk@^2.10.0": - version "2.10.3" - resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-react-gateway-sdk/-/safe-react-gateway-sdk-2.10.3.tgz#4537442a78eb0508c483aabcac19296335a77ac3" - integrity sha512-ukaLACozdJQb2YGSAZgBUkF4CT9iKVjpnKFCKUnGGghXqp+Yyn9jpdcfFK0VYQJ6ZSwAm40tHtQaN3K9817Bcg== +"@gnosis.pm/safe-react-gateway-sdk@^3.1.3": + version "3.1.4" + resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-react-gateway-sdk/-/safe-react-gateway-sdk-3.1.4.tgz#90066af7accd75c4c4c04161682db1d907340b55" + integrity sha512-g6SBs+H5dOCpgzPgtucESZm2zI/9rbNQBefcg4ciPI8X7Eq1N6mxK2ZlPmlOoGcISUt5F1E1UogSFkablj2nzw== dependencies: cross-fetch "^3.1.5" @@ -4760,93 +4760,93 @@ dependencies: "@walletconnect/window-getters" "^1.0.0" -"@web3-react/coinbase-wallet@^8.0.33-beta.0": - version "8.0.33-beta.0" - resolved "https://registry.yarnpkg.com/@web3-react/coinbase-wallet/-/coinbase-wallet-8.0.33-beta.0.tgz#65db92da057e9e4d2c63d689cc42874eaa9989e0" - integrity sha512-bi+lm5g8PbLkXjrSS8cKXUuU4yg4A8OJp9M+BAuEWiQ++f7er+XtVF9+o/S81F411YkQH+NTP4VtJmo4V0kWIw== +"@web3-react/coinbase-wallet@^8.0.34-beta.0": + version "8.0.34-beta.0" + resolved "https://registry.yarnpkg.com/@web3-react/coinbase-wallet/-/coinbase-wallet-8.0.34-beta.0.tgz#43d51bb440fb4b98cc2c33782714da30ab8e1fb6" + integrity sha512-eGgtGtAqcRL64U1lcWeICB9CmpUycVl/mWD/b2Nd7yE0hXFUbPGLZHNvBTpnOpkANkjHI5ufFoyDGzzoxdw12A== dependencies: - "@web3-react/types" "^8.0.19-beta.0" + "@web3-react/types" "^8.0.20-beta.0" -"@web3-react/core@^8.0.33-beta.0": - version "8.0.33-beta.0" - resolved "https://registry.yarnpkg.com/@web3-react/core/-/core-8.0.33-beta.0.tgz#018686511e9dcff1001965048d5e16c9ae60268a" - integrity sha512-qif/t5zycmlercIGPGNLpxM0+qiRZpbBIVFHgTGSS67bssgZoeBAXwafesbD1KRjiubATMgYBsKy16KskjxwTA== +"@web3-react/core@^8.0.35-beta.0": + version "8.0.35-beta.0" + resolved "https://registry.yarnpkg.com/@web3-react/core/-/core-8.0.35-beta.0.tgz#8667483bdbc283fc8377d7f56faba1ec2fcdb095" + integrity sha512-vkEL2Vafu57lTA9T/cd3DNkZoDZ3G/JDUgxgjHqKLQVF4bPucrkeErqIHutAJ4suIi4bLOD0dFPMpFs+Bq7RgA== dependencies: - "@web3-react/store" "^8.0.24-beta.0" - "@web3-react/types" "^8.0.19-beta.0" + "@web3-react/store" "^8.0.25-beta.0" + "@web3-react/types" "^8.0.20-beta.0" zustand "^4.0.0-rc.0" optionalDependencies: "@ethersproject/providers" "^5" -"@web3-react/eip1193@^8.0.25-beta.0": - version "8.0.25-beta.0" - resolved "https://registry.yarnpkg.com/@web3-react/eip1193/-/eip1193-8.0.25-beta.0.tgz#1df94b7c5ecef1ea97181015f0717a26b0a08bc7" - integrity sha512-L96B+xWjklR23bYyxYCvDWWcBsoThgY076oKmjJDel+3BnuEK7IH92aWcB1wUo3oLKzETdOm7eWi0ZyjBoM3Ag== - dependencies: - "@web3-react/types" "^8.0.19-beta.0" - -"@web3-react/empty@^8.0.19-beta.0": - version "8.0.19-beta.0" - resolved "https://registry.yarnpkg.com/@web3-react/empty/-/empty-8.0.19-beta.0.tgz#884114cbdc5a82a2cd2e8e661162d2e69284a2ba" - integrity sha512-AAAeaS3Hn6PHdoP86vgx4O0ZjWQ9RFYAID+rJy84DDjLUodl9XLLYidGZmotEdv7kpKw5B5OtxnTjiMrSw64ag== - dependencies: - "@web3-react/types" "^8.0.19-beta.0" - -"@web3-react/gnosis-safe@^8.0.5-beta.0": - version "8.0.5-beta.0" - resolved "https://registry.yarnpkg.com/@web3-react/gnosis-safe/-/gnosis-safe-8.0.5-beta.0.tgz#519a3ab0796d34c8c362709b4fe57b533df9afbb" - integrity sha512-bM3pTPX/B251J411c2eo0ZGn05ySWEiErB0TvY2hNRdYRiAebrho9QgX+Npo6eCZ7TrxZJW4UlFN/UBQtQtjww== - dependencies: - "@gnosis.pm/safe-apps-provider" "^0.11.0" - "@gnosis.pm/safe-apps-sdk" "^7.3.0" - "@web3-react/types" "^8.0.19-beta.0" - -"@web3-react/metamask@^8.0.26-beta.0": +"@web3-react/eip1193@^8.0.26-beta.0": version "8.0.26-beta.0" - resolved "https://registry.yarnpkg.com/@web3-react/metamask/-/metamask-8.0.26-beta.0.tgz#c22dfec8d09be95493668fbb140e5d3a6ff45a8e" - integrity sha512-srYzA4nvMBWlH7kJLCunYueyucbTLmGqDUOK3QquVmQ+avvwOlYVzyvKPQrHf4M2+6f6GpzWYuw6AjNknvfaIA== + resolved "https://registry.yarnpkg.com/@web3-react/eip1193/-/eip1193-8.0.26-beta.0.tgz#2e36423bab637a1fbc57b36d4f0f38ac531fd541" + integrity sha512-n/2ajjABcP8DktZfXxSHrxtPIxeSRJ9tsgfmd9XPEIW9FO7xLzLrF+nloTSghtZ8H+ZKKcswlKjYq4rbX/oqHg== + dependencies: + "@web3-react/types" "^8.0.20-beta.0" + +"@web3-react/empty@^8.0.20-beta.0": + version "8.0.20-beta.0" + resolved "https://registry.yarnpkg.com/@web3-react/empty/-/empty-8.0.20-beta.0.tgz#f8e2a6414ba49c7da3937776c213eb4c8ff6e2c7" + integrity sha512-hde1Wq7w03cal6hD0E+seVg6ZFMWKcaSZ0S5UwJi5CDxhF79oL8QuzpvTBslohRkWqzqlvl52wCSVaY+l2+F8Q== + dependencies: + "@web3-react/types" "^8.0.20-beta.0" + +"@web3-react/gnosis-safe@^8.0.6-beta.0": + version "8.0.6-beta.0" + resolved "https://registry.yarnpkg.com/@web3-react/gnosis-safe/-/gnosis-safe-8.0.6-beta.0.tgz#19eae87aab2cd1cd7a96833fb752c27800a6f2f8" + integrity sha512-xDf87UPfAZK89T19q0oKsN8P6RgWKqD8T9CxjClIVdeDxOoEWMTPn9FPeXM5/Ik3+pq3UUaqcITUZb2CMD14Zw== + dependencies: + "@gnosis.pm/safe-apps-provider" "^0.11.3" + "@gnosis.pm/safe-apps-sdk" "^7.5.0" + "@web3-react/types" "^8.0.20-beta.0" + +"@web3-react/metamask@^8.0.27-beta.0": + version "8.0.27-beta.0" + resolved "https://registry.yarnpkg.com/@web3-react/metamask/-/metamask-8.0.27-beta.0.tgz#a2871a776365c8aac4798cc28d53a0e6173f6688" + integrity sha512-x97x3sy/kKoqoGRZ8+Dld1XEEQ9iv6/bY2gyjadJL99RXoEcvAPbZqCWSJGSySyzTFkq7M7rounkuGmaCMC8lg== dependencies: "@metamask/detect-provider" "^1.2.0" - "@web3-react/types" "^8.0.19-beta.0" + "@web3-react/types" "^8.0.20-beta.0" -"@web3-react/network@^8.0.26-beta.0": - version "8.0.26-beta.0" - resolved "https://registry.yarnpkg.com/@web3-react/network/-/network-8.0.26-beta.0.tgz#43582d7652ae3a3785df0d3c3e582b03e6672e72" - integrity sha512-8VSYbWYHpGvlJOSXgUduSp+UDUaUU1tx+/9ivMb96TOgeyUqmkbERJzzPiaE3d3Ehe+7y/uvu0+v20tQqlx8Uw== +"@web3-react/network@^8.0.27-beta.0": + version "8.0.27-beta.0" + resolved "https://registry.yarnpkg.com/@web3-react/network/-/network-8.0.27-beta.0.tgz#7cb522b02efc9d0f877ac285f350810fbf322292" + integrity sha512-kLHilUpLkDejx0C5Rr57puQSEVA+BQmT58xN6D/elphcZpVHAIkbh/MCYm0XrnLmqq0uOjw+jDhEYBBn80ncHQ== dependencies: "@ethersproject/providers" "^5" - "@web3-react/types" "^8.0.19-beta.0" + "@web3-react/types" "^8.0.20-beta.0" -"@web3-react/store@^8.0.24-beta.0": - version "8.0.24-beta.0" - resolved "https://registry.yarnpkg.com/@web3-react/store/-/store-8.0.24-beta.0.tgz#fb7e25d8478fce8ae95e6f50d7310f97876dc591" - integrity sha512-R2MA1lByr9LwQKhso3PYq31GRYEPbM1HKC4uWGGAY42JBXG+Fnhf/0fUIDcdJzdT6tonGBKRgqXKXQ+8HEjgzA== +"@web3-react/store@^8.0.25-beta.0": + version "8.0.25-beta.0" + resolved "https://registry.yarnpkg.com/@web3-react/store/-/store-8.0.25-beta.0.tgz#853a029a9f82d8950e306adb455ba308f908c8f4" + integrity sha512-YHrZ42EHiQ9UAJq8Y/pHsyXu6GhzbCSHaQJ9U0wCDhbPoQ9QjOj0Pwcaa/VLXljuynK/7ERP942nI1IzArt9Sg== dependencies: "@ethersproject/address" "^5" - "@web3-react/types" "^8.0.19-beta.0" + "@web3-react/types" "^8.0.20-beta.0" zustand "^4.0.0-rc.0" -"@web3-react/types@^8.0.19-beta.0": - version "8.0.19-beta.0" - resolved "https://registry.yarnpkg.com/@web3-react/types/-/types-8.0.19-beta.0.tgz#07daeef090cb252302f3bdf138d133df99826fb1" - integrity sha512-tM63N3IiL5E61HBvx62kDmQlQ/zCfnlYAkJCQnLWFpzQ2Kafcfpi0qAynvFye8DqSgy4E3d6kQah/NIs6BL+qw== +"@web3-react/types@^8.0.20-beta.0": + version "8.0.20-beta.0" + resolved "https://registry.yarnpkg.com/@web3-react/types/-/types-8.0.20-beta.0.tgz#6b4509bef8c5c7eb866e49295880c865c20fb565" + integrity sha512-qOZYMyUmsm3Um6t6Pg3OgnE86ufhWZpB5/VxsooB8cdpXc/C/f8KMyYSeM63GoKSMScOKwfqV6yODFL7g/Qc8g== dependencies: zustand "^4.0.0-rc.0" -"@web3-react/url@^8.0.24-beta.0": - version "8.0.24-beta.0" - resolved "https://registry.yarnpkg.com/@web3-react/url/-/url-8.0.24-beta.0.tgz#7417cdb37bace531aa0fe76ccc4ccef8ed55c0e9" - integrity sha512-+pAMWVKNqg2h0iCRQ6b8zETdmSk903Vg3jinjMwwWSdxLAArCPlUoMgCtnxIFonQzwphynCEIo9w55uQBrOglA== +"@web3-react/url@^8.0.25-beta.0": + version "8.0.25-beta.0" + resolved "https://registry.yarnpkg.com/@web3-react/url/-/url-8.0.25-beta.0.tgz#68e464d2e78b89496e50e9e4a28e91281c4d53d6" + integrity sha512-cjFfAFjsWF5vqJ7TG79HT72jNNWlcS9bqbNK2jvu25zej62zMpPvy4iyYiV7zy2SLbAQTdsgvIMYAdxRbnzlWg== dependencies: "@ethersproject/providers" "^5" - "@web3-react/types" "^8.0.19-beta.0" + "@web3-react/types" "^8.0.20-beta.0" -"@web3-react/walletconnect@^8.0.34-beta.0": - version "8.0.34-beta.0" - resolved "https://registry.yarnpkg.com/@web3-react/walletconnect/-/walletconnect-8.0.34-beta.0.tgz#b0dee4d8e37dbb8783b46f6e181cbb7c317084d8" - integrity sha512-CG6dc6Lq0QVNvTp5lCFycIaHoPPV+X/6ay3swd5t2LD9R9Ao8sSzF0zU9Fi1iq41UDCue6WO4u2Lp7uHNAIcxw== +"@web3-react/walletconnect@^8.0.35-beta.0": + version "8.0.35-beta.0" + resolved "https://registry.yarnpkg.com/@web3-react/walletconnect/-/walletconnect-8.0.35-beta.0.tgz#49c6c77447d58bfb295f28fa87c8fbfeec95cff5" + integrity sha512-fUrqcnwAr5oecZ6VUE/7+RSVURrohbAgWMLKYxd8Zo47AtTPzgJ1t5Lydh/EX4xJPLhfK1LqX5YgMwiys3DvhQ== dependencies: - "@web3-react/types" "^8.0.19-beta.0" + "@web3-react/types" "^8.0.20-beta.0" eventemitter3 "^4.0.7" "@webassemblyjs/ast@1.9.0": @@ -8965,12 +8965,12 @@ ethereumjs-util@^6.0.0: ethjs-util "0.1.6" rlp "^2.2.3" -ethers@^5.1.4, ethers@^5.4.7, ethers@^5.6.0: - version "5.6.8" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.6.8.tgz#d36b816b4896341a80a8bbd2a44e8cb6e9b98dd4" - integrity sha512-YxIGaltAOdvBFPZwIkyHnXbW40f1r8mHUgapW6dxkO+6t7H6wY8POUn0Kbxrd/N7I4hHxyi7YCddMAH/wmho2w== +ethers@^5.1.4, ethers@^5.6.0, ethers@^5.6.8: + version "5.6.9" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.6.9.tgz#4e12f8dfcb67b88ae7a78a9519b384c23c576a4d" + integrity sha512-lMGC2zv9HC5EC+8r429WaWu3uWJUCgUCt8xxKCFqkrFuBDZXDYIdzDUECxzjf2BMF8IVBByY1EBoGSL3RTm8RA== dependencies: - "@ethersproject/abi" "5.6.3" + "@ethersproject/abi" "5.6.4" "@ethersproject/abstract-provider" "5.6.1" "@ethersproject/abstract-signer" "5.6.2" "@ethersproject/address" "5.6.1" @@ -8985,7 +8985,7 @@ ethers@^5.1.4, ethers@^5.4.7, ethers@^5.6.0: "@ethersproject/json-wallets" "5.6.1" "@ethersproject/keccak256" "5.6.1" "@ethersproject/logger" "5.6.0" - "@ethersproject/networks" "5.6.3" + "@ethersproject/networks" "5.6.4" "@ethersproject/pbkdf2" "5.6.1" "@ethersproject/properties" "5.6.0" "@ethersproject/providers" "5.6.8"