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

package/dist/lib.cjs/plugins/wallet-services-plugin/plugin.js

@@ -33,7 +33,7 @@ class WalletServicesPlugin extends auth.SafeEventEmitter {
   async initWithWeb3Auth(web3auth, _whiteLabel, analytics) {
     if (this.isInitialized) return;
     if (!web3auth) throw errors.WalletServicesPluginError.web3authRequired();
-    if (web3auth.connection && !this.SUPPORTED_CONNECTORS.includes(web3auth.connectedConnectorName)) throw errors.WalletServicesPluginError.notInitialized();
+    if (web3auth.connection && !this.SUPPORTED_CONNECTORS.includes(web3auth.primaryConnectorName)) throw errors.WalletServicesPluginError.notInitialized();
     const currentChainConfig = web3auth.currentChain;
     if (![baseControllers.CHAIN_NAMESPACES.EIP155, baseControllers.CHAIN_NAMESPACES.SOLANA].includes(currentChainConfig === null || currentChainConfig === void 0 ? void 0 : currentChainConfig.chainNamespace)) throw errors.WalletServicesPluginError.unsupportedChainNamespace();
     this.web3auth = web3auth;

package/dist/lib.cjs/providers/base-provider/baseProvider.js

@@ -33,6 +33,8 @@ class BaseProvider extends baseControllers.BaseController {
     // set to true when the keyExportEnabled flag is set by code.
     // This is to prevent the flag from being overridden by the dashboard config.
     _defineProperty(this, "keyExportFlagSetByCode", false);
+    _defineProperty(this, "providerEventBridges", new Map());
+    _defineProperty(this, "providerListenerBridgeRegistered", false);
     const {
       chain
     } = config;
@@ -104,41 +106,18 @@ class BaseProvider extends baseControllers.BaseController {
     })).catch(err => callback(err, null));
   }
   updateProviderEngineProxy(provider) {
+    if (this._providerEngineProxy === provider) return;
     if (this._providerEngineProxy) {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      this._providerEngineProxy.setTarget(provider);
-      // we want events to propagate from Ethereum provider -> wrapper provider (e.g. CommonJRPC provider) -> SDK -> dapp
-      // ensure that only one handler is added for each event
-      const reEmitHandler = event => {
-        // skip newListener event
-        if (event === "newListener") return;
-        // listen to the event from the Ethereum provider
-        provider.on(event, (...args) => {
-          // handle chainChanged event: update chainId state
-          if (event === utils.EIP1193_EVENTS.CHAIN_CHANGED) {
-            const chainId = args[0];
-            this.update({
-              chainId
-            });
-          }
-          // re-emit the event
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          this.emit(event, ...args);
-        });
-      };
-      // handle existing events
-      this.eventNames().forEach(event => {
-        reEmitHandler(event);
-      });
-      // handle when a new listener is added
-      this.on("newListener", event => {
-        // skip if the event already exists
-        if (this.listenerCount(event) > 0) return;
-        reEmitHandler(event);
-      });
-    } else {
-      this._providerEngineProxy = baseControllers.createEventEmitterProxy(provider);
+      // remove all event bridges from the previous provider
+      this.detachProviderEventBridges(this._providerEngineProxy);
     }
+    // attach all event bridges to the new provider
+    this._providerEngineProxy = provider;
+    this.ensureProviderListenerBridge();
+    this.eventNames().forEach(event => {
+      this.ensureProviderEventBridge(event);
+    });
+    this.attachProviderEventBridges(provider);
   }
   setKeyExportFlag(flag) {
     if (!this.keyExportFlagSetByCode) {
@@ -153,6 +132,59 @@ class BaseProvider extends baseControllers.BaseController {
   getChain(chainId) {
     return this.config.chains.find(chain => chain.chainId === chainId);
   }
+  ensureProviderListenerBridge() {
+    if (this.providerListenerBridgeRegistered) return;
+    this.providerListenerBridgeRegistered = true;
+    this.on("newListener", event => {
+      this.ensureProviderEventBridge(event);
+    });
+  }
+  ensureProviderEventBridge(event) {
+    if (event === "newListener" || event === "removeListener" || this.providerEventBridges.has(event)) return;
+    const bridge = {
+      handler: (...args) => {
+        if (event === utils.EIP1193_EVENTS.CHAIN_CHANGED) {
+          const chainId = args[0];
+          this.update({
+            chainId
+          });
+        }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        this.emit(event, ...args);
+      }
+    };
+    this.providerEventBridges.set(event, bridge);
+    if (!this._providerEngineProxy) return;
+    bridge.detach = this.attachProviderEventBridge(this._providerEngineProxy, event, bridge.handler);
+  }
+  attachProviderEventBridges(provider) {
+    this.providerEventBridges.forEach((bridge, event) => {
+      if (bridge.detach) return;
+      bridge.detach = this.attachProviderEventBridge(provider, event, bridge.handler);
+    });
+  }
+  attachProviderEventBridge(provider, event, handler) {
+    const removableProvider = provider;
+    const maybeDetach = removableProvider.on(event, handler);
+    return typeof maybeDetach === "function" ? () => {
+      maybeDetach();
+    } : undefined;
+  }
+  detachProviderEventBridges(provider) {
+    this.providerEventBridges.forEach((bridge, event) => {
+      if (bridge.detach) {
+        bridge.detach();
+      } else {
+        const removableProvider = provider;
+        if (typeof removableProvider.removeListener === "function") {
+          removableProvider.removeListener(event, bridge.handler);
+        } else if (typeof removableProvider.off === "function") {
+          removableProvider.off(event, bridge.handler);
+        }
+      }
+      bridge.detach = undefined;
+    });
+  }
 }
 
 exports.BaseProvider = BaseProvider;

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

@@ -12,12 +12,26 @@ require('@toruslabs/constants');
 require('@toruslabs/http-helpers');
 var constants$1 = require('../../base/constants.js');
 require('../../base/wallet/index.js');
-require('../../base/connector/connectorStatus.js');
+var connectorStatus = require('../../base/connector/connectorStatus.js');
 var constants = require('../../base/connector/constants.js');
 require('jwt-decode');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
 
+function getInitialState(web3Auth) {
+  var _web3Auth$currentChai, _web3Auth$currentChai2;
+  const isConnected = connectorStatus.CONNECTED_STATUSES.includes(web3Auth.status);
+  const isAuthorized = web3Auth.status === constants.CONNECTOR_STATUS.AUTHORIZED;
+  return {
+    chainId: isConnected ? web3Auth.currentChainId : null,
+    chainNamespace: isConnected ? (_web3Auth$currentChai = (_web3Auth$currentChai2 = web3Auth.currentChain) === null || _web3Auth$currentChai2 === void 0 ? void 0 : _web3Auth$currentChai2.chainNamespace) !== null && _web3Auth$currentChai !== void 0 ? _web3Auth$currentChai : null : null,
+    connection: isConnected ? web3Auth.connection : null,
+    isAuthorized,
+    isConnected,
+    isInitialized: isConnected,
+    status: web3Auth.status
+  };
+}
 function useWeb3AuthInnerContextValue({
   Web3AuthConstructor,
   web3AuthOptions,
@@ -26,20 +40,20 @@ function useWeb3AuthInnerContextValue({
   cleanupOnUnmount = false,
   initEffectDependency
 }) {
-  const [chainId, setChainId] = react.useState(null);
-  const [chainNamespace, setChainNamespace] = react.useState(null);
-  const [isInitializing, setIsInitializing] = react.useState(false);
-  const [initError, setInitError] = react.useState(null);
-  const [connection, setConnection] = react.useState(null);
-  const [isInitialized, setIsInitialized] = react.useState(false);
-  const [isMFAEnabled, setIsMFAEnabled] = react.useState(false);
   const web3Auth = react.useMemo(() => {
-    setConnection(null);
     return new Web3AuthConstructor(web3AuthOptions, initialState);
   }, [Web3AuthConstructor, web3AuthOptions, initialState]);
-  const [isConnected, setIsConnected] = react.useState(false);
-  const [status, setStatus] = react.useState(null);
-  const [isAuthorized, setIsAuthorized] = react.useState(false);
+  const initialWeb3AuthState = getInitialState(web3Auth);
+  const [chainId, setChainId] = react.useState(() => initialWeb3AuthState.chainId);
+  const [chainNamespace, setChainNamespace] = react.useState(() => initialWeb3AuthState.chainNamespace);
+  const [isInitializing, setIsInitializing] = react.useState(false);
+  const [initError, setInitError] = react.useState(null);
+  const [connection, setConnection] = react.useState(() => initialWeb3AuthState.connection);
+  const [isInitialized, setIsInitialized] = react.useState(initialWeb3AuthState.isInitialized);
+  const [isMFAEnabled, setIsMFAEnabled] = react.useState(false);
+  const [isConnected, setIsConnected] = react.useState(initialWeb3AuthState.isConnected);
+  const [status, setStatus] = react.useState(initialWeb3AuthState.status);
+  const [isAuthorized, setIsAuthorized] = react.useState(initialWeb3AuthState.isAuthorized);
   const getPlugin = react.useCallback(name => {
     if (!web3Auth) throw index.WalletInitializationError.notReady();
     return web3Auth.getPlugin(name);
@@ -48,7 +62,7 @@ function useWeb3AuthInnerContextValue({
     const controller = new AbortController();
     async function init() {
       try {
-        var _web3Auth$currentChai;
+        var _web3Auth$currentChai3;
         setInitError(null);
         setIsInitializing(true);
         web3Auth.setAnalyticsProperties({
@@ -58,7 +72,7 @@ function useWeb3AuthInnerContextValue({
           signal: controller.signal
         });
         setChainId(web3Auth.currentChainId);
-        setChainNamespace((_web3Auth$currentChai = web3Auth.currentChain) === null || _web3Auth$currentChai === void 0 ? void 0 : _web3Auth$currentChai.chainNamespace);
+        setChainNamespace((_web3Auth$currentChai3 = web3Auth.currentChain) === null || _web3Auth$currentChai3 === void 0 ? void 0 : _web3Auth$currentChai3.chainNamespace);
       } catch (error) {
         setInitError(error);
       } finally {
@@ -73,9 +87,9 @@ function useWeb3AuthInnerContextValue({
   react.useEffect(() => {
     var _connection$ethereumP;
     const handleChainChange = async nextChainId => {
-      var _web3Auth$currentChai2;
+      var _web3Auth$currentChai4;
       setChainId(nextChainId);
-      setChainNamespace((_web3Auth$currentChai2 = web3Auth.currentChain) === null || _web3Auth$currentChai2 === void 0 ? void 0 : _web3Auth$currentChai2.chainNamespace);
+      setChainNamespace((_web3Auth$currentChai4 = web3Auth.currentChain) === null || _web3Auth$currentChai4 === void 0 ? void 0 : _web3Auth$currentChai4.chainNamespace);
     };
     const provider = (_connection$ethereumP = connection === null || connection === void 0 ? void 0 : connection.ethereumProvider) !== null && _connection$ethereumP !== void 0 ? _connection$ethereumP : null;
     if (!provider) return undefined;
@@ -97,12 +111,12 @@ function useWeb3AuthInnerContextValue({
       setStatus(web3Auth.status);
       // we do this because of rehydration issues. status connected is fired first but web3auth sdk is not ready yet.
       if (web3Auth.status === constants.CONNECTOR_STATUS.CONNECTED) {
-        var _web3Auth$currentChai3, _web3Auth$currentChai4;
+        var _web3Auth$currentChai5, _web3Auth$currentChai6;
         setIsInitialized(true);
         setIsConnected(true);
         setConnection(web3Auth.connection);
         setChainId(web3Auth.currentChainId);
-        setChainNamespace((_web3Auth$currentChai3 = (_web3Auth$currentChai4 = web3Auth.currentChain) === null || _web3Auth$currentChai4 === void 0 ? void 0 : _web3Auth$currentChai4.chainNamespace) !== null && _web3Auth$currentChai3 !== void 0 ? _web3Auth$currentChai3 : null);
+        setChainNamespace((_web3Auth$currentChai5 = (_web3Auth$currentChai6 = web3Auth.currentChain) === null || _web3Auth$currentChai6 === void 0 ? void 0 : _web3Auth$currentChai6.chainNamespace) !== null && _web3Auth$currentChai5 !== void 0 ? _web3Auth$currentChai5 : null);
       }
     };
     const disconnectedListener = () => {
@@ -133,12 +147,12 @@ function useWeb3AuthInnerContextValue({
     const consentAcceptedListener = () => {
       setStatus(web3Auth.status);
       if (web3Auth.status === constants.CONNECTOR_STATUS.CONNECTED || web3Auth.status === constants.CONNECTOR_STATUS.AUTHORIZED) {
-        var _web3Auth$currentChai5, _web3Auth$currentChai6;
+        var _web3Auth$currentChai7, _web3Auth$currentChai8;
         setIsInitialized(true);
         setIsConnected(true);
         setConnection(web3Auth.connection);
         setChainId(web3Auth.currentChainId);
-        setChainNamespace((_web3Auth$currentChai5 = (_web3Auth$currentChai6 = web3Auth.currentChain) === null || _web3Auth$currentChai6 === void 0 ? void 0 : _web3Auth$currentChai6.chainNamespace) !== null && _web3Auth$currentChai5 !== void 0 ? _web3Auth$currentChai5 : null);
+        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);
         if (web3Auth.status === constants.CONNECTOR_STATUS.AUTHORIZED) {
           setIsAuthorized(true);
         }
@@ -147,6 +161,13 @@ function useWeb3AuthInnerContextValue({
     const mfaEnabledListener = nextIsMFAEnabled => {
       if (typeof nextIsMFAEnabled === "boolean") setIsMFAEnabled(nextIsMFAEnabled);
     };
+    const connectionUpdatedListener = () => {
+      var _web3Auth$currentChai9, _web3Auth$currentChai0;
+      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);
+    };
     if (web3Auth) {
       web3Auth.on(constants.CONNECTOR_EVENTS.NOT_READY, notReadyListener);
       web3Auth.on(constants.CONNECTOR_EVENTS.READY, readyListener);
@@ -157,6 +178,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);
       }
@@ -172,6 +194,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/hooks/useWallets.js

@@ -0,0 +1,51 @@
+'use strict';
+
+var react = require('react');
+require('@babel/runtime/helpers/objectSpread2');
+require('@babel/runtime/helpers/defineProperty');
+require('@segment/analytics-next');
+require('../../base/loglevel.js');
+require('@toruslabs/base-controllers');
+require('@toruslabs/session-manager');
+require('@web3auth/auth');
+var index = 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');
+var useWeb3AuthInner = require('./useWeb3AuthInner.js');
+
+const useWallets = () => {
+  const {
+    web3Auth
+  } = useWeb3AuthInner.useWeb3AuthInner();
+  const [loading, setLoading] = react.useState(false);
+  const [error, setError] = react.useState(null);
+  const [wallets, setWallets] = react.useState([]);
+  const syncWallets = react.useCallback(async () => {
+    if (!web3Auth) throw index.WalletInitializationError.notReady();
+    setLoading(true);
+    setError(null);
+    try {
+      const result = await web3Auth.getConnectedAccountsWithProviders();
+      setWallets(result);
+    } catch (err) {
+      setError(err);
+    } finally {
+      setLoading(false);
+    }
+  }, [web3Auth]);
+  return {
+    loading,
+    error,
+    wallets,
+    syncWallets
+  };
+};
+
+exports.useWallets = useWallets;

package/dist/lib.cjs/react/hooks/useWeb3AuthConnect.js

@@ -18,7 +18,7 @@ const useWeb3AuthConnect = () => {
       setConnectorName(null);
     }
     if (isConnected && !connectorName) {
-      setConnectorName(web3Auth.connectedConnectorName);
+      setConnectorName(web3Auth.primaryConnectorName);
     }
   }, [isConnected, connectorName, web3Auth]);
   const connect = react.useCallback(async (connector, params) => {
@@ -27,7 +27,7 @@ const useWeb3AuthConnect = () => {
     try {
       const provider = await web3Auth.connectTo(connector, params);
       if (provider) {
-        setConnectorName(web3Auth.connectedConnectorName);
+        setConnectorName(web3Auth.primaryConnectorName);
       }
       return provider;
     } catch (error) {

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

@@ -14,6 +14,7 @@ var useReceive = require('./hooks/useReceive.js');
 var useSwap = require('./hooks/useSwap.js');
 var useSwitchChain = require('./hooks/useSwitchChain.js');
 var useWalletConnectScanner = require('./hooks/useWalletConnectScanner.js');
+var useWallets = require('./hooks/useWallets.js');
 var useWalletServicesPlugin = require('./hooks/useWalletServicesPlugin.js');
 var useWalletUI = require('./hooks/useWalletUI.js');
 var useWeb3Auth = require('./hooks/useWeb3Auth.js');
@@ -38,6 +39,7 @@ exports.useReceive = useReceive.useReceive;
 exports.useSwap = useSwap.useSwap;
 exports.useSwitchChain = useSwitchChain.useSwitchChain;
 exports.useWalletConnectScanner = useWalletConnectScanner.useWalletConnectScanner;
+exports.useWallets = useWallets.useWallets;
 exports.useWalletServicesPlugin = useWalletServicesPlugin.useWalletServicesPlugin;
 exports.useWalletUI = useWalletUI.useWalletUI;
 exports.useWeb3Auth = useWeb3Auth.useWeb3Auth;

package/dist/lib.cjs/react/solana/hooks/useSolanaWallet.js

@@ -30,12 +30,12 @@ const useSolanaWallet = () => {
     return kit.createSolanaRpc(web3Auth.currentChain.rpcTarget);
   }, [web3Auth, solanaWallet, chainNamespace]);
   const getPrivateKey = react.useCallback(async () => {
-    var _web3Auth$connectedCo;
+    var _web3Auth$primaryConn;
     if (!web3Auth) throw new Error("Web3Auth not initialized");
     if ((connection === null || connection === void 0 ? void 0 : connection.connectorName) !== index.WALLET_CONNECTORS.AUTH) {
       throw new Error("getPrivateKey is only supported with the Auth connector");
     }
-    const provider = (_web3Auth$connectedCo = web3Auth.connectedConnector) === null || _web3Auth$connectedCo === void 0 ? void 0 : _web3Auth$connectedCo.provider;
+    const provider = (_web3Auth$primaryConn = web3Auth.primaryConnector) === null || _web3Auth$primaryConn === void 0 ? void 0 : _web3Auth$primaryConn.provider;
     if (!provider) throw new Error("Provider not available");
     const privateKey = await provider.request({
       method: wsEmbed.SOLANA_METHOD_TYPES.SOLANA_PRIVATE_KEY

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);
@@ -117,6 +118,11 @@ function useFrameworkKitSolanaClient() {
         adopt(makePlaceholder(rpc));
         return;
       }
+      // only reconnect for the primary connector
+      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, {
@@ -148,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/provider.js

@@ -92,7 +92,8 @@ function Web3AuthWagmiProvider({
 }) {
   const {
     isConnected,
-    connection
+    connection,
+    chainNamespace
   } = useWeb3Auth.useWeb3Auth();
   const {
     disconnect
@@ -101,10 +102,17 @@ function Web3AuthWagmiProvider({
   const {
     mutate: reconnect
   } = wagmi.useReconnect();
+  const suppressWagmiDisconnect = react.useRef(false);
+  const lastSyncedBinding = react.useRef({
+    provider: null,
+    connectorName: null
+  });
   wagmi.useConnectionEffect({
     onDisconnect: async () => {
       loglevel.log.info("Disconnected from wagmi");
-      if (isConnected) await disconnect();
+      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
@@ -115,20 +123,44 @@ function Web3AuthWagmiProvider({
   });
   react.useEffect(() => {
     (async () => {
-      if (isConnected && connection !== null && connection !== void 0 && connection.ethereumProvider) {
+      const shouldBindToWagmi = isConnected && chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 && Boolean(connection === null || connection === void 0 ? void 0 : connection.ethereumProvider);
+      if (shouldBindToWagmi) {
+        const hasSameBinding = lastSyncedBinding.current.provider === connection.ethereumProvider && lastSyncedBinding.current.connectorName === connection.connectorName;
+        if (hasSameBinding && wagmiConfig.state.status === "connected") {
+          return;
+        }
+        if (!hasSameBinding && getWeb3authConnector(wagmiConfig)) {
+          if (wagmiConfig.state.status === "connected") {
+            suppressWagmiDisconnect.current = true;
+            await disconnectWeb3AuthFromWagmi(wagmiConfig);
+          } else {
+            resetConnectorState(wagmiConfig);
+          }
+        }
         const connector = await setupConnector(connection.ethereumProvider, wagmiConfig);
         if (!connector) {
           throw new Error("Failed to setup connector");
         }
         await connectWeb3AuthWithWagmi(connector, wagmiConfig);
+        lastSyncedBinding.current = {
+          provider: connection.ethereumProvider,
+          connectorName: connection.connectorName
+        };
         reconnect();
-      } else if (!isConnected) {
+      } else {
+        lastSyncedBinding.current = {
+          provider: null,
+          connectorName: null
+        };
         if (wagmiConfig.state.status === "connected") {
+          suppressWagmiDisconnect.current = true;
           await disconnectWeb3AuthFromWagmi(wagmiConfig);
+        } else if (getWeb3authConnector(wagmiConfig)) {
+          resetConnectorState(wagmiConfig);
         }
       }
     })();
-  }, [isConnected, wagmiConfig, connection, reconnect]);
+  }, [chainNamespace, connection, isConnected, reconnect, wagmiConfig]);
   return react.createElement(react.Fragment, null, children);
 }
 function WagmiProvider(_ref) {

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

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

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

@@ -0,0 +1,90 @@
+import type { WALLET_CONNECTOR_TYPE } from "../base/wallet";
+export type CITADEL_NETWORK = "ethereum" | "solana";
+export interface LinkAccountParams {
+    /**
+     * Name of the external wallet connector to link.
+     * Example: WALLET_CONNECTORS.METAMASK, WALLET_CONNECTORS.WALLET_CONNECT_V2.
+     *
+     * Optional in the modal SDK (`@web3auth/modal`): when omitted, the modal opens
+     * a wallet picker dedicated to account linking and uses the wallet selected by
+     * the user. Required in the no-modal SDK (`@web3auth/no-modal`).
+     */
+    connectorName: WALLET_CONNECTOR_TYPE | string;
+    /**
+     * Chain ID to use when generating the wallet identity proof.
+     * Defaults to the currently active chain if not specified.
+     */
+    chainId?: string;
+}
+/**
+ * Linked account info returned from the Citadel server
+ */
+export interface BaseLinkedAccountInfo {
+    /** Type of the account (e.g. "social", "external_wallet", "account_abstraction") */
+    accountType: string;
+    /** Address of the account */
+    address: string | null;
+    /** Auth connection id of the account */
+    authConnectionId: string | null;
+    /** Grouped auth connection id of the account */
+    groupedAuthConnectionId?: string | null;
+    /** Chain namespace of the account */
+    chainNamespace: string | null;
+}
+/**
+ * Result returned after a successful account-linking operation.
+ */
+export interface LinkAccountResult {
+    /** Whether the Citadel server accepted the linking request. */
+    success: boolean;
+    /** Refreshed id token for the user */
+    idToken: string;
+    /** Linked account info */
+    linkedAccounts: BaseLinkedAccountInfo[];
+    /** Error message from the Citadel server */
+    message?: string;
+}
+/**
+ * Result returned after a successful account-unlinking operation.
+ */
+export interface UnlinkAccountResult {
+    /** Whether the Citadel server accepted the linking request. */
+    success: boolean;
+    /** Refreshed id token for the user */
+    idToken: string;
+    /** Remaining linked account info */
+    linkedAccounts: BaseLinkedAccountInfo[];
+    /** Error message from the Citadel server */
+    message?: string;
+}
+/**
+ * Payload sent to the Citadel account-linking endpoint.
+ */
+export interface CitadelLinkAccountPayload {
+    /** Current idToken to refresh with updated linked accounts */
+    idToken: string;
+    /** Network of the account being linked */
+    network: CITADEL_NETWORK;
+    /** Name of the connector being linked */
+    connector: string;
+    /** Challenge message to be signed by the user */
+    message: string;
+    /** Sign In with Web3 signature object */
+    signature: {
+        /** signature value */
+        s: string;
+        /** signature type (e.g. "eip191", "sip99") */
+        t: string;
+    };
+}
+/**
+ * Payload sent to the Citadel account-unlinking endpoint.
+ */
+export interface UnlinkAccountPayload {
+    /** Current idToken to refresh with updated linked accounts */
+    idToken: string;
+    /** Address of the account to unlink */
+    address: string;
+    /** Network of the account being unlinked */
+    network: CITADEL_NETWORK;
+}

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

@@ -0,0 +1,19 @@
+import { type LinkedAccountInfo, Web3AuthError } from "../base";
+import { makeAccountLinkingRequest, makeAccountUnlinkingRequest } from "./index";
+import type { BaseLinkedAccountInfo, LinkAccountParams, LinkAccountResult, UnlinkAccountResult } from "./interfaces";
+export { makeAccountLinkingRequest, makeAccountUnlinkingRequest };
+export type { CITADEL_NETWORK, CitadelLinkAccountPayload, LinkAccountParams, LinkAccountResult, BaseLinkedAccountInfo as LinkedAccountInfo, UnlinkAccountPayload, UnlinkAccountResult, } from "./interfaces";
+export interface IUseLinkAccount {
+    loading: boolean;
+    error: Web3AuthError | null;
+    linkedAccounts: BaseLinkedAccountInfo[];
+    linkAccount(params?: LinkAccountParams): Promise<LinkAccountResult | void>;
+    unlinkAccount(address: string): Promise<UnlinkAccountResult | void>;
+}
+export interface IUseSwitchAccount {
+    loading: boolean;
+    error: Web3AuthError | null;
+    switchAccount(account: LinkedAccountInfo): Promise<void>;
+}
+export declare const useLinkAccount: () => IUseLinkAccount;
+export declare const useSwitchAccount: () => IUseSwitchAccount;

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

@@ -0,0 +1,9 @@
+import { CitadelLinkAccountPayload, LinkAccountResult, UnlinkAccountPayload, UnlinkAccountResult } from "./interfaces";
+/**
+ * Send both identity proofs to the Citadel account-linking endpoint and
+ * return a normalized result.
+ *
+ * Throws AccountLinkingError when the server returns an error or the request itself fails.
+ */
+export declare function makeAccountLinkingRequest(authServerUrl: string, accessToken: string, payload: CitadelLinkAccountPayload): Promise<LinkAccountResult>;
+export declare function makeAccountUnlinkingRequest(authServerUrl: string, accessToken: string, payload: UnlinkAccountPayload): Promise<UnlinkAccountResult>;

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

@@ -0,0 +1,20 @@
+import { Ref } from "vue";
+import { type LinkedAccountInfo, Web3AuthError } from "../base";
+import { makeAccountLinkingRequest, makeAccountUnlinkingRequest } from "./index";
+import type { BaseLinkedAccountInfo, LinkAccountParams, LinkAccountResult, UnlinkAccountResult } from "./interfaces";
+export { makeAccountLinkingRequest, makeAccountUnlinkingRequest };
+export type { CITADEL_NETWORK, CitadelLinkAccountPayload, LinkAccountParams, LinkAccountResult, BaseLinkedAccountInfo as LinkedAccountInfo, UnlinkAccountPayload, UnlinkAccountResult, } from "./interfaces";
+export interface IUseLinkAccount {
+    loading: Ref<boolean>;
+    error: Ref<Web3AuthError | null>;
+    linkedAccounts: Ref<BaseLinkedAccountInfo[]>;
+    linkAccount(params?: LinkAccountParams): Promise<LinkAccountResult | void>;
+    unlinkAccount(address: string): Promise<UnlinkAccountResult | void>;
+}
+export interface IUseSwitchAccount {
+    loading: Ref<boolean>;
+    error: Ref<Web3AuthError | null>;
+    switchAccount(account: LinkedAccountInfo): Promise<void>;
+}
+export declare const useLinkAccount: () => IUseLinkAccount;
+export declare const useSwitchAccount: () => IUseSwitchAccount;

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

@@ -37,6 +37,15 @@ export declare const ANALYTICS_EVENTS: {
     WALLET_CHECKOUT_CLICKED: string;
     WALLET_RECEIVE_CLICKED: string;
     WALLET_SWAP_CLICKED: string;
+    ACCOUNT_LINKING_STARTED: string;
+    ACCOUNT_LINKING_COMPLETED: string;
+    ACCOUNT_LINKING_FAILED: string;
+    ACCOUNT_UNLINKING_STARTED: string;
+    ACCOUNT_UNLINKING_COMPLETED: string;
+    ACCOUNT_UNLINKING_FAILED: string;
+    ACCOUNT_SWITCH_STARTED: string;
+    ACCOUNT_SWITCH_COMPLETED: string;
+    ACCOUNT_SWITCH_FAILED: string;
 };
 export declare const ANALYTICS_INTEGRATION_TYPE: {
     REACT_HOOKS: string;