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

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

@@ -1,6 +1,6 @@
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
-import { useMemo, createElement, useEffect, Fragment } from 'react';
+import { useMemo, createElement, useRef, useEffect, Fragment } from 'react';
 import { defineChain } from 'viem';
 import { createConfig, WagmiProvider as WagmiProvider$1, webSocket, http, fallback, useConfig, useReconnect, useConnectionEffect } from 'wagmi';
 import { injected } from 'wagmi/connectors';
@@ -78,7 +78,8 @@ function Web3AuthWagmiProvider({
 }) {
   const {
     isConnected,
-    connection
+    connection,
+    chainNamespace
   } = useWeb3Auth();
   const {
     disconnect
@@ -87,10 +88,17 @@ function Web3AuthWagmiProvider({
   const {
     mutate: reconnect
   } = useReconnect();
+  const suppressWagmiDisconnect = useRef(false);
+  const lastSyncedBinding = useRef({
+    provider: null,
+    connectorName: null
+  });
   useConnectionEffect({
     onDisconnect: async () => {
       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
@@ -101,20 +109,44 @@ function Web3AuthWagmiProvider({
   });
   useEffect(() => {
     (async () => {
-      if (isConnected && connection !== null && connection !== void 0 && connection.ethereumProvider) {
+      const shouldBindToWagmi = isConnected && chainNamespace === 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 createElement(Fragment, null, children);
 }
 function WagmiProvider(_ref) {

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

@@ -3,6 +3,7 @@ import { defineComponent, ref, provide, watch, 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';
 
 const disposeClient = async client => {
@@ -29,63 +30,85 @@ const SolanaProvider = defineComponent({
       connection,
       web3Auth
     } = useWeb3Auth();
+    const {
+      chainId
+    } = useChain();
     const clientRef = ref(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;
 
     // provide the client to the app
     provide(SOLANA_CLIENT_KEY, clientRef);
-
-    // watch for changes in the connection and chain namespace
-    watch([isConnected, connection], async ([newIsConnected, newConnection]) => {
-      var _web3Auth$value;
-      if (!newIsConnected || !(newConnection !== null && newConnection !== void 0 && newConnection.solanaWallet)) {
-        if (clientRef.value) {
-          await disposeClient(clientRef.value);
-          clientRef.value = null;
+    const syncClient = async () => {
+      var _web3Auth$value, _web3Auth$value2;
+      // Only the latest async, `syncing` run should be allowed to attach its client.
+      // A fresh Symbol gives each run a unique identity without relying on counters.
+      const syncToken = Symbol("solana-client-sync");
+      activeSyncToken = syncToken;
+      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;
+        clientRef.value = null;
+        if (prevClient) {
+          await disposeClient(prevClient);
         }
         return;
       }
-      const currentChain = web3Auth.value.currentChain;
-      let chainConfig;
-      if ((currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) === CHAIN_NAMESPACES.SOLANA) {
-        chainConfig = currentChain;
-      } else {
-        // use the 1st Solana chain if current chain is not solana
-        chainConfig = web3Auth.value.coreOptions.chains.find(c => c.chainNamespace === CHAIN_NAMESPACES.SOLANA);
-        if (!chainConfig) return;
-      }
-
-      // only reconnect for the primary connector
-      if (newConnection.connectorName !== ((_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.primaryConnectorName)) 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
-        const solanaWalletId = "wallet-standard:" + connection.value.connectorName;
-        const connector = createWalletStandardConnector(connection.value.solanaWallet, {
+        const solanaWalletId = "wallet-standard:" + newConnection.connectorName;
+        const connector = createWalletStandardConnector(newConnection.solanaWallet, {
           id: solanaWalletId,
-          name: connection.value.connectorName
+          name: newConnection.connectorName
         });
 
         // create a solana client
         const {
           rpcTarget,
           wsTarget
-        } = chainConfig;
-        const client = createClient({
+        } = currentChain;
+        client = createClient({
           endpoint: rpcTarget,
           websocketEndpoint: wsTarget,
           walletConnectors: [connector]
         });
-        clientRef.value = client;
-        if (prevClient) await disposeClient(prevClient);
 
         // connect the client to the wallet
         await client.actions.connectWallet(solanaWalletId, {
           autoConnect: true
         });
+        // If another sync started while connectWallet was in flight, this client is stale.
+        if (activeSyncToken !== syncToken) {
+          await disposeClient(client);
+          return;
+        }
+        clientRef.value = client;
       } catch (err) {
+        if (client) {
+          await disposeClient(client);
+        }
         log.error("Failed to create or connect Solana client", err);
-        clientRef.value = null;
+        // Only clear the shared ref when this failing run is still the newest one.
+        if (activeSyncToken === syncToken) {
+          clientRef.value = null;
+        }
       }
+    };
+
+    // watch for changes in the connection and active chain
+    watch([isConnected, connection, chainId], () => {
+      void syncClient();
     }, {
       immediate: true
     });

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

@@ -78,7 +78,8 @@ const Web3AuthWagmiProvider = defineComponent({
   setup() {
     const {
       isConnected,
-      connection
+      connection,
+      chainNamespace
     } = useWeb3Auth();
     const {
       disconnect
@@ -87,11 +88,15 @@ const Web3AuthWagmiProvider = defineComponent({
     const {
       mutate: reconnect
     } = useReconnect();
-    const lastSyncedWeb3AuthConnection = shallowRef(null);
+    const lastSyncedProvider = shallowRef(null);
+    const lastSyncedConnectorName = ref(null);
+    const suppressWagmiDisconnect = ref(false);
     useConnectionEffect({
       onDisconnect: async () => {
         log.info("Disconnected from wagmi");
-        if (isConnected.value) await disconnect();
+        const isSuppressed = suppressWagmiDisconnect.value;
+        suppressWagmiDisconnect.value = false;
+        if (!isSuppressed && isConnected.value) await disconnect();
         const connector = getWeb3authConnector(wagmiConfig);
         // reset wagmi connector state if the provider handles disconnection because of the accountsChanged event
         // from the connected provider
@@ -100,30 +105,41 @@ const Web3AuthWagmiProvider = defineComponent({
         }
       }
     });
-    watch([isConnected, connection], async () => {
+    watch([isConnected, connection, chainNamespace], async () => {
       var _newConnection$ethere;
       const newIsConnected = isConnected.value;
       const newConnection = connection.value;
       const newEth = (_newConnection$ethere = newConnection === null || newConnection === void 0 ? void 0 : newConnection.ethereumProvider) !== null && _newConnection$ethere !== void 0 ? _newConnection$ethere : null;
-      if (newIsConnected && newConnection && newEth) {
-        // Linked-account switches can reuse or replace the underlying wallet provider,
-        // so key wagmi resyncs off the Web3Auth connection object instead of provider identity.
-        if (lastSyncedWeb3AuthConnection.value !== newConnection) {
-          if (getWeb3authConnector(wagmiConfig)) {
+      const shouldBindToWagmi = newIsConnected && chainNamespace.value === CHAIN_NAMESPACES.EIP155 && Boolean(newConnection && newEth);
+      if (shouldBindToWagmi && newConnection && newEth) {
+        const hasSameBinding = lastSyncedProvider.value === newEth && lastSyncedConnectorName.value === newConnection.connectorName;
+        if (hasSameBinding && wagmiConfig.state.status === "connected") {
+          return;
+        }
+        if (!hasSameBinding && getWeb3authConnector(wagmiConfig)) {
+          if (wagmiConfig.state.status === "connected") {
+            suppressWagmiDisconnect.value = true;
+            await disconnectWeb3AuthFromWagmi(wagmiConfig);
+          } else {
             resetConnectorState(wagmiConfig);
           }
-          lastSyncedWeb3AuthConnection.value = newConnection;
-          const connector = await setupConnector(newEth, wagmiConfig);
-          if (!connector) {
-            throw new Error("Failed to setup connector");
-          }
-          await connectWeb3AuthWithWagmi(connector, wagmiConfig);
-          reconnect();
         }
-      } else if (!newIsConnected) {
-        lastSyncedWeb3AuthConnection.value = null;
+        const connector = await setupConnector(newEth, wagmiConfig);
+        if (!connector) {
+          throw new Error("Failed to setup connector");
+        }
+        await connectWeb3AuthWithWagmi(connector, wagmiConfig);
+        lastSyncedProvider.value = newEth;
+        lastSyncedConnectorName.value = newConnection.connectorName;
+        reconnect();
+      } else {
+        lastSyncedProvider.value = null;
+        lastSyncedConnectorName.value = null;
         if (wagmiConfig.state.status === "connected") {
+          suppressWagmiDisconnect.value = true;
           await disconnectWeb3AuthFromWagmi(wagmiConfig);
+        } else if (getWeb3authConnector(wagmiConfig)) {
+          resetConnectorState(wagmiConfig);
         }
       }
     }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3auth/no-modal",
-  "version": "11.0.0-beta.1",
+  "version": "11.0.0-beta.2",
   "description": "Multi chain wallet aggregator for web3Auth",
   "keywords": [
     "web3Auth/no-modal",
@@ -88,7 +88,7 @@
     "@walletconnect/types": "^2.23.9",
     "@walletconnect/utils": "^2.23.9",
     "@web3auth/auth": "^11.8.0",
-    "@web3auth/ws-embed": "^6.0.0",
+    "@web3auth/ws-embed": "^6.0.4",
     "bignumber.js": "~9.3.1",
     "deepmerge": "^4.3.1",
     "ethers": "^6.16.0",
@@ -252,5 +252,5 @@
     "node": ">=22.x",
     "npm": ">=10.x"
   },
-  "gitHead": "a15a4f552ee844c7b743f48f4b725c52b6b7316d"
+  "gitHead": "05577130ae9ced90ed412c1597681672074d8d2a"
 }