@web3auth/no-modal 11.0.0 → 11.0.2

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

@@ -107,6 +107,13 @@ const ANALYTICS_EVENTS = {
   MFA_ENABLEMENT_FAILED: "MFA Enablement Failed",
   MFA_MANAGEMENT_SELECTED: "MFA Management Selected",
   MFA_MANAGEMENT_FAILED: "MFA Management Failed",
+  // Consent Flow
+  USER_CONSENT_STARTED: "User Consent Started",
+  USER_CONSENT_ACCEPTED: "User Consent Accepted",
+  USER_CONSENT_DECLINED: "User Consent Declined",
+  USER_CONSENT_ERRORED: "User Consent Errored",
+  TERMS_OF_SERVICE_CLICKED: "Terms of Service Clicked",
+  PRIVACY_POLICY_CLICKED: "Privacy Policy Clicked",
   // Login Modal
   LOGIN_MODAL_OPENED: "Login Modal Opened",
   LOGIN_MODAL_CLOSED: "Login Modal Closed",

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.0";
+const sdkVersion = "11.0.2";
 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

@@ -492,7 +492,7 @@ class AuthConnector extends baseConnector.BaseConnector {
         accessToken,
         idToken
       } = await this.getPrimaryAuthSession(params.authSessionTokens);
-      const walletProof = await this.createWalletLinkingProof(params.connectorToLink);
+      const walletProof = await this.createWalletLinkingProof(params.connectorToLink, chainId);
       const authServerUrl = utils.citadelServerUrl(this.coreOptions.authBuildEnv);
       const result = await rest.makeAccountLinkingRequest(authServerUrl, accessToken, {
         idToken,
@@ -684,7 +684,7 @@ class AuthConnector extends baseConnector.BaseConnector {
     }
     throw errors.AccountLinkingError.requestFailed(`Unsupported chain namespace "${matchedAccount.chainNamespace}" for address "${address}".`);
   }
-  async createWalletLinkingProof(connector) {
+  async createWalletLinkingProof(connector, chainId) {
     // Notify listeners that the linking wallet is about to be asked for a signature so the UI
     // (e.g. modal) can switch from a "connecting" loader to an "authorizing" prompt while the
     // user reviews the signature request inside their wallet. Emitted on the isolated wallet
@@ -692,11 +692,13 @@ class AuthConnector extends baseConnector.BaseConnector {
     connector.emit(constants.CONNECTOR_EVENTS.AUTHORIZING, {
       connector: connector.name
     });
+    // Reuse the caller's target chain so multichain wallets generate the linking
+    // proof for the same namespace they were connected for.
     const {
       challenge,
       signature,
       chainNamespace
-    } = await connector.generateChallengeAndSign();
+    } = await connector.generateChallengeAndSign(undefined, undefined, chainId);
     const address = await this.getLinkingWalletAddress(connector, chainNamespace);
     if (chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155) {
       return {

package/dist/lib.cjs/connectors/base-evm-connector/baseEvmConnector.js

@@ -3,6 +3,7 @@
 var baseControllers = require('@toruslabs/base-controllers');
 var metadataHelpers = require('@toruslabs/metadata-helpers');
 var wsEmbed = require('@web3auth/ws-embed');
+var viem = require('viem');
 var siwe = require('viem/siwe');
 require('@babel/runtime/helpers/objectSpread2');
 require('@babel/runtime/helpers/defineProperty');
@@ -67,9 +68,9 @@ class BaseEvmConnector extends baseConnector.BaseConnector {
     } = currentChainConfig;
     const authServer = authServerUrl || utils.citadelServerUrl(this.coreOptions.authBuildEnv);
     const payload = {
-      domain: window.location.origin,
+      domain: window.location.host,
       uri: window.location.href,
-      address: accountsToUse[0],
+      address: viem.checksumAddress(accountsToUse[0]),
       chainId: parseInt(chainId, 16),
       version: "1",
       nonce: siwe.generateSiweNonce(),

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

@@ -140,7 +140,12 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
                 this.disconnect();
               }
             },
-            chainChanged: _chainId => {},
+            chainChanged: _chainId => {
+              // Keep Web3Auth state aligned with the wallet's actual EVM chain after connect/switch.
+              this.updateConnectorData({
+                chainId: _chainId
+              });
+            },
             connect: _result => {},
             disconnect: () => {
               if (this.connected) {
@@ -196,7 +201,7 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
         ethereumProvider: this.evmProvider,
         solanaWallet: this.solanaProvider
       });
-      if (options.getAuthTokenInfo) await this.getAuthTokenInfo();
+      if (options.getAuthTokenInfo) await this.getAuthTokenInfo(options.chainId);
     } 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);
@@ -259,13 +264,9 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
           await evmConnectedPromise;
         }
       }
-      // // Switch EVM chain if not connected to the right one (Solana chains are handled by the wallet-standard provider)
-      // if (chainConfig.chainNamespace === CHAIN_NAMESPACES.EIP155) {
-      //   const currentChainId = this.evmClient!.getChainId();
-      //   if (currentChainId !== chainId) {
-      //     await this.switchChain(chainConfig, true);
-      //   }
-      // }
+      // 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);
       // check if connected
       if (this.multichainClient.status !== "connected") {
         throw index$1.WalletLoginError.notConnectedError("Failed to connect with MetaMask wallet");
@@ -286,7 +287,7 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
         solanaWallet: this.solanaProvider
       });
       if (getAuthTokenInfo) {
-        await this.getAuthTokenInfo();
+        await this.getAuthTokenInfo(chainId);
       }
       return {
         ethereumProvider: this.evmProvider,
@@ -336,13 +337,11 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
       connector: index.WALLET_CONNECTORS.METAMASK
     });
   }
