@web3auth/no-modal 11.0.0-beta.2 → 11.0.1

package/dist/lib.esm/providers/account-abstraction-provider/providers/AccountAbstractionProvider.js

@@ -5,7 +5,7 @@ export { SMART_ACCOUNT } from '@toruslabs/ethereum-controllers';
 import { JRPCEngineV2, providerFromEngineV2, providerErrors } from '@web3auth/auth';
 import { defineChain, createPublicClient, http, createWalletClient, custom } from 'viem';
 import { createPaymasterClient, createBundlerClient } from 'viem/account-abstraction';
-import { createEoaMiddleware, providerAsMiddleware, createAaMiddleware } from '../rpc/ethRpcMiddlewares.js';
+import { createEoaMiddleware, providerAsMiddleware, createAaMiddleware, createEip7702And5792MiddlewareForAaProvider } from '../rpc/ethRpcMiddlewares.js';
 import { getProviderHandlers } from './utils.js';
 import { BaseProvider } from '../../base-provider/baseProvider.js';
 import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
@@ -55,9 +55,10 @@ class AccountAbstractionProvider extends BaseProvider {
   }
   async setupProvider(eoaProvider) {
     var _bundlerConfig$transp;
-    const {
-      currentChain
-    } = this;
+    const currentChain = this.currentChain;
+    if (!currentChain) {
+      throw WalletInitializationError.invalidProviderConfigError(`AA chain config not found for chain ${this.chainId}`);
+    }
     const {
       chainNamespace
     } = currentChain;
@@ -134,19 +135,33 @@ class AccountAbstractionProvider extends BaseProvider {
       eoaProvider,
       handlers: providerHandlers
     });
+
+    // middleware to handle EIP-7702 and EIP-5792 methods,
+    // currently, we do not support EIP-7702 and EIP-5792 methods for account abstraction provider
+    const eip7702And5792Middleware = await createEip7702And5792MiddlewareForAaProvider();
     const eoaMiddleware = providerAsMiddleware(eoaProvider);
     const engine = JRPCEngineV2.create({
-      middleware: [aaMiddleware, eoaMiddleware]
+      middleware: [aaMiddleware, eip7702And5792Middleware, eoaMiddleware]
     });
     const provider = providerFromEngineV2(engine);
     this.updateProviderEngineProxy(provider);
