@web3auth/no-modal 11.0.0-beta.1 → 11.0.0

package/dist/lib.cjs/index.js

@@ -1,6 +1,5 @@
 'use strict';
 
-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');
@@ -11,13 +10,13 @@ var auth = require('@web3auth/auth');
 var utils$1 = require('./base/connector/utils.js');
 var constants$1 = require('./base/constants.js');
 var cookie = require('./base/cookie.js');
-var index = require('./base/errors/index.js');
+var index$1 = require('./base/errors/index.js');
 var loglevel = require('./base/loglevel.js');
-var errors = require('./base/plugin/errors.js');
+var errors$1 = require('./base/plugin/errors.js');
 var IPlugin = require('./base/plugin/IPlugin.js');
 var IProvider = require('./base/provider/IProvider.js');
 var utils$2 = require('./base/utils.js');
-var index$1 = require('./base/wallet/index.js');
+var index = require('./base/wallet/index.js');
 var authConnector = require('./connectors/auth-connector/authConnector.js');
 var baseEvmConnector = require('./connectors/base-evm-connector/baseEvmConnector.js');
 var baseSolanaConnector = require('./connectors/base-solana-connector/baseSolanaConnector.js');
@@ -39,16 +38,16 @@ 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.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;
@@ -63,6 +62,7 @@ exports.CONNECTOR_CATEGORY = constants.CONNECTOR_CATEGORY;
 exports.CONNECTOR_EVENTS = constants.CONNECTOR_EVENTS;
 exports.CONNECTOR_INITIAL_AUTHENTICATION_MODE = constants.CONNECTOR_INITIAL_AUTHENTICATION_MODE;
 exports.CONNECTOR_STATUS = constants.CONNECTOR_STATUS;
