@web3auth/no-modal 11.0.2 → 11.2.0

package/dist/lib.cjs/account-linking/react.js

@@ -19,6 +19,7 @@ require('jwt-decode');
 require('../base/plugin/errors.js');
 require('../base/plugin/IPlugin.js');
 var useWeb3AuthInner = require('../react/hooks/useWeb3AuthInner.js');
+require('./errors.js');
 var rest = require('./rest.js');
 
 const useLinkAccount = () => {

package/dist/lib.cjs/account-linking/vue.js

@@ -19,6 +19,7 @@ require('jwt-decode');
 require('../base/plugin/errors.js');
 require('../base/plugin/IPlugin.js');
 var useWeb3AuthInner = require('../vue/composables/useWeb3AuthInner.js');
+require('./errors.js');
 var rest = require('./rest.js');
 
 const useLinkAccount = () => {

package/dist/lib.cjs/base/connector/baseConnector.js

@@ -128,17 +128,28 @@ class BaseConnector extends auth.SafeEventEmitter {
     return cached;
   }
   async verifyAndAuthorize(params) {
-    const tokens = await baseControllers.verifySignedChallenge({
-      chainNamespace: params.chainNamespace,
-      signedMessage: params.signedMessage,
-      challenge: params.challenge,
-      connector: this.name,
-      authServer: params.authServer,
-      web3AuthClientId: this.coreOptions.clientId,
-      web3AuthNetwork: this.coreOptions.web3AuthNetwork,
-      sessionTimeout: this.coreOptions.sessionTime,
-      deviceInfo: baseControllers.getDeviceInfo()
-    });
+    let tokens;
+    try {
+      tokens = await baseControllers.verifySignedChallenge({
+        chainNamespace: params.chainNamespace,
+        signedMessage: params.signedMessage,
+        challenge: params.challenge,
+        connector: this.name,
+        authServer: params.authServer,
+        web3AuthClientId: this.coreOptions.clientId,
+        web3AuthNetwork: this.coreOptions.web3AuthNetwork,
+        sessionTimeout: this.coreOptions.sessionTime,
+        deviceInfo: baseControllers.getDeviceInfo()
+      });
+    } catch (error) {
+      if (error instanceof Response && error.status === 401) {
+        const body = await error.clone().json().catch(() => ({}));
+        if (body.message === "ACCESS_CONTROL_DENIED") {
+          throw index$1.WalletLoginError.userBlocked("User is blocked by the application", error);
+        }
+      }
+      throw error;
+    }
     await this.saveAuthTokenInfo(tokens);
     const tokenInfo = {
       idToken: tokens.idToken,
@@ -152,6 +163,26 @@ class BaseConnector extends auth.SafeEventEmitter {
     });
     return tokenInfo;
   }
+  async authorizeOrDisconnect(getAuthTokenInfo, chainId) {
+    if (!getAuthTokenInfo) return;
+    try {
+      await this.getAuthTokenInfo(chainId);
+    } catch (error) {
+      loglevel.log.error("Authorization failed after connect; disconnecting wallet to keep state consistent", error);
+      const wasRehydrated = this.rehydrated;
+      try {
+        // getAuthTokenInfo moved status to AUTHORIZING; restore CONNECTED so disconnect requirements pass.
+        if (!this.connected) this.status = constants.CONNECTOR_STATUS.CONNECTED;
+        await this.disconnect();
+      } catch (disconnectError) {
+        loglevel.log.error("Failed to disconnect wallet after authorization error", disconnectError);
+      } finally {
+        // disconnect() resets rehydrated=false; restore so caller catch emits the right event.
+        this.rehydrated = wasRehydrated;
+      }
+      throw error;
+    }
+  }
   async clearWalletSession() {
     if (!this.authSessionManager) return;
     try {

package/dist/lib.cjs/base/errors/index.js

@@ -159,6 +159,9 @@ class WalletLoginError extends Web3AuthError {
   static userNotLoggedIn(extraMessage = "", cause) {
     return WalletLoginError.fromCode(5119, extraMessage, cause);
   }
+  static userBlocked(extraMessage = "", cause) {
+    return WalletLoginError.fromCode(5120, extraMessage, cause);
+  }
 }
 _defineProperty(WalletLoginError, "messages", {
   5000: "Custom",
@@ -170,7 +173,8 @@ _defineProperty(WalletLoginError, "messages", {
   5116: "Chain config has not been added. Please add the chain config before calling switchChain",
   5117: "Unsupported operation",
   5118: "useSFAKey flag is enabled but SFA key is not available",
-  5119: "User not logged in."
+  5119: "User not logged in.",
+  5120: "User is blocked by the application"
 });
 class WalletOperationsError extends Web3AuthError {
   constructor(code, message, cause) {

package/dist/lib.cjs/base/utils.js

@@ -145,7 +145,7 @@ const getWalletServicesAnalyticsProperties = walletServicesConfig => {
     ws_default_portfolio: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig10 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig10 === void 0 ? void 0 : _walletServicesConfig10.defaultPortfolio
   };
 };
-const sdkVersion = "11.0.2";
+const sdkVersion = "11.2.0";
 const getErrorAnalyticsProperties = error => {
   try {
     const code = error instanceof index.Web3AuthError ? error.code : error === null || error === void 0 ? void 0 : error.code;

package/dist/lib.cjs/connectors/auth-connector/authConnector.js

@@ -9,6 +9,8 @@ var securePubSub = require('@toruslabs/secure-pub-sub');
 var auth = require('@web3auth/auth');
 var wsEmbed = require('@web3auth/ws-embed');
 var deepmerge = require('deepmerge');
+var errors = require('../../account-linking/errors.js');
+var rest = require('../../account-linking/rest.js');
 var analytics = require('../../base/analytics.js');
 var IChainInterface = require('../../base/chain/IChainInterface.js');
 var baseConnector = require('../../base/connector/baseConnector.js');
@@ -24,8 +26,6 @@ var utils = require('../../base/utils.js');
 var index$1 = require('../../base/wallet/index.js');
 var utils$1 = require('../utils.js');
 var authSolanaWallet = require('./authSolanaWallet.js');
-var errors = require('../../account-linking/errors.js');
-var rest = require('../../account-linking/rest.js');
 
 // Auth connections that have been deprecated and are no longer supported by the SDK.
 // Passing any of these as `authConnection` results in a hard error so consumers
@@ -209,7 +209,8 @@ class AuthConnector extends baseConnector.BaseConnector {
       return {
         ethereumProvider: this.provider,
         solanaWallet: this._solanaWallet,
-        connectorName: this.name
+        connectorName: this.name,
+        connectorNamespace: this.connectorNamespace
       };
     } catch (error) {
       var _error$message;
@@ -372,11 +373,9 @@ class AuthConnector extends baseConnector.BaseConnector {
     }
   }
   async cleanup() {
-    if (!this.authInstance) throw index.WalletInitializationError.notReady("authInstance is not ready");
-    await this.authInstance.cleanup();
-    if (this.wsEmbedInstance) {
-      this.wsEmbedInstance.clearInit();
-    }
+    var _this$authInstance, _this$wsEmbedInstance2;
+    await ((_this$authInstance = this.authInstance) === null || _this$authInstance === void 0 ? void 0 : _this$authInstance.cleanup());
+    (_this$wsEmbedInstance2 = this.wsEmbedInstance) === null || _this$wsEmbedInstance2 === void 0 || _this$wsEmbedInstance2.clearInit();
     this._solanaWallet = null;
     this.unbindWsEmbedProviderEvents();
   }
@@ -741,8 +740,8 @@ class AuthConnector extends baseConnector.BaseConnector {
     return accounts[0];
   }
   getWsEmbedProvider() {
-    var _this$wsEmbedInstance2, _this$wsEmbedInstance3;
-    return (_this$wsEmbedInstance2 = (_this$wsEmbedInstance3 = this.wsEmbedInstance) === null || _this$wsEmbedInstance3 === void 0 ? void 0 : _this$wsEmbedInstance3.provider) !== null && _this$wsEmbedInstance2 !== void 0 ? _this$wsEmbedInstance2 : null;
+    var _this$wsEmbedInstance3, _this$wsEmbedInstance4;
+    return (_this$wsEmbedInstance3 = (_this$wsEmbedInstance4 = this.wsEmbedInstance) === null || _this$wsEmbedInstance4 === void 0 ? void 0 : _this$wsEmbedInstance4.provider) !== null && _this$wsEmbedInstance3 !== void 0 ? _this$wsEmbedInstance3 : null;
   }
   bindWsEmbedProviderEvents() {
     const rawProvider = this.getWsEmbedProvider();
@@ -787,7 +786,7 @@ class AuthConnector extends baseConnector.BaseConnector {
     return finalPrivKey;
   }
   async connectWithProvider(params) {
-    var _this$authInstance, _params$extraLoginOpt, _this$authInstance2, _this$authInstance3;
+    var _this$authInstance2, _params$extraLoginOpt, _this$authInstance3, _this$authInstance4;
     if (!this.authInstance) throw index.WalletInitializationError.notReady("authInstance is not ready");
     const chainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId);
     if (!chainConfig) throw index.WalletLoginError.connectionError("Chain config is not available");
@@ -795,7 +794,7 @@ class AuthConnector extends baseConnector.BaseConnector {
       chainNamespace
     } = chainConfig;
     // if not logged in then login
-    const keyAvailable = chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 || chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA ? (_this$authInstance = this.authInstance) === null || _this$authInstance === void 0 ? void 0 : _this$authInstance.sessionId : this._getFinalPrivKey();
+    const keyAvailable = chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 || chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA ? (_this$authInstance2 = this.authInstance) === null || _this$authInstance2 === void 0 ? void 0 : _this$authInstance2.sessionId : this._getFinalPrivKey();
     if (params.idToken) params.extraLoginOptions = _objectSpread(_objectSpread({}, params.extraLoginOptions), {}, {
       id_token: params.idToken
     });
@@ -811,13 +810,14 @@ class AuthConnector extends baseConnector.BaseConnector {
       }
     }
     // if useSFAKey is true and privKey is available but coreKitKey is not available, throw an error
-    if (this.coreOptions.useSFAKey && (_this$authInstance2 = this.authInstance) !== null && _this$authInstance2 !== void 0 && _this$authInstance2.privKey && !((_this$authInstance3 = this.authInstance) !== null && _this$authInstance3 !== void 0 && _this$authInstance3.coreKitKey)) {
+    if (this.coreOptions.useSFAKey && (_this$authInstance3 = this.authInstance) !== null && _this$authInstance3 !== void 0 && _this$authInstance3.privKey && !((_this$authInstance4 = this.authInstance) !== null && _this$authInstance4 !== void 0 && _this$authInstance4.coreKitKey)) {
       // If the user is already logged in, logout and throw an error
       if (this.authInstance.sessionId) {
         await this.authInstance.logout();
       }
       throw index.WalletLoginError.sfaKeyNotFound("This typically occurs when the authentication method used does not provide SFA keys (e.g., default auth connection).");
     }
+    const connectorNamespace = this.connectorNamespace;
     // setup WS embed if chainNamespace is EIP155 or SOLANA
     if (chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 || chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA) {
       // wait for ws embed instance to be ready.
@@ -843,7 +843,8 @@ class AuthConnector extends baseConnector.BaseConnector {
             connectorName: index$1.WALLET_CONNECTORS.AUTH,
             reconnected: this.rehydrated,
             ethereumProvider: this.provider,
-            solanaWallet: this._solanaWallet
+            solanaWallet: this._solanaWallet,
+            connectorNamespace
           });
           if (params.getAuthTokenInfo) {
             await this.getAuthTokenInfo();
@@ -860,7 +861,8 @@ class AuthConnector extends baseConnector.BaseConnector {
           connectorName: index$1.WALLET_CONNECTORS.AUTH,
           ethereumProvider: this.provider,
           solanaWallet: this._solanaWallet,
-          reconnected: this.rehydrated
+          reconnected: this.rehydrated,
+          connectorNamespace
         });
       }
     }
@@ -961,7 +963,12 @@ class AuthConnector extends baseConnector.BaseConnector {
         if (error instanceof index.Web3AuthError) {
           throw error;
         }
-        reject(index.WalletLoginError.connectionError(error instanceof Error ? error.message : error || "Failed to login with social"));
+        const errorMessage = error instanceof Error ? error.message : error;
+        if (errorMessage === "Access control denied") {
+          reject(index.WalletLoginError.userBlocked(errorMessage, error));
+          return;
+        }
+        reject(index.WalletLoginError.connectionError(errorMessage || "Failed to login with social"));
       });
     });
   }

package/dist/lib.cjs/connectors/coinbase-connector/coinbaseConnector.js

@@ -112,15 +112,15 @@ class CoinbaseConnector extends baseEvmConnector.BaseEvmConnector {
         connectorName: index.WALLET_CONNECTORS.COINBASE,
         reconnected: this.rehydrated,
         ethereumProvider: this.provider,
-        solanaWallet: null
+        solanaWallet: null,
+        connectorNamespace: this.connectorNamespace
       });
-      if (getAuthTokenInfo) {
-        await this.getAuthTokenInfo();
-      }
+      await this.authorizeOrDisconnect(getAuthTokenInfo);
       return {
         ethereumProvider: this.provider,
         solanaWallet: null,
-        connectorName: this.name
+        connectorName: this.name,
+        connectorNamespace: this.connectorNamespace
       };
     } catch (error) {
       // ready again to be connected

package/dist/lib.cjs/connectors/injected-evm-connector/injectedEvmConnector.js

@@ -101,19 +101,20 @@ class InjectedEvmConnector extends baseEvmConnector.BaseEvmConnector {
         }
       };
       this.injectedProvider.on("accountsChanged", accountDisconnectHandler);
+      const connectorNamespace = this.connectorNamespace;
       this.emit(constants.CONNECTOR_EVENTS.CONNECTED, {
         connectorName: this.name,
         reconnected: this.rehydrated,
         ethereumProvider: this.injectedProvider,
-        solanaWallet: null
+        solanaWallet: null,
+        connectorNamespace
       });
-      if (getAuthTokenInfo) {
-        await this.getAuthTokenInfo();
-      }
+      await this.authorizeOrDisconnect(getAuthTokenInfo);
       return {
         ethereumProvider: this.injectedProvider,
         solanaWallet: null,
-        connectorName: this.name
+        connectorName: this.name,
+        connectorNamespace
       };
     } catch (error) {
       // ready again to be connected

package/dist/lib.cjs/connectors/injected-solana-connector/walletStandardConnector.js

@@ -88,19 +88,20 @@ class WalletStandardConnector extends baseSolanaConnector.BaseSolanaConnector {
       }
       if (this.wallet.accounts.length === 0) throw index.WalletLoginError.connectionError();
       this.status = constants.CONNECTOR_STATUS.CONNECTED;
+      const connectorNamespace = this.connectorNamespace;
       this.emit(constants.CONNECTOR_EVENTS.CONNECTED, {
         connectorName: this.name,
         reconnected: this.rehydrated,
         ethereumProvider: null,
-        solanaWallet: this.solanaWallet
+        solanaWallet: this.solanaWallet,
+        connectorNamespace
       });
-      if (getAuthTokenInfo) {
-        await this.getAuthTokenInfo();
-      }
+      await this.authorizeOrDisconnect(getAuthTokenInfo);
       return {
         ethereumProvider: null,
         solanaWallet: this.solanaWallet,
-        connectorName: this.name
+        connectorName: this.name,
+        connectorNamespace
       };
     } catch (error) {
       // ready again to be connected

package/dist/lib.cjs/connectors/metamask-connector/metamaskConnector.js

@@ -19,7 +19,7 @@ require('@web3auth/auth');
 require('jwt-decode');
 require('../../base/constants.js');
 var index$1 = require('../../base/errors/index.js');
-require('../../base/loglevel.js');
+var loglevel = require('../../base/loglevel.js');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
 var utils = require('../../base/utils.js');
@@ -27,6 +27,11 @@ var index = require('../../base/wallet/index.js');
 var utils$1 = require('../utils.js');
 var solana = require('../../base/wallet/solana.js');
 
+// `@metamask/connect-evm` announces its SDK-backed provider over EIP-6963 with this
+// RDNS value. Web3Auth uses the dedicated `metaMaskConnector` for MetaMask, so MIPD
+// discovery should ignore this provider to avoid treating the QR/deeplink transport
+// as a native injected wallet.
+const METAMASK_ERC_6963_PROVIDER_RDNS = "io.metamask.mmc";
 class MetaMaskConnector extends baseConnector.BaseConnector {
   constructor(connectorOptions) {
     super(connectorOptions);
@@ -195,13 +200,24 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
     if (coreStatus === "connected" && options.autoConnect) {
       this.status = constants.CONNECTOR_STATUS.CONNECTED;
       this.rehydrated = true;
+      // Force sync the chain state before connect with rehydrated state.
+      // during rehydration, `createEVMClient` (from above) cause re-creating session for connected the evm provider,
+      // triggering `switchChain` internally and unintentionally update the connector data with the new chain id.
+      // This creates issue in rehydration flow, where Web3Auth connects to the incorrect chain id, not the rehydrated chain id.
+      // Force sync the chain state with the rehydrated chain id to avoid this issue.
+      await this.forceSyncChainState(chainConfig);
       this.emit(constants.CONNECTOR_EVENTS.CONNECTED, {
         connectorName: index.WALLET_CONNECTORS.METAMASK,
         reconnected: true,
         ethereumProvider: this.evmProvider,
-        solanaWallet: this.solanaProvider
+        solanaWallet: this.solanaProvider,
+        connectorNamespace: this.connectorNamespace
       });
-      if (options.getAuthTokenInfo) await this.getAuthTokenInfo(options.chainId);
+      try {
+        await this.authorizeOrDisconnect(options.getAuthTokenInfo, options.chainId);
+      } catch (error) {
+        this.emit(constants.CONNECTOR_EVENTS.REHYDRATION_ERROR, error);
+      }
     } else if (coreStatus === "connected" || coreStatus === "loaded" || coreStatus === "disconnected" || coreStatus === "pending") {
       this.status = constants.CONNECTOR_STATUS.READY;
       this.emit(constants.CONNECTOR_EVENTS.READY, index.WALLET_CONNECTORS.METAMASK);
@@ -266,7 +282,7 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
       }
       // sync the chain state after connect
       // metamask might not be connected to the requested chain, so we need to sync the chain state to/from Web3Auth state after connect.
-      await this.syncChainStateAfterConnect(chainConfig);
+      await this.forceSyncChainState(chainConfig);
       // check if connected
       if (this.multichainClient.status !== "connected") {
         throw index$1.WalletLoginError.notConnectedError("Failed to connect with MetaMask wallet");
@@ -284,15 +300,15 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
         connectorName: index.WALLET_CONNECTORS.METAMASK,
         reconnected: this.rehydrated,
         ethereumProvider: this.evmProvider,
-        solanaWallet: this.solanaProvider
+        solanaWallet: this.solanaProvider,
+        connectorNamespace: this.connectorNamespace
       });
-      if (getAuthTokenInfo) {
-        await this.getAuthTokenInfo(chainId);
-      }
+      await this.authorizeOrDisconnect(getAuthTokenInfo, chainId);
       return {
         ethereumProvider: this.evmProvider,
         solanaWallet: this.solanaProvider,
-        connectorName: this.name
+        connectorName: this.name,
+        connectorNamespace: this.connectorNamespace
       };
     } catch (error) {
       // Ready again to be connected
@@ -317,9 +333,11 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
   }) {
     if (!this.multichainClient) throw index$1.WalletLoginError.connectionError("Multichain client is not available");
     this.checkDisconnectionRequirements();
-    await this.clearWalletSession();
+    await this.clearMultichainWalletSessions();
     // Disconnect using the multichain client
-    await this.multichainClient.disconnect();
+    if (this.multichainClient.status === "connected") {
+      await this.multichainClient.disconnect();
+    }
     if (options.cleanup) {
       this.status = constants.CONNECTOR_STATUS.NOT_READY;
       this.initializationPromise = null;
@@ -375,32 +393,40 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
   }
   async switchChain(params, init = false) {
     super.checkSwitchChainRequirements(params, init);
+    await this.ensureInitialized();
     const targetChainConfig = this.coreOptions.chains.find(c => c.chainId === params.chainId);
-    if ((targetChainConfig === null || targetChainConfig === void 0 ? void 0 : targetChainConfig.chainNamespace) === baseControllers.CHAIN_NAMESPACES.SOLANA) {
-      // no need to switch chain for Solana
+    if (!targetChainConfig) throw index$1.WalletLoginError.connectionError("Chain config is not available");
+    if (targetChainConfig.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA) {
+      if (!this.solanaWallet) {
+        throw index$1.WalletLoginError.unsupportedOperation("switchChain requires a Solana client, but no Solana chains are configured.");
+      }
+      // For solana case, we don't have the `switchChain` method like `evmClient`.
+      // So, we just need to sync with the connected solana chain to the Web3Auth state.
+      await this.forceSyncChainState(targetChainConfig);
       return;
     }
-    await this.ensureInitialized();
     if (!this.evmClient) {
       throw index$1.WalletLoginError.unsupportedOperation("switchChain requires an EVM client, but no EVM chains are configured.");
     }
-    const chainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId && [baseControllers.CHAIN_NAMESPACES.EIP155].includes(x.chainNamespace));
-    const chainConfiguration = chainConfig ? {
+    const chainConfiguration = targetChainConfig ? {
       chainId: params.chainId,
-      chainName: chainConfig.displayName,
-      rpcUrls: [chainConfig.rpcTarget],
-      blockExplorerUrls: chainConfig.blockExplorerUrl ? [chainConfig.blockExplorerUrl] : undefined,
+      chainName: targetChainConfig.displayName,
+      rpcUrls: [targetChainConfig.rpcTarget],
+      blockExplorerUrls: targetChainConfig.blockExplorerUrl ? [targetChainConfig.blockExplorerUrl] : undefined,
       nativeCurrency: {
-        name: chainConfig.tickerName,
-        symbol: chainConfig.ticker,
-        decimals: chainConfig.decimals || 18
+        name: targetChainConfig.tickerName,
+        symbol: targetChainConfig.ticker,
+        decimals: targetChainConfig.decimals || 18
       },
-      iconUrls: chainConfig.logo ? [chainConfig.logo] : undefined
+      iconUrls: targetChainConfig.logo ? [targetChainConfig.logo] : undefined
     } : undefined;
     await this.evmClient.switchChain({
       chainId: params.chainId,
       chainConfiguration
     });
+    this.updateConnectorData({
+      chainId: params.chainId
+    });
   }
   async generateChallengeAndSign(authServerUrl, accounts, chainId) {
     const activeChainConfig = this.resolveAuthChainConfig(chainId);
@@ -458,7 +484,11 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
     }
     await this.initializationPromise;
   }
-  async syncChainStateAfterConnect(chainConfig) {
+  /**
+   * Syncs the chain state with the Web3Auth state.
+   * @param chainConfig - The chain config to sync.
+   */
+  async forceSyncChainState(chainConfig) {
     var _this$evmProvider2;
     // EVM connectors can switch chains, so align the wallet with the requested chain
     // before Web3Auth persists the active chain in controller state.
@@ -479,13 +509,9 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
         if (!connectedChainConfig) {
           throw index$1.WalletLoginError.connectionError("Connected chain is not available in the chains config");
         }
-        if (connectedChainConfig.chainId !== chainConfig.chainId) {
-          // since, switchChain is not supported for solana (in metamask connect),
-          // we will make use of the connector data to update the Web3Auth state.
-          this.updateConnectorData({
-            chainId: connectedChainConfig.chainId
-          });
-        }
+        this.updateConnectorData({
+          chainId: chainConfig.chainId
+        });
       }
     }
   }
@@ -499,6 +525,30 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
     // Keep the old fallback for callers that do not pass a chainId yet.
     return isSolanaOnly ? this.coreOptions.chains.find(x => x.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA) : this.evmProvider ? this.coreOptions.chains.find(x => x.chainId === evmChainId) : undefined;
   }
