@web3auth/no-modal 11.0.2 → 11.2.0

package/dist/lib.cjs/noModal.js

@@ -7,6 +7,8 @@ var baseControllers = require('@toruslabs/base-controllers');
 var ethereumControllers = require('@toruslabs/ethereum-controllers');
 var auth = require('@web3auth/auth');
 var deepmerge = require('deepmerge');
+var errors = require('./account-linking/errors.js');
+require('@toruslabs/http-helpers');
 var analytics = require('./base/analytics.js');
 var IChainInterface = require('./base/chain/IChainInterface.js');
 require('@toruslabs/session-manager');
@@ -27,7 +29,6 @@ var plugin = require('./plugins/wallet-services-plugin/plugin.js');
 require('./providers/base-provider/utils.js');
 var CommonJRPCProvider = require('./providers/base-provider/CommonJRPCProvider.js');
 require('./providers/base-provider/commonPrivateKeyProvider.js');
-var errors = require('./account-linking/errors.js');
 
 const _excluded = ["walletScope", "eipStandard"];
 const PRIMARY_CONNECTED_WALLET_KEY = "__primary__";
@@ -56,7 +57,8 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       idToken: null,
       accessToken: null,
       refreshToken: null,
-      activeAccount: null
+      activeAccount: null,
+      cachedConnectorNamespace: null
     });
     if (!options.clientId) throw index.WalletInitializationError.invalidParams("Please provide a valid clientId in constructor");
     if (options.enableLogging) loglevel.log.enableAll();else loglevel.log.setLevel("error");
@@ -248,6 +250,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     await this.setState({
       primaryConnectorName: null,
       cachedConnector: null,
+      cachedConnectorNamespace: null,
       currentChainId: null,
       idToken: null,
       accessToken: null,
@@ -258,7 +261,10 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
   }
   async cleanup() {
     for (const connector of this.connectors) {
-      if (connector.cleanup) await connector.cleanup();
+      // if the connector is not ready, we don't need to cleanup
+      // this means that we load the connector (coz of the dashboard config) but the clients did not use it (i.e. with `showOnModal` set to false)
+      // example use case: external wallet **ONLY** login mode but the ClientID has enabled Auth connection in dashboard.
+      if (connector.cleanup && connector.status !== constants.CONNECTOR_STATUS.NOT_READY) await connector.cleanup();
     }
   }
   async switchChain(params) {
@@ -780,7 +786,9 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       chains: this.coreOptions.chains
     });
     // sync chainId
-    this.commonJRPCProvider.on("chainChanged", async chainId => this.setCurrentChain(chainId));
+    this.commonJRPCProvider.on("chainChanged", async chainId => {
+      await this.setCurrentChain(chainId);
+    });
   }
   async setupConnector(connector) {
     this.subscribeToConnectorEvents(connector);
@@ -844,12 +852,19 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
           injectedEvmConnector
         } = await Promise.resolve().then(function () { return require('./connectors/injected-evm-connector/index.js'); });
         const evmMipd = createMipd();
+        // `@metamask/connect-evm` SDK announces its own EIP-6963 provider (`io.metamask.mmc`) so
+        // it can be discovered by generic wallet pickers. We already register MetaMask via
+        // `metaMaskConnector`, so we must exclude the SDK-announced provider here; otherwise
+        // it is misclassified as an injected wallet and the modal shows MetaMask as installed,
+        // even when the user does not have the extension installed.
+        const isNonSdkAnnouncedProvider = providerDetail => providerDetail.info.rdns !== metamaskConnector.METAMASK_ERC_6963_PROVIDER_RDNS;
         // subscribe to new injected connectors
         evmMipd.subscribe(providerDetails => {
-          const newConnectors = providerDetails.map(providerDetail => injectedEvmConnector(providerDetail)(config));
+          const filteredProviderDetails = providerDetails.filter(isNonSdkAnnouncedProvider);
+          const newConnectors = filteredProviderDetails.map(providerDetail => injectedEvmConnector(providerDetail)(config));
           this.setConnectors(newConnectors);
         });