+exports.WEB3AUTH_CONNECTOR_ID = constants.WEB3AUTH_CONNECTOR_ID;
 Object.defineProperty(exports, "AUTH_CONNECTION", {
 	enumerable: true,
 	get: function () { return auth.AUTH_CONNECTION; }
@@ -98,14 +98,14 @@ exports.WALLET_REGISTRY_URL = constants$1.WALLET_REGISTRY_URL;
 exports.WEB3AUTH_STATE_STORAGE_KEY = constants$1.WEB3AUTH_STATE_STORAGE_KEY;
 exports.WIDGET_TYPE = constants$1.WIDGET_TYPE;
 exports.cookieToWeb3AuthState = cookie.cookieToWeb3AuthState;
-exports.AccountLinkingError = index.AccountLinkingError;
-exports.WalletInitializationError = index.WalletInitializationError;
-exports.WalletLoginError = index.WalletLoginError;
-exports.WalletOperationsError = index.WalletOperationsError;
-exports.WalletProviderError = index.WalletProviderError;
-exports.Web3AuthError = index.Web3AuthError;
+exports.WalletInitializationError = index$1.WalletInitializationError;
+exports.WalletLoginError = index$1.WalletLoginError;
+exports.WalletOperationsError = index$1.WalletOperationsError;
+exports.WalletProviderError = index$1.WalletProviderError;
+exports.Web3AuthError = index$1.Web3AuthError;
+exports.isUserRejectedError = index$1.isUserRejectedError;
 exports.log = loglevel.log;
-exports.WalletServicesPluginError = errors.WalletServicesPluginError;
+exports.WalletServicesPluginError = errors$1.WalletServicesPluginError;
 exports.EVM_PLUGINS = IPlugin.EVM_PLUGINS;
 exports.PLUGIN_EVENTS = IPlugin.PLUGIN_EVENTS;
 exports.PLUGIN_NAMESPACES = IPlugin.PLUGIN_NAMESPACES;
@@ -131,12 +131,12 @@ exports.normalizeWalletName = utils$2.normalizeWalletName;
 exports.parseChainNamespaceFromCitadelResponse = utils$2.parseChainNamespaceFromCitadelResponse;
 exports.sdkVersion = utils$2.sdkVersion;
 exports.withAbort = utils$2.withAbort;
-exports.CONNECTOR_NAMES = index$1.CONNECTOR_NAMES;
-exports.EVM_CONNECTORS = index$1.EVM_CONNECTORS;
-exports.MULTI_CHAIN_CONNECTORS = index$1.MULTI_CHAIN_CONNECTORS;
-exports.SOLANA_CONNECTORS = index$1.SOLANA_CONNECTORS;
-exports.WALLET_CONNECTORS = index$1.WALLET_CONNECTORS;
-exports.WEB3AUTH_ICON = index$1.WEB3AUTH_ICON;
+exports.CONNECTOR_NAMES = index.CONNECTOR_NAMES;
+exports.EVM_CONNECTORS = index.EVM_CONNECTORS;
+exports.MULTI_CHAIN_CONNECTORS = index.MULTI_CHAIN_CONNECTORS;
+exports.SOLANA_CONNECTORS = index.SOLANA_CONNECTORS;
+exports.WALLET_CONNECTORS = index.WALLET_CONNECTORS;
+exports.WEB3AUTH_ICON = index.WEB3AUTH_ICON;
 exports.assertAuthConnector = authConnector.assertAuthConnector;
 exports.authConnector = authConnector.authConnector;
 exports.isAuthConnector = authConnector.isAuthConnector;
@@ -215,6 +215,9 @@ 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; }
@@ -239,4 +242,6 @@ 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;

package/dist/lib.cjs/noModal.js

@@ -27,6 +27,7 @@ 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__";
@@ -60,7 +61,9 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     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");
     if (!options.initialAuthenticationMode) options.initialAuthenticationMode = constants.CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN;
-    this.coreOptions = options;
+    this.coreOptions = _objectSpread(_objectSpread({}, options), {}, {
+      authBuildEnv: options.authBuildEnv || auth.BUILD_ENV.PRODUCTION
+    });
     this.storage = this.getStorageMethod();
     this.analytics = new analytics.Analytics();
     if (options.disableAnalytics) {
@@ -526,13 +529,13 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     const linkedAccounts = (_await$authConnector$ = (await authConnector.getUserInfo()).linkedAccounts) !== null && _await$authConnector$ !== void 0 ? _await$authConnector$ : [];
     const targetAccount = this.findLinkedAccountByAddress(linkedAccounts, address);
     if (!targetAccount) {
-      throw index.AccountLinkingError.accountNotLinked(`Account with address "${address}" is not linked`);
+      throw errors.AccountLinkingError.accountNotLinked(`Account with address "${address}" is not linked`);
     }
     if (targetAccount.connector === index$1.WALLET_CONNECTORS.AUTH || targetAccount.isPrimary) {
-      throw index.AccountLinkingError.cannotUnlinkPrimaryAccount();
+      throw errors.AccountLinkingError.cannotUnlinkPrimaryAccount();
     }
     if (((_this$state$activeAcc = this.state.activeAccount) === null || _this$state$activeAcc === void 0 ? void 0 : _this$state$activeAcc.id) === targetAccount.id) {
-      throw index.AccountLinkingError.cannotUnlinkActiveAccount();
+      throw errors.AccountLinkingError.cannotUnlinkActiveAccount();
     }
     const result = await authConnector.unlinkAccount({
       address,
@@ -908,7 +911,6 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       }));
       this.setActiveWalletConnectorKey();
       this.connectionReconnected = data.reconnected;
-      const connectedChainId = ethereumProvider === null || ethereumProvider === void 0 ? void 0 : ethereumProvider.chainId;
       // when ssr is enabled, we need to get the idToken from the connector.
       if (this.coreOptions.ssr) {
         try {
@@ -931,14 +933,16 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       }
       // The following block only hits during rehydration
       const {
-        activeAccount
+        activeAccount,
+        currentChainId
       } = this.state;
-      // if the active account is not the primary account, i.e. not `null`, create an isolated connector and connect to the chain
+      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) {
         var _ref3, _walletConnector$prov, _linkedAccountConnect, _ref4, _walletConnector$sola, _linkedAccountConnect2;
         const accountLinkingConnector = authConnector.isAuthConnector(connector) ? connector : this.getConnector(index$1.WALLET_CONNECTORS.AUTH);
         authConnector.assertAuthConnector(accountLinkingConnector, "Account switching requires the AUTH connector to be available.");
-        const targetChainId = accountLinkingConnector.getChainIdForLinkedAccount(activeAccount, connectedChainId);
+        const targetChainId = accountLinkingConnector.getChainIdForLinkedAccount(activeAccount, currentChainId);
         const walletConnector = await this.createIsolatedWalletConnector(activeAccount.connector, targetChainId);
         let linkedAccountConnection = null;
         if (!this.hasUsableConnectedSwitchConnector(walletConnector)) {
@@ -946,7 +950,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
             chainId: targetChainId
           });
           if (!linkedAccountConnection) {
-            throw index.AccountLinkingError.requestFailed(`Failed to connect isolated connector "${activeAccount.connector}" for account switch.`);
+            throw errors.AccountLinkingError.requestFailed(`Failed to connect isolated connector "${activeAccount.connector}" for account switch.`);
           }
         }
         const connectedWalletState = await this.resolveConnectedWalletConnectorState({
@@ -958,6 +962,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
         });
         this.setConnectedWalletConnectorState(connectedWalletState, activeAccount);
         this.setActiveWalletConnectorKey(activeAccount);