+  async clearMultichainWalletSessions() {
+    const addresses = new Set();
+    if (this.evmProvider) {
+      const evmAccounts = await this.evmProvider.request({
+        method: wsEmbed.EVM_METHOD_TYPES.GET_ACCOUNTS
+      });
+      evmAccounts.forEach(account => addresses.add(account));
+    }
+    if (this.solanaProvider) {
+      this.solanaProvider.accounts.forEach(account => addresses.add(account.address));
+    }
+    if (addresses.size === 0) {
+      await this.clearWalletSession();
+      return;
+    }
+    // MetaMask can authorize both EVM and Solana accounts in one session, but BaseConnector
+    // caches SIWW tokens under one address at a time. Clear every connected address on disconnect.
+    for (const address of addresses) {
+      this.initSessionManager(address);
+      await this.clearWalletSession().catch(error => {
+        loglevel.log.error("Failed to clear multichain wallet session", error);
+      });
+    }
+  }
 }
 /**
  * Factory function to create a MetaMask connector
@@ -527,4 +577,5 @@ const metaMaskConnector = params => {
   };
 };
 
+exports.METAMASK_ERC_6963_PROVIDER_RDNS = METAMASK_ERC_6963_PROVIDER_RDNS;
 exports.metaMaskConnector = metaMaskConnector;

package/dist/lib.cjs/connectors/wallet-connect-v2-connector/config.js

@@ -31,8 +31,6 @@ exports.DEFAULT_EIP155_METHODS = void 0;
   DEFAULT_EIP155_METHODS["ADD_ETHEREUM_CHAIN"] = "wallet_addEthereumChain";
   DEFAULT_EIP155_METHODS["SWITCH_ETHEREUM_CHAIN"] = "wallet_switchEthereumChain";
 })(exports.DEFAULT_EIP155_METHODS || (exports.DEFAULT_EIP155_METHODS = {}));
-// methods that return `null` on success
-const NULL_ON_SUCCESS_METHODS = [exports.DEFAULT_EIP155_METHODS.SWITCH_ETHEREUM_CHAIN, exports.DEFAULT_EIP155_METHODS.ADD_ETHEREUM_CHAIN];
 exports.DEFAULT_SOLANA_METHODS = void 0;
 (function (DEFAULT_SOLANA_METHODS) {
   DEFAULT_SOLANA_METHODS["SIGN_TRANSACTION"] = "solana_signTransaction";
@@ -125,7 +123,6 @@ const getWalletConnectV2Settings = async (chains, projectID) => {
   };
 };
 
-exports.NULL_ON_SUCCESS_METHODS = NULL_ON_SUCCESS_METHODS;
 exports.getNamespacesFromChains = getNamespacesFromChains;
 exports.getRequiredNamespaces = getRequiredNamespaces;
 exports.getSupportedEventsByNamespace = getSupportedEventsByNamespace;

package/dist/lib.cjs/connectors/wallet-connect-v2-connector/index.js

@@ -22,7 +22,6 @@ Object.defineProperty(exports, "DEFAULT_SOLANA_METHODS", {
 	enumerable: true,
 	get: function () { return config.DEFAULT_SOLANA_METHODS; }
 });
-exports.NULL_ON_SUCCESS_METHODS = config.NULL_ON_SUCCESS_METHODS;
 exports.getNamespacesFromChains = config.getNamespacesFromChains;
 exports.getRequiredNamespaces = config.getRequiredNamespaces;
 exports.getSupportedEventsByNamespace = config.getSupportedEventsByNamespace;

package/dist/lib.cjs/connectors/wallet-connect-v2-connector/walletConnectV2Connector.js

@@ -175,6 +175,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
           }));
         }
       };
+      const connectorNamespace = this.connectorNamespace;
       // if already connected
       if (this.connected) {
         await this.onConnectHandler({
@@ -184,7 +185,8 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
         return {
           ethereumProvider: this.provider,
           solanaWallet: this._solanaWallet,
-          connectorName: this.name
+          connectorName: this.name,
+          connectorNamespace
         };
       }
       if (this.status !== constants.CONNECTOR_STATUS.CONNECTING) {
@@ -197,7 +199,8 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
       return {
         ethereumProvider: this.provider,
         solanaWallet: this._solanaWallet,
-        connectorName: this.name
+        connectorName: this.name,
+        connectorNamespace
       };
     } catch (error) {
       loglevel.log.error("Wallet connect v2 connector error while connecting", error);
@@ -475,11 +478,10 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
       connectorName: index.WALLET_CONNECTORS.WALLET_CONNECT_V2,
       reconnected: this.rehydrated,
       ethereumProvider: this.provider,
-      solanaWallet: this._solanaWallet
+      solanaWallet: this._solanaWallet,
+      connectorNamespace: this.connectorNamespace
     });
-    if (getAuthTokenInfo) {
-      await this.getAuthTokenInfo();
-    }
+    await this.authorizeOrDisconnect(getAuthTokenInfo);
   }
   subscribeEvents() {
     if (!this.connector) throw index$1.WalletInitializationError.notReady("Wallet connector is not ready yet");

package/dist/lib.cjs/index.js

@@ -1,5 +1,7 @@
 'use strict';
 
+var errors = require('./account-linking/errors.js');
+var rest = require('./account-linking/rest.js');
 var analytics = require('./base/analytics.js');
 var IChainInterface = require('./base/chain/IChainInterface.js');
 var index$2 = require('./base/composables/index.js');
@@ -38,16 +40,19 @@ var utils = require('./providers/base-provider/utils.js');
 var ethRpcMiddlewares = require('./providers/ethereum-provider/rpc/ethRpcMiddlewares.js');
 var jrpcClient = require('./providers/ethereum-provider/rpc/jrpcClient.js');
 var walletMiddleware = require('./providers/ethereum-provider/rpc/walletMiddleware.js');
-var errors = require('./account-linking/errors.js');
 var wsEmbed = require('@web3auth/ws-embed');
 var baseControllers = require('@toruslabs/base-controllers');
 var app = require('@wallet-standard/app');
 var solana = require('./base/wallet/solana.js');
-var rest = require('./account-linking/rest.js');
 var walletStandardConnector = require('./connectors/injected-solana-connector/walletStandardConnector.js');
 
 
 
+exports.AccountLinkingError = errors.AccountLinkingError;
+exports.formatAccountLinkingErrorMessage = errors.formatAccountLinkingErrorMessage;
+exports.getAccountLinkingRequestError = errors.getAccountLinkingRequestError;
+exports.makeAccountLinkingRequest = rest.makeAccountLinkingRequest;
+exports.makeAccountUnlinkingRequest = rest.makeAccountUnlinkingRequest;
 exports.ANALYTICS_EVENTS = analytics.ANALYTICS_EVENTS;
 exports.ANALYTICS_INTEGRATION_TYPE = analytics.ANALYTICS_INTEGRATION_TYPE;
 exports.ANALYTICS_SDK_TYPE = analytics.ANALYTICS_SDK_TYPE;
@@ -148,6 +153,7 @@ Object.defineProperty(exports, "createMipd", {
 	get: function () { return mipd.createStore; }
 });
 exports.hasSolanaWalletStandardFeatures = index$3.hasSolanaWalletStandardFeatures;
+exports.METAMASK_ERC_6963_PROVIDER_RDNS = metamaskConnector.METAMASK_ERC_6963_PROVIDER_RDNS;
 exports.metaMaskConnector = metamaskConnector.metaMaskConnector;
 Object.defineProperty(exports, "DEFAULT_EIP155_METHODS", {
 	enumerable: true,
@@ -165,7 +171,6 @@ Object.defineProperty(exports, "DEFAULT_SOLANA_METHODS", {
 	enumerable: true,
 	get: function () { return config.DEFAULT_SOLANA_METHODS; }
 });
-exports.NULL_ON_SUCCESS_METHODS = config.NULL_ON_SUCCESS_METHODS;
 exports.getNamespacesFromChains = config.getNamespacesFromChains;
 exports.getRequiredNamespaces = config.getRequiredNamespaces;
 exports.getSupportedEventsByNamespace = config.getSupportedEventsByNamespace;
@@ -216,9 +221,6 @@ exports.createEthChainSwitchMiddleware = ethRpcMiddlewares.createEthChainSwitchM
 exports.createEthMiddleware = ethRpcMiddlewares.createEthMiddleware;
 exports.createEthJsonRpcClient = jrpcClient.createEthJsonRpcClient;
 exports.createWalletMiddlewareV2 = walletMiddleware.createWalletMiddlewareV2;
-exports.AccountLinkingError = errors.AccountLinkingError;
-exports.formatAccountLinkingErrorMessage = errors.formatAccountLinkingErrorMessage;
-exports.getAccountLinkingRequestError = errors.getAccountLinkingRequestError;
 Object.defineProperty(exports, "BUTTON_POSITION", {
 	enumerable: true,
 	get: function () { return wsEmbed.BUTTON_POSITION; }
@@ -243,6 +245,4 @@ exports.getSolanaChainByChainConfig = solana.getSolanaChainByChainConfig;
 exports.walletSignAndSendTransaction = solana.walletSignAndSendTransaction;
 exports.walletSignMessage = solana.walletSignMessage;
 exports.walletSignTransaction = solana.walletSignTransaction;
-exports.makeAccountLinkingRequest = rest.makeAccountLinkingRequest;
-exports.makeAccountUnlinkingRequest = rest.makeAccountUnlinkingRequest;
 exports.walletStandardConnector = walletStandardConnector.walletStandardConnector;