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

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

@@ -5,7 +5,6 @@ var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var react = require('react');
 var viem = require('viem');
 var wagmi = require('wagmi');
-var connectors = require('wagmi/connectors');
 require('@babel/runtime/helpers/defineProperty');
 require('@segment/analytics-next');
 var loglevel = require('../../base/loglevel.js');
@@ -18,7 +17,7 @@ require('@toruslabs/http-helpers');
 require('../../base/constants.js');
 require('../../base/wallet/index.js');
 require('../../base/connector/connectorStatus.js');
-require('../../base/connector/constants.js');
+var constants$1 = require('../../base/connector/constants.js');
 require('jwt-decode');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
@@ -29,28 +28,46 @@ var useWeb3AuthDisconnect = require('../hooks/useWeb3AuthDisconnect.js');
 var constants = require('./constants.js');
 
 const _excluded = ["children"];
-const WEB3AUTH_CONNECTOR_ID = "web3auth";
 function getWeb3authConnector(config) {
-  return config.connectors.find(c => c.id === WEB3AUTH_CONNECTOR_ID);
+  return config.connectors.find(c => c.id === constants$1.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 = connectors.injected({
+function createWeb3AuthConnectorForWagmi(provider) {
+  const baseConnector = wagmi.injected({
     target: {
       provider: provider,
-      id: WEB3AUTH_CONNECTOR_ID,
+      id: constants$1.WEB3AUTH_CONNECTOR_ID,
       name: "Web3Auth"
     }
   });
+  return config => {
+    const connector = baseConnector(config);
+    const baseOnAccountsChanged = connector.onAccountsChanged.bind(connector);
+    // 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.
+    connector.onAccountsChanged = accounts => {
+      if (accounts.length > 0 && !accounts.every(account => typeof account === "string" && viem.isAddress(account))) {
+        loglevel.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;
 }
-// Helper to connect a wallet and update wagmi state
 async function connectWeb3AuthWithWagmi(connector, config) {
   var _config$storage, _config$storage2;
   await Promise.all([(_config$storage = config.storage) === null || _config$storage === void 0 ? void 0 : _config$storage.removeItem(`${connector.id}.disconnected`), (_config$storage2 = config.storage) === null || _config$storage2 === void 0 ? void 0 : _config$storage2.setItem("recentConnectorId", connector.id)]);
@@ -72,8 +89,8 @@ async function connectWeb3AuthWithWagmi(connector, config) {
   }));
 }
 function resetConnectorState(config) {
-  config._internal.connectors.setState(prev => prev.filter(c => c.id !== WEB3AUTH_CONNECTOR_ID));
-  config.connectors.filter(c => c.id !== WEB3AUTH_CONNECTOR_ID);
+  config._internal.connectors.setState(prev => prev.filter(c => c.id !== constants$1.WEB3AUTH_CONNECTOR_ID));
+  config.connectors.filter(c => c.id !== constants$1.WEB3AUTH_CONNECTOR_ID);
 }
 async function disconnectWeb3AuthFromWagmi(config) {
   var _config$storage3, _config$storage4;
@@ -90,6 +107,7 @@ async function disconnectWeb3AuthFromWagmi(config) {
 function Web3AuthWagmiProvider({
   children
 }) {
+  var _connection$ethereumP, _connection$connector;
   const {
     isConnected,
     connection,
@@ -103,59 +121,54 @@ function Web3AuthWagmiProvider({
     mutate: reconnect
   } = wagmi.useReconnect();
   const suppressWagmiDisconnect = react.useRef(false);
-  const lastSyncedBinding = react.useRef({
-    provider: null,
-    connectorName: null
-  });
+  const lastSyncedProvider = react.useRef((_connection$ethereumP = connection === null || connection === void 0 ? void 0 : connection.ethereumProvider) !== null && _connection$ethereumP !== void 0 ? _connection$ethereumP : null);
+  const lastSyncedConnectorName = react.useRef((_connection$connector = connection === null || connection === void 0 ? void 0 : connection.connectorName) !== null && _connection$connector !== void 0 ? _connection$connector : null);
   wagmi.useConnectionEffect({
     onDisconnect: async () => {
       loglevel.log.info("Disconnected from wagmi");
       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
-      if (connector) {
+      if (getWeb3authConnector(wagmiConfig)) {
         resetConnectorState(wagmiConfig);
       }
     }
   });
   react.useEffect(() => {
-    (async () => {
-      const shouldBindToWagmi = isConnected && chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 && Boolean(connection === null || connection === void 0 ? void 0 : connection.ethereumProvider);
+    (async _connection$ethereumP2 => {
+      const newConnection = connection !== null && connection !== void 0 ? connection : null;
+      const newEth = (_connection$ethereumP2 = connection === null || connection === void 0 ? void 0 : connection.ethereumProvider) !== null && _connection$ethereumP2 !== void 0 ? _connection$ethereumP2 : null;
+      const w3aWagmiConnector = getWeb3authConnector(wagmiConfig);
+      const shouldBindToWagmi = isConnected && chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 && Boolean(newConnection && newEth);
       if (shouldBindToWagmi) {
-        const hasSameBinding = lastSyncedBinding.current.provider === connection.ethereumProvider && lastSyncedBinding.current.connectorName === connection.connectorName;
-        if (hasSameBinding && wagmiConfig.state.status === "connected") {
+        const hasSameBinding = lastSyncedProvider.current === newEth && lastSyncedConnectorName.current === newConnection.connectorName && wagmiConfig.state.status === "connected";
+        if (hasSameBinding) {
+          // rehydration: already connected to the same provider, so no need to reconnect
           return;
         }
-        if (!hasSameBinding && getWeb3authConnector(wagmiConfig)) {
-          if (wagmiConfig.state.status === "connected") {
-            suppressWagmiDisconnect.current = true;
-            await disconnectWeb3AuthFromWagmi(wagmiConfig);
-          } else {
-            resetConnectorState(wagmiConfig);
-          }
+        // `ethereumProvider` is a stable proxy (`commonJRPCProvider`) across account switches,
+        // so key wagmi resyncs off the Web3Auth connection object instead of provider identity.
+        if (w3aWagmiConnector) {
+          resetConnectorState(wagmiConfig);
         }
-        const connector = await setupConnector(connection.ethereumProvider, wagmiConfig);
+        lastSyncedProvider.current = newEth;
+        lastSyncedConnectorName.current = newConnection.connectorName;
+        const connector = setupConnector(newEth, wagmiConfig);
         if (!connector) {
+          loglevel.log.error("Failed to setup react wagmi connector");
           throw new Error("Failed to setup connector");
         }
         await connectWeb3AuthWithWagmi(connector, wagmiConfig);
-        lastSyncedBinding.current = {
-          provider: connection.ethereumProvider,
-          connectorName: connection.connectorName
-        };
         reconnect();
       } else {
-        lastSyncedBinding.current = {
-          provider: null,
-          connectorName: null
-        };
+        lastSyncedProvider.current = null;
+        lastSyncedConnectorName.current = null;
         if (wagmiConfig.state.status === "connected") {
           suppressWagmiDisconnect.current = true;
           await disconnectWeb3AuthFromWagmi(wagmiConfig);
-        } else if (getWeb3authConnector(wagmiConfig)) {
+        } else if (w3aWagmiConnector) {
           resetConnectorState(wagmiConfig);
         }
       }
@@ -255,3 +268,9 @@ function WagmiProvider(_ref) {
 }
 
 exports.WagmiProvider = WagmiProvider;
+exports.connectWeb3AuthWithWagmi = connectWeb3AuthWithWagmi;
+exports.createWeb3AuthConnectorForWagmi = createWeb3AuthConnectorForWagmi;
+exports.disconnectWeb3AuthFromWagmi = disconnectWeb3AuthFromWagmi;
+exports.getWeb3authConnector = getWeb3authConnector;
+exports.resetConnectorState = resetConnectorState;
+exports.setupConnector = setupConnector;

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

@@ -0,0 +1,17 @@
+import { ErrorCodes, Web3AuthError } from "../base";
+export declare class AccountLinkingError extends Web3AuthError {
+    protected static messages: ErrorCodes;
+    constructor(code: number, message?: string, cause?: unknown);
+    static fromCode(code: number, extraMessage?: string, cause?: unknown): AccountLinkingError;
+    static requestFailed(extraMessage?: string, cause?: unknown): AccountLinkingError;
+    static serverNotConfigured(extraMessage?: string, cause?: unknown): AccountLinkingError;
+    static primaryTokenNotAvailable(extraMessage?: string, cause?: unknown): AccountLinkingError;
+    static walletProofFailed(extraMessage?: string, cause?: unknown): AccountLinkingError;
+    static unsupportedConnector(extraMessage?: string, cause?: unknown): AccountLinkingError;
+    static cannotUnlinkActiveAccount(): AccountLinkingError;
+    static accountNotLinked(message?: string, cause?: unknown): AccountLinkingError;
+    static cannotUnlinkPrimaryAccount(): AccountLinkingError;
+    toString(): string;
+}
+export declare function getAccountLinkingRequestError(error: unknown): Promise<AccountLinkingError>;
+export declare function formatAccountLinkingErrorMessage(error: unknown, fallbackMessage?: string): string;

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

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

package/dist/lib.cjs/types/base/connector/constants.d.ts

@@ -1,3 +1,4 @@
+export declare const WEB3AUTH_CONNECTOR_ID = "web3auth";
 export declare const CONNECTOR_STATUS: {
     readonly NOT_READY: "not_ready";
     readonly READY: "ready";

package/dist/lib.cjs/types/base/connector/interfaces.d.ts

@@ -1,4 +1,4 @@
-import { CaipAccountId } from "@metamask/connect-evm";
+import { type CaipAccountId } from "@metamask/connect-evm";
 import type { Wallet } from "@wallet-standard/base";
 import { AUTH_CONNECTION_TYPE, AuthUserInfo, ExtraLoginOptions, JRPCRequest, JRPCResponse, Maybe, RequestArguments, SafeEventEmitter, SendCallBack, UX_MODE, type UX_MODE_TYPE, WEB3AUTH_NETWORK, type WEB3AUTH_NETWORK_TYPE } from "@web3auth/auth";
 import { BaseLinkedAccountInfo } from "../../account-linking/interfaces";

package/dist/lib.cjs/types/base/errors/index.d.ts

@@ -56,19 +56,7 @@ export declare class WalletOperationsError extends Web3AuthError {
     static chainIDNotAllowed(extraMessage?: string, cause?: unknown): IWeb3AuthError;
     static operationNotAllowed(extraMessage?: string, cause?: unknown): IWeb3AuthError;
     static chainNamespaceNotAllowed(extraMessage?: string, cause?: unknown): IWeb3AuthError;
-}
-export declare class AccountLinkingError extends Web3AuthError {
-    protected static messages: ErrorCodes;
-    constructor(code: number, message?: string, cause?: unknown);
-    static fromCode(code: number, extraMessage?: string, cause?: unknown): AccountLinkingError;
-    static requestFailed(extraMessage?: string, cause?: unknown): AccountLinkingError;
-    static serverNotConfigured(extraMessage?: string, cause?: unknown): AccountLinkingError;
-    static primaryTokenNotAvailable(extraMessage?: string, cause?: unknown): AccountLinkingError;
-    static walletProofFailed(extraMessage?: string, cause?: unknown): AccountLinkingError;
-    static unsupportedConnector(extraMessage?: string, cause?: unknown): AccountLinkingError;
-    static cannotUnlinkActiveAccount(): AccountLinkingError;
-    static accountNotLinked(message?: string, cause?: unknown): AccountLinkingError;
-    static cannotUnlinkPrimaryAccount(): AccountLinkingError;
+    static userRejected(extraMessage?: string, cause?: unknown): IWeb3AuthError;
 }
 export declare class WalletProviderError extends Web3AuthError {
     protected static messages: ErrorCodes;
@@ -78,3 +66,4 @@ export declare class WalletProviderError extends Web3AuthError {
     static invalidRequestMethod(extraMessage?: string, cause?: unknown): IWeb3AuthError;
     static invalidRequestParams(extraMessage?: string, cause?: unknown): IWeb3AuthError;
 }
+export declare function isUserRejectedError(error: unknown): boolean;

package/dist/lib.cjs/types/connectors/auth-connector/authConnector.d.ts

@@ -2,8 +2,8 @@ import { ChainNamespaceType } from "@toruslabs/base-controllers";
 import type { Wallet } from "@wallet-standard/base";
 import { Auth, AuthConnectionConfigItem } from "@web3auth/auth";
 import { type default as WsEmbed } from "@web3auth/ws-embed";
-import { LinkAccountResult, UnlinkAccountResult } from "../../account-linking";
-import { AccountLinkingError, AuthLoginParams, AuthTokenInfo, BaseConnector, BaseConnectorLoginParams, type Connection, CONNECTOR_CATEGORY_TYPE, CONNECTOR_STATUS_TYPE, ConnectorFn, ConnectorInitOptions, ConnectorNamespaceType, IConnector, IProvider, LinkedAccountInfo, UserInfo, WALLET_CONNECTOR_TYPE } from "../../base";
+import { AccountLinkingError, LinkAccountResult, UnlinkAccountResult } from "../../account-linking";
+import { AuthLoginParams, AuthTokenInfo, BaseConnector, BaseConnectorLoginParams, type Connection, CONNECTOR_CATEGORY_TYPE, CONNECTOR_STATUS_TYPE, ConnectorFn, ConnectorInitOptions, ConnectorNamespaceType, IConnector, IProvider, LinkedAccountInfo, UserInfo, WALLET_CONNECTOR_TYPE } from "../../base";
 import { type AuthConnectorLinkAccountParams, type AuthConnectorOptions, type AuthConnectorSwitchAccountContext, type AuthConnectorSwitchAccountResult, type AuthConnectorUnlinkAccountParams, IAuthConnector, type PrivateKeyProvider } from "./interface";
 declare class AuthConnector extends BaseConnector<AuthLoginParams> implements IAuthConnector {
     readonly name: WALLET_CONNECTOR_TYPE;

package/dist/lib.cjs/types/providers/account-abstraction-provider/rpc/ethRpcMiddlewares.d.ts

@@ -8,4 +8,5 @@ export declare function createAaMiddleware({ eoaProvider, handlers, }: {
 export declare function createEoaMiddleware({ aaProvider }: {
     aaProvider: IProvider;
 }): Promise<MiddlewareConstraint>;
+export declare function createEip7702And5792MiddlewareForAaProvider(): Promise<MiddlewareConstraint>;
 export declare function providerAsMiddleware(provider: IProvider): MiddlewareConstraint;

package/dist/lib.cjs/types/react/wagmi/constants.d.ts

@@ -38,8 +38,10 @@ export declare const defaultWagmiConfig: import("wagmi").Config<readonly [{
     fees?: import("viem").ChainFees<undefined> | undefined;
     formatters?: undefined;
     prepareTransactionRequest?: ((args: import("viem").PrepareTransactionRequestParameters, options: {
+        client: import("viem").Client;
         phase: "beforeFillTransaction" | "beforeFillParameters" | "afterFillParameters";
     }) => Promise<import("viem").PrepareTransactionRequestParameters>) | [fn: ((args: import("viem").PrepareTransactionRequestParameters, options: {
+        client: import("viem").Client;
         phase: "beforeFillTransaction" | "beforeFillParameters" | "afterFillParameters";
     }) => Promise<import("viem").PrepareTransactionRequestParameters>) | undefined, options: {
         runAt: readonly ("beforeFillTransaction" | "beforeFillParameters" | "afterFillParameters")[];

package/dist/lib.cjs/types/react/wagmi/provider.d.ts

@@ -1,3 +1,10 @@
 import { PropsWithChildren } from "react";
+import { Config, Connector, CreateConnectorFn } from "wagmi";
 import { WagmiProviderProps } from "./interface";
+export declare function getWeb3authConnector(config: Config): Connector<CreateConnectorFn>;
+export declare function createWeb3AuthConnectorForWagmi(provider: any): CreateConnectorFn;
+export declare function setupConnector(provider: any, config: Config): Connector;
+export declare function connectWeb3AuthWithWagmi(connector: Connector, config: Config): Promise<void>;
+export declare function resetConnectorState(config: Config): void;
+export declare function disconnectWeb3AuthFromWagmi(config: Config): Promise<void>;
 export declare function WagmiProvider({ children, ...props }: PropsWithChildren<WagmiProviderProps>): import("react").FunctionComponentElement<PropsWithChildren<import("wagmi").WagmiProviderProps>>;

package/dist/lib.cjs/types/vue/wagmi/constants.d.ts

@@ -38,8 +38,10 @@ export declare const defaultWagmiConfig: import("wagmi").Config<readonly [{
     fees?: import("viem").ChainFees<undefined> | undefined;
     formatters?: undefined;
     prepareTransactionRequest?: ((args: import("viem").PrepareTransactionRequestParameters, options: {
+        client: import("viem").Client;
         phase: "beforeFillTransaction" | "beforeFillParameters" | "afterFillParameters";
     }) => Promise<import("viem").PrepareTransactionRequestParameters>) | [fn: ((args: import("viem").PrepareTransactionRequestParameters, options: {
+        client: import("viem").Client;
         phase: "beforeFillTransaction" | "beforeFillParameters" | "afterFillParameters";
     }) => Promise<import("viem").PrepareTransactionRequestParameters>) | undefined, options: {
         runAt: readonly ("beforeFillTransaction" | "beforeFillParameters" | "afterFillParameters")[];

package/dist/lib.cjs/types/vue/wagmi/provider.d.ts

@@ -1,6 +1,12 @@
-import { type Config } from "@wagmi/core";
+import { type Config, type Connector, type CreateConnectorFn } from "@wagmi/core";
 import { PropType } from "vue";
 import { WagmiProviderProps } from "./interface";
+export declare function getWeb3authConnector(config: Config): Connector<CreateConnectorFn>;
+export declare function createWeb3AuthConnectorForWagmi(provider: any): CreateConnectorFn;
+export declare function setupConnector(provider: any, config: Config): Connector;
+export declare function connectWeb3AuthWithWagmi(connector: Connector, config: Config): Promise<void>;
+export declare function resetConnectorState(config: Config): void;
+export declare function disconnectWeb3AuthFromWagmi(config: Config): Promise<void>;
 export declare const WagmiProvider: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     config: {
         type: PropType<WagmiProviderProps>;

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

@@ -112,20 +112,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 === constants.CONNECTOR_STATUS.AUTHORIZED) {
+        var _web3Auth$value$curre3, _web3Auth$value$curre4;
+        if (!isInitialized.value) isInitialized.value = true;
         isAuthorized.value = true;
         isConnected.value = true;
+        connection.value = web3Auth.value.connection;
+        chainId.value = web3Auth.value.currentChainId;
+        chainNamespace.value = (_web3Auth$value$curre3 = (_web3Auth$value$curre4 = web3Auth.value.currentChain) === null || _web3Auth$value$curre4 === void 0 ? void 0 : _web3Auth$value$curre4.chainNamespace) !== null && _web3Auth$value$curre3 !== void 0 ? _web3Auth$value$curre3 : null;
       }
     };
     const consentAcceptedListener = () => {
       status.value = web3Auth.value.status;
       if (web3Auth.value.status === constants.CONNECTOR_STATUS.CONNECTED || web3Auth.value.status === constants.CONNECTOR_STATUS.AUTHORIZED) {
-        var _web3Auth$value$curre3, _web3Auth$value$curre4;
+        var _web3Auth$value$curre5, _web3Auth$value$curre6;
         if (!isInitialized.value) isInitialized.value = true;
         isConnected.value = true;
         connection.value = web3Auth.value.connection;
         chainId.value = web3Auth.value.currentChainId;
-        chainNamespace.value = (_web3Auth$value$curre3 = (_web3Auth$value$curre4 = web3Auth.value.currentChain) === null || _web3Auth$value$curre4 === void 0 ? void 0 : _web3Auth$value$curre4.chainNamespace) !== null && _web3Auth$value$curre3 !== void 0 ? _web3Auth$value$curre3 : null;
+        chainNamespace.value = (_web3Auth$value$curre5 = (_web3Auth$value$curre6 = web3Auth.value.currentChain) === null || _web3Auth$value$curre6 === void 0 ? void 0 : _web3Auth$value$curre6.chainNamespace) !== null && _web3Auth$value$curre5 !== void 0 ? _web3Auth$value$curre5 : null;
         if (web3Auth.value.status === constants.CONNECTOR_STATUS.AUTHORIZED) {
           isAuthorized.value = true;
         }
@@ -148,11 +155,11 @@ function useWeb3AuthInnerContextValue({
       isMFAEnabled.value = true;
     };
     const connectionUpdatedListener = () => {
-      var _web3Auth$value$curre5, _web3Auth$value$curre6;
+      var _web3Auth$value$curre7, _web3Auth$value$curre8;
       status.value = web3Auth.value.status;
       connection.value = web3Auth.value.connection;
       chainId.value = web3Auth.value.currentChainId;
-      chainNamespace.value = (_web3Auth$value$curre5 = (_web3Auth$value$curre6 = web3Auth.value.currentChain) === null || _web3Auth$value$curre6 === void 0 ? void 0 : _web3Auth$value$curre6.chainNamespace) !== null && _web3Auth$value$curre5 !== void 0 ? _web3Auth$value$curre5 : null;
+      chainNamespace.value = (_web3Auth$value$curre7 = (_web3Auth$value$curre8 = web3Auth.value.currentChain) === null || _web3Auth$value$curre8 === void 0 ? void 0 : _web3Auth$value$curre8.chainNamespace) !== null && _web3Auth$value$curre7 !== void 0 ? _web3Auth$value$curre7 : null;
     };
     if (prevWeb3Auth && newWeb3Auth !== prevWeb3Auth) {
       prevWeb3Auth.removeListener(constants.CONNECTOR_EVENTS.NOT_READY, notReadyListener);
@@ -191,9 +198,9 @@ function useWeb3AuthInnerContextValue({
   vue.watch(connection, (newConnection, prevConnection) => {
     var _prevConnection$ether, _newConnection$ethere;
     const handleChainChange = newChainId => {
-      var _web3Auth$value$curre7, _web3Auth$value;
+      var _web3Auth$value$curre9, _web3Auth$value;
       chainId.value = newChainId;
-      chainNamespace.value = (_web3Auth$value$curre7 = (_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 || (_web3Auth$value = _web3Auth$value.currentChain) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.chainNamespace) !== null && _web3Auth$value$curre7 !== void 0 ? _web3Auth$value$curre7 : null;
+      chainNamespace.value = (_web3Auth$value$curre9 = (_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 || (_web3Auth$value = _web3Auth$value.currentChain) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.chainNamespace) !== null && _web3Auth$value$curre9 !== void 0 ? _web3Auth$value$curre9 : null;
     };
     const prevProvider = (_prevConnection$ether = prevConnection === null || prevConnection === void 0 ? void 0 : prevConnection.ethereumProvider) !== null && _prevConnection$ether !== void 0 ? _prevConnection$ether : null;
     const newProvider = (_newConnection$ethere = newConnection === null || newConnection === void 0 ? void 0 : newConnection.ethereumProvider) !== null && _newConnection$ethere !== void 0 ? _newConnection$ethere : null;

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

@@ -5,3 +5,9 @@ var provider = require('./provider.js');
 
 
 exports.WagmiProvider = provider.WagmiProvider;
+exports.connectWeb3AuthWithWagmi = provider.connectWeb3AuthWithWagmi;
+exports.createWeb3AuthConnectorForWagmi = provider.createWeb3AuthConnectorForWagmi;
+exports.disconnectWeb3AuthFromWagmi = provider.disconnectWeb3AuthFromWagmi;
+exports.getWeb3authConnector = provider.getWeb3authConnector;
+exports.resetConnectorState = provider.resetConnectorState;
+exports.setupConnector = provider.setupConnector;

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

@@ -3,7 +3,6 @@
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var core = require('@wagmi/core');
 var vue$1 = require('@wagmi/vue');
-var connectors = require('@wagmi/vue/connectors');
 var auth = require('@web3auth/auth');
 var viem = require('viem');
 var vue = require('vue');
@@ -18,7 +17,7 @@ require('@toruslabs/http-helpers');
 require('../../base/constants.js');
 require('../../base/wallet/index.js');
 require('../../base/connector/connectorStatus.js');
-require('../../base/connector/constants.js');
+var constants$1 = require('../../base/connector/constants.js');
 require('jwt-decode');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
@@ -26,23 +25,42 @@ var useWeb3Auth = require('../composables/useWeb3Auth.js');
 var useWeb3AuthDisconnect = require('../composables/useWeb3AuthDisconnect.js');
 var constants = require('./constants.js');
 
-const WEB3AUTH_CONNECTOR_ID = "web3auth";
 function getWeb3authConnector(config) {
-  return config.connectors.find(c => c.id === WEB3AUTH_CONNECTOR_ID);
+  return config.connectors.find(c => c.id === constants$1.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 = connectors.injected({
+function createWeb3AuthConnectorForWagmi(provider) {
+  const baseConnector = core.injected({
     target: {
       provider: provider,
-      id: WEB3AUTH_CONNECTOR_ID,
+      id: constants$1.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" && viem.isAddress(account))) {
+        loglevel.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;
@@ -69,8 +87,8 @@ async function connectWeb3AuthWithWagmi(connector, config) {
   }));
 }
 function resetConnectorState(config) {
-  config._internal.connectors.setState(prev => prev.filter(c => c.id !== WEB3AUTH_CONNECTOR_ID));
-  config.connectors.filter(c => c.id !== WEB3AUTH_CONNECTOR_ID);
+  config._internal.connectors.setState(prev => prev.filter(c => c.id !== constants$1.WEB3AUTH_CONNECTOR_ID));
+  config.connectors.filter(c => c.id !== constants$1.WEB3AUTH_CONNECTOR_ID);
 }
 async function disconnectWeb3AuthFromWagmi(config) {
   var _config$storage3, _config$storage4;
@@ -90,6 +108,7 @@ const Web3AuthWagmiProvider = vue.defineComponent({
     const {
       isConnected,
       connection,
+      web3Auth,
       chainNamespace
     } = useWeb3Auth.useWeb3Auth();
     const {
@@ -121,13 +140,15 @@ const Web3AuthWagmiProvider = vue.defineComponent({
       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;
+      const w3aWagmiConnector = getWeb3authConnector(wagmiConfig);
       const shouldBindToWagmi = newIsConnected && chainNamespace.value === baseControllers.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") {
+      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 && getWeb3authConnector(wagmiConfig)) {
+        if (!hasSameBinding && w3aWagmiConnector) {
           if (wagmiConfig.state.status === "connected") {
             suppressWagmiDisconnect.value = true;
             await disconnectWeb3AuthFromWagmi(wagmiConfig);
@@ -135,21 +156,21 @@ const Web3AuthWagmiProvider = vue.defineComponent({
             resetConnectorState(wagmiConfig);
           }
         }
-        const connector = await setupConnector(newEth, wagmiConfig);
+        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);
-        lastSyncedProvider.value = newEth;
-        lastSyncedConnectorName.value = newConnection.connectorName;
         reconnect();
-      } else {
+      } else if (!newIsConnected || chainNamespace.value !== baseControllers.CHAIN_NAMESPACES.EIP155) {
         lastSyncedProvider.value = null;
         lastSyncedConnectorName.value = null;
         if (wagmiConfig.state.status === "connected") {
           suppressWagmiDisconnect.value = true;
           await disconnectWeb3AuthFromWagmi(wagmiConfig);
-        } else if (getWeb3authConnector(wagmiConfig)) {
+        } else if (w3aWagmiConnector) {
           resetConnectorState(wagmiConfig);
         }
       }
@@ -214,7 +235,7 @@ const WagmiProvider = vue.defineComponent({
       return viem.fallback(transports);
     };
     const defineWagmiConfig = () => {
-      var _web3Auth$value;
+      var _web3Auth$value2;
       const configParams = _objectSpread(_objectSpread({
         ssr: true
       }, config), {}, {
@@ -225,7 +246,7 @@ const WagmiProvider = vue.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 === baseControllers.CHAIN_NAMESPACES.EIP155);
@@ -273,8 +294,8 @@ const WagmiProvider = vue.defineComponent({
       }
     };
     vue.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) {
@@ -307,3 +328,9 @@ const WagmiProvider = vue.defineComponent({
 });
 
 exports.WagmiProvider = WagmiProvider;
+exports.connectWeb3AuthWithWagmi = connectWeb3AuthWithWagmi;
+exports.createWeb3AuthConnectorForWagmi = createWeb3AuthConnectorForWagmi;
+exports.disconnectWeb3AuthFromWagmi = disconnectWeb3AuthFromWagmi;
+exports.getWeb3authConnector = getWeb3authConnector;
+exports.resetConnectorState = resetConnectorState;
+exports.setupConnector = setupConnector;