+        rehydrateWithLinkedAccount = true;
       }
       if (ethereumProvider) {
         await this.bindPrimaryEthereumSigningProxy(ethereumProvider, data.connectorName);
@@ -970,24 +975,42 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       });
       this.setConnectedWalletConnectorState(primaryConnectedWalletState);
       await this.setState({
-        primaryConnectorName: data.connectorName,
-        currentChainId: connectedChainId
+        primaryConnectorName: data.connectorName
       });
       this.cacheWallet(data.connectorName);
       const isConnectAndSign = this.coreOptions.initialAuthenticationMode === constants.CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN;
-      if (this.consentRequired && !isConnectAndSign && !this.state.hasUserConsent) {
+      const pendingUserConsent = this.consentRequired && !this.state.hasUserConsent;
+      if (pendingUserConsent && !isConnectAndSign) {
         this.status = constants.CONNECTOR_STATUS.CONSENT_REQUIRING;
         this.emit(constants.CONNECTOR_EVENTS.CONSENT_REQUIRING);
         loglevel.log.debug("consent_requiring", this.status, this.primaryConnectorName);
       } else {
-        this.status = constants.CONNECTOR_STATUS.CONNECTED;
+        // In CONNECT_AND_SIGN mode the AUTHORIZED handler can run before this point (e.g. when `ssr=true`
+        // this handler `await`s `connector.getAuthTokenInfo()` which fires AUTHORIZED mid-execution).
+        // Don't downgrade an already-advanced status (CONSENT_REQUIRING or AUTHORIZED) back to CONNECTED;
+        // otherwise `acceptConsent` would throw "Cannot accept consent: not in consent_requiring state".
+        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);
-        this.connectToPlugins(_objectSpread(_objectSpread({}, data), {}, {
-          connector: data.connectorName
-        }));
+        // 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) {
+          this.connectToPlugins(_objectSpread(_objectSpread({}, data), {}, {
+            connector: data.connectorName
+          }));
+        }
+        // `pendingUserConsent` signals listeners (LoginModal, React/Vue contexts) to skip processing this CONNECTED event,
+        // so the upcoming AUTHORIZED -> CONSENT_REQUIRING transition is not overridden by a late CONNECTED handler in CONNECT_AND_SIGN mode.
         this.emit(constants.CONNECTOR_EVENTS.CONNECTED, _objectSpread(_objectSpread({}, data), {}, {
-          loginMode: this.loginMode
+          loginMode: this.loginMode,
+          pendingUserConsent
         }));
