Fix/wagmi solana auth

packages/adapters/solana/src/client.ts

@@ -99,7 +99,10 @@ export class SolanaAdapter implements ChainAdapter {
       const isSolanaNetwork = val?.chainNamespace === this.chainNamespace
 
       if (isSolanaAddress && isSolanaNetwork && caipAddress) {
-        this.syncAccount({ address: CoreHelperUtil.getPlainAddress(caipAddress), caipNetwork: val })
+        this.syncAccount({
+          address: CoreHelperUtil.getPlainAddress(caipAddress),
+          caipNetwork: val
+        })
       }
     })
     AccountController.subscribeKey(

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

@@ -14,7 +14,12 @@ import {
 import { withSolanaNamespace } from '../utils/withSolanaNamespace.js'
 import base58 from 'bs58'
 import { isVersionedTransaction } from '@solana/wallet-adapter-base'
-import type { CaipNetwork, ChainNamespace } from '@reown/appkit-common'
+import {
+  SafeLocalStorage,
+  SafeLocalStorageKeys,
+  type CaipNetwork,
+  type ChainNamespace
+} from '@reown/appkit-common'
 
 export type AuthProviderConfig = {
   getProvider: () => W3mFrameProvider
@@ -31,24 +36,15 @@ export class AuthProvider extends ProviderEventEmitter implements Provider, Prov
 
   private readonly getProvider: AuthProviderConfig['getProvider']
   private readonly getActiveChain: AuthProviderConfig['getActiveChain']
-  private readonly getActiveNamespace: AuthProviderConfig['getActiveNamespace']
   private readonly requestedChains: CaipNetwork[]
   private readonly getSession: AuthProviderConfig['getSession']
   private readonly setSession: AuthProviderConfig['setSession']
 
-  constructor({
-    getProvider,
-    getActiveChain,
-    getActiveNamespace,
-    getSession,
-    setSession,
-    chains
-  }: AuthProviderConfig) {
+  constructor({ getProvider, getActiveChain, getSession, setSession, chains }: AuthProviderConfig) {
     super()
 
     this.getProvider = getProvider
     this.getActiveChain = getActiveChain
-    this.getActiveNamespace = getActiveNamespace
     this.requestedChains = chains
     this.getSession = getSession
     this.setSession = setSession
@@ -213,7 +209,9 @@ export class AuthProvider extends ProviderEventEmitter implements Provider, Prov
   }
 
   private serializeTransaction(transaction: AnyTransaction) {
-    return base58.encode(transaction.serialize({ verifySignatures: false }))
+    const serializedTransaction = transaction.serialize({ verifySignatures: false })
+
+    return base58.encode(Buffer.from(serializedTransaction))
   }
 
   private bindEvents() {
@@ -231,10 +229,14 @@ export class AuthProvider extends ProviderEventEmitter implements Provider, Prov
 
     this.getProvider().onIsConnected(response => {
       this.setSession(response)
-      const activeNamespace = this.getActiveNamespace()
 
-      if (activeNamespace === 'solana') {
-        this.emit('connect', this.getPublicKey(true))
+      const storedCaipNetwork = SafeLocalStorage.getItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK)
+      if (storedCaipNetwork) {
+        const parsedCaipNetwork = JSON.parse(storedCaipNetwork) as CaipNetwork
+
+        if (parsedCaipNetwork.chainNamespace === 'solana') {
+          this.emit('connect', this.getPublicKey(true))
+        }
       }
     })
 

packages/adapters/wagmi/src/client.ts

@@ -236,7 +236,14 @@ export class WagmiAdapter implements ChainAdapter {
         )
         const chainId = Number(NetworkUtil.caipNetworkIdToNumber(caipNetwork?.id))
 
-        if (chainId && this.wagmiConfig) {
+        if (chainId && this.wagmiConfig && caipNetwork) {
+          const connectedConnector = SafeLocalStorage.getItem(
+            SafeLocalStorageKeys.CONNECTED_CONNECTOR
+          )
+          const isConnectedWithAuth = connectedConnector === 'AUTH'
+          if (isConnectedWithAuth) {
+            this.handleSwitchNetworkAuthConnector(caipNetwork)
+          }
           await switchChain(this.wagmiConfig, { chainId })
         }
       },
@@ -787,6 +794,16 @@ export class WagmiAdapter implements ChainAdapter {
     this.appKit?.setBalance(undefined, undefined, this.chainNamespace)
   }
 
+  private async handleSwitchNetworkAuthConnector(caipNetwork: CaipNetwork) {
+    const connector = this.wagmiConfig.connectors.find(
+      c => c.id === ConstantsUtil.AUTH_CONNECTOR_ID
+    ) as unknown as AdapterOptions<Config>['wagmiConfig']['connectors'][0]
+    const provider = (await connector?.getProvider()) as W3mFrameProvider
+    if (caipNetwork?.id) {
+      await provider.switchNetwork(caipNetwork?.id)
+    }
+  }
+
   private async syncConnectedWalletInfo(connector: GetAccountReturnType['connector']) {
     if (!connector) {
       throw Error('syncConnectedWalletInfo - connector is undefined')

packages/core/src/controllers/ChainController.ts

@@ -106,7 +106,9 @@ export const ChainController = {
     if (!state.noAdapters) {
       state.activeChain = adapterToActivate?.chainNamespace
       PublicStateController.set({ activeChain: adapterToActivate?.chainNamespace })
-      this.setActiveCaipNetwork(adapterToActivate?.defaultNetwork)
+      this.setActiveCaipNetwork(
+        adapterToActivate?.defaultNetwork || adapterToActivate?.caipNetworks?.[0]
+      )
 
       adapters.forEach((adapter: ChainsInitializerAdapter) => {
         state.chains.set(adapter.chainNamespace, {
@@ -262,6 +264,12 @@ export const ChainController = {
 
     if (caipNetwork.chainNamespace !== state.activeChain) {
       this.setActiveChain(caipNetwork.chainNamespace, caipNetwork)
+      state.activeCaipNetwork = caipNetwork
+      SafeLocalStorage.setItem(
+        SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK,
+        JSON.stringify(caipNetwork)
+      )
+      SafeLocalStorage.setItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK_ID, caipNetwork.id)
 
       return
     }

packages/core/src/controllers/ConnectorController.ts

@@ -146,18 +146,15 @@ export const ConnectorController = {
   },
 
   getAuthConnector(): AuthConnector | undefined {
-    const activeNamespace = ChainController.state.activeChain
-    const authConnector = state.connectors.find(c => c.id === 'w3mAuth')
+    const activeNamespace = ChainController.state.activeCaipNetwork?.chainNamespace
+
+    const authConnector = state.connectors.find(
+      c => c.id === 'w3mAuth' && c.chain === activeNamespace
+    )
     if (!authConnector) {
       return undefined
     }
 
-    if (authConnector.type === 'MULTI_CHAIN' && authConnector?.connectors?.length) {
-      return authConnector.connectors.find(c => c.chain === activeNamespace) as
-        | AuthConnector
-        | undefined
-    }
-
     return authConnector as AuthConnector
   },
 

packages/core/tests/controllers/ConnectorController.test.ts

@@ -11,11 +11,21 @@ import {
 import { ConstantsUtil, getW3mThemeVariables } from '@reown/appkit-common'
 
 // -- Setup --------------------------------------------------------------------
-const authProvider = {
+const evmAuthProvider = {
   syncDappData: (_args: { metadata: Metadata; sdkVersion: SdkVersion; projectId: string }) =>
     Promise.resolve(),
   syncTheme: (_args: { themeMode: ThemeMode; themeVariables: ThemeVariables }) => Promise.resolve()
-}
+} as const
+
+const caipNetwork = {
+  id: 'eip155:1',
+  name: 'Ethereum',
+  chainNamespace: ConstantsUtil.CHAIN.EVM,
+  chainId: 1,
+  currency: 'ETH',
+  explorerUrl: 'https://etherscan.io',
+  rpcUrl: 'https://rpc.infura.com/v1/'
+} as const
 
 const walletConnectConnector = {
   id: 'walletConnect',
@@ -33,17 +43,10 @@ const externalConnector = {
 const evmAuthConnector = {
   id: 'w3mAuth',
   type: 'AUTH',
-  provider: authProvider,
+  provider: evmAuthProvider,
   chain: ConstantsUtil.CHAIN.EVM,
   name: 'Auth'
 } as const
-const solanaAuthConnector = {
-  id: 'w3mAuth',
-  type: 'AUTH',
-  provider: authProvider,
-  chain: ConstantsUtil.CHAIN.SOLANA,
-  name: 'Auth'
-} as const
 
 const announcedConnector = {
   id: 'announced',
@@ -53,8 +56,8 @@ const announcedConnector = {
   name: 'Announced'
 } as const
 
-const syncDappDataSpy = vi.spyOn(authProvider, 'syncDappData')
-const syncThemeSpy = vi.spyOn(authProvider, 'syncTheme')
+const syncDappDataSpy = vi.spyOn(evmAuthProvider, 'syncDappData')
+const syncThemeSpy = vi.spyOn(evmAuthProvider, 'syncTheme')
 
 const mockDappData = {
   metadata: {
@@ -85,6 +88,7 @@ const zerionConnector = {
 describe('ConnectorController', () => {
   beforeAll(() => {
     ChainController.state.activeChain = ConstantsUtil.CHAIN.EVM
+    ChainController.state.activeCaipNetwork = caipNetwork
   })
   it('should have valid default state', () => {
     expect(ConnectorController.state.connectors).toEqual([])
@@ -152,12 +156,6 @@ describe('ConnectorController', () => {
     expect(connector).toEqual(evmAuthConnector)
   })
 
-  it('getAuthConnector() should return merged connector when already added on different network', () => {
-    ConnectorController.addConnector(solanaAuthConnector)
-    const connector = ConnectorController.getAuthConnector()
-    expect(connector).toEqual(evmAuthConnector)
-  })
-
   it('getAnnouncedConnectorRdns() should not throw when no announced connector is not set', () => {
     expect(ConnectorController.getAnnouncedConnectorRdns()).toEqual([])
   })
@@ -173,37 +171,9 @@ describe('ConnectorController', () => {
       externalConnector,
       metamaskConnector,
       zerionConnector,
+      evmAuthConnector,
       // Need to define inline to reference the spies
-      {
-        id: 'w3mAuth',
-        imageId: undefined,
-        imageUrl: undefined,
-        name: 'Auth',
-        type: 'MULTI_CHAIN',
-        chain: 'eip155',
-        connectors: [
-          {
-            chain: 'eip155',
-            id: 'w3mAuth',
-            name: 'Auth',
-            provider: {
-              syncDappData: syncDappDataSpy,
-              syncTheme: syncThemeSpy
-            },
-            type: 'AUTH'
-          },
-          {
-            chain: 'solana',
-            id: 'w3mAuth',
-            name: 'Auth',
-            provider: {
-              syncDappData: syncDappDataSpy,
-              syncTheme: syncThemeSpy
-            },
-            type: 'AUTH'
-          }
-        ]
-      },
+
       announcedConnector
     ])
   })