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

package/dist/lib.cjs/index.js

@@ -10,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');
@@ -38,6 +38,7 @@ 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');
@@ -61,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; }
@@ -96,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;
@@ -129,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;
@@ -213,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; }

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,
@@ -933,7 +936,8 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
         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);
@@ -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);
@@ -1001,6 +1006,11 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
           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 => {
@@ -1194,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;
   }
@@ -1215,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);
@@ -1443,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);
@@ -1692,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
@@ -1721,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);
         }
@@ -162,11 +169,11 @@ function useWeb3AuthInnerContextValue({
       if (typeof nextIsMFAEnabled === "boolean") setIsMFAEnabled(nextIsMFAEnabled);
     };
     const connectionUpdatedListener = () => {
-      var _web3Auth$currentChai9, _web3Auth$currentChai0;
+      var _web3Auth$currentChai1, _web3Auth$currentChai10;
       setStatus(web3Auth.status);
       setConnection(web3Auth.connection);
       setChainId(web3Auth.currentChainId);
-      setChainNamespace((_web3Auth$currentChai9 = (_web3Auth$currentChai0 = web3Auth.currentChain) === null || _web3Auth$currentChai0 === void 0 ? void 0 : _web3Auth$currentChai0.chainNamespace) !== null && _web3Auth$currentChai9 !== void 0 ? _web3Auth$currentChai9 : null);
+      setChainNamespace((_web3Auth$currentChai1 = (_web3Auth$currentChai10 = web3Auth.currentChain) === null || _web3Auth$currentChai10 === void 0 ? void 0 : _web3Auth$currentChai10.chainNamespace) !== null && _web3Auth$currentChai1 !== void 0 ? _web3Auth$currentChai1 : null);
     };
     if (web3Auth) {
       web3Auth.on(constants.CONNECTOR_EVENTS.NOT_READY, notReadyListener);

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;

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

@@ -5,7 +5,6 @@ var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var react = require('react');
 var viem = require('viem');
 var wagmi = require('wagmi');
-var connectors = require('wagmi/connectors');
 require('@babel/runtime/helpers/defineProperty');
 require('@segment/analytics-next');
 var loglevel = require('../../base/loglevel.js');
@@ -18,7 +17,7 @@ require('@toruslabs/http-helpers');
 require('../../base/constants.js');
 require('../../base/wallet/index.js');
 require('../../base/connector/connectorStatus.js');
-require('../../base/connector/constants.js');
+var constants$1 = require('../../base/connector/constants.js');
 require('jwt-decode');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
@@ -29,28 +28,46 @@ var useWeb3AuthDisconnect = require('../hooks/useWeb3AuthDisconnect.js');
 var constants = require('./constants.js');
 
 const _excluded = ["children"];
-const WEB3AUTH_CONNECTOR_ID = "web3auth";
 function getWeb3authConnector(config) {
-  return config.connectors.find(c => c.id === WEB3AUTH_CONNECTOR_ID);
+  return config.connectors.find(c => c.id === constants$1.WEB3AUTH_CONNECTOR_ID);
 }
-// Helper to initialize connectors for the given wallets
+// Helper to create a Web3Auth connector to connect with wagmi
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-async function setupConnector(provider, config) {
-  let connector = getWeb3authConnector(config);
-  if (connector) return connector;
-  // Create new connector if not already existing
-  connector = connectors.injected({
+function createWeb3AuthConnectorForWagmi(provider) {
+  const baseConnector = wagmi.injected({
     target: {
       provider: provider,
-      id: WEB3AUTH_CONNECTOR_ID,
+      id: constants$1.WEB3AUTH_CONNECTOR_ID,
       name: "Web3Auth"
     }
   });
+  return config => {
+    const connector = baseConnector(config);
+    const baseOnAccountsChanged = connector.onAccountsChanged.bind(connector);
+    // we need to handle the `accountsChanged` event emitted on the cross-namespace chain switch.
+    // on evm -> solana, the accountsChanged event is emitted with the solana address, which is not valid for evm.
+    // that causes the `invalid account address` error in wagmi. So, here, we're filtering out the solana addresses.
+    connector.onAccountsChanged = accounts => {
+      if (accounts.length > 0 && !accounts.every(account => typeof account === "string" && viem.isAddress(account))) {
+        loglevel.log.warn("onAccountsChanged::accountsChanged event received on non-EVM address");
+        return;
+      }
+      baseOnAccountsChanged(accounts);
+    };
+    return connector;
+  };
+}
+// Helper to initialize connectors for the given wallets
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function setupConnector(provider, config) {
+  let connector = getWeb3authConnector(config);
+  if (connector) return connector;
+  // Create new connector if not already existing
+  connector = createWeb3AuthConnectorForWagmi(provider);
   const result = config._internal.connectors.setup(connector);
   config._internal.connectors.setState(current => [...current, result]);
   return result;
 }
-// Helper to connect a wallet and update wagmi state
 async function connectWeb3AuthWithWagmi(connector, config) {
   var _config$storage, _config$storage2;
   await Promise.all([(_config$storage = config.storage) === null || _config$storage === void 0 ? void 0 : _config$storage.removeItem(`${connector.id}.disconnected`), (_config$storage2 = config.storage) === null || _config$storage2 === void 0 ? void 0 : _config$storage2.setItem("recentConnectorId", connector.id)]);
@@ -72,8 +89,8 @@ async function connectWeb3AuthWithWagmi(connector, config) {
   }));
 }
 function resetConnectorState(config) {
-  config._internal.connectors.setState(prev => prev.filter(c => c.id !== WEB3AUTH_CONNECTOR_ID));
-  config.connectors.filter(c => c.id !== WEB3AUTH_CONNECTOR_ID);
+  config._internal.connectors.setState(prev => prev.filter(c => c.id !== constants$1.WEB3AUTH_CONNECTOR_ID));
+  config.connectors.filter(c => c.id !== constants$1.WEB3AUTH_CONNECTOR_ID);
 }
 async function disconnectWeb3AuthFromWagmi(config) {
   var _config$storage3, _config$storage4;
@@ -90,6 +107,7 @@ async function disconnectWeb3AuthFromWagmi(config) {
 function Web3AuthWagmiProvider({
   children
 }) {
+  var _connection$ethereumP, _connection$connector;
   const {
     isConnected,
     connection,
@@ -103,59 +121,54 @@ function Web3AuthWagmiProvider({
     mutate: reconnect
   } = wagmi.useReconnect();
   const suppressWagmiDisconnect = react.useRef(false);
-  const lastSyncedBinding = react.useRef({
-    provider: null,
-    connectorName: null
-  });
+  const lastSyncedProvider = react.useRef((_connection$ethereumP = connection === null || connection === void 0 ? void 0 : connection.ethereumProvider) !== null && _connection$ethereumP !== void 0 ? _connection$ethereumP : null);
+  const lastSyncedConnectorName = react.useRef((_connection$connector = connection === null || connection === void 0 ? void 0 : connection.connectorName) !== null && _connection$connector !== void 0 ? _connection$connector : null);
   wagmi.useConnectionEffect({
     onDisconnect: async () => {
       loglevel.log.info("Disconnected from wagmi");
       const isSuppressed = suppressWagmiDisconnect.current;
       suppressWagmiDisconnect.current = false;
       if (!isSuppressed && isConnected) await disconnect();
-      const connector = getWeb3authConnector(wagmiConfig);
       // reset wagmi connector state if the provider handles disconnection because of the accountsChanged event
       // from the connected provider
-      if (connector) {
+      if (getWeb3authConnector(wagmiConfig)) {
         resetConnectorState(wagmiConfig);
       }
     }
   });
   react.useEffect(() => {
-    (async () => {
-      const shouldBindToWagmi = isConnected && chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 && Boolean(connection === null || connection === void 0 ? void 0 : connection.ethereumProvider);
+    (async _connection$ethereumP2 => {
+      const newConnection = connection !== null && connection !== void 0 ? connection : null;
+      const newEth = (_connection$ethereumP2 = connection === null || connection === void 0 ? void 0 : connection.ethereumProvider) !== null && _connection$ethereumP2 !== void 0 ? _connection$ethereumP2 : null;
+      const w3aWagmiConnector = getWeb3authConnector(wagmiConfig);
+      const shouldBindToWagmi = isConnected && chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 && Boolean(newConnection && newEth);
       if (shouldBindToWagmi) {
-        const hasSameBinding = lastSyncedBinding.current.provider === connection.ethereumProvider && lastSyncedBinding.current.connectorName === connection.connectorName;
-        if (hasSameBinding && wagmiConfig.state.status === "connected") {
+        const hasSameBinding = lastSyncedProvider.current === newEth && lastSyncedConnectorName.current === newConnection.connectorName && wagmiConfig.state.status === "connected";
+        if (hasSameBinding) {
+          // rehydration: already connected to the same provider, so no need to reconnect
           return;
         }
-        if (!hasSameBinding && getWeb3authConnector(wagmiConfig)) {
-          if (wagmiConfig.state.status === "connected") {
-            suppressWagmiDisconnect.current = true;
-            await disconnectWeb3AuthFromWagmi(wagmiConfig);
-          } else {
-            resetConnectorState(wagmiConfig);
-          }
+        // `ethereumProvider` is a stable proxy (`commonJRPCProvider`) across account switches,
+        // so key wagmi resyncs off the Web3Auth connection object instead of provider identity.
+        if (w3aWagmiConnector) {
+          resetConnectorState(wagmiConfig);
         }
-        const connector = await setupConnector(connection.ethereumProvider, wagmiConfig);
+        lastSyncedProvider.current = newEth;
+        lastSyncedConnectorName.current = newConnection.connectorName;
+        const connector = setupConnector(newEth, wagmiConfig);
         if (!connector) {
+          loglevel.log.error("Failed to setup react wagmi connector");
           throw new Error("Failed to setup connector");
         }
         await connectWeb3AuthWithWagmi(connector, wagmiConfig);
-        lastSyncedBinding.current = {
-          provider: connection.ethereumProvider,
-          connectorName: connection.connectorName
-        };
         reconnect();
       } else {
-        lastSyncedBinding.current = {
-          provider: null,
-          connectorName: null
-        };
+        lastSyncedProvider.current = null;
+        lastSyncedConnectorName.current = null;
         if (wagmiConfig.state.status === "connected") {
           suppressWagmiDisconnect.current = true;
           await disconnectWeb3AuthFromWagmi(wagmiConfig);
-        } else if (getWeb3authConnector(wagmiConfig)) {
+        } else if (w3aWagmiConnector) {
           resetConnectorState(wagmiConfig);
         }
       }
@@ -255,3 +268,9 @@ function WagmiProvider(_ref) {
 }
 
 exports.WagmiProvider = WagmiProvider;
+exports.connectWeb3AuthWithWagmi = connectWeb3AuthWithWagmi;
+exports.createWeb3AuthConnectorForWagmi = createWeb3AuthConnectorForWagmi;
+exports.disconnectWeb3AuthFromWagmi = disconnectWeb3AuthFromWagmi;
+exports.getWeb3authConnector = getWeb3authConnector;
+exports.resetConnectorState = resetConnectorState;
+exports.setupConnector = setupConnector;

package/dist/lib.cjs/types/account-linking/errors.d.ts

@@ -0,0 +1,17 @@
+import { ErrorCodes, Web3AuthError } from "../base";
+export declare class AccountLinkingError extends Web3AuthError {
+    protected static messages: ErrorCodes;
+    constructor(code: number, message?: string, cause?: unknown);
+    static fromCode(code: number, extraMessage?: string, cause?: unknown): AccountLinkingError;
+    static requestFailed(extraMessage?: string, cause?: unknown): AccountLinkingError;
+    static serverNotConfigured(extraMessage?: string, cause?: unknown): AccountLinkingError;
+    static primaryTokenNotAvailable(extraMessage?: string, cause?: unknown): AccountLinkingError;
+    static walletProofFailed(extraMessage?: string, cause?: unknown): AccountLinkingError;
+    static unsupportedConnector(extraMessage?: string, cause?: unknown): AccountLinkingError;
+    static cannotUnlinkActiveAccount(): AccountLinkingError;
+    static accountNotLinked(message?: string, cause?: unknown): AccountLinkingError;
+    static cannotUnlinkPrimaryAccount(): AccountLinkingError;
+    toString(): string;
+}
+export declare function getAccountLinkingRequestError(error: unknown): Promise<AccountLinkingError>;
+export declare function formatAccountLinkingErrorMessage(error: unknown, fallbackMessage?: string): string;

package/dist/lib.cjs/types/account-linking/index.d.ts

@@ -1,2 +1,3 @@
+export * from "./errors";
 export * from "./interfaces";
 export * from "./rest";

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

@@ -1,3 +1,4 @@
+export declare const WEB3AUTH_CONNECTOR_ID = "web3auth";
 export declare const CONNECTOR_STATUS: {
     readonly NOT_READY: "not_ready";
     readonly READY: "ready";

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

@@ -1,4 +1,4 @@
-import { CaipAccountId } from "@metamask/connect-evm";
+import { type CaipAccountId } from "@metamask/connect-evm";
 import type { Wallet } from "@wallet-standard/base";
 import { AUTH_CONNECTION_TYPE, AuthUserInfo, ExtraLoginOptions, JRPCRequest, JRPCResponse, Maybe, RequestArguments, SafeEventEmitter, SendCallBack, UX_MODE, type UX_MODE_TYPE, WEB3AUTH_NETWORK, type WEB3AUTH_NETWORK_TYPE } from "@web3auth/auth";
 import { BaseLinkedAccountInfo } from "../../account-linking/interfaces";

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

@@ -56,19 +56,7 @@ export declare class WalletOperationsError extends Web3AuthError {
     static chainIDNotAllowed(extraMessage?: string, cause?: unknown): IWeb3AuthError;
     static operationNotAllowed(extraMessage?: string, cause?: unknown): IWeb3AuthError;
     static chainNamespaceNotAllowed(extraMessage?: string, cause?: unknown): IWeb3AuthError;
-}
-export declare class AccountLinkingError extends Web3AuthError {
-    protected static messages: ErrorCodes;
-    constructor(code: number, message?: string, cause?: unknown);
-    static fromCode(code: number, extraMessage?: string, cause?: unknown): AccountLinkingError;
-    static requestFailed(extraMessage?: string, cause?: unknown): AccountLinkingError;
-    static serverNotConfigured(extraMessage?: string, cause?: unknown): AccountLinkingError;
-    static primaryTokenNotAvailable(extraMessage?: string, cause?: unknown): AccountLinkingError;
-    static walletProofFailed(extraMessage?: string, cause?: unknown): AccountLinkingError;
-    static unsupportedConnector(extraMessage?: string, cause?: unknown): AccountLinkingError;
-    static cannotUnlinkActiveAccount(): AccountLinkingError;
-    static accountNotLinked(message?: string, cause?: unknown): AccountLinkingError;
-    static cannotUnlinkPrimaryAccount(): AccountLinkingError;
+    static userRejected(extraMessage?: string, cause?: unknown): IWeb3AuthError;
 }
 export declare class WalletProviderError extends Web3AuthError {
     protected static messages: ErrorCodes;
@@ -78,3 +66,4 @@ export declare class WalletProviderError extends Web3AuthError {
     static invalidRequestMethod(extraMessage?: string, cause?: unknown): IWeb3AuthError;
     static invalidRequestParams(extraMessage?: string, cause?: unknown): IWeb3AuthError;
 }
+export declare function isUserRejectedError(error: unknown): boolean;

package/dist/lib.cjs/types/connectors/auth-connector/authConnector.d.ts

@@ -2,8 +2,8 @@ import { ChainNamespaceType } from "@toruslabs/base-controllers";
 import type { Wallet } from "@wallet-standard/base";
 import { Auth, AuthConnectionConfigItem } from "@web3auth/auth";
 import { type default as WsEmbed } from "@web3auth/ws-embed";
-import { LinkAccountResult, UnlinkAccountResult } from "../../account-linking";
-import { AccountLinkingError, AuthLoginParams, AuthTokenInfo, BaseConnector, BaseConnectorLoginParams, type Connection, CONNECTOR_CATEGORY_TYPE, CONNECTOR_STATUS_TYPE, ConnectorFn, ConnectorInitOptions, ConnectorNamespaceType, IConnector, IProvider, LinkedAccountInfo, UserInfo, WALLET_CONNECTOR_TYPE } from "../../base";
+import { AccountLinkingError, LinkAccountResult, UnlinkAccountResult } from "../../account-linking";
+import { AuthLoginParams, AuthTokenInfo, BaseConnector, BaseConnectorLoginParams, type Connection, CONNECTOR_CATEGORY_TYPE, CONNECTOR_STATUS_TYPE, ConnectorFn, ConnectorInitOptions, ConnectorNamespaceType, IConnector, IProvider, LinkedAccountInfo, UserInfo, WALLET_CONNECTOR_TYPE } from "../../base";
 import { type AuthConnectorLinkAccountParams, type AuthConnectorOptions, type AuthConnectorSwitchAccountContext, type AuthConnectorSwitchAccountResult, type AuthConnectorUnlinkAccountParams, IAuthConnector, type PrivateKeyProvider } from "./interface";
 declare class AuthConnector extends BaseConnector<AuthLoginParams> implements IAuthConnector {
     readonly name: WALLET_CONNECTOR_TYPE;

package/dist/lib.cjs/types/providers/account-abstraction-provider/rpc/ethRpcMiddlewares.d.ts

@@ -8,4 +8,5 @@ export declare function createAaMiddleware({ eoaProvider, handlers, }: {
 export declare function createEoaMiddleware({ aaProvider }: {
     aaProvider: IProvider;
 }): Promise<MiddlewareConstraint>;
+export declare function createEip7702And5792MiddlewareForAaProvider(): Promise<MiddlewareConstraint>;
 export declare function providerAsMiddleware(provider: IProvider): MiddlewareConstraint;

package/dist/lib.cjs/types/react/wagmi/constants.d.ts

@@ -38,8 +38,10 @@ export declare const defaultWagmiConfig: import("wagmi").Config<readonly [{
     fees?: import("viem").ChainFees<undefined> | undefined;
     formatters?: undefined;
     prepareTransactionRequest?: ((args: import("viem").PrepareTransactionRequestParameters, options: {
+        client: import("viem").Client;
         phase: "beforeFillTransaction" | "beforeFillParameters" | "afterFillParameters";
     }) => Promise<import("viem").PrepareTransactionRequestParameters>) | [fn: ((args: import("viem").PrepareTransactionRequestParameters, options: {
+        client: import("viem").Client;
         phase: "beforeFillTransaction" | "beforeFillParameters" | "afterFillParameters";
     }) => Promise<import("viem").PrepareTransactionRequestParameters>) | undefined, options: {
         runAt: readonly ("beforeFillTransaction" | "beforeFillParameters" | "afterFillParameters")[];