-    eoaProvider.once("chainChanged", chainId => {
+    const chainChangedHandler = chainId => {
       this.update({
         chainId
       });
       this.setupChainSwitchMiddleware();
       this.emit("chainChanged", chainId);
-    });
+      if (eoaProvider !== null && eoaProvider !== void 0 && eoaProvider.removeListener && typeof eoaProvider.removeListener === "function") {
+        eoaProvider.removeListener("chainChanged", chainChangedHandler);
+      }
+    };
+    if (eoaProvider !== null && eoaProvider !== void 0 && eoaProvider.once && typeof eoaProvider.once === "function") {
+      eoaProvider.once("chainChanged", chainChangedHandler);
+    } else {
+      // some providers like trust wallet does not have `once` method, so we use `on` instead
+      // and cleanup the listener after the event triggers once
+      eoaProvider.on("chainChanged", chainChangedHandler);
+    }
   }
   async updateAccount(_params) {
     throw providerErrors.unsupportedMethod("updateAccount. Please call it on eoaProvider");

package/dist/lib.esm/providers/account-abstraction-provider/providers/utils.js

@@ -2,7 +2,6 @@ import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { isHexString, add0x } from '@toruslabs/metadata-helpers';
 import { providerErrors } from '@web3auth/auth';
 import { createWalletClient, http } from 'viem';
-import { log } from '../../../base/loglevel.js';
 
 function getProviderHandlers({
   bundlerClient,
@@ -20,8 +19,6 @@ function getProviderHandlers({
       const [smartAccounts, eoaAccounts] = await Promise.all([smartAccount.getAddress(), eoaProvider.request({
         method: "eth_accounts"
       })]);
-      log.info("smartAccounts", smartAccounts);
-      log.info("eoaAccounts", eoaAccounts);
       return [smartAccounts, ...eoaAccounts];
     },
     getPrivateKey: async _ => {

package/dist/lib.esm/providers/account-abstraction-provider/rpc/ethRpcMiddlewares.js

@@ -1,6 +1,6 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
-import { METHOD_TYPES } from '@toruslabs/ethereum-controllers';
-import { createScaffoldMiddlewareV2, rpcErrors } from '@web3auth/auth';
+import { METHOD_TYPES, EIP_5792_METHODS, EIP_7702_METHODS } from '@toruslabs/ethereum-controllers';
+import { createScaffoldMiddlewareV2, providerErrors, rpcErrors } from '@web3auth/auth';
 
 async function createAaMiddleware({
   eoaProvider,
@@ -181,6 +181,20 @@ async function createEoaMiddleware({
     eth_requestAccounts: requestAccounts
   });
 }
+async function createEip7702And5792MiddlewareForAaProvider() {
+  const eip5792Methods = Object.values(EIP_5792_METHODS);
+  const eip7702Methods = Object.values(EIP_7702_METHODS);
+  const eip7702And5792Methods = [...eip5792Methods, ...eip7702Methods];
+  return async ({
+    request,
+    next
+  }) => {
+    if (eip7702And5792Methods.includes(request.method)) {
+      throw providerErrors.unsupportedMethod(`${request.method} is not supported for account abstraction provider`);
+    }
+    return next(request);
+  };
+}
 function providerAsMiddleware(provider) {
   return async ({
     request
@@ -192,4 +206,4 @@ function providerAsMiddleware(provider) {
   };
 }
 
-export { createAaMiddleware, createEoaMiddleware, providerAsMiddleware };
+export { createAaMiddleware, createEip7702And5792MiddlewareForAaProvider, createEoaMiddleware, providerAsMiddleware };

package/dist/lib.esm/react/context/useWeb3AuthInnerContextValue.js

@@ -127,19 +127,26 @@ function useWeb3AuthInnerContextValue({
     const authorizedListener = () => {
       setStatus(web3Auth.status);
       if (web3Auth.status === CONNECTOR_STATUS.AUTHORIZED) {
+        var _web3Auth$currentChai7, _web3Auth$currentChai8;
+        setIsInitialized(true);
         setIsConnected(true);
+        // on rehydration, `AUTHORIZED` event can be fired first in `CONNECT_AND_SIGN` mode, before `CONNECTED` event.
+        // Update the connection state here, so that clients can use the connection state immediately.
+        setConnection(web3Auth.connection);
+        setChainId(web3Auth.currentChainId);
+        setChainNamespace((_web3Auth$currentChai7 = (_web3Auth$currentChai8 = web3Auth.currentChain) === null || _web3Auth$currentChai8 === void 0 ? void 0 : _web3Auth$currentChai8.chainNamespace) !== null && _web3Auth$currentChai7 !== void 0 ? _web3Auth$currentChai7 : null);
         setIsAuthorized(true);
       }
     };
     const consentAcceptedListener = () => {
       setStatus(web3Auth.status);
       if (web3Auth.status === CONNECTOR_STATUS.CONNECTED || web3Auth.status === CONNECTOR_STATUS.AUTHORIZED) {
-        var _web3Auth$currentChai7, _web3Auth$currentChai8;
+        var _web3Auth$currentChai9, _web3Auth$currentChai0;
         setIsInitialized(true);
         setIsConnected(true);
         setConnection(web3Auth.connection);
         setChainId(web3Auth.currentChainId);
-        setChainNamespace((_web3Auth$currentChai7 = (_web3Auth$currentChai8 = web3Auth.currentChain) === null || _web3Auth$currentChai8 === void 0 ? void 0 : _web3Auth$currentChai8.chainNamespace) !== null && _web3Auth$currentChai7 !== void 0 ? _web3Auth$currentChai7 : null);
+        setChainNamespace((_web3Auth$currentChai9 = (_web3Auth$currentChai0 = web3Auth.currentChain) === null || _web3Auth$currentChai0 === void 0 ? void 0 : _web3Auth$currentChai0.chainNamespace) !== null && _web3Auth$currentChai9 !== void 0 ? _web3Auth$currentChai9 : null);
         if (web3Auth.status === CONNECTOR_STATUS.AUTHORIZED) {
           setIsAuthorized(true);
         }
@@ -149,11 +156,11 @@ function useWeb3AuthInnerContextValue({
       if (typeof nextIsMFAEnabled === "boolean") setIsMFAEnabled(nextIsMFAEnabled);
     };
     const connectionUpdatedListener = () => {
-      var _web3Auth$currentChai9, _web3Auth$currentChai0;
+      var _web3Auth$currentChai1, _web3Auth$currentChai10;
       setStatus(web3Auth.status);
       setConnection(web3Auth.connection);
       setChainId(web3Auth.currentChainId);
-      setChainNamespace((_web3Auth$currentChai9 = (_web3Auth$currentChai0 = web3Auth.currentChain) === null || _web3Auth$currentChai0 === void 0 ? void 0 : _web3Auth$currentChai0.chainNamespace) !== null && _web3Auth$currentChai9 !== void 0 ? _web3Auth$currentChai9 : null);
+      setChainNamespace((_web3Auth$currentChai1 = (_web3Auth$currentChai10 = web3Auth.currentChain) === null || _web3Auth$currentChai10 === void 0 ? void 0 : _web3Auth$currentChai10.chainNamespace) !== null && _web3Auth$currentChai1 !== void 0 ? _web3Auth$currentChai1 : null);
     };
     if (web3Auth) {
       web3Auth.on(CONNECTOR_EVENTS.NOT_READY, notReadyListener);

package/dist/lib.esm/react/wagmi/index.js

@@ -1 +1 @@
-export { WagmiProvider } from './provider.js';
+export { WagmiProvider, connectWeb3AuthWithWagmi, createWeb3AuthConnectorForWagmi, disconnectWeb3AuthFromWagmi, getWeb3authConnector, resetConnectorState, setupConnector } from './provider.js';

package/dist/lib.esm/react/wagmi/provider.js

@@ -1,42 +1,61 @@
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { useMemo, createElement, useRef, useEffect, Fragment } from 'react';
-import { defineChain } from 'viem';
-import { createConfig, WagmiProvider as WagmiProvider$1, webSocket, http, fallback, useConfig, useReconnect, useConnectionEffect } from 'wagmi';
-import { injected } from 'wagmi/connectors';
+import { defineChain, isAddress } from 'viem';
+import { createConfig, WagmiProvider as WagmiProvider$1, injected, webSocket, http, fallback, useConfig, useReconnect, useConnectionEffect } from 'wagmi';
 import { defaultWagmiConfig } from './constants.js';
 import { useWeb3Auth } from '../hooks/useWeb3Auth.js';
 import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 import { WalletInitializationError } from '../../base/errors/index.js';
-import { useWeb3AuthDisconnect } from '../hooks/useWeb3AuthDisconnect.js';
+import { WEB3AUTH_CONNECTOR_ID } from '../../base/connector/constants.js';
 import { log } from '../../base/loglevel.js';
+import { useWeb3AuthDisconnect } from '../hooks/useWeb3AuthDisconnect.js';
 
 const _excluded = ["children"];
-const WEB3AUTH_CONNECTOR_ID = "web3auth";
 function getWeb3authConnector(config) {
   return config.connectors.find(c => c.id === WEB3AUTH_CONNECTOR_ID);
 }
 
-// Helper to initialize connectors for the given wallets
+// Helper to create a Web3Auth connector to connect with wagmi
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-async function setupConnector(provider, config) {
-  let connector = getWeb3authConnector(config);
-  if (connector) return connector;
-
-  // Create new connector if not already existing
-  connector = injected({
+function createWeb3AuthConnectorForWagmi(provider) {
+  const baseConnector = injected({
     target: {
       provider: provider,
       id: WEB3AUTH_CONNECTOR_ID,
       name: "Web3Auth"
     }
   });
+  return config => {
+    const connector = baseConnector(config);
+    const baseOnAccountsChanged = connector.onAccountsChanged.bind(connector);
+
+    // we need to handle the `accountsChanged` event emitted on the cross-namespace chain switch.
+    // on evm -> solana, the accountsChanged event is emitted with the solana address, which is not valid for evm.
+    // that causes the `invalid account address` error in wagmi. So, here, we're filtering out the solana addresses.
+    connector.onAccountsChanged = accounts => {
+      if (accounts.length > 0 && !accounts.every(account => typeof account === "string" && isAddress(account))) {
+        log.warn("onAccountsChanged::accountsChanged event received on non-EVM address");
+        return;
+      }
+      baseOnAccountsChanged(accounts);
+    };
+    return connector;
+  };
+}
+
+// Helper to initialize connectors for the given wallets
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function setupConnector(provider, config) {
+  let connector = getWeb3authConnector(config);
+  if (connector) return connector;
+
+  // Create new connector if not already existing
+  connector = createWeb3AuthConnectorForWagmi(provider);
   const result = config._internal.connectors.setup(connector);
   config._internal.connectors.setState(current => [...current, result]);
   return result;
 }
-
-// Helper to connect a wallet and update wagmi state
 async function connectWeb3AuthWithWagmi(connector, config) {
   var _config$storage, _config$storage2;
   await Promise.all([(_config$storage = config.storage) === null || _config$storage === void 0 ? void 0 : _config$storage.removeItem(`${connector.id}.disconnected`), (_config$storage2 = config.storage) === null || _config$storage2 === void 0 ? void 0 : _config$storage2.setItem("recentConnectorId", connector.id)]);
@@ -76,6 +95,7 @@ async function disconnectWeb3AuthFromWagmi(config) {
 function Web3AuthWagmiProvider({
   children
 }) {
+  var _connection$ethereumP, _connection$connector;
   const {
     isConnected,
     connection,
@@ -89,59 +109,56 @@ function Web3AuthWagmiProvider({
     mutate: reconnect
   } = useReconnect();
   const suppressWagmiDisconnect = useRef(false);
-  const lastSyncedBinding = useRef({
-    provider: null,
-    connectorName: null
-  });
+  const lastSyncedProvider = useRef((_connection$ethereumP = connection === null || connection === void 0 ? void 0 : connection.ethereumProvider) !== null && _connection$ethereumP !== void 0 ? _connection$ethereumP : null);
+  const lastSyncedConnectorName = useRef((_connection$connector = connection === null || connection === void 0 ? void 0 : connection.connectorName) !== null && _connection$connector !== void 0 ? _connection$connector : null);
   useConnectionEffect({
     onDisconnect: async () => {
       log.info("Disconnected from wagmi");
       const isSuppressed = suppressWagmiDisconnect.current;
       suppressWagmiDisconnect.current = false;
       if (!isSuppressed && isConnected) await disconnect();
-      const connector = getWeb3authConnector(wagmiConfig);
+
       // reset wagmi connector state if the provider handles disconnection because of the accountsChanged event
       // from the connected provider
-      if (connector) {
+      if (getWeb3authConnector(wagmiConfig)) {
         resetConnectorState(wagmiConfig);
       }
     }
   });
   useEffect(() => {
-    (async () => {
-      const shouldBindToWagmi = isConnected && chainNamespace === CHAIN_NAMESPACES.EIP155 && Boolean(connection === null || connection === void 0 ? void 0 : connection.ethereumProvider);
+    (async _connection$ethereumP2 => {
+      const newConnection = connection !== null && connection !== void 0 ? connection : null;
+      const newEth = (_connection$ethereumP2 = connection === null || connection === void 0 ? void 0 : connection.ethereumProvider) !== null && _connection$ethereumP2 !== void 0 ? _connection$ethereumP2 : null;
+      const w3aWagmiConnector = getWeb3authConnector(wagmiConfig);
+      const shouldBindToWagmi = isConnected && chainNamespace === CHAIN_NAMESPACES.EIP155 && Boolean(newConnection && newEth);
       if (shouldBindToWagmi) {
-        const hasSameBinding = lastSyncedBinding.current.provider === connection.ethereumProvider && lastSyncedBinding.current.connectorName === connection.connectorName;
-        if (hasSameBinding && wagmiConfig.state.status === "connected") {
+        const hasSameBinding = lastSyncedProvider.current === newEth && lastSyncedConnectorName.current === newConnection.connectorName && wagmiConfig.state.status === "connected";
+        if (hasSameBinding) {
+          // rehydration: already connected to the same provider, so no need to reconnect
           return;
         }
-        if (!hasSameBinding && getWeb3authConnector(wagmiConfig)) {
-          if (wagmiConfig.state.status === "connected") {
-            suppressWagmiDisconnect.current = true;
-            await disconnectWeb3AuthFromWagmi(wagmiConfig);
-          } else {
-            resetConnectorState(wagmiConfig);
-          }
+
+        // `ethereumProvider` is a stable proxy (`commonJRPCProvider`) across account switches,
+        // so key wagmi resyncs off the Web3Auth connection object instead of provider identity.
+        if (w3aWagmiConnector) {
+          resetConnectorState(wagmiConfig);
         }
-        const connector = await setupConnector(connection.ethereumProvider, wagmiConfig);
+        lastSyncedProvider.current = newEth;
+        lastSyncedConnectorName.current = newConnection.connectorName;
+        const connector = setupConnector(newEth, wagmiConfig);
         if (!connector) {
+          log.error("Failed to setup react wagmi connector");
           throw new Error("Failed to setup connector");
         }
         await connectWeb3AuthWithWagmi(connector, wagmiConfig);
-        lastSyncedBinding.current = {
-          provider: connection.ethereumProvider,
-          connectorName: connection.connectorName
-        };
         reconnect();
       } else {
-        lastSyncedBinding.current = {
-          provider: null,
-          connectorName: null
-        };
+        lastSyncedProvider.current = null;
+        lastSyncedConnectorName.current = null;
         if (wagmiConfig.state.status === "connected") {
           suppressWagmiDisconnect.current = true;
           await disconnectWeb3AuthFromWagmi(wagmiConfig);
-        } else if (getWeb3authConnector(wagmiConfig)) {
+        } else if (w3aWagmiConnector) {
           resetConnectorState(wagmiConfig);
         }
       }
@@ -240,4 +257,4 @@ function WagmiProvider(_ref) {
   }), createElement(Web3AuthWagmiProvider, null, children));
 }
 
-export { WagmiProvider };
+export { WagmiProvider, connectWeb3AuthWithWagmi, createWeb3AuthConnectorForWagmi, disconnectWeb3AuthFromWagmi, getWeb3authConnector, resetConnectorState, setupConnector };

package/dist/lib.esm/vue/useWeb3AuthInnerContextValue.js

@@ -99,20 +99,27 @@ function useWeb3AuthInnerContextValue({
     };
     const authorizedListener = () => {
       status.value = web3Auth.value.status;
+      // on rehydration, `AUTHORIZED` event can be fired first in `CONNECT_AND_SIGN` mode, before `CONNECTED` event.
+      // Update the connection state here, so that clients can use the connection state immediately.
       if (web3Auth.value.status === CONNECTOR_STATUS.AUTHORIZED) {
+        var _currentChain$chainNa2, _currentChain2;
+        if (!isInitialized.value) isInitialized.value = true;
         isAuthorized.value = true;
         isConnected.value = true;
+        connection.value = web3Auth.value.connection;
+        chainId.value = web3Auth.value.currentChainId;
+        chainNamespace.value = (_currentChain$chainNa2 = (_currentChain2 = web3Auth.value.currentChain) === null || _currentChain2 === void 0 ? void 0 : _currentChain2.chainNamespace) !== null && _currentChain$chainNa2 !== void 0 ? _currentChain$chainNa2 : null;
       }
     };
     const consentAcceptedListener = () => {
       status.value = web3Auth.value.status;
       if (web3Auth.value.status === CONNECTOR_STATUS.CONNECTED || web3Auth.value.status === CONNECTOR_STATUS.AUTHORIZED) {
-        var _currentChain$chainNa2, _currentChain2;
+        var _currentChain$chainNa3, _currentChain3;
         if (!isInitialized.value) isInitialized.value = true;
         isConnected.value = true;
         connection.value = web3Auth.value.connection;
         chainId.value = web3Auth.value.currentChainId;
-        chainNamespace.value = (_currentChain$chainNa2 = (_currentChain2 = web3Auth.value.currentChain) === null || _currentChain2 === void 0 ? void 0 : _currentChain2.chainNamespace) !== null && _currentChain$chainNa2 !== void 0 ? _currentChain$chainNa2 : null;
+        chainNamespace.value = (_currentChain$chainNa3 = (_currentChain3 = web3Auth.value.currentChain) === null || _currentChain3 === void 0 ? void 0 : _currentChain3.chainNamespace) !== null && _currentChain$chainNa3 !== void 0 ? _currentChain$chainNa3 : null;
         if (web3Auth.value.status === CONNECTOR_STATUS.AUTHORIZED) {
           isAuthorized.value = true;
         }
@@ -135,11 +142,11 @@ function useWeb3AuthInnerContextValue({
       isMFAEnabled.value = true;
     };
     const connectionUpdatedListener = () => {
-      var _currentChain$chainNa3, _currentChain3;
+      var _currentChain$chainNa4, _currentChain4;
       status.value = web3Auth.value.status;
       connection.value = web3Auth.value.connection;
       chainId.value = web3Auth.value.currentChainId;
-      chainNamespace.value = (_currentChain$chainNa3 = (_currentChain3 = web3Auth.value.currentChain) === null || _currentChain3 === void 0 ? void 0 : _currentChain3.chainNamespace) !== null && _currentChain$chainNa3 !== void 0 ? _currentChain$chainNa3 : null;
+      chainNamespace.value = (_currentChain$chainNa4 = (_currentChain4 = web3Auth.value.currentChain) === null || _currentChain4 === void 0 ? void 0 : _currentChain4.chainNamespace) !== null && _currentChain$chainNa4 !== void 0 ? _currentChain$chainNa4 : null;
     };
     if (prevWeb3Auth && newWeb3Auth !== prevWeb3Auth) {
       prevWeb3Auth.removeListener(CONNECTOR_EVENTS.NOT_READY, notReadyListener);

package/dist/lib.esm/vue/wagmi/index.js

@@ -1 +1 @@
-export { WagmiProvider } from './provider.js';
+export { WagmiProvider, connectWeb3AuthWithWagmi, createWeb3AuthConnectorForWagmi, disconnectWeb3AuthFromWagmi, getWeb3authConnector, resetConnectorState, setupConnector } from './provider.js';

package/dist/lib.esm/vue/wagmi/provider.js

@@ -1,9 +1,8 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
-import { hydrate } from '@wagmi/core';
+import { injected, hydrate } from '@wagmi/core';
 import { configKey, createConfig, useConfig, useReconnect, useConnectionEffect } from '@wagmi/vue';
-import { injected } from '@wagmi/vue/connectors';
 import { randomId } from '@web3auth/auth';
-import { defineChain, webSocket, http, fallback } from 'viem';
+import { isAddress, defineChain, webSocket, http, fallback } from 'viem';
 import { defineComponent, h, shallowRef, ref, watch, provide } from 'vue';
 import { log } from '../../base/loglevel.js';
 import { defaultWagmiConfig } from './constants.js';
@@ -11,26 +10,47 @@ import { useWeb3Auth } from '../composables/useWeb3Auth.js';
 import { useWeb3AuthDisconnect } from '../composables/useWeb3AuthDisconnect.js';
 import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 import { WalletInitializationError } from '../../base/errors/index.js';
+import { WEB3AUTH_CONNECTOR_ID } from '../../base/connector/constants.js';
 
-const WEB3AUTH_CONNECTOR_ID = "web3auth";
 function getWeb3authConnector(config) {
   return config.connectors.find(c => c.id === WEB3AUTH_CONNECTOR_ID);
 }
 
-// Helper to initialize connectors for the given wallets
+// Helper to create a Web3Auth connector to connect with wagmi
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-async function setupConnector(provider, config) {
-  let connector = getWeb3authConnector(config);
-  if (connector) return connector;
-
-  // Create new connector if not already existing
-  connector = injected({
+function createWeb3AuthConnectorForWagmi(provider) {
+  const baseConnector = injected({
     target: {
       provider: provider,
       id: WEB3AUTH_CONNECTOR_ID,
       name: "Web3Auth"
     }
   });
+  return config => {
+    const connector = baseConnector(config);
+    const baseOnAccountsChanged = connector.onAccountsChanged.bind(connector);
+    connector.onAccountsChanged = accounts => {
+      // we need to handle the `accountsChanged` event emitted on the cross-namespace chain switch.
+      // on evm -> solana, the accountsChanged event is emitted with the solana address, which is not valid for evm.
+      // that causes the `invalid account address` error in wagmi. So, here, we're filtering out the solana addresses.
+      if (accounts.length > 0 && !accounts.every(account => typeof account === "string" && isAddress(account))) {
+        log.warn("onAccountsChanged::accountsChanged event received on non-EVM address");
+        return;
+      }
+      baseOnAccountsChanged(accounts);
+    };
+    return connector;
+  };
+}
+
+// Helper to initialize connectors for the given wallets
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function setupConnector(provider, config) {
+  let connector = getWeb3authConnector(config);
+  if (connector) return connector;
+
+  // Create new connector if not already existing
+  connector = createWeb3AuthConnectorForWagmi(provider);
   const result = config._internal.connectors.setup(connector);
   config._internal.connectors.setState(current => [...current, result]);
   return result;
@@ -79,6 +99,7 @@ const Web3AuthWagmiProvider = defineComponent({
     const {
       isConnected,
       connection,
+      web3Auth,
       chainNamespace
     } = useWeb3Auth();
     const {
@@ -110,13 +131,15 @@ const Web3AuthWagmiProvider = defineComponent({
       const newIsConnected = isConnected.value;
       const newConnection = connection.value;
       const newEth = (_newConnection$ethere = newConnection === null || newConnection === void 0 ? void 0 : newConnection.ethereumProvider) !== null && _newConnection$ethere !== void 0 ? _newConnection$ethere : null;
+      const w3aWagmiConnector = getWeb3authConnector(wagmiConfig);
       const shouldBindToWagmi = newIsConnected && chainNamespace.value === CHAIN_NAMESPACES.EIP155 && Boolean(newConnection && newEth);
-      if (shouldBindToWagmi && newConnection && newEth) {
-        const hasSameBinding = lastSyncedProvider.value === newEth && lastSyncedConnectorName.value === newConnection.connectorName;
-        if (hasSameBinding && wagmiConfig.state.status === "connected") {
+      if (shouldBindToWagmi) {
+        var _web3Auth$value;
+        const hasSameBinding = lastSyncedProvider.value === newEth && lastSyncedConnectorName.value === newConnection.connectorName && (newConnection === null || newConnection === void 0 ? void 0 : newConnection.connectorName) === ((_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.connection.connectorName) && wagmiConfig.state.status === "connected";
+        if (hasSameBinding) {
           return;
         }
-        if (!hasSameBinding && getWeb3authConnector(wagmiConfig)) {
+        if (!hasSameBinding && w3aWagmiConnector) {
           if (wagmiConfig.state.status === "connected") {
             suppressWagmiDisconnect.value = true;
             await disconnectWeb3AuthFromWagmi(wagmiConfig);
@@ -124,21 +147,21 @@ const Web3AuthWagmiProvider = defineComponent({
             resetConnectorState(wagmiConfig);
           }
         }
-        const connector = await setupConnector(newEth, wagmiConfig);
+        lastSyncedProvider.value = newEth;
+        lastSyncedConnectorName.value = newConnection.connectorName;
+        const connector = setupConnector(newEth, wagmiConfig);
         if (!connector) {
           throw new Error("Failed to setup connector");
         }
         await connectWeb3AuthWithWagmi(connector, wagmiConfig);
-        lastSyncedProvider.value = newEth;
-        lastSyncedConnectorName.value = newConnection.connectorName;
         reconnect();
-      } else {
+      } else if (!newIsConnected || chainNamespace.value !== CHAIN_NAMESPACES.EIP155) {
         lastSyncedProvider.value = null;
         lastSyncedConnectorName.value = null;
         if (wagmiConfig.state.status === "connected") {
           suppressWagmiDisconnect.value = true;
           await disconnectWeb3AuthFromWagmi(wagmiConfig);
-        } else if (getWeb3authConnector(wagmiConfig)) {
+        } else if (w3aWagmiConnector) {
           resetConnectorState(wagmiConfig);
         }
       }
@@ -203,7 +226,7 @@ const WagmiProvider = defineComponent({
       return fallback(transports);
     };
     const defineWagmiConfig = () => {
-      var _web3Auth$value;
+      var _web3Auth$value2;
       const configParams = _objectSpread(_objectSpread({
         ssr: true
       }, config), {}, {
@@ -214,7 +237,7 @@ const WagmiProvider = defineComponent({
         client: undefined
       });
       const wagmiChains = [];
-      if (isInitialized.value && web3Auth !== null && web3Auth !== void 0 && (_web3Auth$value = web3Auth.value) !== null && _web3Auth$value !== void 0 && (_web3Auth$value = _web3Auth$value.coreOptions) !== null && _web3Auth$value !== void 0 && _web3Auth$value.chains) {
+      if (isInitialized.value && web3Auth !== null && web3Auth !== void 0 && (_web3Auth$value2 = web3Auth.value) !== null && _web3Auth$value2 !== void 0 && (_web3Auth$value2 = _web3Auth$value2.coreOptions) !== null && _web3Auth$value2 !== void 0 && _web3Auth$value2.chains) {
         var _web3Auth$value$curre;
         const defaultChainId = (_web3Auth$value$curre = web3Auth.value.currentChain) === null || _web3Auth$value$curre === void 0 ? void 0 : _web3Auth$value$curre.chainId;
         const chains = web3Auth.value.coreOptions.chains.filter(chain => chain.chainNamespace === CHAIN_NAMESPACES.EIP155);
@@ -262,8 +285,8 @@ const WagmiProvider = defineComponent({
       }
     };
     watch(isInitialized, (newIsInitialized, prevIsInitialized) => {
-      var _web3Auth$value2;
-      (_web3Auth$value2 = web3Auth.value) === null || _web3Auth$value2 === void 0 || _web3Auth$value2.setAnalyticsProperties({
+      var _web3Auth$value3;
+      (_web3Auth$value3 = web3Auth.value) === null || _web3Auth$value3 === void 0 || _web3Auth$value3.setAnalyticsProperties({
         wagmi_enabled: true
       });
       if (newIsInitialized && !prevIsInitialized) {
@@ -295,4 +318,4 @@ const WagmiProvider = defineComponent({
   }
 });
 
-export { WagmiProvider };
+export { WagmiProvider, connectWeb3AuthWithWagmi, createWeb3AuthConnectorForWagmi, disconnectWeb3AuthFromWagmi, getWeb3authConnector, resetConnectorState, setupConnector };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3auth/no-modal",
-  "version": "11.0.0-beta.2",
+  "version": "11.0.1",
   "description": "Multi chain wallet aggregator for web3Auth",
   "keywords": [
     "web3Auth/no-modal",
@@ -65,17 +65,17 @@
     }
   },
   "dependencies": {
-    "@metamask/connect-evm": "^1.3.0",
-    "@metamask/connect-multichain": "^0.14.0",
-    "@metamask/connect-solana": "^1.1.0",
-    "@segment/analytics-next": "^1.83.0",
+    "@metamask/connect-evm": "^1.4.0",
+    "@metamask/connect-multichain": "^0.15.0",
+    "@metamask/connect-solana": "^1.2.0",
+    "@segment/analytics-next": "^1.84.0",
     "@solana/client": "^1.7.0",
-    "@solana/kit": "^6.8.0",
+    "@solana/kit": "^6.9.0",
     "@solana/wallet-standard-features": "^1.3.0",
-    "@toruslabs/base-controllers": "^9.5.0",
+    "@toruslabs/base-controllers": "^9.10.0",
     "@toruslabs/constants": "^16.1.1",
     "@toruslabs/eccrypto": "^7.0.0",
-    "@toruslabs/ethereum-controllers": "^9.5.0",
+    "@toruslabs/ethereum-controllers": "^9.10.0",
     "@toruslabs/http-helpers": "^9.0.0",
     "@toruslabs/loglevel-sentry": "^9.0.0",
     "@toruslabs/metadata-helpers": "^8.2.0",
@@ -87,7 +87,7 @@
     "@walletconnect/sign-client": "^2.23.9",
     "@walletconnect/types": "^2.23.9",
     "@walletconnect/utils": "^2.23.9",
-    "@web3auth/auth": "^11.8.0",
+    "@web3auth/auth": "^11.8.1",
     "@web3auth/ws-embed": "^6.0.4",
     "bignumber.js": "~9.3.1",
     "deepmerge": "^4.3.1",
@@ -101,16 +101,16 @@
   "devDependencies": {
     "@coinbase/wallet-sdk": "^4.3.7",
     "@solana/react-hooks": "^1.4.1",
-    "@types/react": "^19.2.14",
-    "@wagmi/core": "^3.4.7",
-    "@wagmi/vue": "^0.5.9",
-    "@x402/evm": "^2.11.0",
-    "@x402/fetch": "^2.11.0",
-    "@x402/svm": "^2.11.0",
-    "react": "^19.2.5",
-    "viem": "^2.48.4",
+    "@types/react": "^19.2.16",
+    "@wagmi/core": "^3.5.0",
+    "@wagmi/vue": "^0.5.17",
+    "@x402/evm": "^2.14.0",
+    "@x402/fetch": "^2.14.0",
+    "@x402/svm": "^2.14.0",
+    "react": "^19.2.7",
+    "viem": "^2.52.0",
     "vue": "^3.x",
-    "wagmi": "^3.6.8"
+    "wagmi": "^3.6.16"
   },
   "exports": {
     ".": {
@@ -252,5 +252,5 @@
     "node": ">=22.x",
     "npm": ">=10.x"
   },
-  "gitHead": "05577130ae9ced90ed412c1597681672074d8d2a"
+  "gitHead": "83f7a5e2ead574c15f74b63f19e83ea13098da61"
 }