Merge branch 'main' of github.com:WalletConnect/web3modal into feat/d…

…efault-account-type-option
reown-com · Jan 10, 2025 · 5e140fa · 5e140fa
2 parents 55879a7 + 427dde3
commit 5e140fa
Show file tree

Hide file tree

Showing 28 changed files with 573 additions and 621 deletions.
diff --git a/.changeset/breezy-candles-nail.md b/.changeset/breezy-candles-nail.md
@@ -0,0 +1,23 @@
+---
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit-utils': patch
+'@reown/appkit-adapter-bitcoin': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-cli': patch
+'@reown/appkit-common': patch
+'@reown/appkit-core': patch
+'@reown/appkit-experimental': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-siwx': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-wallet': patch
+'@reown/appkit-wallet-button': patch
+---
+
+Abstracts Connectors management in Solana Adapter
diff --git a/packages/adapters/ethers/src/client.ts b/packages/adapters/ethers/src/client.ts
@@ -528,43 +528,38 @@ export class EthersAdapter extends AdapterBlueprint {
     }
   }
 
-  public async switchNetwork(params: AdapterBlueprint.SwitchNetworkParams): Promise<void> {
+  public override async switchNetwork(params: AdapterBlueprint.SwitchNetworkParams): Promise<void> {
     const { caipNetwork, provider, providerType } = params
-    if (providerType === 'WALLET_CONNECT') {
-      ;(provider as UniversalProvider).setDefaultChain(String(`eip155:${String(caipNetwork.id)}`))
-    } else if (providerType === 'AUTH') {
-      const authProvider = provider as W3mFrameProvider
-      await authProvider.switchNetwork(caipNetwork.id)
-      await authProvider.connect({
-        chainId: caipNetwork.id,
-        preferredAccountType: OptionsController.state.defaultAccountTypes.eip155
+
+    if (providerType === 'AUTH' || providerType === 'WALLET_CONNECT') {
+      await super.switchNetwork(params)
+
+      return
+    }
+
+    try {
+      await (provider as Provider).request({
+        method: 'wallet_switchEthereumChain',
+        params: [{ chainId: EthersHelpersUtil.numberToHexString(caipNetwork.id) }]
       })
-    } else {
-      try {
-        await (provider as Provider).request({
-          method: 'wallet_switchEthereumChain',
-          params: [{ chainId: EthersHelpersUtil.numberToHexString(caipNetwork.id) }]
-        })
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      } catch (switchError: any) {
-        if (
-          switchError.code === WcConstantsUtil.ERROR_CODE_UNRECOGNIZED_CHAIN_ID ||
-          switchError.code === WcConstantsUtil.ERROR_CODE_DEFAULT ||
-          switchError?.data?.originalError?.code ===
-            WcConstantsUtil.ERROR_CODE_UNRECOGNIZED_CHAIN_ID
-        ) {
-          try {
-            await EthersHelpersUtil.addEthereumChain(provider as Provider, caipNetwork)
-          } catch (e) {
-            console.warn('Could not add chain to wallet', e)
-          }
-        } else if (
-          providerType === 'ANNOUNCED' ||
-          providerType === 'EXTERNAL' ||
-          providerType === 'INJECTED'
-        ) {
-          throw new Error('Chain is not supported')
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (switchError: any) {
+      if (
+        switchError.code === WcConstantsUtil.ERROR_CODE_UNRECOGNIZED_CHAIN_ID ||
+        switchError.code === WcConstantsUtil.ERROR_CODE_DEFAULT ||
+        switchError?.data?.originalError?.code === WcConstantsUtil.ERROR_CODE_UNRECOGNIZED_CHAIN_ID
+      ) {
+        try {
+          await EthersHelpersUtil.addEthereumChain(provider as Provider, caipNetwork)
+        } catch (e) {
+          console.warn('Could not add chain to wallet', e)
         }
+      } else if (
+        providerType === 'ANNOUNCED' ||
+        providerType === 'EXTERNAL' ||
+        providerType === 'INJECTED'
+      ) {
+        throw new Error('Chain is not supported')
       }
     }
   }

diff --git a/packages/adapters/ethers/src/tests/client.test.ts b/packages/adapters/ethers/src/tests/client.test.ts
@@ -75,7 +75,8 @@ const mockWalletConnectProvider = {
 const mockAuthProvider = {
   connect: vi.fn(),
   disconnect: vi.fn(),
-  switchNetwork: vi.fn()
+  switchNetwork: vi.fn(),
+  getUser: vi.fn()
 } as unknown as W3mFrameProvider
 
 const mockNetworks = [mainnet]
@@ -312,8 +313,8 @@ describe('EthersAdapter', () => {
         providerType: 'AUTH'
       })
 
-      expect(mockAuthProvider.switchNetwork).toHaveBeenCalledWith(1)
-      expect(mockAuthProvider.connect).toHaveBeenCalledWith({ chainId: 1 })
+      expect(mockAuthProvider.switchNetwork).toHaveBeenCalledWith('eip155:1')
+      expect(mockAuthProvider.getUser).toHaveBeenCalledWith({ chainId: 'eip155:1' })
     })
 
     it('should add Ethereum chain with external provider and use chain default', async () => {

diff --git a/packages/adapters/ethers/src/tests/mocks/AuthConnector.ts b/packages/adapters/ethers/src/tests/mocks/AuthConnector.ts
@@ -25,5 +25,12 @@ export const mockAuthConnector = {
   disconnect: vi.fn(),
   switchNetwork: vi.fn(),
   rejectRpcRequests: vi.fn(),
-  request: vi.fn()
+  request: vi.fn(),
+  getUser: vi.fn().mockResolvedValue({
+    address: '0x1234567890123456789012345678901234567890',
+    chainId: 1,
+    smartAccountDeployed: true,
+    preferredAccountType: 'eoa',
+    accounts: []
+  })
 }
diff --git a/packages/adapters/ethers5/src/client.ts b/packages/adapters/ethers5/src/client.ts
@@ -531,39 +531,34 @@ export class Ethers5Adapter extends AdapterBlueprint {
     }
   }
 
-  public async switchNetwork(params: AdapterBlueprint.SwitchNetworkParams): Promise<void> {
+  public override async switchNetwork(params: AdapterBlueprint.SwitchNetworkParams): Promise<void> {
     const { caipNetwork, provider, providerType } = params
-    if (providerType === 'WALLET_CONNECT') {
-      ;(provider as UniversalProvider).setDefaultChain(String(`eip155:${String(caipNetwork.id)}`))
-    } else if (providerType === 'AUTH') {
-      const authProvider = provider as W3mFrameProvider
-      await authProvider.switchNetwork(caipNetwork.id)
-      await authProvider.connect({
-        chainId: caipNetwork.id,
-        preferredAccountType: OptionsController.state.defaultAccountTypes.eip155
+
+    if (providerType === 'AUTH' || providerType === 'WALLET_CONNECT') {
+      await super.switchNetwork(params)
+
+      return
+    }
+
+    try {
+      await (provider as Provider).request({
+        method: 'wallet_switchEthereumChain',
+        params: [{ chainId: EthersHelpersUtil.numberToHexString(caipNetwork.id) }]
       })
-    } else {
-      try {
-        await (provider as Provider).request({
-          method: 'wallet_switchEthereumChain',
-          params: [{ chainId: EthersHelpersUtil.numberToHexString(caipNetwork.id) }]
-        })
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      } catch (switchError: any) {
-        if (
-          switchError.code === WcConstantsUtil.ERROR_CODE_UNRECOGNIZED_CHAIN_ID ||
-          switchError.code === WcConstantsUtil.ERROR_CODE_DEFAULT ||
-          switchError?.data?.originalError?.code ===
-            WcConstantsUtil.ERROR_CODE_UNRECOGNIZED_CHAIN_ID
-        ) {
-          await EthersHelpersUtil.addEthereumChain(provider as Provider, caipNetwork)
-        } else if (
-          providerType === 'ANNOUNCED' ||
-          providerType === 'EXTERNAL' ||
-          providerType === 'INJECTED'
-        ) {
-          throw new Error('Chain is not supported')
-        }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (switchError: any) {
+      if (
+        switchError.code === WcConstantsUtil.ERROR_CODE_UNRECOGNIZED_CHAIN_ID ||
+        switchError.code === WcConstantsUtil.ERROR_CODE_DEFAULT ||
+        switchError?.data?.originalError?.code === WcConstantsUtil.ERROR_CODE_UNRECOGNIZED_CHAIN_ID
+      ) {
+        await EthersHelpersUtil.addEthereumChain(provider as Provider, caipNetwork)
+      } else if (
+        providerType === 'ANNOUNCED' ||
+        providerType === 'EXTERNAL' ||
+        providerType === 'INJECTED'
+      ) {
+        throw new Error('Chain is not supported')
       }
     }
   }

diff --git a/packages/adapters/ethers5/src/tests/client.test.ts b/packages/adapters/ethers5/src/tests/client.test.ts
@@ -67,7 +67,8 @@ const mockWalletConnectProvider = {
 const mockAuthProvider = {
   connect: vi.fn(),
   disconnect: vi.fn(),
-  switchNetwork: vi.fn()
+  switchNetwork: vi.fn(),
+  getUser: vi.fn()
 } as unknown as W3mFrameProvider
 
 const mockNetworks = [mainnet]
@@ -304,8 +305,8 @@ describe('Ethers5Adapter', () => {
         providerType: 'AUTH'
       })
 
-      expect(mockAuthProvider.switchNetwork).toHaveBeenCalledWith(1)
-      expect(mockAuthProvider.connect).toHaveBeenCalledWith({ chainId: 1 })
+      expect(mockAuthProvider.switchNetwork).toHaveBeenCalledWith('eip155:1')
+      expect(mockAuthProvider.getUser).toHaveBeenCalledWith({ chainId: 'eip155:1' })
     })
   })