fix: approved caip networks data for universal provider

.changeset/blue-pens-yawn.md

@@ -0,0 +1,38 @@
+---
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit': patch
+'@reown/appkit-core': patch
+'@apps/demo': patch
+'@apps/gallery': patch
+'@apps/laboratory': patch
+'@examples/html-ethers': patch
+'@examples/html-ethers5': patch
+'@examples/html-wagmi': patch
+'@examples/next-ethers': patch
+'@examples/next-wagmi': patch
+'@examples/react-ethers': patch
+'@examples/react-ethers5': patch
+'@examples/react-solana': patch
+'@examples/react-wagmi': patch
+'@examples/vue-ethers5': patch
+'@examples/vue-solana': patch
+'@examples/vue-wagmi': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-polkadot': patch
+'@reown/appkit-utils': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-common': patch
+'@reown/appkit-ethers': patch
+'@reown/appkit-ethers5': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-solana': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-wagmi': patch
+'@reown/appkit-wallet': patch
+---
+
+Get correct data from session namespaces and set it for approved caip networks data on UniversalProvider usage"

packages/adapters/solana/src/client.ts

@@ -26,7 +26,7 @@ import type {
   NetworkControllerClient,
   Connector
 } from '@reown/appkit-core'
-import type { AdapterType, CaipAddress, CaipNetwork, CaipNetworkId } from '@reown/appkit-common'
+import type { AdapterType, CaipAddress, CaipNetwork } from '@reown/appkit-common'
 import type { ChainNamespace } from '@reown/appkit-common'
 
 import { watchStandard } from './utils/watchStandard.js'
@@ -44,7 +44,7 @@ import type { AppKit } from '@reown/appkit'
 import type { AppKitOptions as CoreOptions } from '@reown/appkit'
 import { ProviderUtil } from '@reown/appkit/store'
 import { W3mFrameProviderSingleton } from '@reown/appkit/auth-provider'
-import { ConstantsUtil, PresetsUtil } from '@reown/appkit-utils'
+import { ConstantsUtil } from '@reown/appkit-utils'
 import { createSendTransaction } from './utils/createSendTransaction.js'
 
 export interface AdapterOptions {
@@ -152,34 +152,19 @@ export class SolanaAdapter implements ChainAdapter {
         }
       },
 
