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

package/dist/lib.esm/vue/solana/composables/useSignMessage.js

@@ -1,8 +1,8 @@
 import { ref } from 'vue';
 import { useSolanaWallet } from './useSolanaWallet.js';
 import { WalletInitializationError } from '../../../base/errors/index.js';
-import { walletSignMessage } from '../../../base/wallet/solana.js';
 import { log } from '../../../base/loglevel.js';
+import { walletSignMessage } from '../../../base/wallet/solana.js';
 
 const useSignMessage = () => {
   const {

package/dist/lib.esm/vue/solana/composables/useSignTransaction.js

@@ -1,8 +1,8 @@
 import { ref } from 'vue';
 import { useSolanaWallet } from './useSolanaWallet.js';
 import { WalletInitializationError } from '../../../base/errors/index.js';
-import { walletSignTransaction } from '../../../base/wallet/solana.js';
 import { log } from '../../../base/loglevel.js';
+import { walletSignTransaction } from '../../../base/wallet/solana.js';
 
 const useSignTransaction = () => {
   const {

package/dist/lib.esm/vue/solana/composables/useSolanaWallet.js

@@ -49,12 +49,12 @@ const useSolanaWallet = () => {
   };
   onScopeDispose(teardownWalletListeners);
   const getPrivateKey = async () => {
-    var _connection$value2, _web3Auth$value$conne;
+    var _connection$value2, _web3Auth$value$prima;
     if (!web3Auth.value) throw new Error("Web3Auth not initialized");
     if (((_connection$value2 = connection.value) === null || _connection$value2 === void 0 ? void 0 : _connection$value2.connectorName) !== WALLET_CONNECTORS.AUTH) {
       throw new Error("getPrivateKey is only supported with the Auth connector");
     }
-    const provider = (_web3Auth$value$conne = web3Auth.value.connectedConnector) === null || _web3Auth$value$conne === void 0 ? void 0 : _web3Auth$value$conne.provider;
+    const provider = (_web3Auth$value$prima = web3Auth.value.primaryConnector) === null || _web3Auth$value$prima === void 0 ? void 0 : _web3Auth$value$prima.provider;
     if (!provider) throw new Error("Provider not available");
     const privateKey = await provider.request({
       method: SOLANA_METHOD_TYPES.SOLANA_PRIVATE_KEY

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,59 +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]) => {
-      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;
-      }
       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/useWeb3AuthInnerContextValue.js

@@ -1,9 +1,9 @@
 import { shallowRef, ref, watch } from 'vue';
 import { ANALYTICS_INTEGRATION_TYPE } from '../base/analytics.js';
 import { log } from '../base/loglevel.js';
-import { CONNECTOR_EVENTS, CONNECTOR_STATUS } from '../base/connector/constants.js';
 import { LOGIN_MODE } from '../base/constants.js';
 import { WalletInitializationError } from '../base/errors/index.js';
+import { CONNECTOR_EVENTS, CONNECTOR_STATUS } from '../base/connector/constants.js';
 
 function useWeb3AuthInnerContextValue({
   Web3AuthConstructor,
@@ -92,7 +92,7 @@ function useWeb3AuthInnerContextValue({
         var _currentChain$chainNa, _currentChain;
         if (!isInitialized.value) isInitialized.value = true;
         isConnected.value = true;
-        connection.value = newWeb3Auth.connection;
+        connection.value = web3Auth.value.connection;
         chainId.value = web3Auth.value.currentChainId;
         chainNamespace.value = (_currentChain$chainNa = (_currentChain = web3Auth.value.currentChain) === null || _currentChain === void 0 ? void 0 : _currentChain.chainNamespace) !== null && _currentChain$chainNa !== void 0 ? _currentChain$chainNa : null;
       }
@@ -110,7 +110,7 @@ function useWeb3AuthInnerContextValue({
         var _currentChain$chainNa2, _currentChain2;
         if (!isInitialized.value) isInitialized.value = true;
         isConnected.value = true;
-        connection.value = newWeb3Auth.connection;
+        connection.value = web3Auth.value.connection;
         chainId.value = web3Auth.value.currentChainId;
         chainNamespace.value = (_currentChain$chainNa2 = (_currentChain2 = web3Auth.value.currentChain) === null || _currentChain2 === void 0 ? void 0 : _currentChain2.chainNamespace) !== null && _currentChain$chainNa2 !== void 0 ? _currentChain$chainNa2 : null;
         if (web3Auth.value.status === CONNECTOR_STATUS.AUTHORIZED) {
@@ -134,6 +134,13 @@ function useWeb3AuthInnerContextValue({
     const mfaEnabledListener = () => {
       isMFAEnabled.value = true;
     };
+    const connectionUpdatedListener = () => {
+      var _currentChain$chainNa3, _currentChain3;
+      status.value = web3Auth.value.status;
+      connection.value = web3Auth.value.connection;
+      chainId.value = web3Auth.value.currentChainId;
+      chainNamespace.value = (_currentChain$chainNa3 = (_currentChain3 = web3Auth.value.currentChain) === null || _currentChain3 === void 0 ? void 0 : _currentChain3.chainNamespace) !== null && _currentChain$chainNa3 !== void 0 ? _currentChain$chainNa3 : null;
+    };
     if (prevWeb3Auth && newWeb3Auth !== prevWeb3Auth) {
       prevWeb3Auth.removeListener(CONNECTOR_EVENTS.NOT_READY, notReadyListener);
       prevWeb3Auth.removeListener(CONNECTOR_EVENTS.READY, readyListener);
@@ -144,6 +151,7 @@ function useWeb3AuthInnerContextValue({
       prevWeb3Auth.removeListener(CONNECTOR_EVENTS.ERRORED, errorListener);
       prevWeb3Auth.removeListener(CONNECTOR_EVENTS.REHYDRATION_ERROR, errorListener);
       prevWeb3Auth.removeListener(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
+      prevWeb3Auth.removeListener(CONNECTOR_EVENTS.CONNECTION_UPDATED, connectionUpdatedListener);
       if (prevWeb3Auth.loginMode === LOGIN_MODE.MODAL) {
         prevWeb3Auth.removeListener(CONNECTOR_EVENTS.CONSENT_ACCEPTED, consentAcceptedListener);
       }
@@ -159,6 +167,7 @@ function useWeb3AuthInnerContextValue({
       newWeb3Auth.on(CONNECTOR_EVENTS.ERRORED, errorListener);
       newWeb3Auth.on(CONNECTOR_EVENTS.REHYDRATION_ERROR, errorListener);
       newWeb3Auth.on(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
+      newWeb3Auth.on(CONNECTOR_EVENTS.CONNECTION_UPDATED, connectionUpdatedListener);
       if (newWeb3Auth.loginMode === LOGIN_MODE.MODAL) {
         newWeb3Auth.on(CONNECTOR_EVENTS.CONSENT_ACCEPTED, consentAcceptedListener);
       }

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

@@ -7,8 +7,8 @@ import { defineChain, webSocket, http, fallback } from 'viem';
 import { defineComponent, h, shallowRef, ref, watch, provide } from 'vue';
 import { log } from '../../base/loglevel.js';
 import { defaultWagmiConfig } from './constants.js';
-import { useWeb3AuthDisconnect } from '../composables/useWeb3AuthDisconnect.js';
 import { useWeb3Auth } from '../composables/useWeb3Auth.js';
+import { useWeb3AuthDisconnect } from '../composables/useWeb3AuthDisconnect.js';
 import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 import { WalletInitializationError } from '../../base/errors/index.js';
 
@@ -78,7 +78,8 @@ const Web3AuthWagmiProvider = defineComponent({
   setup() {
     const {
       isConnected,
-      connection
+      connection,
+      chainNamespace
     } = useWeb3Auth();
     const {
       disconnect
@@ -87,10 +88,15 @@ const Web3AuthWagmiProvider = defineComponent({
     const {
       mutate: reconnect
     } = useReconnect();
+    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
@@ -99,19 +105,41 @@ const Web3AuthWagmiProvider = defineComponent({
         }
       }
     });
-    watch([isConnected, connection], async () => {
-      var _connection$value;
+    watch([isConnected, connection, chainNamespace], async () => {
+      var _newConnection$ethere;
       const newIsConnected = isConnected.value;
-      if (newIsConnected && (_connection$value = connection.value) !== null && _connection$value !== void 0 && _connection$value.ethereumProvider) {
-        const connector = await setupConnector(connection.value.ethereumProvider, wagmiConfig);
+      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;
+      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);
+          }
+        }
+        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 if (!newIsConnected) {
+      } 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.0",
+  "version": "11.0.0-beta.2",
   "description": "Multi chain wallet aggregator for web3Auth",
   "keywords": [
     "web3Auth/no-modal",
@@ -65,12 +65,12 @@
     }
   },
   "dependencies": {
-    "@metamask/connect-evm": "^1.0.0",
-    "@metamask/connect-multichain": "^0.12.1",
-    "@metamask/connect-solana": "^1.0.0",
-    "@segment/analytics-next": "^1.82.0",
+    "@metamask/connect-evm": "^1.3.0",
+    "@metamask/connect-multichain": "^0.14.0",
+    "@metamask/connect-solana": "^1.1.0",
+    "@segment/analytics-next": "^1.83.0",
     "@solana/client": "^1.7.0",
-    "@solana/kit": "^6.5.0",
+    "@solana/kit": "^6.8.0",
     "@solana/wallet-standard-features": "^1.3.0",
     "@toruslabs/base-controllers": "^9.5.0",
     "@toruslabs/constants": "^16.1.1",
@@ -84,11 +84,11 @@
     "@wallet-standard/app": "^1.1.0",
     "@wallet-standard/base": "^1.1.0",
     "@wallet-standard/features": "^1.1.0",
-    "@walletconnect/sign-client": "^2.23.8",
-    "@walletconnect/types": "^2.23.8",
-    "@walletconnect/utils": "^2.23.8",
-    "@web3auth/auth": "^11.6.0",
-    "@web3auth/ws-embed": "^6.0.0",
+    "@walletconnect/sign-client": "^2.23.9",
+    "@walletconnect/types": "^2.23.9",
+    "@walletconnect/utils": "^2.23.9",
+    "@web3auth/auth": "^11.8.0",
+    "@web3auth/ws-embed": "^6.0.4",
     "bignumber.js": "~9.3.1",
     "deepmerge": "^4.3.1",
     "ethers": "^6.16.0",
@@ -102,15 +102,15 @@
     "@coinbase/wallet-sdk": "^4.3.7",
     "@solana/react-hooks": "^1.4.1",
     "@types/react": "^19.2.14",
-    "@wagmi/core": "^3.4.1",
-    "@wagmi/vue": "^0.5.1",
-    "@x402/evm": "^2.7.0",
-    "@x402/fetch": "^2.7.0",
-    "@x402/svm": "^2.7.0",
-    "react": "^19.2.4",
-    "viem": "^2.47.6",
+    "@wagmi/core": "^3.4.7",
+    "@wagmi/vue": "^0.5.9",
+    "@x402/evm": "^2.11.0",
+    "@x402/fetch": "^2.11.0",
+    "@x402/svm": "^2.11.0",
+    "react": "^19.2.5",
+    "viem": "^2.48.4",
     "vue": "^3.x",
-    "wagmi": "^3.6.0"
+    "wagmi": "^3.6.8"
   },
   "exports": {
     ".": {
@@ -118,6 +118,21 @@
       "require": "./dist/lib.cjs/index.js",
       "types": "./dist/lib.cjs/types/index.d.ts"
     },
+    "./account-linking": {
+      "import": "./dist/lib.esm/account-linking/index.js",
+      "require": "./dist/lib.cjs/account-linking/index.js",
+      "types": "./dist/lib.cjs/types/account-linking/index.d.ts"
+    },
+    "./account-linking/react": {
+      "import": "./dist/lib.esm/account-linking/react.js",
+      "require": "./dist/lib.cjs/account-linking/react.js",
+      "types": "./dist/lib.cjs/types/account-linking/react.d.ts"
+    },
+    "./account-linking/vue": {
+      "import": "./dist/lib.esm/account-linking/vue.js",
+      "require": "./dist/lib.cjs/account-linking/vue.js",
+      "types": "./dist/lib.cjs/types/account-linking/vue.d.ts"
+    },
     "./x402": {
       "import": "./dist/lib.esm/x402/index.js",
       "require": "./dist/lib.cjs/x402/index.js",
@@ -176,6 +191,15 @@
   },
   "typesVersions": {
     "*": {
+      "account-linking": [
+        "./dist/lib.cjs/types/account-linking/index.d.ts"
+      ],
+      "account-linking/react": [
+        "./dist/lib.cjs/types/account-linking/react.d.ts"
+      ],
+      "account-linking/vue": [
+        "./dist/lib.cjs/types/account-linking/vue.d.ts"
+      ],
       "x402": [
         "./dist/lib.cjs/types/x402/index.d.ts"
       ],
@@ -228,5 +252,5 @@
     "node": ">=22.x",
     "npm": ">=10.x"
   },
-  "gitHead": "992aabbd96cd8f19e6cdab1bebf498bb15157024"
+  "gitHead": "05577130ae9ced90ed412c1597681672074d8d2a"
 }