fix: gets chains from approved accounts (#2562)

Co-authored-by: tomiir <[email protected]>
reown-com · Jul 23, 2024 · 2f95f1a · 2f95f1a
1 parent 30acdfc
commit 2f95f1a
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 102 deletions.
diff --git a/apps/laboratory/package.json b/apps/laboratory/package.json
@@ -43,8 +43,8 @@
     "@tanstack/react-query": "5.24.8",
     "@wagmi/core": "2.11.6",
     "@wagmi/connectors": "5.0.21",
-    "@walletconnect/ethereum-provider": "2.13.0",
-    "@walletconnect/utils": "2.13.1",
+    "@walletconnect/ethereum-provider": "2.14.0",
+    "@walletconnect/utils": "2.14.0",
     "@web3modal/ethers": "workspace:*",
     "@web3modal/siwe": "workspace:*",
     "@web3modal/solana": "workspace:*",

diff --git a/packages/ethers/package.json b/packages/ethers/package.json
@@ -45,6 +45,7 @@
   "dependencies": {
     "@coinbase/wallet-sdk": "4.0.3",
     "@walletconnect/ethereum-provider": "2.14.0",
+    "@walletconnect/utils": "2.14.0",
     "@web3modal/common": "workspace:*",
     "@web3modal/wallet": "workspace:*",
     "@web3modal/polyfills": "workspace:*",

diff --git a/packages/ethers/src/client.ts b/packages/ethers/src/client.ts
@@ -16,6 +16,7 @@ import { Web3ModalScaffold } from '@web3modal/scaffold'
 import { ConstantsUtil, PresetsUtil, HelpersUtil } from '@web3modal/scaffold-utils'
 import { ConstantsUtil as CommonConstantsUtil } from '@web3modal/common'
 import EthereumProvider, { OPTIONAL_METHODS } from '@walletconnect/ethereum-provider'
+import { getChainsFromAccounts } from '@walletconnect/utils'
 import type { Web3ModalSIWEClient } from '@web3modal/siwe'
 import { ConstantsUtil as CommonConstants } from '@web3modal/common'
 import type { Chain as AvailableChain } from '@web3modal/common'
@@ -171,7 +172,9 @@ export class Web3Modal extends Web3ModalScaffold {
             }
             const ns = provider.signer?.session?.namespaces
             const nsMethods = ns?.[ConstantsUtil.EIP155]?.methods
-            const nsChains = ns?.[ConstantsUtil.EIP155]?.chains
+            const nsChains = getChainsFromAccounts(
+              ns?.[ConstantsUtil.EIP155]?.accounts || []
+            ) as CaipNetworkId[]
 
             const result = {
               supportsAllNetworks: nsMethods?.includes(ConstantsUtil.ADD_CHAIN_METHOD) ?? false,

diff --git a/packages/ethers5/package.json b/packages/ethers5/package.json
@@ -45,6 +45,7 @@
   "dependencies": {
     "@coinbase/wallet-sdk": "4.0.3",
     "@walletconnect/ethereum-provider": "2.14.0",
+    "@walletconnect/utils": "2.14.0",
     "@web3modal/common": "workspace:*",
     "@web3modal/polyfills": "workspace:*",
     "@web3modal/scaffold": "workspace:*",

diff --git a/packages/ethers5/src/client.ts b/packages/ethers5/src/client.ts
@@ -16,6 +16,7 @@ import type { Web3ModalSIWEClient } from '@web3modal/siwe'
 import { ConstantsUtil, PresetsUtil, HelpersUtil } from '@web3modal/scaffold-utils'
 import { ConstantsUtil as CommonConstantsUtil } from '@web3modal/common'
 import EthereumProvider, { OPTIONAL_METHODS } from '@walletconnect/ethereum-provider'
+import { getChainsFromAccounts } from '@walletconnect/utils'
 import type {
   Address,
   Metadata,
@@ -146,7 +147,9 @@ export class Web3Modal extends Web3ModalScaffold {
             }
             const ns = provider.signer?.session?.namespaces
             const nsMethods = ns?.[ConstantsUtil.EIP155]?.methods
-            const nsChains = ns?.[ConstantsUtil.EIP155]?.chains
+            const nsChains = getChainsFromAccounts(
+              ns?.[ConstantsUtil.EIP155]?.accounts || []
+            ) as CaipNetworkId[]
 
             const result = {
               supportsAllNetworks: nsMethods?.includes(ConstantsUtil.ADD_CHAIN_METHOD) ?? false,

diff --git a/packages/solana/package.json b/packages/solana/package.json
@@ -77,7 +77,7 @@
   },
   "devDependencies": {
     "@types/bn.js": "5.1.5",
-    "@walletconnect/types": "2.13.3"
+    "@walletconnect/types": "2.14.0"
   },
   "peerDependencies": {
     "react": ">=17",

diff --git a/packages/wagmi/package.json b/packages/wagmi/package.json
@@ -52,6 +52,7 @@
   },
   "dependencies": {
     "@walletconnect/ethereum-provider": "2.14.0",
+    "@walletconnect/utils": "2.14.0",
     "@web3modal/polyfills": "workspace:*",
     "@web3modal/wallet": "workspace:*",
     "@web3modal/common": "workspace:*",

diff --git a/packages/wagmi/src/utils/helpers.ts b/packages/wagmi/src/utils/helpers.ts
@@ -1,6 +1,7 @@
 import { CoreHelperUtil } from '@web3modal/scaffold'
 import { ConstantsUtil, PresetsUtil } from '@web3modal/scaffold-utils'
 import { EthereumProvider } from '@walletconnect/ethereum-provider'
+import { getChainsFromAccounts } from '@walletconnect/utils'
 import { fallback, http } from 'viem'
 
 import type { CaipNetwork, CaipNetworkId } from '@web3modal/scaffold'
@@ -28,7 +29,9 @@ export async function getWalletConnectCaipNetworks(connector?: Connector) {
   >
   const ns = provider?.signer?.session?.namespaces
   const nsMethods = ns?.[ConstantsUtil.EIP155]?.methods
-  const nsChains = ns?.[ConstantsUtil.EIP155]?.chains as CaipNetworkId[]
+  const nsChains = getChainsFromAccounts(
+    ns?.[ConstantsUtil.EIP155]?.accounts || []
+  ) as CaipNetworkId[]
 
   return {
     supportsAllNetworks: Boolean(nsMethods?.includes(ConstantsUtil.ADD_CHAIN_METHOD)),

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml