@web3auth/no-modal 11.0.2 → 11.2.0

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

@@ -7,6 +7,7 @@ import { useWeb3Auth } from '../hooks/useWeb3Auth.js';
 import { useChain } from '../hooks/useChain.js';
 import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 import { log } from '../../base/loglevel.js';
+import { getCaipChainId } from '../../base/utils.js';
 
 const _excluded = ["children"];
 const DEVNET_ENDPOINT = "https://api.devnet.solana.com";
@@ -36,13 +37,29 @@ function makePlaceholder(rpc) {
   });
 }
 function dispose(client) {
-  void client.actions.disconnectWallet().catch(() => {});
   client.destroy();
 }
+function resolveSolanaChain(web3Auth, connection) {
+  var _web3Auth$coreOptions3;
+  const currentChain = web3Auth === null || web3Auth === void 0 ? void 0 : web3Auth.currentChain;
+  if ((currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) === CHAIN_NAMESPACES.SOLANA) {
+    return currentChain;
+  }
+  const connectedScope = connection !== null && connection !== void 0 && connection.solanaWallet && "scope" in connection.solanaWallet && typeof connection.solanaWallet.scope === "string" ? connection.solanaWallet.scope : null;
+  if (connectedScope) {
+    var _web3Auth$coreOptions2;
+    const connectedChain = web3Auth === null || web3Auth === void 0 || (_web3Auth$coreOptions2 = web3Auth.coreOptions.chains) === null || _web3Auth$coreOptions2 === void 0 ? void 0 : _web3Auth$coreOptions2.find(chain => {
+      return chain.chainNamespace === CHAIN_NAMESPACES.SOLANA && getCaipChainId(chain) === connectedScope;
+    });
+    if (connectedChain) return connectedChain;
+  }
+  return (web3Auth === null || web3Auth === void 0 || (_web3Auth$coreOptions3 = web3Auth.coreOptions.chains) === null || _web3Auth$coreOptions3 === void 0 ? void 0 : _web3Auth$coreOptions3.find(chain => chain.chainNamespace === CHAIN_NAMESPACES.SOLANA)) || null;
+}
 
 /**
- * Builds the SolanaClient for Framework Kit React hooks: placeholder when idle, Web3Auth-backed when
- * connected on Solana. Ref + state so React re-renders on swap and effects dispose the right instance.
+ * Builds the SolanaClient for Framework Kit React hooks.
+ * For multichain wallets, keep the Solana client warm across namespace switches so
+ * switching back to Solana can reuse the existing wallet session.
  */
 function useFrameworkKitSolanaClient() {
   const {
@@ -55,12 +72,13 @@ function useFrameworkKitSolanaClient() {
     chainId,
     chainNamespace
   } = useChain();
-  const ref = useRef(null);
+  const solClientRef = useRef(null);
+  const connectedClientRef = useRef(null);
   const [client, setClient] = useState(() => {
     const c = makePlaceholder({
       rpcTarget: DEVNET_ENDPOINT
     });
-    ref.current = c;
+    solClientRef.current = c;
     return c;
   });
   useEffect(() => {
@@ -69,54 +87,61 @@ function useFrameworkKitSolanaClient() {
     });
   }, [isInitialized, web3Auth]);
   useEffect(() => () => {
-    const c = ref.current;
-    if (c) {
-      dispose(c);
-      ref.current = null;
+    const connectedClient = connectedClientRef.current;
+    const currentClient = solClientRef.current;
+    if (currentClient) {
+      dispose(currentClient);
+      solClientRef.current = null;
+    }
+    if (connectedClient && connectedClient !== currentClient) {
+      dispose(connectedClient);
     }
+    connectedClientRef.current = null;
   }, []);
   useEffect(() => {
     let stale = false;
-    const adopt = next => {
+    const adopt = nextClient => {
       if (stale) {
-        dispose(next);
+        dispose(nextClient);
         return;
       }
-      const prev = ref.current;
-      if (prev === next) return;
-      if (prev) dispose(prev);
-      ref.current = next;
-      setClient(next);
+      const prevClient = solClientRef.current;
+      if (prevClient === nextClient) return;
+      if (prevClient) dispose(prevClient);
+      solClientRef.current = nextClient;
+      setClient(nextClient);
     };
-    (async _web3Auth$currentChai => {
+    (async () => {
       const rpc = placeholderRpc(isInitialized, web3Auth);
-      const solanaWallet = connection === null || connection === void 0 ? void 0 : connection.solanaWallet;
-      const onSolana = isConnected && Boolean(solanaWallet) && chainNamespace === CHAIN_NAMESPACES.SOLANA && (web3Auth === null || web3Auth === void 0 || (_web3Auth$currentChai = web3Auth.currentChain) === null || _web3Auth$currentChai === void 0 ? void 0 : _web3Auth$currentChai.chainNamespace) === CHAIN_NAMESPACES.SOLANA;
-      if (!onSolana) {
-        adopt(makePlaceholder(rpc));
-        return;
-      }
       const conn = connection;
-      if (!conn || !solanaWallet) {
+      const currentChain = web3Auth === null || web3Auth === void 0 ? void 0 : web3Auth.currentChain;
+      if ((currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) !== CHAIN_NAMESPACES.SOLANA) {
         adopt(makePlaceholder(rpc));
         return;
       }
-
-      // only reconnect for the primary connector
-      if (conn.connectorName !== (web3Auth === null || web3Auth === void 0 ? void 0 : web3Auth.primaryConnectorName)) {
+      const preferredSolanaChain = resolveSolanaChain(web3Auth, conn);
+      const shouldKeepSolanaClient = isConnected && Boolean(conn === null || conn === void 0 ? void 0 : conn.solanaWallet) && Boolean(preferredSolanaChain) &&
+      // only manage the client for the primary connector
+      (conn === null || conn === void 0 ? void 0 : conn.connectorName) === (web3Auth === null || web3Auth === void 0 ? void 0 : web3Auth.primaryConnectorName);
+      if (!shouldKeepSolanaClient) {
+        const connectedClient = connectedClientRef.current;
+        connectedClientRef.current = null;
+        if (connectedClient) {
+          dispose(connectedClient);
+        }
         adopt(makePlaceholder(rpc));
         return;
       }
       try {
         const solanaWalletId = "wallet-standard:" + conn.connectorName;
-        const connector = createWalletStandardConnector(solanaWallet, {
+        const connector = createWalletStandardConnector(conn.solanaWallet, {
           id: solanaWalletId,
           name: conn.connectorName
         });
         const {
           rpcTarget,
           wsTarget
-        } = web3Auth.currentChain;
+        } = preferredSolanaChain;
         const wired = createClient({
           endpoint: rpcTarget,
           websocketEndpoint: wsTarget,
@@ -129,7 +154,16 @@ function useFrameworkKitSolanaClient() {
           dispose(wired);
           return;
         }
-        adopt(wired);
+        const prevConnectedClient = connectedClientRef.current;
+        connectedClientRef.current = wired;
+        if (chainNamespace === CHAIN_NAMESPACES.SOLANA && (currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) === CHAIN_NAMESPACES.SOLANA) {
+          adopt(wired);
+        } else {
+          adopt(makePlaceholder(rpc));
+        }
+        if (prevConnectedClient && prevConnectedClient !== wired) {
+          dispose(prevConnectedClient);
+        }
       } catch (e) {
         log.error("Failed to create or connect Solana client", e);
         adopt(makePlaceholder(rpc));

package/dist/lib.esm/vue/solana/provider.js

@@ -1,24 +1,36 @@
 import { createWalletStandardConnector, createClient } from '@solana/client';
-import { defineComponent, ref, provide, watch, h, Fragment } from 'vue';
+import { defineComponent, ref, provide, watch, onBeforeUnmount, h, Fragment } from 'vue';
 import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 import { SOLANA_CLIENT_KEY } from './constants.js';
 import { useWeb3Auth } from '../composables/useWeb3Auth.js';
 import { useChain } from '../composables/useChain.js';
 import { log } from '../../base/loglevel.js';
+import { getCaipChainId } from '../../base/utils.js';
 
 const disposeClient = async client => {
-  try {
-    await client.actions.disconnectWallet();
-  } catch (e) {
-    log.warn("Solana client disconnect", e);
-  }
   client.destroy();
 };
+const resolveSolanaChain = (web3Auth, connection) => {
+  var _web3Auth$coreOptions2;
+  const currentChain = web3Auth === null || web3Auth === void 0 ? void 0 : web3Auth.currentChain;
+  if ((currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) === CHAIN_NAMESPACES.SOLANA) {
+    return currentChain;
+  }
+  const connectedScope = connection !== null && connection !== void 0 && connection.solanaWallet && "scope" in connection.solanaWallet && typeof connection.solanaWallet.scope === "string" ? connection.solanaWallet.scope : null;
+  if (connectedScope) {
+    var _web3Auth$coreOptions;
+    const connectedChain = web3Auth === null || web3Auth === void 0 || (_web3Auth$coreOptions = web3Auth.coreOptions.chains) === null || _web3Auth$coreOptions === void 0 ? void 0 : _web3Auth$coreOptions.find(chain => {
+      return chain.chainNamespace === CHAIN_NAMESPACES.SOLANA && getCaipChainId(chain) === connectedScope;
+    });
+    if (connectedChain) return connectedChain;
+  }
+  return (web3Auth === null || web3Auth === void 0 || (_web3Auth$coreOptions2 = web3Auth.coreOptions.chains) === null || _web3Auth$coreOptions2 === void 0 ? void 0 : _web3Auth$coreOptions2.find(chain => chain.chainNamespace === CHAIN_NAMESPACES.SOLANA)) || null;
+};
 
 /**
  * Syncs Web3Auth Solana connection with Framework Kit client.
- * When user is connected via Web3Auth and current chain is Solana, creates a Framework Kit client
- * with Web3Auth as the wallet connector and connects it (same pattern as Wagmi provider).
+ * For multichain wallets, keep the Solana client warm across namespace switches so
+ * switching back to Solana can reuse the existing wallet session.
  */
 const SolanaProvider = defineComponent({
   name: "SolanaProvider",
@@ -34,6 +46,8 @@ const SolanaProvider = defineComponent({
       chainId
     } = useChain();
     const clientRef = ref(null);
+    let connectedClient = null;
+    // let connectedClientKey: string | null = null;
     // Holds the token for the newest requested sync run. Older async runs compare against it
     // before publishing results so a slower reconnect cannot overwrite a newer chain/account update.
     let activeSyncToken = null;
@@ -49,21 +63,26 @@ const SolanaProvider = defineComponent({
       const newIsConnected = isConnected.value;
       const newConnection = connection.value;
       const currentChain = (_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.currentChain;
-      if (!newIsConnected || !(newConnection !== null && newConnection !== void 0 && newConnection.solanaWallet) || (currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) !== CHAIN_NAMESPACES.SOLANA ||
-      // only reconnect for the primary connector
-      newConnection.connectorName !== ((_web3Auth$value2 = web3Auth.value) === null || _web3Auth$value2 === void 0 ? void 0 : _web3Auth$value2.primaryConnectorName)) {
-        const prevClient = clientRef.value;
+      if ((currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) !== CHAIN_NAMESPACES.SOLANA) {
+        // Mirror the React provider behavior: hide the live Solana client from injected
+        // consumers whenever Web3Auth is currently scoped to a non-Solana namespace.
         clientRef.value = null;
+        return;
+      }
+      const preferredSolanaChain = resolveSolanaChain(web3Auth.value, newConnection);
+      const shouldKeepSolanaClient = newIsConnected && Boolean(newConnection === null || newConnection === void 0 ? void 0 : newConnection.solanaWallet) && Boolean(preferredSolanaChain) &&
+      // only manage the client for the primary connector
+      (newConnection === null || newConnection === void 0 ? void 0 : newConnection.connectorName) === ((_web3Auth$value2 = web3Auth.value) === null || _web3Auth$value2 === void 0 ? void 0 : _web3Auth$value2.primaryConnectorName);
+      if (!shouldKeepSolanaClient) {
+        clientRef.value = null;
+        const prevClient = connectedClient;
+        connectedClient = null;
+        // connectedClientKey = null;
         if (prevClient) {
           await disposeClient(prevClient);
         }
         return;
       }
-      const prevClient = clientRef.value;
-      clientRef.value = null;
-      if (prevClient) {
-        await disposeClient(prevClient);
-      }
       let client = null;
       try {
         // create a wallet standard connector from connected wallet
@@ -77,7 +96,7 @@ const SolanaProvider = defineComponent({
         const {
           rpcTarget,
           wsTarget
-        } = currentChain;
+        } = preferredSolanaChain;
         client = createClient({
           endpoint: rpcTarget,
           websocketEndpoint: wsTarget,
@@ -93,7 +112,13 @@ const SolanaProvider = defineComponent({
           await disposeClient(client);
           return;
         }
-        clientRef.value = client;
+        const prevClient = connectedClient;
+        connectedClient = client;
+        // connectedClientKey = nextClientKey;
+        clientRef.value = (currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) === CHAIN_NAMESPACES.SOLANA ? client : null;
+        if (prevClient) {
+          await disposeClient(prevClient);
+        }
       } catch (err) {
         if (client) {
           await disposeClient(client);
@@ -112,6 +137,17 @@ const SolanaProvider = defineComponent({
     }, {
       immediate: true
     });
+    onBeforeUnmount(() => {
+      const publishedClient = clientRef.value;
+      clientRef.value = null;
+      const prevClient = connectedClient;
+      connectedClient = null;
+      if (prevClient) {
+        void disposeClient(prevClient);
+      } else if (publishedClient) {
+        void disposeClient(publishedClient);
+      }
+    });
     return () => {
       var _slots$default, _slots$default2;
       return h(Fragment, null, (_slots$default = (_slots$default2 = slots.default) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots)) !== null && _slots$default !== void 0 ? _slots$default : []);

package/dist/lib.esm/vue/useWeb3AuthInnerContextValue.js

@@ -148,6 +148,14 @@ function useWeb3AuthInnerContextValue({
       chainId.value = web3Auth.value.currentChainId;
       chainNamespace.value = (_currentChain$chainNa4 = (_currentChain4 = web3Auth.value.currentChain) === null || _currentChain4 === void 0 ? void 0 : _currentChain4.chainNamespace) !== null && _currentChain$chainNa4 !== void 0 ? _currentChain$chainNa4 : null;
     };
+    const connectorDataUpdatedListener = data => {
+      const updatedData = data.data;
+      if (updatedData.chainId && chainId.value !== updatedData.chainId) {
+        var _currentChain5;
+        chainId.value = updatedData.chainId;
+        chainNamespace.value = (_currentChain5 = web3Auth.value.currentChain) === null || _currentChain5 === void 0 ? void 0 : _currentChain5.chainNamespace;
+      }
+    };
     if (prevWeb3Auth && newWeb3Auth !== prevWeb3Auth) {
       prevWeb3Auth.removeListener(CONNECTOR_EVENTS.NOT_READY, notReadyListener);
       prevWeb3Auth.removeListener(CONNECTOR_EVENTS.READY, readyListener);
@@ -159,6 +167,7 @@ function useWeb3AuthInnerContextValue({
       prevWeb3Auth.removeListener(CONNECTOR_EVENTS.REHYDRATION_ERROR, errorListener);
       prevWeb3Auth.removeListener(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
       prevWeb3Auth.removeListener(CONNECTOR_EVENTS.CONNECTION_UPDATED, connectionUpdatedListener);
+      prevWeb3Auth.removeListener(CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, connectorDataUpdatedListener);
       if (prevWeb3Auth.loginMode === LOGIN_MODE.MODAL) {
         prevWeb3Auth.removeListener(CONNECTOR_EVENTS.CONSENT_ACCEPTED, consentAcceptedListener);
       }
@@ -175,6 +184,7 @@ function useWeb3AuthInnerContextValue({
       newWeb3Auth.on(CONNECTOR_EVENTS.REHYDRATION_ERROR, errorListener);
       newWeb3Auth.on(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
       newWeb3Auth.on(CONNECTOR_EVENTS.CONNECTION_UPDATED, connectionUpdatedListener);
+      newWeb3Auth.on(CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, connectorDataUpdatedListener);
       if (newWeb3Auth.loginMode === LOGIN_MODE.MODAL) {
         newWeb3Auth.on(CONNECTOR_EVENTS.CONSENT_ACCEPTED, consentAcceptedListener);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3auth/no-modal",
-  "version": "11.0.2",
+  "version": "11.2.0",
   "description": "Multi chain wallet aggregator for web3Auth",
   "keywords": [
     "web3Auth/no-modal",
@@ -65,9 +65,9 @@
     }
   },
   "dependencies": {
-    "@metamask/connect-evm": "^1.4.0",
-    "@metamask/connect-multichain": "^0.15.0",
-    "@metamask/connect-solana": "^1.2.0",
+    "@metamask/connect-evm": "^2.0.0",
+    "@metamask/connect-multichain": "^1.0.0",
+    "@metamask/connect-solana": "^2.0.0",
     "@segment/analytics-next": "^1.84.0",
     "@solana/client": "^1.7.0",
     "@solana/kit": "^6.9.0",
@@ -75,7 +75,7 @@
     "@toruslabs/base-controllers": "^9.10.0",
     "@toruslabs/constants": "^16.1.1",
     "@toruslabs/eccrypto": "^7.0.0",
-    "@toruslabs/ethereum-controllers": "^9.10.0",
+    "@toruslabs/ethereum-controllers": "^9.11.0",
     "@toruslabs/http-helpers": "^9.0.0",
     "@toruslabs/loglevel-sentry": "^9.0.0",
     "@toruslabs/metadata-helpers": "^8.2.0",
@@ -88,7 +88,7 @@
     "@walletconnect/types": "^2.23.9",
     "@walletconnect/utils": "^2.23.9",
     "@web3auth/auth": "^11.8.1",
-    "@web3auth/ws-embed": "^6.0.4",
+    "@web3auth/ws-embed": "^6.1.0",
     "bignumber.js": "~9.3.1",
     "deepmerge": "^4.3.1",
     "ethers": "^6.16.0",
@@ -252,5 +252,5 @@
     "node": ">=22.x",
     "npm": ">=10.x"
   },
-  "gitHead": "de91630f1420601b3a9b2377c0dff760b8674013"
+  "gitHead": "e2f5aedf569d05ffb73ce089bd9189c47cb163c6"
 }