+        // if we're rehydrating with a linked account, we need to emit a CONNECTION_UPDATED event
+        // so that upstream listeners and context are updated with the linked connection.
+        if (rehydrateWithLinkedAccount) {
+          this.emit(constants.CONNECTOR_EVENTS.CONNECTION_UPDATED, this.connection);
+        }
       }
     });
     connector.on(constants.CONNECTOR_EVENTS.DISCONNECTED, async data => {
@@ -1181,7 +1204,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
   resolveLinkAccountChainId(chainId) {
     const finalChainId = chainId || this.state.currentChainId;
     if (!finalChainId) {
-      throw index.AccountLinkingError.walletProofFailed("No chainId is available. Please specify chainId in LinkAccountParams or ensure the SDK has an active chain.");
+      throw errors.AccountLinkingError.walletProofFailed("No chainId is available. Please specify chainId in LinkAccountParams or ensure the SDK has an active chain.");
     }
     return finalChainId;
   }
@@ -1202,7 +1225,15 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     return activeChainId;
   }
   async createLinkingWalletConnector(connectorName, chainId, config) {
-    return this.createIsolatedWalletConnector(connectorName, chainId, config);
+    try {
+      const linkingConnector = await this.createIsolatedWalletConnector(connectorName, chainId, config);
+      return linkingConnector;
+    } catch (error) {
+      if (error instanceof errors.AccountLinkingError && error.code === 5405) {
+        throw error;
+      }
+      throw errors.AccountLinkingError.walletProofFailed(error instanceof Error ? error.message : String(error), error);
+    }
   }
   async createSwitchingWalletConnector(connectorName, chainId, config) {
     return this.createIsolatedWalletConnector(connectorName, chainId, config);
@@ -1357,12 +1388,12 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       account
     });
   }