-      getApprovedCaipNetworksData: async () =>
-        new Promise(resolve => {
-          const walletId = SafeLocalStorage.getItem(SafeLocalStorageKeys.WALLET_ID)
-
-          if (!walletId) {
-            throw new Error('No wallet id found to get approved networks data')
-          }
-
-          const providerConfigs = {
-            [ConstantsUtil.AUTH_CONNECTOR_ID]: {
-              supportsAllNetworks: true,
-              approvedCaipNetworkIds: PresetsUtil.WalletConnectRpcChainIds.map(
-                id => `${ConstantsUtil.EIP155}:${id}`
-              ) as CaipNetworkId[]
-            }
-          }
-
-          const networkData = providerConfigs[walletId as unknown as keyof typeof providerConfigs]
+      getApprovedCaipNetworksData: async () => {
+        if (this.provider) {
+          return Promise.resolve({
+            supportsAllNetworks: false,
+            approvedCaipNetworkIds: this.provider.chains.map(chain => chain.id)
+          })
+        }
 
-          if (networkData) {
-            resolve(networkData)
-          } else {
-            resolve({
-              supportsAllNetworks: true,
-              approvedCaipNetworkIds: []
-            })
-          }
+        return Promise.resolve({
+          supportsAllNetworks: false,
+          approvedCaipNetworkIds: []
         })
+      }
     }
 
     this.connectionControllerClient = {
@@ -479,26 +464,29 @@ export class SolanaAdapter implements ChainAdapter {
       this.appKit?.setLoading(true)
       const address = await provider.connect()
       const caipChainId = SafeLocalStorage.getItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK_ID)
-      let connectionChain: CaipNetwork | undefined = undefined
-
-      const activeCaipNetwork = this.appKit?.getCaipNetwork()
 
-      // eslint-disable-next-line no-nested-ternary
-      connectionChain = caipChainId
-        ? SolHelpersUtil.getChainFromCaip(this.caipNetworks, caipChainId)
-        : activeCaipNetwork?.chainNamespace === 'solana'
-          ? this.caipNetworks.find(chain => chain.chainNamespace === 'solana')
-          : activeCaipNetwork || this.caipNetworks.find(chain => chain.chainNamespace === 'solana')
+      const connectionChain =
+        provider.chains.find(chain => chain.id === caipChainId) || provider.chains[0]
 
       if (connectionChain) {
-        const caipAddress = `solana:${connectionChain.chainId}:${address}` as CaipAddress
+        const caipAddress = `solana:${connectionChain.chainId}:${address}` as const
         this.appKit?.setCaipAddress(caipAddress, this.chainNamespace)
 
         await this.switchNetwork(connectionChain)
 
         ProviderUtil.setProvider(this.chainNamespace, provider)
         this.provider = provider
-        ProviderUtil.setProviderId(this.chainNamespace, 'walletConnect')
+
+        switch (provider.type) {
+          case 'WALLET_CONNECT':
+            ProviderUtil.setProviderId(this.chainNamespace, 'walletConnect')
+            break
+          case 'AUTH':
+            ProviderUtil.setProviderId(this.chainNamespace, 'w3mAuth')
+            break
+          default:
+            ProviderUtil.setProviderId(this.chainNamespace, 'injected')
+        }
 
         SafeLocalStorage.setItem(SafeLocalStorageKeys.WALLET_ID, provider.name)
 
@@ -609,6 +597,8 @@ export class SolanaAdapter implements ChainAdapter {
       getActiveChain: () => this.appKit?.getCaipNetwork()
     })
 
+    this.addProvider(walletConnectProvider)
+
     return walletConnectProvider
   }
 
@@ -659,9 +649,7 @@ export class SolanaAdapter implements ChainAdapter {
 
     for (const provider of providers) {
       this.availableProviders = this.availableProviders.filter(p => p.name !== provider.name)
-      if (provider.type !== 'WALLET_CONNECT') {
-        this.availableProviders.push(provider)
-      }
+      this.availableProviders.push(provider)
 
       if (provider.name === activeProviderName && isSolana) {
         this.setProvider(provider)

packages/adapters/solana/src/providers/WalletConnectProvider.ts

@@ -14,6 +14,7 @@ import {
 import { isVersionedTransaction } from '@solana/wallet-adapter-base'
 import type { CaipNetwork, ChainId } from '@reown/appkit-common'
 import { withSolanaNamespace } from '../utils/withSolanaNamespace.js'
+import { WcHelpersUtil } from '@reown/appkit'
 
 export type WalletConnectProviderConfig = {
   provider: UniversalProvider
@@ -220,20 +221,7 @@ export class WalletConnectProvider extends ProviderEventEmitter implements Provi
   }
 
   private get sessionChains() {
-    const solanaNamespace = this.session?.namespaces['solana']
-
-    if (!solanaNamespace) {
-      return []
-    }
-
-    const chains = solanaNamespace.chains || []
-    const accountsChains = solanaNamespace.accounts.map(account => {
-      const [chainNamespace, chainId] = account.split(':')
-
-      return `${chainNamespace}:${chainId}`
-    })
-
-    return Array.from(new Set([...chains, ...accountsChains]))
+    return WcHelpersUtil.getChainsFromNamespaces(this.session?.namespaces)
   }
 
   private serializeTransaction(transaction: AnyTransaction) {

packages/adapters/solana/src/tests/client.test.ts

@@ -147,7 +147,8 @@ describe('SolanaAdapter', () => {
       const mockProvider = {
         connect: vi.fn().mockResolvedValue('DjPi1LtwrXJMAh2AUvuUMajCpMJEKg8N1J1PbLGjCH5B'),
         name: 'MockProvider',
-        on: vi.fn()
+        on: vi.fn(),
+        chains: [{ chainId: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp' }]
       }
       vi.spyOn(SafeLocalStorage, 'getItem').mockReturnValue(
         'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp'
@@ -161,11 +162,16 @@ describe('SolanaAdapter', () => {
         'solana'
       )
       expect(ProviderUtil.setProvider).toHaveBeenCalledWith('solana', mockProvider)
-      expect(ProviderUtil.setProviderId).toHaveBeenCalledWith('solana', 'walletConnect')
+      expect(ProviderUtil.setProviderId).toHaveBeenCalledWith('solana', 'injected')
     })
 
     it('should add provider', () => {
-      const mockProvider = { name: 'MockProvider', type: 'INJECTED', icon: 'mock-icon' }
+      const mockProvider = {
+        name: 'MockProvider',
+        type: 'INJECTED',
+        icon: 'mock-icon',
+        chains: [{ chainId: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp' }]
+      }
       client['addProvider'](mockProvider as any)
 
       expect(client['availableProviders']).toContain(mockProvider)

packages/adapters/wagmi/src/utils/helpers.ts

@@ -6,6 +6,7 @@ import { fallback, http, type Hex } from 'viem'
 import type { Chain } from '@wagmi/core/chains'
 import type { Connector } from '@wagmi/core'
 import { CoreHelperUtil } from '@reown/appkit-core'
+import { WcHelpersUtil } from '@reown/appkit'
 
 export async function getWalletConnectCaipNetworks(connector?: Connector) {
   if (!connector) {
@@ -15,22 +16,13 @@ export async function getWalletConnectCaipNetworks(connector?: Connector) {
     ReturnType<(typeof UniversalProvider)['init']>
   >
 
-  const ns = provider?.session?.namespaces
-
-  const nsChains: CaipNetworkId[] | undefined = []
-
-  if (ns) {
-    Object.keys(ns).forEach(key => {
-      const chains = ns?.[key]?.chains
-      if (chains) {
-        nsChains.push(...(chains as CaipNetworkId[]))
-      }
-    })
-  }
+  const approvedCaipNetworkIds = WcHelpersUtil.getChainsFromNamespaces(
+    provider?.session?.namespaces
+  )
 
   return {
-    supportsAllNetworks: true,
-    approvedCaipNetworkIds: nsChains
+    supportsAllNetworks: false,
+    approvedCaipNetworkIds
   }
 }
 

packages/appkit/src/tests/universal-adapter.test.ts

@@ -55,7 +55,7 @@ describe('UniversalAdapter', () => {
         await universalAdapter.networkControllerClient.getApprovedCaipNetworksData()
 
       expect(approvedCaipNetworksData).toMatchObject({
-        supportsAllNetworks: true,
+        supportsAllNetworks: false,
         approvedCaipNetworkIds: [
           mockProvider.session?.namespaces['eip155']?.chains?.[0],
           mockProvider.session?.namespaces['solana']?.chains?.[0]
@@ -137,6 +137,14 @@ describe('UniversalAdapter', () => {
       expect(mockAppKit.resetAccount).toHaveBeenCalledWith('eip155')
       expect(mockAppKit.resetAccount).toHaveBeenCalledWith('solana')
     })
+
+    it('should set the ApprovedCaipNetworksData', async () => {
+      const mockOnUri = vi.fn()
+      await universalAdapter?.connectionControllerClient?.connectWalletConnect?.(mockOnUri)
+
+      expect(mockAppKit.setApprovedCaipNetworksData).toHaveBeenCalledWith('eip155')
+      expect(mockAppKit.setApprovedCaipNetworksData).toHaveBeenCalledWith('solana')
+    })
   })
 
   describe('UniversalAdapter - ProviderUtil', () => {

packages/appkit/src/tests/utils/HelpersUtil.test.ts

@@ -1,6 +1,7 @@
 import { describe, test, expect } from 'vitest'
 import { WcHelpersUtil } from '../../utils/HelpersUtil'
 import type { CaipNetwork } from '@reown/appkit-common'
+import type { SessionTypes } from '@walletconnect/types'
 
 const mockEthereumNetwork = {
   id: 'eip155:1',
@@ -124,4 +125,33 @@ describe('WcHelpersUtil', () => {
       expect(namespaces).toEqual({})
     })
   })
+
+  describe('getChainsFromNamespaces', () => {
+    test('returns correct chain ids', () => {
+      const namespaces = {
+        eip155: {
+          methods: [],
+          events: [],
+          chains: ['eip155:1', 'eip155:137'],
+          accounts: ['eip155:4000:0x123', 'eip155:3000:0x456']
+        },
+        solana: {
+          methods: [],
+          events: [],
+          chains: ['solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp'],
+          accounts: ['solana:mainnet:address', 'solana:devnet:address']
+        }
+      } as SessionTypes.Namespaces
+
+      expect(WcHelpersUtil.getChainsFromNamespaces(namespaces)).toEqual([
+        'eip155:1',
+        'eip155:137',
+        'eip155:4000',
+        'eip155:3000',
+        'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+        'solana:mainnet',
+        'solana:devnet'
+      ])
+    })
+  })
 })