-        connectorFns.push(...evmMipd.getProviders().map(injectedEvmConnector));
+        connectorFns.push(...evmMipd.getProviders().filter(isNonSdkAnnouncedProvider).map(injectedEvmConnector));
       }
     }
     // add WalletConnectV2 connector if external wallets are enabled
@@ -981,7 +996,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       await this.setState({
         primaryConnectorName: data.connectorName
       });
-      this.cacheWallet(data.connectorName);
+      this.cacheWallet(data.connectorName, data.connectorNamespace);
       const isConnectAndSign = this.coreOptions.initialAuthenticationMode === constants.CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN;
       const pendingUserConsent = this.consentRequired && !this.state.hasUserConsent;
       if (pendingUserConsent && !isConnectAndSign) {
@@ -996,7 +1011,6 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
         if (this.status !== constants.CONNECTOR_STATUS.CONSENT_REQUIRING && this.status !== constants.CONNECTOR_STATUS.AUTHORIZED) {
           this.status = constants.CONNECTOR_STATUS.CONNECTED;
         }
-        loglevel.log.debug("connected", this.status, this.primaryConnectorName);
         // Defer plugin connection until consent is accepted; otherwise plugins would start before the consent step completes.
         // `completeConsentAcceptance` connects the plugins once the user accepts the consent.
         if (!pendingUserConsent) {
@@ -1111,7 +1125,14 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       // External wallets can resolve to a different active chain than the requested one,
       // so let connector-reported chain updates reconcile Web3Auth state after connect.
       if (typeof (data === null || data === void 0 ? void 0 : data.data) === "object" && (data === null || data === void 0 ? void 0 : data.data) !== null && "chainId" in data.data && typeof data.data.chainId === "string") {
+        const previousChain = this.currentChain;
         await this.setCurrentChain(data.data.chainId);
+        const currentChain = this.currentChain;
+        const connectorEthereumProvider = connector.provider;
+        if ((previousChain === null || previousChain === void 0 ? void 0 : previousChain.chainNamespace) !== (currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) && (currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) === baseControllers.CHAIN_NAMESPACES.EIP155 && connectorEthereumProvider) {
+          // from sol -> evm namespace switch, we need to re-create AccountAbstractionProvider
+          await this.bindPrimaryEthereumSigningProxy(connectorEthereumProvider, connector.name);
+        }
       }
       loglevel.log.debug("connector data updated", data);
       this.emit(constants.CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, data);
@@ -1165,7 +1186,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
   }
   checkIfAutoConnect(connector) {
     var _this$currentChain3;
-    let autoConnect = this.cachedConnector === connector.name;
+    let autoConnect = this.cachedConnector === connector.name && this.state.cachedConnectorNamespace === connector.connectorNamespace;
     if (autoConnect && (_this$currentChain3 = this.currentChain) !== null && _this$currentChain3 !== void 0 && _this$currentChain3.chainNamespace) {
       if (connector.connectorNamespace === IChainInterface.CONNECTOR_NAMESPACES.MULTICHAIN) autoConnect = true;else autoConnect = connector.connectorNamespace === this.currentChain.chainNamespace;
     }
@@ -1178,10 +1199,15 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
   getInitialChainIdForConnector(connector) {
     var _initialChain;
     let initialChain = this.currentChain;
-    if (((_initialChain = initialChain) === null || _initialChain === void 0 ? void 0 : _initialChain.chainNamespace) !== connector.connectorNamespace && connector.connectorNamespace !== IChainInterface.CONNECTOR_NAMESPACES.MULTICHAIN) {
+    const defaultChainId = this.coreOptions.defaultChainId;
+    const isMultiChainConnector = connector.connectorNamespace === IChainInterface.CONNECTOR_NAMESPACES.MULTICHAIN;
+    // if the connector is a multi-chain connector and a default chain id is set, use the default chain id
+    if (isMultiChainConnector && defaultChainId) {
+      initialChain = this.coreOptions.chains.find(chain => chain.chainId === defaultChainId) || this.currentChain;
+    } else if (((_initialChain = initialChain) === null || _initialChain === void 0 ? void 0 : _initialChain.chainNamespace) !== connector.connectorNamespace && connector.connectorNamespace !== IChainInterface.CONNECTOR_NAMESPACES.MULTICHAIN) {
       initialChain = this.coreOptions.chains.find(x => x.chainNamespace === connector.connectorNamespace);
-      if (!initialChain) throw index.WalletInitializationError.invalidParams(`No chain found for ${connector.connectorNamespace}`);
     }
+    if (!initialChain) throw index.WalletInitializationError.invalidParams(`No chain found for ${connector.connectorNamespace}`);
     return initialChain;
   }
   async completeConsentAcceptance() {
@@ -1365,7 +1391,8 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     return {
       ethereumProvider: connectedWallet.signingProvider,
       solanaWallet: (_connectedWallet$sola = connectedWallet.solanaWallet) !== null && _connectedWallet$sola !== void 0 ? _connectedWallet$sola : null,
-      connectorName: connectedWallet.connector.name
+      connectorName: connectedWallet.connector.name,
+      connectorNamespace: connectedWallet.connector.connectorNamespace
     };
   }
   buildImmediateConnectedWalletConnectorState(params) {
@@ -1502,11 +1529,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     if (!connection) {
       throw index.WalletLoginError.connectionError("Failed to resolve the active connection after switching accounts.");
     }
-    this.emit(constants.CONNECTOR_EVENTS.CONNECTION_UPDATED, {
-      ethereumProvider: connection.ethereumProvider,
-      solanaWallet: connection.solanaWallet,
-      connectorName: connection.connectorName
-    });
+    this.emit(constants.CONNECTOR_EVENTS.CONNECTION_UPDATED, connection);
   }
   isActiveConnectorEventSource(connector) {
     if (!this.primaryConnectorName) return true;
@@ -1589,9 +1612,10 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       loglevel.log.debug("Failed to cache connected linked wallet connector", error);
     }
   }
-  async cacheWallet(walletName) {
+  async cacheWallet(walletName, connectorNamespace) {
     await this.setState({
-      cachedConnector: walletName
+      cachedConnector: walletName,
+      cachedConnectorNamespace: connectorNamespace
     });
   }
   async setCurrentChain(chainId) {
@@ -1627,9 +1651,11 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     });
   }
   async bindPrimaryEthereumSigningProxy(ethereumProvider, connectorName) {
-    var _this$currentChain5, _accountAbstractionCo;
+    var _this$primaryConnecto2, _this$currentChain5, _accountAbstractionCo;
     if (!this.commonJRPCProvider) throw index.WalletInitializationError.notFound(`CommonJrpcProvider not found`);
-    let finalProvider = (ethereumProvider === null || ethereumProvider === void 0 ? void 0 : ethereumProvider.provider) || ethereumProvider;
+    const primaryConnectorProvider = connectorName === this.primaryConnectorName ? (_this$primaryConnecto2 = this.primaryConnector) === null || _this$primaryConnecto2 === void 0 ? void 0 : _this$primaryConnecto2.provider : null;
+    const baseEthereumProvider = ethereumProvider === this.commonJRPCProvider || ethereumProvider === this.aaProvider ? primaryConnectorProvider !== null && primaryConnectorProvider !== void 0 ? primaryConnectorProvider : ethereumProvider : ethereumProvider;
+    let finalProvider = (baseEthereumProvider === null || baseEthereumProvider === void 0 ? void 0 : baseEthereumProvider.provider) || baseEthereumProvider;
     const {
       accountAbstractionConfig
     } = this.coreOptions;
@@ -1645,7 +1671,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
         accountAbstractionProvider,
         toEoaProvider
       } = await Promise.resolve().then(function () { return require('./providers/account-abstraction-provider/index.js'); });
-      const eoaProvider = connectorName === index$1.WALLET_CONNECTORS.AUTH ? await toEoaProvider(ethereumProvider) : ethereumProvider;
+      const eoaProvider = connectorName === index$1.WALLET_CONNECTORS.AUTH ? await toEoaProvider(baseEthereumProvider) : baseEthereumProvider;
       const aaChainIds = new Set((accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo2 = accountAbstractionConfig.chains) === null || _accountAbstractionCo2 === void 0 ? void 0 : _accountAbstractionCo2.map(chain => chain.chainId)) || []);
       const aaProvider = await accountAbstractionProvider({
         accountAbstractionConfig,

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

@@ -70,7 +70,7 @@ class AccountAbstractionProvider extends baseProvider.BaseProvider {
     });
   }
   async setupProvider(eoaProvider) {
-    var _bundlerConfig$transp;
+    var _await$eoaProvider$re, _bundlerConfig$transp;
     const currentChain = this.currentChain;
     if (!currentChain) {
       throw index.WalletInitializationError.invalidProviderConfigError(`AA chain config not found for chain ${this.chainId}`);
@@ -113,7 +113,14 @@ class AccountAbstractionProvider extends baseProvider.BaseProvider {
       chain,
       transport: viem.http(currentChain.rpcTarget)
     });
-    const [eoaAddress] = await eoaProvider.request({
+    // Firstly, try to get the accounts from the existing connected provider with `eth_accounts` method.
+    // We don't wanna do `eth_requestAccounts` method here, coz if the wallet is already connected, it will trigger chainChanged event and unintentionally update the AaProvider re-bind and
+    // re-bind run this again, so we will end up in infinite loop.
+    const existingAccounts = (_await$eoaProvider$re = await eoaProvider.request({
+      method: ethereumControllers.METHOD_TYPES.GET_ACCOUNTS
+    })) !== null && _await$eoaProvider$re !== void 0 ? _await$eoaProvider$re : [];
+    // only if the existing accounts are not found (that means wallet isn't connected), then we will trigger `eth_requestAccounts` method to get the accounts.
+    const [eoaAddress] = existingAccounts.length > 0 ? existingAccounts : await eoaProvider.request({
       method: ethereumControllers.METHOD_TYPES.ETH_REQUEST_ACCOUNTS
     });
     const walletClient = viem.createWalletClient({

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

@@ -3,41 +3,6 @@
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var ethereumControllers = require('@toruslabs/ethereum-controllers');
 var auth = require('@web3auth/auth');
-require('@babel/runtime/helpers/defineProperty');
-require('@toruslabs/base-controllers');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
-require('@toruslabs/secure-pub-sub');
-require('@web3auth/ws-embed');
-require('deepmerge');
-require('@segment/analytics-next');
-require('../../../base/loglevel.js');
-require('@toruslabs/session-manager');
-require('../../../base/errors/index.js');
-require('../../../base/constants.js');
-require('../../../base/wallet/index.js');
-require('../../../base/connector/connectorStatus.js');
-require('../../../base/connector/constants.js');
-require('jwt-decode');
-require('../../../base/plugin/errors.js');
-require('../../../base/plugin/IPlugin.js');
-require('@toruslabs/eccrypto');
-require('@toruslabs/metadata-helpers');
-require('../../../connectors/auth-connector/authSolanaWallet.js');
-require('viem');
-require('viem/siwe');
-require('mipd');
-require('@solana/wallet-standard-features');
-require('@wallet-standard/app');
-require('@wallet-standard/features');
-require('@metamask/connect-evm');
-require('@metamask/connect-multichain');
-require('@metamask/connect-solana');
-var config = require('../../../connectors/wallet-connect-v2-connector/config.js');
-require('@walletconnect/sign-client');
-require('@walletconnect/utils');
-require('../../../connectors/wallet-connect-v2-connector/WalletConnectV2Provider.js');
-require('../../../connectors/wallet-connect-v2-connector/wcSolanaWallet.js');
 
 async function createAaMiddleware({
   eoaProvider,
@@ -234,17 +199,10 @@ function providerAsMiddleware(provider) {
   return async ({
     request
   }) => {
-    const result = await provider.request({
+    return provider.request({
       method: request.method,
       params: request.params
     });
-    if (result === undefined && config.NULL_ON_SUCCESS_METHODS.includes(request.method)) {
-      // For some RPC requests, such as `wallet_switchEthereumChain`, the standard rpc result is `null`.
-      // However, some wallet providers might return `undefined` instead and causing the JRPCEngineV2 to throw `Nothing ended the request` error.
-      // So, we handle this case by returning `null` instead, so that JRPCEngineV2 won't throw `Nothing ended the request` error
-      return null;
-    }
-    return result;
   };
 }
 

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

@@ -175,6 +175,14 @@ function useWeb3AuthInnerContextValue({
       setChainId(web3Auth.currentChainId);
       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);
     };
+    const connectorDataUpdatedListener = data => {
+      const updatedData = data.data;
+      if (updatedData.chainId) {
+        var _web3Auth$currentChai11;
+        setChainId(updatedData.chainId);
+        setChainNamespace((_web3Auth$currentChai11 = web3Auth.currentChain) === null || _web3Auth$currentChai11 === void 0 ? void 0 : _web3Auth$currentChai11.chainNamespace);
+      }
+    };
     if (web3Auth) {
       web3Auth.on(constants.CONNECTOR_EVENTS.NOT_READY, notReadyListener);
       web3Auth.on(constants.CONNECTOR_EVENTS.READY, readyListener);
@@ -186,6 +194,7 @@ function useWeb3AuthInnerContextValue({
       web3Auth.on(constants.CONNECTOR_EVENTS.REHYDRATION_ERROR, rehydrationErrorListener);
       web3Auth.on(constants.CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
       web3Auth.on(constants.CONNECTOR_EVENTS.CONNECTION_UPDATED, connectionUpdatedListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, connectorDataUpdatedListener);
       if (web3Auth.loginMode === constants$1.LOGIN_MODE.MODAL) {
         web3Auth.on(constants.CONNECTOR_EVENTS.CONSENT_ACCEPTED, consentAcceptedListener);
       }
@@ -202,6 +211,7 @@ function useWeb3AuthInnerContextValue({
       web3Auth.removeListener(constants.CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
       web3Auth.removeListener(constants.CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
       web3Auth.removeListener(constants.CONNECTOR_EVENTS.CONNECTION_UPDATED, connectionUpdatedListener);
+      web3Auth.removeListener(constants.CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, connectorDataUpdatedListener);
       if (web3Auth.loginMode === constants$1.LOGIN_MODE.MODAL) {
         web3Auth.removeListener(constants.CONNECTOR_EVENTS.CONSENT_ACCEPTED, consentAcceptedListener);
       }

package/dist/lib.cjs/react/solana/provider.js

@@ -12,13 +12,12 @@ var baseControllers = require('@toruslabs/base-controllers');
 require('@toruslabs/session-manager');
 require('@web3auth/auth');
 require('../../base/errors/index.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
-require('../../base/constants.js');
+var utils = require('../../base/utils.js');
 require('../../base/wallet/index.js');
 require('../../base/connector/connectorStatus.js');
 require('../../base/connector/constants.js');
 require('jwt-decode');
+require('../../base/constants.js');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
 require('../context/Web3AuthInnerContext.js');
@@ -54,12 +53,28 @@ function makePlaceholder(rpc) {
   });
 }
 function dispose(client) {
-  void client.actions.disconnectWallet().catch(() => {});
   client.destroy();
 }
+function resolveSolanaChain(web3Auth, connection) {
+  var _web3Auth$coreOptions3;
+  const currentChain = web3Auth === null || web3Auth === void 0 ? void 0 : web3Auth.currentChain;
+  if ((currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) === baseControllers.CHAIN_NAMESPACES.SOLANA) {
+    return currentChain;
+  }
+  const connectedScope = connection !== null && connection !== void 0 && connection.solanaWallet && "scope" in connection.solanaWallet && typeof connection.solanaWallet.scope === "string" ? connection.solanaWallet.scope : null;
+  if (connectedScope) {
+    var _web3Auth$coreOptions2;
+    const connectedChain = web3Auth === null || web3Auth === void 0 || (_web3Auth$coreOptions2 = web3Auth.coreOptions.chains) === null || _web3Auth$coreOptions2 === void 0 ? void 0 : _web3Auth$coreOptions2.find(chain => {
+      return chain.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA && utils.getCaipChainId(chain) === connectedScope;
+    });
+    if (connectedChain) return connectedChain;
+  }
+  return (web3Auth === null || web3Auth === void 0 || (_web3Auth$coreOptions3 = web3Auth.coreOptions.chains) === null || _web3Auth$coreOptions3 === void 0 ? void 0 : _web3Auth$coreOptions3.find(chain => chain.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA)) || null;
+}
 /**
- * Builds the SolanaClient for Framework Kit React hooks: placeholder when idle, Web3Auth-backed when
- * connected on Solana. Ref + state so React re-renders on swap and effects dispose the right instance.
+ * Builds the SolanaClient for Framework Kit React hooks.
+ * For multichain wallets, keep the Solana client warm across namespace switches so
+ * switching back to Solana can reuse the existing wallet session.
  */
 function useFrameworkKitSolanaClient() {
   const {
@@ -72,12 +87,13 @@ function useFrameworkKitSolanaClient() {
     chainId,
     chainNamespace
   } = useChain.useChain();
-  const ref = react.useRef(null);
+  const solClientRef = react.useRef(null);
+  const connectedClientRef = react.useRef(null);
   const [client$1, setClient] = react.useState(() => {
     const c = makePlaceholder({
       rpcTarget: DEVNET_ENDPOINT
     });
-    ref.current = c;
+    solClientRef.current = c;
     return c;
   });
   react.useEffect(() => {
@@ -86,53 +102,61 @@ function useFrameworkKitSolanaClient() {
     });
   }, [isInitialized, web3Auth]);
   react.useEffect(() => () => {
-    const c = ref.current;
-    if (c) {
-      dispose(c);
-      ref.current = null;
+    const connectedClient = connectedClientRef.current;
+    const currentClient = solClientRef.current;
+    if (currentClient) {
+      dispose(currentClient);
+      solClientRef.current = null;
+    }
+    if (connectedClient && connectedClient !== currentClient) {
+      dispose(connectedClient);
     }
+    connectedClientRef.current = null;
   }, []);
   react.useEffect(() => {
     let stale = false;
-    const adopt = next => {
+    const adopt = nextClient => {
       if (stale) {
-        dispose(next);
+        dispose(nextClient);
         return;
       }
-      const prev = ref.current;
-      if (prev === next) return;
-      if (prev) dispose(prev);
-      ref.current = next;
-      setClient(next);
+      const prevClient = solClientRef.current;
+      if (prevClient === nextClient) return;
+      if (prevClient) dispose(prevClient);
+      solClientRef.current = nextClient;
+      setClient(nextClient);
     };
-    (async _web3Auth$currentChai => {
+    (async () => {
       const rpc = placeholderRpc(isInitialized, web3Auth);
-      const solanaWallet = connection === null || connection === void 0 ? void 0 : connection.solanaWallet;
-      const onSolana = isConnected && Boolean(solanaWallet) && chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA && (web3Auth === null || web3Auth === void 0 || (_web3Auth$currentChai = web3Auth.currentChain) === null || _web3Auth$currentChai === void 0 ? void 0 : _web3Auth$currentChai.chainNamespace) === baseControllers.CHAIN_NAMESPACES.SOLANA;
-      if (!onSolana) {
-        adopt(makePlaceholder(rpc));
-        return;
-      }
       const conn = connection;
-      if (!conn || !solanaWallet) {
+      const currentChain = web3Auth === null || web3Auth === void 0 ? void 0 : web3Auth.currentChain;
+      if ((currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) !== baseControllers.CHAIN_NAMESPACES.SOLANA) {
         adopt(makePlaceholder(rpc));
         return;
       }
-      // only reconnect for the primary connector
-      if (conn.connectorName !== (web3Auth === null || web3Auth === void 0 ? void 0 : web3Auth.primaryConnectorName)) {
+      const preferredSolanaChain = resolveSolanaChain(web3Auth, conn);
+      const shouldKeepSolanaClient = isConnected && Boolean(conn === null || conn === void 0 ? void 0 : conn.solanaWallet) && Boolean(preferredSolanaChain) &&
+      // only manage the client for the primary connector
+      (conn === null || conn === void 0 ? void 0 : conn.connectorName) === (web3Auth === null || web3Auth === void 0 ? void 0 : web3Auth.primaryConnectorName);
+      if (!shouldKeepSolanaClient) {
+        const connectedClient = connectedClientRef.current;
+        connectedClientRef.current = null;
+        if (connectedClient) {
+          dispose(connectedClient);
+        }
         adopt(makePlaceholder(rpc));
         return;
       }
       try {
         const solanaWalletId = "wallet-standard:" + conn.connectorName;
-        const connector = client.createWalletStandardConnector(solanaWallet, {
+        const connector = client.createWalletStandardConnector(conn.solanaWallet, {
           id: solanaWalletId,
           name: conn.connectorName
         });
         const {
           rpcTarget,
           wsTarget
-        } = web3Auth.currentChain;
+        } = preferredSolanaChain;
         const wired = client.createClient({
           endpoint: rpcTarget,
           websocketEndpoint: wsTarget,
@@ -145,7 +169,16 @@ function useFrameworkKitSolanaClient() {
           dispose(wired);
           return;
         }
-        adopt(wired);
+        const prevConnectedClient = connectedClientRef.current;
+        connectedClientRef.current = wired;
+        if (chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA && (currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) === baseControllers.CHAIN_NAMESPACES.SOLANA) {
+          adopt(wired);
+        } else {
+          adopt(makePlaceholder(rpc));
+        }
+        if (prevConnectedClient && prevConnectedClient !== wired) {
+          dispose(prevConnectedClient);
+        }
       } catch (e) {
         loglevel.log.error("Failed to create or connect Solana client", e);
         adopt(makePlaceholder(rpc));

package/dist/lib.cjs/types/base/connector/baseConnector.d.ts

@@ -40,6 +40,7 @@ export declare abstract class BaseConnector<T> extends SafeEventEmitter<Connecto
         challenge: string;
         authServer: string;
     }): Promise<AuthTokenInfo>;
+    protected authorizeOrDisconnect(getAuthTokenInfo?: boolean, chainId?: string): Promise<void>;
     protected clearWalletSession(): Promise<void>;
     abstract init(options?: ConnectorInitOptions): Promise<void>;
     abstract connect(params: T & BaseConnectorLoginParams): Promise<Connection | null>;
@@ -47,7 +48,7 @@ export declare abstract class BaseConnector<T> extends SafeEventEmitter<Connecto
     abstract getUserInfo(): Promise<Partial<UserInfo>>;
     abstract enableMFA(params?: T): Promise<void>;
     abstract manageMFA(params?: T): Promise<void>;
-    abstract getAuthTokenInfo(): Promise<AuthTokenInfo>;
+    abstract getAuthTokenInfo(chainId?: string): Promise<AuthTokenInfo>;
     abstract generateChallengeAndSign(authServerUrl?: string, accounts?: string[]): Promise<{
         challenge: string;
         signature: string;

package/dist/lib.cjs/types/base/connector/interfaces.d.ts

@@ -79,6 +79,7 @@ export interface Connection {
     readonly ethereumProvider: IProvider | null;
     readonly solanaWallet: Wallet | null;
     readonly connectorName: WALLET_CONNECTOR_TYPE | string;
+    readonly connectorNamespace: ConnectorNamespaceType;
 }
 export interface IConnector<T> extends SafeEventEmitter {
     connectorNamespace: ConnectorNamespaceType;

package/dist/lib.cjs/types/base/errors/index.d.ts

@@ -48,6 +48,7 @@ export declare class WalletLoginError extends Web3AuthError {
     static unsupportedOperation(extraMessage?: string, cause?: unknown): IWeb3AuthError;
     static sfaKeyNotFound(extraMessage?: string, cause?: unknown): IWeb3AuthError;
     static userNotLoggedIn(extraMessage?: string, cause?: unknown): IWeb3AuthError;
+    static userBlocked(extraMessage?: string, cause?: unknown): IWeb3AuthError;
 }
 export declare class WalletOperationsError extends Web3AuthError {
     protected static messages: ErrorCodes;

package/dist/lib.cjs/types/base/interfaces.d.ts

@@ -1,7 +1,7 @@
 import { type BUTTON_POSITION_TYPE } from "@toruslabs/base-controllers";
 import type { SmartAccountEipStandardType, SmartAccountType } from "@toruslabs/ethereum-controllers";
 import { AuthConnectionConfigItem, type WhiteLabelData } from "@web3auth/auth";
-import { type ChainNamespaceType, type CustomChainConfig } from "./chain/IChainInterface";
+import { type ChainNamespaceType, ConnectorNamespaceType, type CustomChainConfig } from "./chain/IChainInterface";
 import { LinkedAccountInfo } from "./connector";
 import { LOGIN_MODE, MODAL_SIGN_IN_METHODS, SMART_ACCOUNT_WALLET_SCOPE, WIDGET_TYPE } from "./constants";
 import { WALLET_CONNECTOR_TYPE } from "./wallet";
@@ -11,6 +11,7 @@ export interface WhitelistResponse {
 }
 export interface IWeb3AuthState {
     cachedConnector: string | null;
+    cachedConnectorNamespace: ConnectorNamespaceType | null;
     primaryConnectorName: WALLET_CONNECTOR_TYPE | null;
     currentChainId: string;
     idToken: string | null;

package/dist/lib.cjs/types/connectors/metamask-connector/metamaskConnector.d.ts

@@ -21,6 +21,7 @@ export interface MetaMaskConnectorSettings {
 export interface MetaMaskConnectorOptions extends BaseConnectorSettings {
     connectorSettings?: MetaMaskConnectorSettings;
 }
+export declare const METAMASK_ERC_6963_PROVIDER_RDNS = "io.metamask.mmc";
 /**
  * Factory function to create a MetaMask connector
  *

package/dist/lib.cjs/types/connectors/wallet-connect-v2-connector/config.d.ts

@@ -12,7 +12,6 @@ export declare enum DEFAULT_EIP155_METHODS {
     ADD_ETHEREUM_CHAIN = "wallet_addEthereumChain",
     SWITCH_ETHEREUM_CHAIN = "wallet_switchEthereumChain"
 }
-export declare const NULL_ON_SUCCESS_METHODS: string[];
 export declare enum DEFAULT_SOLANA_METHODS {
     SIGN_TRANSACTION = "solana_signTransaction",
     SIGN_MESSAGE = "solana_signMessage"

package/dist/lib.cjs/types/vue/solana/provider.d.ts

@@ -1,7 +1,7 @@
 /**
  * Syncs Web3Auth Solana connection with Framework Kit client.
- * When user is connected via Web3Auth and current chain is Solana, creates a Framework Kit client
- * with Web3Auth as the wallet connector and connects it (same pattern as Wagmi provider).
+ * For multichain wallets, keep the Solana client warm across namespace switches so
+ * switching back to Solana can reuse the existing wallet session.
  */
 export declare const SolanaProvider: import("vue").DefineComponent<{}, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;