-  async getAuthTokenInfo() {
-    var _this$evmProvider2, _this$coreOptions$cha;
+  async getAuthTokenInfo(chainId) {
     if (!this.canAuthorize) throw index$1.WalletLoginError.notConnectedError();
-    // Determine the active chain: prefer Solana if no EVM provider, otherwise use EVM provider's chain
-    const evmChainId = ((_this$evmProvider2 = this.evmProvider) === null || _this$evmProvider2 === void 0 ? void 0 : _this$evmProvider2.chainId) || ((_this$coreOptions$cha = this.coreOptions.chains.find(x => x.chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155)) === null || _this$coreOptions$cha === void 0 ? void 0 : _this$coreOptions$cha.chainId);
-    const isSolanaOnly = !this.evmProvider && !!this.solanaProvider;
-    const activeChainConfig = isSolanaOnly ? this.coreOptions.chains.find(x => x.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA) : this.evmProvider ? this.coreOptions.chains.find(x => x.chainId === evmChainId) : undefined;
+    // In multichain sessions both providers can exist at the same time, so auth must
+    // follow the caller-selected chain instead of inferring from provider availability.
+    const activeChainConfig = this.resolveAuthChainConfig(chainId);
     if (!activeChainConfig) throw index$1.WalletLoginError.connectionError("Chain config is not available");
     const {
       chainNamespace
@@ -362,7 +361,7 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
     const {
       challenge,
       signature
-    } = await this.generateChallengeAndSign(authServer, accounts);
+    } = await this.generateChallengeAndSign(authServer, accounts, activeChainConfig.chainId);
     return this.verifyAndAuthorize({
       chainNamespace,
       signedMessage: signature,
@@ -403,11 +402,8 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
       chainConfiguration
     });
   }
-  async generateChallengeAndSign(authServerUrl, accounts) {
-    var _this$evmProvider3, _this$coreOptions$cha2;
-    const evmChainId = ((_this$evmProvider3 = this.evmProvider) === null || _this$evmProvider3 === void 0 ? void 0 : _this$evmProvider3.chainId) || ((_this$coreOptions$cha2 = this.coreOptions.chains.find(x => x.chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155)) === null || _this$coreOptions$cha2 === void 0 ? void 0 : _this$coreOptions$cha2.chainId);
-    const isSolanaOnly = !this.evmProvider && !!this.solanaProvider;
-    const activeChainConfig = isSolanaOnly ? this.coreOptions.chains.find(x => x.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA) : this.evmProvider ? this.coreOptions.chains.find(x => x.chainId === evmChainId) : undefined;
+  async generateChallengeAndSign(authServerUrl, accounts, chainId) {
+    const activeChainConfig = this.resolveAuthChainConfig(chainId);
     if (!activeChainConfig) throw index$1.WalletLoginError.connectionError("Chain config is not available");
     const {
       chainNamespace
@@ -462,6 +458,47 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
     }
     await this.initializationPromise;
   }
+  async syncChainStateAfterConnect(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.
+    if (chainConfig.chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 && ((_this$evmProvider2 = this.evmProvider) === null || _this$evmProvider2 === void 0 ? void 0 : _this$evmProvider2.chainId) !== chainConfig.chainId) {
+      await this.switchChain({
+        chainId: chainConfig.chainId
+      }, true);
+    } else if (chainConfig.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA) {
+      // For solana case, metamask connect the first available scope in priority order: mainnet > devnet > testnet.
+      // So, if the user requested chain is different from the connected chain,
+      // we need to update the connector data with the connected chain id to keep the Web3Auth state aligned.
+      if ("scope" in this.solanaProvider && typeof this.solanaProvider.scope === "string") {
+        var _this$coreOptions$cha;
+        const connectedSolChain = this.solanaProvider.scope;
+        const connectedChainConfig = (_this$coreOptions$cha = this.coreOptions.chains) === null || _this$coreOptions$cha === void 0 ? void 0 : _this$coreOptions$cha.find(chain => {
+          return utils.getCaipChainId(chain) === connectedSolChain && chain.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA;
+        });
+        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
+          });
+        }
+      }
+    }
+  }
+  resolveAuthChainConfig(chainId) {
+    var _this$evmProvider3, _this$coreOptions$cha2;
+    if (chainId) {
+      return this.coreOptions.chains.find(x => x.chainId === chainId);
+    }
+    const evmChainId = ((_this$evmProvider3 = this.evmProvider) === null || _this$evmProvider3 === void 0 ? void 0 : _this$evmProvider3.chainId) || ((_this$coreOptions$cha2 = this.coreOptions.chains.find(x => x.chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155)) === null || _this$coreOptions$cha2 === void 0 ? void 0 : _this$coreOptions$cha2.chainId);
+    const isSolanaOnly = !this.evmProvider && !!this.solanaProvider;
+    // 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;
+  }
 }
 /**
  * Factory function to create a MetaMask connector

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

@@ -31,6 +31,8 @@ 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";
@@ -123,6 +125,7 @@ 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,6 +22,7 @@ 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/index.js

@@ -165,6 +165,7 @@ 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/noModal.js

@@ -482,7 +482,9 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     };
     try {
       this.analytics.track(analytics.ANALYTICS_EVENTS.IDENTITY_TOKEN_STARTED, trackData);
-      const authTokenInfo = await this.primaryConnector.getAuthTokenInfo();
+      // Thread the controller's active chain into connector auth so multichain
+      // connectors sign for the same chain the app/session is currently using.
+      const authTokenInfo = await this.primaryConnector.getAuthTokenInfo(this.currentChainId);
       this.analytics.track(analytics.ANALYTICS_EVENTS.IDENTITY_TOKEN_COMPLETED, trackData);
       return {
         idToken: authTokenInfo.idToken
@@ -519,7 +521,9 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     if (!(params !== null && params !== void 0 && params.connectorName)) {
       throw index.WalletInitializationError.invalidParams("connectorName is required when calling linkAccount on the no-modal SDK");
     }
-    const chainId = this.resolveLinkAccountChainId(params.chainId);
+    const {
+      chainId
+    } = this.resolveLinkAccountChainConfig(params.chainId);
     const isolatedConnector = await this.createLinkingWalletConnector(params.connectorName, chainId);
     return this.linkAccountWithConnector(params.connectorName, chainId, isolatedConnector);
   }
@@ -911,11 +915,15 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       }));
       this.setActiveWalletConnectorKey();
       this.connectionReconnected = data.reconnected;
+      const {
+        activeAccount,
+        currentChainId
+      } = this.state;
       // when ssr is enabled, we need to get the idToken from the connector.
       if (this.coreOptions.ssr) {
         try {
           var _data$accessToken, _data$refreshToken;
-          const data = await connector.getAuthTokenInfo();
+          const data = await connector.getAuthTokenInfo(currentChainId);
           if (!data.idToken) throw index.WalletLoginError.connectionError("No idToken found");
           await this.setState({
             idToken: data.idToken,
@@ -932,10 +940,6 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
         }
       }
       // The following block only hits during rehydration
-      const {
-        activeAccount,
-        currentChainId
-      } = this.state;
       let rehydrateWithLinkedAccount = false;
       // for rehydration, if the active account is not the primary account, i.e. not `null`, create an isolated connector and connect to the chain
       if (activeAccount && !activeAccount.isPrimary && activeAccount.connector !== index$1.WALLET_CONNECTORS.AUTH) {
@@ -982,7 +986,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       const pendingUserConsent = this.consentRequired && !this.state.hasUserConsent;
       if (pendingUserConsent && !isConnectAndSign) {
         this.status = constants.CONNECTOR_STATUS.CONSENT_REQUIRING;
-        this.emit(constants.CONNECTOR_EVENTS.CONSENT_REQUIRING);
+        this.emit(constants.CONNECTOR_EVENTS.CONSENT_REQUIRING, _objectSpread({}, data));
         loglevel.log.debug("consent_requiring", this.status, this.primaryConnectorName);
       } else {
         // In CONNECT_AND_SIGN mode the AUTHORIZED handler can run before this point (e.g. when `ssr=true`
@@ -1102,7 +1106,13 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       await this.clearCache();
       this.emit(constants.CONNECTOR_EVENTS.REHYDRATION_ERROR, error);
     });
-    connector.on(constants.CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, data => {
+    connector.on(constants.CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, async data => {
+      if (this.shouldIgnoreInactiveConnectorEvent(connector, constants.CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED)) return;
+      // 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") {
+        await this.setCurrentChain(data.data.chainId);
+      }
       loglevel.log.debug("connector data updated", data);
       this.emit(constants.CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, data);
     });
@@ -1139,7 +1149,9 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       // if the user has not consented yet, we will ask for consent
       if (this.consentRequired && this.connection && !this.state.hasUserConsent) {
         this.status = constants.CONNECTOR_STATUS.CONSENT_REQUIRING;
-        this.emit(constants.CONNECTOR_EVENTS.CONSENT_REQUIRING);
+        this.emit(constants.CONNECTOR_EVENTS.CONSENT_REQUIRING, {
+          connectorName: data.connector
+        });
         loglevel.log.debug("consent_requiring", this.status, this.primaryConnectorName);
       } else {
         this.status = constants.CONNECTOR_STATUS.AUTHORIZED;
@@ -1201,12 +1213,14 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       reconnected: this.connectionReconnected
     });
   }
-  resolveLinkAccountChainId(chainId) {
+  resolveLinkAccountChainConfig(chainId) {
+    var _this$coreOptions$cha7;
     const finalChainId = chainId || this.state.currentChainId;
-    if (!finalChainId) {
+    const chainConfig = (_this$coreOptions$cha7 = this.coreOptions.chains) === null || _this$coreOptions$cha7 === void 0 ? void 0 : _this$coreOptions$cha7.find(chain => chain.chainId === finalChainId);
+    if (!chainConfig) {
       throw errors.AccountLinkingError.walletProofFailed("No chainId is available. Please specify chainId in LinkAccountParams or ensure the SDK has an active chain.");
     }
-    return finalChainId;
+    return chainConfig;
   }
   /**
    * Resolves the chain ID for a switch account operation.

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

@@ -158,13 +158,23 @@ class AccountAbstractionProvider extends baseProvider.BaseProvider {
     });
     const provider = auth.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 auth.providerErrors.unsupportedMethod("updateAccount. Please call it on eoaProvider");

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

@@ -3,6 +3,41 @@
 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,
@@ -199,10 +234,17 @@ function providerAsMiddleware(provider) {
   return async ({
     request
   }) => {
-    return provider.request({
+    const result = await 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/types/base/analytics.d.ts

@@ -26,6 +26,12 @@ export declare const ANALYTICS_EVENTS: {
     MFA_ENABLEMENT_FAILED: string;
     MFA_MANAGEMENT_SELECTED: string;
     MFA_MANAGEMENT_FAILED: string;
+    USER_CONSENT_STARTED: string;
+    USER_CONSENT_ACCEPTED: string;
+    USER_CONSENT_DECLINED: string;
+    USER_CONSENT_ERRORED: string;
+    TERMS_OF_SERVICE_CLICKED: string;
+    PRIVACY_POLICY_CLICKED: string;
     LOGIN_MODAL_OPENED: string;
     LOGIN_MODAL_CLOSED: string;
     SOCIAL_LOGIN_SELECTED: string;

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

@@ -102,8 +102,12 @@ export interface IConnector<T> extends SafeEventEmitter {
     switchChain(params: {
         chainId: string;
     }): Promise<void>;
-    getAuthTokenInfo(): Promise<AuthTokenInfo>;
-    generateChallengeAndSign(authServerUrl?: string, accounts?: string[]): Promise<{
+    /**
+     * `chainId` is optional to keep the connector API backward compatible while still
+     * allowing multichain connectors to bind auth/signing to the caller's selected chain.
+     */
+    getAuthTokenInfo(chainId?: string): Promise<AuthTokenInfo>;
+    generateChallengeAndSign(authServerUrl?: string, accounts?: string[], chainId?: string): Promise<{
         challenge: string;
         signature: string;
         chainNamespace: ChainNamespaceType;

package/dist/lib.cjs/types/base/core/IWeb3Auth.d.ts

@@ -227,13 +227,14 @@ export type SDK_CONNECTED_EVENT_DATA = CONNECTED_EVENT_DATA & {
     loginMode: LoginModeType;
     pendingUserConsent?: boolean;
 };
-export type SDK_CONSENT_ACCEPTED_EVENT_DATA = {
+export type SDK_CONSENT_ACCEPTED_EVENT_DATA = Partial<CONNECTED_EVENT_DATA> & {
     reconnected: boolean;
 };
+export type SDK_CONSENT_REQUIRING_EVENT_DATA = Partial<CONNECTED_EVENT_DATA>;
 export type Web3AuthNoModalEvents = Omit<ConnectorEvents, "connected" | "errored" | "ready" | "consent_requiring" | "consent_accepted"> & {
     [CONNECTOR_EVENTS.READY]: () => void;
     [CONNECTOR_EVENTS.CONNECTED]: (data: SDK_CONNECTED_EVENT_DATA) => void;
-    [CONNECTOR_EVENTS.CONSENT_REQUIRING]: () => void;
+    [CONNECTOR_EVENTS.CONSENT_REQUIRING]: (data: SDK_CONSENT_REQUIRING_EVENT_DATA) => void;
     [CONNECTOR_EVENTS.CONSENT_ACCEPTED]: (data: SDK_CONSENT_ACCEPTED_EVENT_DATA) => void;
     [CONNECTOR_EVENTS.ERRORED]: (error: Web3AuthError, loginMode: LoginModeType) => void;
     [CONNECTOR_EVENTS.CONNECTION_UPDATED]: (data: CONNECTION_UPDATED_EVENT_DATA) => void;

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

@@ -12,6 +12,7 @@ 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/noModal.d.ts

@@ -95,7 +95,7 @@ export declare class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEve
      */
     protected getInitialChainIdForConnector(connector: IConnector<unknown>): CustomChainConfig;
     protected completeConsentAcceptance(): Promise<void>;
-    protected resolveLinkAccountChainId(chainId?: string | null): string;
+    protected resolveLinkAccountChainConfig(chainId?: string | null): CustomChainConfig;
     /**
      * Resolves the chain ID for a switch account operation.
      * If the account's chain namespace is the same as the current chain namespace, return the current chain ID.

package/dist/lib.esm/base/analytics.js

@@ -106,6 +106,13 @@ const ANALYTICS_EVENTS = {
   MFA_ENABLEMENT_FAILED: "MFA Enablement Failed",
   MFA_MANAGEMENT_SELECTED: "MFA Management Selected",
   MFA_MANAGEMENT_FAILED: "MFA Management Failed",
+  // Consent Flow
+  USER_CONSENT_STARTED: "User Consent Started",
+  USER_CONSENT_ACCEPTED: "User Consent Accepted",
+  USER_CONSENT_DECLINED: "User Consent Declined",
+  USER_CONSENT_ERRORED: "User Consent Errored",
+  TERMS_OF_SERVICE_CLICKED: "Terms of Service Clicked",
+  PRIVACY_POLICY_CLICKED: "Privacy Policy Clicked",
   // Login Modal
   LOGIN_MODAL_OPENED: "Login Modal Opened",
   LOGIN_MODAL_CLOSED: "Login Modal Closed",

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

@@ -149,7 +149,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.0";
+const sdkVersion = "11.0.2";
 const getErrorAnalyticsProperties = error => {
   try {
     const code = error instanceof Web3AuthError ? error.code : error === null || error === void 0 ? void 0 : error.code;

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

@@ -490,7 +490,7 @@ class AuthConnector extends BaseConnector {
         accessToken,
         idToken
       } = await this.getPrimaryAuthSession(params.authSessionTokens);
-      const walletProof = await this.createWalletLinkingProof(params.connectorToLink);
+      const walletProof = await this.createWalletLinkingProof(params.connectorToLink, chainId);
       const authServerUrl = citadelServerUrl(this.coreOptions.authBuildEnv);
       const result = await makeAccountLinkingRequest(authServerUrl, accessToken, {
         idToken,
@@ -683,7 +683,7 @@ class AuthConnector extends BaseConnector {
     }
     throw AccountLinkingError.requestFailed(`Unsupported chain namespace "${matchedAccount.chainNamespace}" for address "${address}".`);
   }
-  async createWalletLinkingProof(connector) {
+  async createWalletLinkingProof(connector, chainId) {
     // Notify listeners that the linking wallet is about to be asked for a signature so the UI
     // (e.g. modal) can switch from a "connecting" loader to an "authorizing" prompt while the
     // user reviews the signature request inside their wallet. Emitted on the isolated wallet
@@ -691,11 +691,13 @@ class AuthConnector extends BaseConnector {
     connector.emit(CONNECTOR_EVENTS.AUTHORIZING, {
       connector: connector.name
     });
+    // Reuse the caller's target chain so multichain wallets generate the linking
+    // proof for the same namespace they were connected for.
     const {
       challenge,
       signature,
       chainNamespace
-    } = await connector.generateChallengeAndSign();
+    } = await connector.generateChallengeAndSign(undefined, undefined, chainId);
     const address = await this.getLinkingWalletAddress(connector, chainNamespace);
     if (chainNamespace === CHAIN_NAMESPACES.EIP155) {
       return {

package/dist/lib.esm/connectors/base-evm-connector/baseEvmConnector.js

@@ -1,6 +1,7 @@
 import { signChallenge } from '@toruslabs/base-controllers';
 import { bytesToHexPrefixedString, utf8ToBytes } from '@toruslabs/metadata-helpers';
 import { EVM_METHOD_TYPES } from '@web3auth/ws-embed';
+import { checksumAddress } from 'viem';
 import { generateSiweNonce } from 'viem/siwe';
 import { WalletLoginError, WalletInitializationError } from '../../base/errors/index.js';
 import { citadelServerUrl } from '../../base/utils.js';
@@ -54,9 +55,9 @@ class BaseEvmConnector extends BaseConnector {
     } = currentChainConfig;
     const authServer = authServerUrl || citadelServerUrl(this.coreOptions.authBuildEnv);
     const payload = {
-      domain: window.location.origin,
+      domain: window.location.host,
       uri: window.location.href,
-      address: accountsToUse[0],
+      address: checksumAddress(accountsToUse[0]),
       chainId: parseInt(chainId, 16),
       version: "1",
       nonce: generateSiweNonce(),

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

@@ -141,7 +141,12 @@ class MetaMaskConnector extends BaseConnector {
                 this.disconnect();
               }
             },
-            chainChanged: _chainId => {},
+            chainChanged: _chainId => {
+              // Keep Web3Auth state aligned with the wallet's actual EVM chain after connect/switch.
+              this.updateConnectorData({
+                chainId: _chainId
+              });
+            },
             connect: _result => {},
             disconnect: () => {
               if (this.connected) {
@@ -198,7 +203,7 @@ class MetaMaskConnector extends BaseConnector {
         ethereumProvider: this.evmProvider,
         solanaWallet: this.solanaProvider
       });
-      if (options.getAuthTokenInfo) await this.getAuthTokenInfo();
+      if (options.getAuthTokenInfo) await this.getAuthTokenInfo(options.chainId);
     } else if (coreStatus === "connected" || coreStatus === "loaded" || coreStatus === "disconnected" || coreStatus === "pending") {
       this.status = CONNECTOR_STATUS.READY;
       this.emit(CONNECTOR_EVENTS.READY, WALLET_CONNECTORS.METAMASK);
@@ -266,13 +271,9 @@ class MetaMaskConnector extends BaseConnector {
         }
       }
 
-      // // Switch EVM chain if not connected to the right one (Solana chains are handled by the wallet-standard provider)
-      // if (chainConfig.chainNamespace === CHAIN_NAMESPACES.EIP155) {
-      //   const currentChainId = this.evmClient!.getChainId();
-      //   if (currentChainId !== chainId) {
-      //     await this.switchChain(chainConfig, true);
-      //   }
-      // }
+      // 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);
 
       // check if connected
       if (this.multichainClient.status !== "connected") {
@@ -295,7 +296,7 @@ class MetaMaskConnector extends BaseConnector {
         solanaWallet: this.solanaProvider
       });
       if (getAuthTokenInfo) {
-        await this.getAuthTokenInfo();
+        await this.getAuthTokenInfo(chainId);
       }
       return {
         ethereumProvider: this.evmProvider,
@@ -347,14 +348,11 @@ class MetaMaskConnector extends BaseConnector {
       connector: WALLET_CONNECTORS.METAMASK
     });
   }
-  async getAuthTokenInfo() {
-    var _this$evmProvider2, _this$coreOptions$cha;
+  async getAuthTokenInfo(chainId) {
     if (!this.canAuthorize) throw WalletLoginError.notConnectedError();
-
-    // Determine the active chain: prefer Solana if no EVM provider, otherwise use EVM provider's chain
-    const evmChainId = ((_this$evmProvider2 = this.evmProvider) === null || _this$evmProvider2 === void 0 ? void 0 : _this$evmProvider2.chainId) || ((_this$coreOptions$cha = this.coreOptions.chains.find(x => x.chainNamespace === CHAIN_NAMESPACES.EIP155)) === null || _this$coreOptions$cha === void 0 ? void 0 : _this$coreOptions$cha.chainId);
-    const isSolanaOnly = !this.evmProvider && !!this.solanaProvider;
-    const activeChainConfig = isSolanaOnly ? this.coreOptions.chains.find(x => x.chainNamespace === CHAIN_NAMESPACES.SOLANA) : this.evmProvider ? this.coreOptions.chains.find(x => x.chainId === evmChainId) : undefined;
+    // In multichain sessions both providers can exist at the same time, so auth must
+    // follow the caller-selected chain instead of inferring from provider availability.
+    const activeChainConfig = this.resolveAuthChainConfig(chainId);
     if (!activeChainConfig) throw WalletLoginError.connectionError("Chain config is not available");
     const {
       chainNamespace
@@ -374,7 +372,7 @@ class MetaMaskConnector extends BaseConnector {
     const {
       challenge,
       signature
-    } = await this.generateChallengeAndSign(authServer, accounts);
+    } = await this.generateChallengeAndSign(authServer, accounts, activeChainConfig.chainId);
     return this.verifyAndAuthorize({
       chainNamespace,
       signedMessage: signature,
@@ -415,11 +413,8 @@ class MetaMaskConnector extends BaseConnector {
       chainConfiguration
     });
   }
-  async generateChallengeAndSign(authServerUrl, accounts) {
-    var _this$evmProvider3, _this$coreOptions$cha2;
-    const evmChainId = ((_this$evmProvider3 = this.evmProvider) === null || _this$evmProvider3 === void 0 ? void 0 : _this$evmProvider3.chainId) || ((_this$coreOptions$cha2 = this.coreOptions.chains.find(x => x.chainNamespace === CHAIN_NAMESPACES.EIP155)) === null || _this$coreOptions$cha2 === void 0 ? void 0 : _this$coreOptions$cha2.chainId);
-    const isSolanaOnly = !this.evmProvider && !!this.solanaProvider;
-    const activeChainConfig = isSolanaOnly ? this.coreOptions.chains.find(x => x.chainNamespace === CHAIN_NAMESPACES.SOLANA) : this.evmProvider ? this.coreOptions.chains.find(x => x.chainId === evmChainId) : undefined;
+  async generateChallengeAndSign(authServerUrl, accounts, chainId) {
+    const activeChainConfig = this.resolveAuthChainConfig(chainId);
     if (!activeChainConfig) throw WalletLoginError.connectionError("Chain config is not available");
     const {
       chainNamespace
@@ -475,6 +470,48 @@ class MetaMaskConnector extends BaseConnector {
     }
     await this.initializationPromise;
   }
+  async syncChainStateAfterConnect(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.
+    if (chainConfig.chainNamespace === CHAIN_NAMESPACES.EIP155 && ((_this$evmProvider2 = this.evmProvider) === null || _this$evmProvider2 === void 0 ? void 0 : _this$evmProvider2.chainId) !== chainConfig.chainId) {
+      await this.switchChain({
+        chainId: chainConfig.chainId
+      }, true);
+    } else if (chainConfig.chainNamespace === CHAIN_NAMESPACES.SOLANA) {
+      // For solana case, metamask connect the first available scope in priority order: mainnet > devnet > testnet.
+      // So, if the user requested chain is different from the connected chain,
+      // we need to update the connector data with the connected chain id to keep the Web3Auth state aligned.
+      if ("scope" in this.solanaProvider && typeof this.solanaProvider.scope === "string") {
+        var _this$coreOptions$cha;
+        const connectedSolChain = this.solanaProvider.scope;
+        const connectedChainConfig = (_this$coreOptions$cha = this.coreOptions.chains) === null || _this$coreOptions$cha === void 0 ? void 0 : _this$coreOptions$cha.find(chain => {
+          return getCaipChainId(chain) === connectedSolChain && chain.chainNamespace === CHAIN_NAMESPACES.SOLANA;
+        });
+        if (!connectedChainConfig) {
+          throw 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
+          });
+        }
+      }
+    }
+  }
+  resolveAuthChainConfig(chainId) {
+    var _this$evmProvider3, _this$coreOptions$cha2;
+    if (chainId) {
+      return this.coreOptions.chains.find(x => x.chainId === chainId);
+    }
+    const evmChainId = ((_this$evmProvider3 = this.evmProvider) === null || _this$evmProvider3 === void 0 ? void 0 : _this$evmProvider3.chainId) || ((_this$coreOptions$cha2 = this.coreOptions.chains.find(x => x.chainNamespace === CHAIN_NAMESPACES.EIP155)) === null || _this$coreOptions$cha2 === void 0 ? void 0 : _this$coreOptions$cha2.chainId);
+    const isSolanaOnly = !this.evmProvider && !!this.solanaProvider;
+
+    // Keep the old fallback for callers that do not pass a chainId yet.
+    return isSolanaOnly ? this.coreOptions.chains.find(x => x.chainNamespace === CHAIN_NAMESPACES.SOLANA) : this.evmProvider ? this.coreOptions.chains.find(x => x.chainId === evmChainId) : undefined;
+  }
 }
 
 /**

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

@@ -14,6 +14,9 @@ let DEFAULT_EIP155_METHODS = /*#__PURE__*/function (DEFAULT_EIP155_METHODS) {
   DEFAULT_EIP155_METHODS["SWITCH_ETHEREUM_CHAIN"] = "wallet_switchEthereumChain";
   return DEFAULT_EIP155_METHODS;
 }({});
+
+// methods that return `null` on success
+const NULL_ON_SUCCESS_METHODS = [DEFAULT_EIP155_METHODS.SWITCH_ETHEREUM_CHAIN, DEFAULT_EIP155_METHODS.ADD_ETHEREUM_CHAIN];
 let DEFAULT_SOLANA_METHODS = /*#__PURE__*/function (DEFAULT_SOLANA_METHODS) {
   DEFAULT_SOLANA_METHODS["SIGN_TRANSACTION"] = "solana_signTransaction";
   DEFAULT_SOLANA_METHODS["SIGN_MESSAGE"] = "solana_signMessage";
@@ -107,4 +110,4 @@ const getWalletConnectV2Settings = async (chains, projectID) => {
   };
 };
 
-export { DEFAULT_EIP155_METHODS, DEFAULT_EIP_155_EVENTS, DEFAULT_SOLANA_EVENTS, DEFAULT_SOLANA_METHODS, getNamespacesFromChains, getRequiredNamespaces, getSupportedEventsByNamespace, getSupportedMethodsByNamespace, getWalletConnectV2Settings };
+export { DEFAULT_EIP155_METHODS, DEFAULT_EIP_155_EVENTS, DEFAULT_SOLANA_EVENTS, DEFAULT_SOLANA_METHODS, NULL_ON_SUCCESS_METHODS, getNamespacesFromChains, getRequiredNamespaces, getSupportedEventsByNamespace, getSupportedMethodsByNamespace, getWalletConnectV2Settings };

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

@@ -1,4 +1,4 @@
-export { DEFAULT_EIP155_METHODS, DEFAULT_EIP_155_EVENTS, DEFAULT_SOLANA_EVENTS, DEFAULT_SOLANA_METHODS, getNamespacesFromChains, getRequiredNamespaces, getSupportedEventsByNamespace, getSupportedMethodsByNamespace, getWalletConnectV2Settings } from './config.js';
+export { DEFAULT_EIP155_METHODS, DEFAULT_EIP_155_EVENTS, DEFAULT_SOLANA_EVENTS, DEFAULT_SOLANA_METHODS, NULL_ON_SUCCESS_METHODS, getNamespacesFromChains, getRequiredNamespaces, getSupportedEventsByNamespace, getSupportedMethodsByNamespace, getWalletConnectV2Settings } from './config.js';
 import { walletConnectV2Connector } from './walletConnectV2Connector.js';
 export { WalletConnectV2Provider } from './WalletConnectV2Provider.js';
 

package/dist/lib.esm/index.js

@@ -15,7 +15,7 @@ export { CONNECTOR_NAMES, EVM_CONNECTORS, MULTI_CHAIN_CONNECTORS, SOLANA_CONNECT
 export { CONNECTOR_NAMESPACES } from './base/chain/IChainInterface.js';
 export { CommonJRPCProvider } from './providers/base-provider/CommonJRPCProvider.js';
 export { CommonPrivateKeyProvider } from './providers/base-provider/commonPrivateKeyProvider.js';
-export { DEFAULT_EIP155_METHODS, DEFAULT_EIP_155_EVENTS, DEFAULT_SOLANA_EVENTS, DEFAULT_SOLANA_METHODS, getNamespacesFromChains, getRequiredNamespaces, getSupportedEventsByNamespace, getSupportedMethodsByNamespace, getWalletConnectV2Settings } from './connectors/wallet-connect-v2-connector/config.js';
+export { DEFAULT_EIP155_METHODS, DEFAULT_EIP_155_EVENTS, DEFAULT_SOLANA_EVENTS, DEFAULT_SOLANA_METHODS, NULL_ON_SUCCESS_METHODS, getNamespacesFromChains, getRequiredNamespaces, getSupportedEventsByNamespace, getSupportedMethodsByNamespace, getWalletConnectV2Settings } from './connectors/wallet-connect-v2-connector/config.js';
 export { EIP1193_EVENTS } from './providers/base-provider/utils.js';
 export { EIP_7702_SUPPORTED_SMART_ACCOUNTS, LOGIN_MODE, MODAL_SIGN_IN_METHODS, SMART_ACCOUNT_WALLET_SCOPE, SOLANA_CAIP_CHAIN_MAP, WALLET_REGISTRY_URL, WEB3AUTH_STATE_STORAGE_KEY, WIDGET_TYPE } from './base/constants.js';
 export { EVM_PLUGINS, PLUGIN_EVENTS, PLUGIN_NAMESPACES, PLUGIN_STATUS, SOLANA_PLUGINS, WALLET_PLUGINS } from './base/plugin/IPlugin.js';

package/dist/lib.esm/noModal.js

@@ -489,7 +489,9 @@ class Web3AuthNoModal extends SafeEventEmitter {
     };
     try {
       this.analytics.track(ANALYTICS_EVENTS.IDENTITY_TOKEN_STARTED, trackData);
-      const authTokenInfo = await this.primaryConnector.getAuthTokenInfo();
+      // Thread the controller's active chain into connector auth so multichain
+      // connectors sign for the same chain the app/session is currently using.
+      const authTokenInfo = await this.primaryConnector.getAuthTokenInfo(this.currentChainId);
       this.analytics.track(ANALYTICS_EVENTS.IDENTITY_TOKEN_COMPLETED, trackData);
       return {
         idToken: authTokenInfo.idToken
@@ -526,7 +528,9 @@ class Web3AuthNoModal extends SafeEventEmitter {
     if (!(params !== null && params !== void 0 && params.connectorName)) {
       throw WalletInitializationError.invalidParams("connectorName is required when calling linkAccount on the no-modal SDK");
     }
-    const chainId = this.resolveLinkAccountChainId(params.chainId);
+    const {
+      chainId
+    } = this.resolveLinkAccountChainConfig(params.chainId);
     const isolatedConnector = await this.createLinkingWalletConnector(params.connectorName, chainId);
     return this.linkAccountWithConnector(params.connectorName, chainId, isolatedConnector);
   }
@@ -928,12 +932,16 @@ class Web3AuthNoModal extends SafeEventEmitter {
       }));
       this.setActiveWalletConnectorKey();
       this.connectionReconnected = data.reconnected;
+      const {
+        activeAccount,
+        currentChainId
+      } = this.state;
 
       // when ssr is enabled, we need to get the idToken from the connector.
       if (this.coreOptions.ssr) {
         try {
           var _data$accessToken, _data$refreshToken;
-          const data = await connector.getAuthTokenInfo();
+          const data = await connector.getAuthTokenInfo(currentChainId);
           if (!data.idToken) throw WalletLoginError.connectionError("No idToken found");
           await this.setState({
             idToken: data.idToken,
@@ -951,10 +959,6 @@ class Web3AuthNoModal extends SafeEventEmitter {
       }
       // The following block only hits during rehydration
 
-      const {
-        activeAccount,
-        currentChainId
-      } = this.state;
       let rehydrateWithLinkedAccount = false;
       // for rehydration, if the active account is not the primary account, i.e. not `null`, create an isolated connector and connect to the chain
       if (activeAccount && !activeAccount.isPrimary && activeAccount.connector !== WALLET_CONNECTORS.AUTH) {
@@ -1001,7 +1005,7 @@ class Web3AuthNoModal extends SafeEventEmitter {
       const pendingUserConsent = this.consentRequired && !this.state.hasUserConsent;
       if (pendingUserConsent && !isConnectAndSign) {
         this.status = CONNECTOR_STATUS.CONSENT_REQUIRING;
-        this.emit(CONNECTOR_EVENTS.CONSENT_REQUIRING);
+        this.emit(CONNECTOR_EVENTS.CONSENT_REQUIRING, _objectSpread({}, data));
         log.debug("consent_requiring", this.status, this.primaryConnectorName);
       } else {
         // In CONNECT_AND_SIGN mode the AUTHORIZED handler can run before this point (e.g. when `ssr=true`
@@ -1124,7 +1128,13 @@ class Web3AuthNoModal extends SafeEventEmitter {
       await this.clearCache();
       this.emit(CONNECTOR_EVENTS.REHYDRATION_ERROR, error);
     });
-    connector.on(CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, data => {
+    connector.on(CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, async data => {
+      if (this.shouldIgnoreInactiveConnectorEvent(connector, CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED)) return;
+      // 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") {
+        await this.setCurrentChain(data.data.chainId);
+      }
       log.debug("connector data updated", data);
       this.emit(CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, data);
     });
@@ -1162,7 +1172,9 @@ class Web3AuthNoModal extends SafeEventEmitter {
       // if the user has not consented yet, we will ask for consent
       if (this.consentRequired && this.connection && !this.state.hasUserConsent) {
         this.status = CONNECTOR_STATUS.CONSENT_REQUIRING;
-        this.emit(CONNECTOR_EVENTS.CONSENT_REQUIRING);
+        this.emit(CONNECTOR_EVENTS.CONSENT_REQUIRING, {
+          connectorName: data.connector
+        });
         log.debug("consent_requiring", this.status, this.primaryConnectorName);
       } else {
         this.status = CONNECTOR_STATUS.AUTHORIZED;
@@ -1226,12 +1238,14 @@ class Web3AuthNoModal extends SafeEventEmitter {
       reconnected: this.connectionReconnected
     });
   }
-  resolveLinkAccountChainId(chainId) {
+  resolveLinkAccountChainConfig(chainId) {
+    var _this$coreOptions$cha7;
     const finalChainId = chainId || this.state.currentChainId;
-    if (!finalChainId) {
+    const chainConfig = (_this$coreOptions$cha7 = this.coreOptions.chains) === null || _this$coreOptions$cha7 === void 0 ? void 0 : _this$coreOptions$cha7.find(chain => chain.chainId === finalChainId);
+    if (!chainConfig) {
       throw AccountLinkingError.walletProofFailed("No chainId is available. Please specify chainId in LinkAccountParams or ensure the SDK has an active chain.");
     }
-    return finalChainId;
+    return chainConfig;
   }
 
   /**

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

@@ -145,13 +145,23 @@ class AccountAbstractionProvider extends BaseProvider {
     });
     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/rpc/ethRpcMiddlewares.js

@@ -1,6 +1,7 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { METHOD_TYPES, EIP_5792_METHODS, EIP_7702_METHODS } from '@toruslabs/ethereum-controllers';
 import { createScaffoldMiddlewareV2, providerErrors, rpcErrors } from '@web3auth/auth';
+import { NULL_ON_SUCCESS_METHODS } from '../../../connectors/wallet-connect-v2-connector/config.js';
 
 async function createAaMiddleware({
   eoaProvider,
@@ -199,10 +200,17 @@ function providerAsMiddleware(provider) {
   return async ({
     request
   }) => {
-    return provider.request({
+    const result = await provider.request({
       method: request.method,
       params: request.params
     });
+    if (result === undefined && 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3auth/no-modal",
-  "version": "11.0.0",
+  "version": "11.0.2",
   "description": "Multi chain wallet aggregator for web3Auth",
   "keywords": [
     "web3Auth/no-modal",
@@ -252,5 +252,5 @@
     "node": ">=22.x",
     "npm": ">=10.x"
   },
-  "gitHead": "84b5f0c887209f24f098b7eea634747193bc1f2c"
+  "gitHead": "de91630f1420601b3a9b2377c0dff760b8674013"
 }