-  async linkAccountWithConnector(connectorName, chainId, walletConnector) {
+  async linkAccountWithConnector(connectorName, chainId, connectorToLink) {
     const authConnector = this.getMainAuthConnector();
     const result = await authConnector.linkAccount({
       connectorName,
       chainId,
-      walletConnector,
+      connectorToLink,
       authSessionTokens: {
         accessToken: this.accessToken,
         idToken: this.idToken
@@ -1371,7 +1402,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     await this.setState({
       idToken: result.idToken
     });
-    await this.cacheConnectedLinkedWalletConnector(authConnector, walletConnector);
+    await this.cacheConnectedLinkedWalletConnector(authConnector, connectorToLink);
     return result;
   }
   getMainAuthConnector() {
@@ -1430,7 +1461,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
             caipAccountIds: [caipAccountId]
           });
           if (!linkedAccountConnection) {
-            throw index.AccountLinkingError.requestFailed(`Failed to connect isolated connector "${switchResult.targetAccount.connector}" for account switch.`);
+            throw errors.AccountLinkingError.requestFailed(`Failed to connect isolated connector "${switchResult.targetAccount.connector}" for account switch.`);
           }
         }
         await authConnector.assertSwitchAccountConnectorMatchesTarget(walletConnector, switchResult.targetAccount);
@@ -1550,7 +1581,10 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     });
   }
   async setCurrentChain(chainId) {
-    if (chainId === this.currentChainId) return;
+    const {
+      currentChainId
+    } = this.state;
+    if (chainId === currentChainId) return;
     const newChain = this.coreOptions.chains.find(chain => chain.chainId === chainId);
     if (!newChain) throw index.WalletInitializationError.invalidParams(`Invalid chainId: ${chainId}`);
     await this.setState({
@@ -1676,7 +1710,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       } = await Promise.resolve().then(function () { return require('./connectors/wallet-connect-v2-connector/index.js'); });
       return walletConnectV2Connector()(config);
     }
-    throw index.AccountLinkingError.unsupportedConnector(`Connector "${connectorName}" does not support automatic wallet linking. ` + `Use ${index$1.WALLET_CONNECTORS.METAMASK}, ${index$1.WALLET_CONNECTORS.WALLET_CONNECT_V2}, or an installed compatible wallet.`);
+    throw errors.AccountLinkingError.unsupportedConnector(`Connector "${connectorName}" does not support automatic wallet linking. ` + `Use ${index$1.WALLET_CONNECTORS.METAMASK}, ${index$1.WALLET_CONNECTORS.WALLET_CONNECT_V2}, or an installed compatible wallet.`);
   }
   /**
    * Create a new connector instance that is NOT registered in this.connectors and NOT
@@ -1705,7 +1739,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
           break;
         }
       case index$1.WALLET_CONNECTORS.AUTH:
-        throw index.AccountLinkingError.unsupportedConnector(`Connector "${connectorName}" does not support automatic wallet linking.`);
+        throw errors.AccountLinkingError.unsupportedConnector(`Connector "${connectorName}" does not support automatic wallet linking.`);
       default:
         {
           connector = await this.resolveDiscoveredWalletConnector(connectorName, chainId, config, effectiveProjectConfig);

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

@@ -71,9 +71,10 @@ class AccountAbstractionProvider extends baseProvider.BaseProvider {
   }
   async setupProvider(eoaProvider) {
     var _bundlerConfig$transp;
-    const {
-      currentChain
-    } = this;
+    const currentChain = this.currentChain;
+    if (!currentChain) {
+      throw index.WalletInitializationError.invalidProviderConfigError(`AA chain config not found for chain ${this.chainId}`);
+    }
     const {
       chainNamespace
     } = currentChain;
@@ -148,9 +149,12 @@ class AccountAbstractionProvider extends baseProvider.BaseProvider {
       eoaProvider,
       handlers: providerHandlers
     });
+    // middleware to handle EIP-7702 and EIP-5792 methods,
+    // currently, we do not support EIP-7702 and EIP-5792 methods for account abstraction provider
+    const eip7702And5792Middleware = await ethRpcMiddlewares.createEip7702And5792MiddlewareForAaProvider();
     const eoaMiddleware = ethRpcMiddlewares.providerAsMiddleware(eoaProvider);
     const engine = auth.JRPCEngineV2.create({
-      middleware: [aaMiddleware, eoaMiddleware]
+      middleware: [aaMiddleware, eip7702And5792Middleware, eoaMiddleware]
     });
     const provider = auth.providerFromEngineV2(engine);
     this.updateProviderEngineProxy(provider);

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

@@ -4,21 +4,6 @@ var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var metadataHelpers = require('@toruslabs/metadata-helpers');
 var auth = require('@web3auth/auth');
 var viem = require('viem');
-require('@babel/runtime/helpers/defineProperty');
-require('@segment/analytics-next');
-var loglevel = require('../../../base/loglevel.js');
-require('@toruslabs/base-controllers');
-require('@toruslabs/session-manager');
-require('../../../base/errors/index.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
-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');
 
 function getProviderHandlers({
   bundlerClient,
@@ -36,8 +21,6 @@ function getProviderHandlers({
       const [smartAccounts, eoaAccounts] = await Promise.all([smartAccount.getAddress(), eoaProvider.request({
         method: "eth_accounts"
       })]);
-      loglevel.log.info("smartAccounts", smartAccounts);
-      loglevel.log.info("eoaAccounts", eoaAccounts);
       return [smartAccounts, ...eoaAccounts];
     },
     getPrivateKey: async _ => {

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

@@ -181,6 +181,20 @@ async function createEoaMiddleware({
     eth_requestAccounts: requestAccounts
   });
 }
+async function createEip7702And5792MiddlewareForAaProvider() {
+  const eip5792Methods = Object.values(ethereumControllers.EIP_5792_METHODS);
+  const eip7702Methods = Object.values(ethereumControllers.EIP_7702_METHODS);
+  const eip7702And5792Methods = [...eip5792Methods, ...eip7702Methods];
+  return async ({
+    request,
+    next
+  }) => {
+    if (eip7702And5792Methods.includes(request.method)) {
+      throw auth.providerErrors.unsupportedMethod(`${request.method} is not supported for account abstraction provider`);
+    }
+    return next(request);
+  };
+}
 function providerAsMiddleware(provider) {
   return async ({
     request
@@ -193,5 +207,6 @@ function providerAsMiddleware(provider) {
 }
 
 exports.createAaMiddleware = createAaMiddleware;
+exports.createEip7702And5792MiddlewareForAaProvider = createEip7702And5792MiddlewareForAaProvider;
 exports.createEoaMiddleware = createEoaMiddleware;
 exports.providerAsMiddleware = providerAsMiddleware;

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

@@ -140,19 +140,26 @@ function useWeb3AuthInnerContextValue({
     const authorizedListener = () => {
       setStatus(web3Auth.status);
       if (web3Auth.status === constants.CONNECTOR_STATUS.AUTHORIZED) {
+        var _web3Auth$currentChai7, _web3Auth$currentChai8;
+        setIsInitialized(true);
         setIsConnected(true);
+        // on rehydration, `AUTHORIZED` event can be fired first in `CONNECT_AND_SIGN` mode, before `CONNECTED` event.
+        // Update the connection state here, so that clients can use the connection state immediately.
+        setConnection(web3Auth.connection);
+        setChainId(web3Auth.currentChainId);
+        setChainNamespace((_web3Auth$currentChai7 = (_web3Auth$currentChai8 = web3Auth.currentChain) === null || _web3Auth$currentChai8 === void 0 ? void 0 : _web3Auth$currentChai8.chainNamespace) !== null && _web3Auth$currentChai7 !== void 0 ? _web3Auth$currentChai7 : null);
         setIsAuthorized(true);
       }
     };
     const consentAcceptedListener = () => {
       setStatus(web3Auth.status);
       if (web3Auth.status === constants.CONNECTOR_STATUS.CONNECTED || web3Auth.status === constants.CONNECTOR_STATUS.AUTHORIZED) {
-        var _web3Auth$currentChai7, _web3Auth$currentChai8;
+        var _web3Auth$currentChai9, _web3Auth$currentChai0;
         setIsInitialized(true);
         setIsConnected(true);
         setConnection(web3Auth.connection);
         setChainId(web3Auth.currentChainId);
-        setChainNamespace((_web3Auth$currentChai7 = (_web3Auth$currentChai8 = web3Auth.currentChain) === null || _web3Auth$currentChai8 === void 0 ? void 0 : _web3Auth$currentChai8.chainNamespace) !== null && _web3Auth$currentChai7 !== void 0 ? _web3Auth$currentChai7 : null);
+        setChainNamespace((_web3Auth$currentChai9 = (_web3Auth$currentChai0 = web3Auth.currentChain) === null || _web3Auth$currentChai0 === void 0 ? void 0 : _web3Auth$currentChai0.chainNamespace) !== null && _web3Auth$currentChai9 !== void 0 ? _web3Auth$currentChai9 : null);
         if (web3Auth.status === constants.CONNECTOR_STATUS.AUTHORIZED) {
           setIsAuthorized(true);
         }
@@ -161,6 +168,13 @@ function useWeb3AuthInnerContextValue({
     const mfaEnabledListener = nextIsMFAEnabled => {
       if (typeof nextIsMFAEnabled === "boolean") setIsMFAEnabled(nextIsMFAEnabled);
     };
+    const connectionUpdatedListener = () => {
+      var _web3Auth$currentChai1, _web3Auth$currentChai10;
+      setStatus(web3Auth.status);
+      setConnection(web3Auth.connection);
+      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);
+    };
     if (web3Auth) {
       web3Auth.on(constants.CONNECTOR_EVENTS.NOT_READY, notReadyListener);
       web3Auth.on(constants.CONNECTOR_EVENTS.READY, readyListener);
@@ -171,6 +185,7 @@ function useWeb3AuthInnerContextValue({
       web3Auth.on(constants.CONNECTOR_EVENTS.ERRORED, errorListener);
       web3Auth.on(constants.CONNECTOR_EVENTS.REHYDRATION_ERROR, rehydrationErrorListener);
       web3Auth.on(constants.CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.CONNECTION_UPDATED, connectionUpdatedListener);
       if (web3Auth.loginMode === constants$1.LOGIN_MODE.MODAL) {
         web3Auth.on(constants.CONNECTOR_EVENTS.CONSENT_ACCEPTED, consentAcceptedListener);
       }
@@ -186,6 +201,7 @@ function useWeb3AuthInnerContextValue({
       web3Auth.removeListener(constants.CONNECTOR_EVENTS.REHYDRATION_ERROR, rehydrationErrorListener);
       web3Auth.removeListener(constants.CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
       web3Auth.removeListener(constants.CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
+      web3Auth.removeListener(constants.CONNECTOR_EVENTS.CONNECTION_UPDATED, connectionUpdatedListener);
       if (web3Auth.loginMode === constants$1.LOGIN_MODE.MODAL) {
         web3Auth.removeListener(constants.CONNECTOR_EVENTS.CONSENT_ACCEPTED, consentAcceptedListener);
       }

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

@@ -69,6 +69,7 @@ function useFrameworkKitSolanaClient() {
     isInitialized
   } = useWeb3Auth.useWeb3Auth();
   const {
+    chainId,
     chainNamespace
   } = useChain.useChain();
   const ref = react.useRef(null);
@@ -118,7 +119,10 @@ function useFrameworkKitSolanaClient() {
         return;
       }
       // only reconnect for the primary connector
-      if (conn.connectorName !== (web3Auth === null || web3Auth === void 0 ? void 0 : web3Auth.primaryConnectorName)) return;
+      if (conn.connectorName !== (web3Auth === null || web3Auth === void 0 ? void 0 : web3Auth.primaryConnectorName)) {
+        adopt(makePlaceholder(rpc));
+        return;
+      }
       try {
         const solanaWalletId = "wallet-standard:" + conn.connectorName;
         const connector = client.createWalletStandardConnector(solanaWallet, {
@@ -150,7 +154,7 @@ function useFrameworkKitSolanaClient() {
     return () => {
       stale = true;
     };
-  }, [isConnected, connection === null || connection === void 0 ? void 0 : connection.solanaWallet, chainNamespace, web3Auth, isInitialized, connection === null || connection === void 0 ? void 0 : connection.connectorName]);
+  }, [isConnected, connection === null || connection === void 0 ? void 0 : connection.solanaWallet, chainId, chainNamespace, web3Auth, isInitialized, connection === null || connection === void 0 ? void 0 : connection.connectorName]);
   return client$1;
 }
 function SolanaProvider(_ref) {

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

@@ -5,3 +5,9 @@ var provider = require('./provider.js');
 
 
 exports.WagmiProvider = provider.WagmiProvider;
+exports.connectWeb3AuthWithWagmi = provider.connectWeb3AuthWithWagmi;
+exports.createWeb3AuthConnectorForWagmi = provider.createWeb3AuthConnectorForWagmi;
+exports.disconnectWeb3AuthFromWagmi = provider.disconnectWeb3AuthFromWagmi;
+exports.getWeb3authConnector = provider.getWeb3authConnector;
+exports.resetConnectorState = provider.resetConnectorState;
+exports.setupConnector = provider.setupConnector;