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

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

@@ -99,20 +99,27 @@ function useWeb3AuthInnerContextValue({
     };
     const authorizedListener = () => {
       status.value = web3Auth.value.status;
+      // 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.
       if (web3Auth.value.status === CONNECTOR_STATUS.AUTHORIZED) {
+        var _currentChain$chainNa2, _currentChain2;
+        if (!isInitialized.value) isInitialized.value = true;
         isAuthorized.value = true;
         isConnected.value = true;
+        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;
       }
     };
     const consentAcceptedListener = () => {
       status.value = web3Auth.value.status;
       if (web3Auth.value.status === CONNECTOR_STATUS.CONNECTED || web3Auth.value.status === CONNECTOR_STATUS.AUTHORIZED) {
-        var _currentChain$chainNa2, _currentChain2;
+        var _currentChain$chainNa3, _currentChain3;
         if (!isInitialized.value) isInitialized.value = true;
         isConnected.value = true;
         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;
+        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 (web3Auth.value.status === CONNECTOR_STATUS.AUTHORIZED) {
           isAuthorized.value = true;
         }
@@ -135,11 +142,11 @@ function useWeb3AuthInnerContextValue({
       isMFAEnabled.value = true;
     };
     const connectionUpdatedListener = () => {
-      var _currentChain$chainNa3, _currentChain3;
+      var _currentChain$chainNa4, _currentChain4;
       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;
+      chainNamespace.value = (_currentChain$chainNa4 = (_currentChain4 = web3Auth.value.currentChain) === null || _currentChain4 === void 0 ? void 0 : _currentChain4.chainNamespace) !== null && _currentChain$chainNa4 !== void 0 ? _currentChain$chainNa4 : null;
     };
     if (prevWeb3Auth && newWeb3Auth !== prevWeb3Auth) {
       prevWeb3Auth.removeListener(CONNECTOR_EVENTS.NOT_READY, notReadyListener);

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

@@ -1 +1 @@
-export { WagmiProvider } from './provider.js';
+export { WagmiProvider, connectWeb3AuthWithWagmi, createWeb3AuthConnectorForWagmi, disconnectWeb3AuthFromWagmi, getWeb3authConnector, resetConnectorState, setupConnector } from './provider.js';

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

@@ -1,9 +1,8 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
-import { hydrate } from '@wagmi/core';
+import { injected, hydrate } from '@wagmi/core';
 import { configKey, createConfig, useConfig, useReconnect, useConnectionEffect } from '@wagmi/vue';
-import { injected } from '@wagmi/vue/connectors';
 import { randomId } from '@web3auth/auth';
-import { defineChain, webSocket, http, fallback } from 'viem';
+import { isAddress, 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';
@@ -11,26 +10,47 @@ 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';
+import { WEB3AUTH_CONNECTOR_ID } from '../../base/connector/constants.js';
 
-const WEB3AUTH_CONNECTOR_ID = "web3auth";
 function getWeb3authConnector(config) {
   return config.connectors.find(c => c.id === 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 = injected({
+function createWeb3AuthConnectorForWagmi(provider) {
+  const baseConnector = injected({
     target: {
       provider: provider,
       id: WEB3AUTH_CONNECTOR_ID,
       name: "Web3Auth"
     }
   });
+  return config => {
+    const connector = baseConnector(config);
+    const baseOnAccountsChanged = connector.onAccountsChanged.bind(connector);
+    connector.onAccountsChanged = accounts => {
+      // 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.
+      if (accounts.length > 0 && !accounts.every(account => typeof account === "string" && isAddress(account))) {
+        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;
@@ -78,7 +98,9 @@ const Web3AuthWagmiProvider = defineComponent({
   setup() {
     const {
       isConnected,
-      connection
+      connection,
+      web3Auth,
+      chainNamespace
     } = useWeb3Auth();
     const {
       disconnect
@@ -87,11 +109,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 +126,43 @@ 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 w3aWagmiConnector = getWeb3authConnector(wagmiConfig);
+      const shouldBindToWagmi = newIsConnected && chainNamespace.value === CHAIN_NAMESPACES.EIP155 && Boolean(newConnection && newEth);
+      if (shouldBindToWagmi) {
+        var _web3Auth$value;
+        const hasSameBinding = lastSyncedProvider.value === newEth && lastSyncedConnectorName.value === newConnection.connectorName && (newConnection === null || newConnection === void 0 ? void 0 : newConnection.connectorName) === ((_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.connection.connectorName) && wagmiConfig.state.status === "connected";
+        if (hasSameBinding) {
+          return;
+        }
+        if (!hasSameBinding && w3aWagmiConnector) {
+          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;
+        lastSyncedProvider.value = newEth;
+        lastSyncedConnectorName.value = newConnection.connectorName;
+        const connector = setupConnector(newEth, wagmiConfig);
+        if (!connector) {
+          throw new Error("Failed to setup connector");
+        }
+        await connectWeb3AuthWithWagmi(connector, wagmiConfig);
+        reconnect();
+      } else if (!newIsConnected || chainNamespace.value !== CHAIN_NAMESPACES.EIP155) {
+        lastSyncedProvider.value = null;
+        lastSyncedConnectorName.value = null;
         if (wagmiConfig.state.status === "connected") {
+          suppressWagmiDisconnect.value = true;
           await disconnectWeb3AuthFromWagmi(wagmiConfig);
+        } else if (w3aWagmiConnector) {
+          resetConnectorState(wagmiConfig);
         }
       }
     }, {
@@ -187,7 +226,7 @@ const WagmiProvider = defineComponent({
       return fallback(transports);
     };
     const defineWagmiConfig = () => {
-      var _web3Auth$value;
+      var _web3Auth$value2;
       const configParams = _objectSpread(_objectSpread({
         ssr: true
       }, config), {}, {
@@ -198,7 +237,7 @@ const WagmiProvider = defineComponent({
         client: undefined
       });
       const wagmiChains = [];
-      if (isInitialized.value && web3Auth !== null && web3Auth !== void 0 && (_web3Auth$value = web3Auth.value) !== null && _web3Auth$value !== void 0 && (_web3Auth$value = _web3Auth$value.coreOptions) !== null && _web3Auth$value !== void 0 && _web3Auth$value.chains) {
+      if (isInitialized.value && web3Auth !== null && web3Auth !== void 0 && (_web3Auth$value2 = web3Auth.value) !== null && _web3Auth$value2 !== void 0 && (_web3Auth$value2 = _web3Auth$value2.coreOptions) !== null && _web3Auth$value2 !== void 0 && _web3Auth$value2.chains) {
         var _web3Auth$value$curre;
         const defaultChainId = (_web3Auth$value$curre = web3Auth.value.currentChain) === null || _web3Auth$value$curre === void 0 ? void 0 : _web3Auth$value$curre.chainId;
         const chains = web3Auth.value.coreOptions.chains.filter(chain => chain.chainNamespace === CHAIN_NAMESPACES.EIP155);
@@ -246,8 +285,8 @@ const WagmiProvider = defineComponent({
       }
     };
     watch(isInitialized, (newIsInitialized, prevIsInitialized) => {
-      var _web3Auth$value2;
-      (_web3Auth$value2 = web3Auth.value) === null || _web3Auth$value2 === void 0 || _web3Auth$value2.setAnalyticsProperties({
+      var _web3Auth$value3;
+      (_web3Auth$value3 = web3Auth.value) === null || _web3Auth$value3 === void 0 || _web3Auth$value3.setAnalyticsProperties({
         wagmi_enabled: true
       });
       if (newIsInitialized && !prevIsInitialized) {
@@ -279,4 +318,4 @@ const WagmiProvider = defineComponent({
   }
 });
 
-export { WagmiProvider };
+export { WagmiProvider, connectWeb3AuthWithWagmi, createWeb3AuthConnectorForWagmi, disconnectWeb3AuthFromWagmi, getWeb3authConnector, resetConnectorState, setupConnector };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3auth/no-modal",
-  "version": "11.0.0-beta.1",
+  "version": "11.0.0",
   "description": "Multi chain wallet aggregator for web3Auth",
   "keywords": [
     "web3Auth/no-modal",
@@ -65,17 +65,17 @@
     }
   },
   "dependencies": {
-    "@metamask/connect-evm": "^1.3.0",
-    "@metamask/connect-multichain": "^0.14.0",
-    "@metamask/connect-solana": "^1.1.0",
-    "@segment/analytics-next": "^1.83.0",
+    "@metamask/connect-evm": "^1.4.0",
+    "@metamask/connect-multichain": "^0.15.0",
+    "@metamask/connect-solana": "^1.2.0",
+    "@segment/analytics-next": "^1.84.0",
     "@solana/client": "^1.7.0",
-    "@solana/kit": "^6.8.0",
+    "@solana/kit": "^6.9.0",
     "@solana/wallet-standard-features": "^1.3.0",
-    "@toruslabs/base-controllers": "^9.5.0",
+    "@toruslabs/base-controllers": "^9.10.0",
     "@toruslabs/constants": "^16.1.1",
     "@toruslabs/eccrypto": "^7.0.0",
-    "@toruslabs/ethereum-controllers": "^9.5.0",
+    "@toruslabs/ethereum-controllers": "^9.10.0",
     "@toruslabs/http-helpers": "^9.0.0",
     "@toruslabs/loglevel-sentry": "^9.0.0",
     "@toruslabs/metadata-helpers": "^8.2.0",
@@ -87,8 +87,8 @@
     "@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.0",
+    "@web3auth/auth": "^11.8.1",
+    "@web3auth/ws-embed": "^6.0.4",
     "bignumber.js": "~9.3.1",
     "deepmerge": "^4.3.1",
     "ethers": "^6.16.0",
@@ -101,16 +101,16 @@
   "devDependencies": {
     "@coinbase/wallet-sdk": "^4.3.7",
     "@solana/react-hooks": "^1.4.1",
-    "@types/react": "^19.2.14",
-    "@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",
+    "@types/react": "^19.2.16",
+    "@wagmi/core": "^3.5.0",
+    "@wagmi/vue": "^0.5.17",
+    "@x402/evm": "^2.14.0",
+    "@x402/fetch": "^2.14.0",
+    "@x402/svm": "^2.14.0",
+    "react": "^19.2.7",
+    "viem": "^2.52.0",
     "vue": "^3.x",
-    "wagmi": "^3.6.8"
+    "wagmi": "^3.6.16"
   },
   "exports": {
     ".": {
@@ -252,5 +252,5 @@
     "node": ">=22.x",
     "npm": ">=10.x"
   },
-  "gitHead": "a15a4f552ee844c7b743f48f4b725c52b6b7316d"
+  "gitHead": "84b5f0c887209f24f098b7eea634747193bc1f2c"
 }