@web3auth/no-modal 10.0.0-alpha.1 → 10.0.0-alpha.2

package/dist/lib.esm/connectors/wallet-connect-v2-connector/walletConnectV2Connector.js

@@ -1,19 +1,24 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { signChallenge, verifySignedChallenge } from '@toruslabs/base-controllers';
+import { CHAIN_NAMESPACES, signChallenge, verifySignedChallenge } from '@toruslabs/base-controllers';
 import Client from '@walletconnect/sign-client';
 import { isValidArray, getSdkError } from '@walletconnect/utils';
 import { EVM_METHOD_TYPES, SOLANA_METHOD_TYPES } from '@web3auth/ws-embed';
 import deepmerge from 'deepmerge';
-import { CONNECTOR_NAMESPACES, CHAIN_NAMESPACES } from '../../base/chain/IChainInterface.js';
-import { WalletInitializationError, WalletLoginError, Web3AuthError } from '../../base/errors/index.js';
+import { WalletLoginError, WalletInitializationError, Web3AuthError } from '../../base/errors/index.js';
+import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
+import { BaseConnector } from '../../base/connector/baseConnector.js';
+import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
+import '@web3auth/auth';
+import { getSavedToken, checkIfTokenIsExpired, saveToken } from '../../base/connector/utils.js';
 import { log } from '../../base/loglevel.js';
+import '../../base/plugin/errors.js';
+import '../../base/plugin/IPlugin.js';
+import '@toruslabs/constants';
+import '@toruslabs/http-helpers';
 import { WALLET_CONNECTORS } from '../../base/wallet/index.js';
 import { getWalletConnectV2Settings } from './config.js';
 import { WalletConnectV2Provider } from './WalletConnectV2Provider.js';
-import { BaseConnector } from '../../base/connector/baseConnector.js';
-import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
-import { getSavedToken, checkIfTokenIsExpired, saveToken } from '../../base/connector/utils.js';
 
 class WalletConnectV2Connector extends BaseConnector {
   constructor(options) {
@@ -65,10 +70,8 @@ class WalletConnectV2Connector extends BaseConnector {
     super.checkInitializationRequirements({
       chainConfig
     });
-    const projectId = (_this$connectorOption6 = this.connectorOptions.connectorSettings) === null || _this$connectorOption6 === void 0 || (_this$connectorOption6 = _this$connectorOption6.walletConnectInitOptions) === null || _this$connectorOption6 === void 0 ? void 0 : _this$connectorOption6.projectId;
-    if (!projectId) {
-      throw WalletInitializationError.invalidParams("Wallet connect project id is required in wallet connect v2 connector");
-    }
+    // use a global wc project id if not provided
+    const projectId = ((_this$connectorOption6 = this.connectorOptions.connectorSettings) === null || _this$connectorOption6 === void 0 || (_this$connectorOption6 = _this$connectorOption6.walletConnectInitOptions) === null || _this$connectorOption6 === void 0 ? void 0 : _this$connectorOption6.projectId) || "d3c63f19f9582f8ba48e982057eb096b";
     const wc2Settings = await getWalletConnectV2Settings(this.coreOptions.chains, projectId);
     if (!this.connectorOptions.loginSettings || Object.keys(this.connectorOptions.loginSettings).length === 0) {
       this.connectorOptions.loginSettings = wc2Settings.loginSettings;
@@ -281,7 +284,7 @@ class WalletConnectV2Connector extends BaseConnector {
             this.status = CONNECTOR_STATUS.READY;
             this.emit(CONNECTOR_EVENTS.READY, WALLET_CONNECTORS.WALLET_CONNECT_V2);
           } catch (error) {
-            log.error("unable to open qr code modal");
+            log.error("unable to open qr code modal", error);
           }
         } else {
           this.updateConnectorData({
@@ -290,7 +293,6 @@ class WalletConnectV2Connector extends BaseConnector {
         }
       }
       log.info("awaiting session approval from wallet");
-
       // Await session approval from the wallet.
       const session = await approval();
       this.activeSession = session;
@@ -302,8 +304,8 @@ class WalletConnectV2Connector extends BaseConnector {
         qrcodeModal.closeModal();
       }
     } catch (error) {
-      var _message;
-      if ((_message = error.message) !== null && _message !== void 0 && _message.toLowerCase().includes("proposal expired")) {
+      var _error$message;
+      if ((_error$message = error.message) !== null && _error$message !== void 0 && _error$message.toLowerCase().includes("proposal expired")) {
         // Retry if connector status is still connecting
         log.info("current connector status: ", this.status);
         if (this.status === CONNECTOR_STATUS.CONNECTING) {
@@ -391,7 +393,6 @@ const walletConnectV2Connector = params => {
     let {
       projectId
     } = (params === null || params === void 0 ? void 0 : params.walletConnectInitOptions) || {};
-
     // use project config if projectId is not set
     if (projectConfig) {
       const {

package/dist/lib.esm/connectors/wallet-connect-v2-connector/walletConnectV2Utils.js

@@ -1,9 +1,19 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
+import { bs58 } from '@toruslabs/bs58';
 import { getAccountsFromNamespaces, parseAccountId } from '@walletconnect/utils';
 import { providerErrors, rpcErrors } from '@web3auth/auth';
-import { EVM_METHOD_TYPES, SOLANA_METHOD_TYPES } from '@web3auth/ws-embed';
-import bs58 from 'bs58';
+import { SOLANA_METHOD_TYPES, EVM_METHOD_TYPES } from '@web3auth/ws-embed';
 import { WalletLoginError } from '../../base/errors/index.js';
+import '@toruslabs/base-controllers';
+import '@babel/runtime/helpers/defineProperty';
+import '../../base/wallet/index.js';
+import '../../base/connector/constants.js';
+import 'jwt-decode';
+import '../../base/loglevel.js';
+import '../../base/plugin/errors.js';
+import '../../base/plugin/IPlugin.js';
+import '@toruslabs/constants';
+import '@toruslabs/http-helpers';
 import { SOLANA_CAIP_CHAIN_MAP } from './config.js';
 
 async function getLastActiveSession(signClient) {

package/dist/lib.esm/index.js

@@ -1,41 +1,37 @@
 export { getChainConfig, getEvmChainConfig, getSolanaChainConfig, getXrplChainConfig } from './base/chain/config.js';
-export { CHAIN_NAMESPACES, CONNECTOR_NAMESPACES } from './base/chain/IChainInterface.js';
+export { CONNECTOR_NAMESPACES } from './base/chain/IChainInterface.js';
 export { Web3AuthContextKey } from './base/composables/index.js';
-export { WalletInitializationError, WalletLoginError, WalletOperationsError, WalletProviderError, Web3AuthError, serializeError } from './base/errors/index.js';
-export { log } from './base/loglevel.js';
-export { PROVIDER_EVENTS } from './base/provider/IProvider.js';
-export { fetchProjectConfig, fetchWalletRegistry, isHexStrict, normalizeWalletName, signerHost } from './base/utils.js';
-export { CONNECTOR_NAMES, EVM_CONNECTORS, MULTI_CHAIN_CONNECTORS, SOLANA_CONNECTORS, WALLET_CONNECTORS } from './base/wallet/index.js';
-export { Web3AuthNoModal } from './noModal.js';
 export { BaseConnector } from './base/connector/baseConnector.js';
 export { CONNECTOR_CATEGORY, CONNECTOR_EVENTS, CONNECTOR_STATUS } from './base/connector/constants.js';
-export { LOGIN_PROVIDER, UX_MODE, WEB3AUTH_NETWORK, getED25519Key } from '@web3auth/auth';
+export { AUTH_CONNECTION, UX_MODE, WEB3AUTH_NETWORK, getED25519Key } from '@web3auth/auth';
 export { checkIfTokenIsExpired, clearToken, getSavedToken, saveToken, storageAvailable } from './base/connector/utils.js';
+export { WalletInitializationError, WalletLoginError, WalletOperationsError, WalletProviderError, Web3AuthError, serializeError } from './base/errors/index.js';
+export { log } from './base/loglevel.js';
 export { NFTCheckoutPluginError, WalletServicesPluginError } from './base/plugin/errors.js';
 export { EVM_PLUGINS, PLUGIN_EVENTS, PLUGIN_NAMESPACES, PLUGIN_STATUS, SOLANA_PLUGINS, WALLET_PLUGINS } from './base/plugin/IPlugin.js';
-export { cloneDeep } from '@toruslabs/base-controllers';
+export { PROVIDER_EVENTS } from './base/provider/IProvider.js';
+export { fetchProjectConfig, fetchWalletRegistry, isHexStrict, normalizeWalletName, signerHost } from './base/utils.js';
+export { CONNECTOR_NAMES, EVM_CONNECTORS, MULTI_CHAIN_CONNECTORS, SOLANA_CONNECTORS, WALLET_CONNECTORS } from './base/wallet/index.js';
 export { authConnector } from './connectors/auth-connector/authConnector.js';
 export { BaseEvmConnector } from './connectors/base-evm-connector/baseEvmConnector.js';
 export { BaseSolanaConnector } from './connectors/base-solana-connector/baseSolanaConnector.js';
 export { coinbaseConnector } from './connectors/coinbase-connector/coinbaseConnector.js';
 export { injectedEvmConnector } from './connectors/injected-evm-connector/injectedEvmConnector.js';
 export { createStore as createMipd } from 'mipd';
-export { getWallets as createSolanaMipd } from '@wallet-standard/app';
 export { hasSolanaWalletStandardFeatures } from './connectors/injected-solana-connector/index.js';
-export { walletStandardConnector } from './connectors/injected-solana-connector/walletStandardConnector.js';
 export { DEFAULT_EIP155_METHODS, DEFAULT_EIP_155_EVENTS, DEFAULT_SOLANA_EVENTS, DEFAULT_SOLANA_METHODS, SOLANA_CAIP_CHAIN_MAP, getNamespacesFromChains, getRequiredNamespaces, getSupportedEventsByNamespace, getSupportedMethodsByNamespace, getWalletConnectV2Settings } from './connectors/wallet-connect-v2-connector/config.js';
 export { walletConnectV2Connector } from './connectors/wallet-connect-v2-connector/walletConnectV2Connector.js';
 export { WalletConnectV2Provider } from './connectors/wallet-connect-v2-connector/WalletConnectV2Provider.js';
+export { Web3AuthNoModal } from './noModal.js';
 export { NFTCheckoutEmbed } from './plugins/nft-checkout-plugin/embed.js';
 export { nftCheckoutPlugin } from './plugins/nft-checkout-plugin/plugin.js';
-export { BUTTON_POSITION, CONFIRMATION_STRATEGY } from '@web3auth/ws-embed';
 export { walletServicesPlugin } from './plugins/wallet-services-plugin/plugin.js';
 export { accountAbstractionProvider } from './providers/account-abstraction-provider/providers/AccountAbstractionProvider.js';
 export { BiconomySmartAccount, KernelSmartAccount, NexusSmartAccount, SMART_ACCOUNT, SafeSmartAccount, TrustSmartAccount } from '@toruslabs/ethereum-controllers';
 export { BaseProvider } from './providers/base-provider/baseProvider.js';
 export { CommonJRPCProvider } from './providers/base-provider/CommonJRPCProvider.js';
 export { CommonPrivateKeyProvider } from './providers/base-provider/commonPrivateKeyProvider.js';
-export { createRandomId } from './providers/base-provider/utils.js';
+export { EIP1193_EVENTS, createRandomId } from './providers/base-provider/utils.js';
 export { EthereumSigningProvider } from './providers/ethereum-mpc-provider/providers/signingProviders/EthereumSigningProvider.js';
 export { EIP1559APIEndpoint, GAS_ESTIMATE_TYPES, LegacyGasAPIEndpoint, TRANSACTION_ENVELOPE_TYPES, TRANSACTION_TYPES } from './providers/ethereum-provider/providers/privateKeyProviders/TransactionFormatter/constants.js';
 export { TransactionFormatter } from './providers/ethereum-provider/providers/privateKeyProviders/TransactionFormatter/formatter.js';
@@ -52,3 +48,7 @@ export { createGenericJRPCMiddleware, createGetAccountsMiddleware, createGetPubl
 export { SolanaWallet } from './providers/solana-provider/solanaWallet.js';
 export { XrplPrivateKeyProvider } from './providers/xrpl-provider/providers/privateKeyProviders/xrplPrivateKeyProvider.js';
 export { getProviderHandlers } from './providers/xrpl-provider/providers/privateKeyProviders/xrplWalletUtils.js';
+export { CHAIN_NAMESPACES, cloneDeep } from '@toruslabs/base-controllers';
+export { getWallets as createSolanaMipd } from '@wallet-standard/app';
+export { walletStandardConnector } from './connectors/injected-solana-connector/walletStandardConnector.js';
+export { BUTTON_POSITION, CONFIRMATION_STRATEGY } from '@web3auth/ws-embed';

package/dist/lib.esm/noModal.js

@@ -3,15 +3,19 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { SafeEventEmitter } from '@web3auth/auth';
 import { authConnector } from './connectors/auth-connector/authConnector.js';
 import { getChainConfig } from './base/chain/config.js';
-import { CHAIN_NAMESPACES, CONNECTOR_NAMESPACES } from './base/chain/IChainInterface.js';
+import { CONNECTOR_NAMESPACES } from './base/chain/IChainInterface.js';
 import { WalletInitializationError, WalletLoginError } from './base/errors/index.js';
-import { log } from './base/loglevel.js';
-import { fetchProjectConfig } from './base/utils.js';
 import { WALLET_CONNECTORS } from './base/wallet/index.js';
-import { CommonJRPCProvider } from './providers/base-provider/CommonJRPCProvider.js';
+import { CONNECTOR_STATUS, CONNECTOR_EVENTS } from './base/connector/constants.js';
 import { storageAvailable } from './base/connector/utils.js';
+import { log } from './base/loglevel.js';
+import './base/plugin/errors.js';
 import { PLUGIN_STATUS, PLUGIN_NAMESPACES } from './base/plugin/IPlugin.js';
-import { CONNECTOR_STATUS, CONNECTOR_EVENTS } from './base/connector/constants.js';
+import { fetchProjectConfig } from './base/utils.js';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
+import './providers/base-provider/utils.js';
+import { CommonJRPCProvider } from './providers/base-provider/CommonJRPCProvider.js';
+import './providers/base-provider/commonPrivateKeyProvider.js';
 
 const CONNECTOR_CACHE_KEY = "Web3Auth-cachedConnector";
 const CURRENT_CHAIN_CACHE_KEY = "Web3Auth-currentChain";
@@ -59,14 +63,14 @@ class Web3AuthNoModal extends SafeEventEmitter {
     return null;
   }
   get connectedConnector() {
-    return this.connectors.find(connector => connector.name === this.connectedConnectorName) || null;
+    var _this$currentChain;
+    return this.getConnector(this.connectedConnectorName, (_this$currentChain = this.currentChain) === null || _this$currentChain === void 0 ? void 0 : _this$currentChain.chainNamespace);
   }
   set provider(_) {
     throw new Error("Not implemented");
   }
   async init() {
     this.initCachedConnectorAndChainId();
-
     // get project config
     let projectConfig;
     try {
@@ -76,16 +80,13 @@ class Web3AuthNoModal extends SafeEventEmitter {
       log.error("Failed to fetch project configurations", e);
       throw WalletInitializationError.notReady("failed to fetch project configurations", e);
     }
-
     // setup common JRPC provider
     await this.setupCommonJRPCProvider();
-
     // initialize connectors
     this.on(CONNECTOR_EVENTS.CONNECTORS_UPDATED, async ({
       connectors: newConnectors
     }) => {
-      await Promise.all(newConnectors.map(this.setupConnector));
-
+      await Promise.all(newConnectors.map(this.setupConnector.bind(this)));
       // emit connector ready event
       if (this.status === CONNECTOR_STATUS.NOT_READY) {
         this.status = CONNECTOR_STATUS.READY;
@@ -97,8 +98,16 @@ class Web3AuthNoModal extends SafeEventEmitter {
     });
     await this.initPlugins();
   }
-  getConnector(connectorName) {
-    return this.connectors.find(connector => connector.name === connectorName) || null;
+  // we need to take into account the chainNamespace as for external connectors, same connector name can be used for multiple chain namespaces
+  getConnector(connectorName, chainNamespace) {
+    return this.connectors.find(connector => {
+      if (connector.name !== connectorName) return false;
+      if (chainNamespace) {
+        if (connector.connectorNamespace === CONNECTOR_NAMESPACES.MULTICHAIN) return true;
+        return connector.connectorNamespace === chainNamespace;
+      }
+      return true;
+    }) || null;
   }
   clearCache() {
     if (!storageAvailable(this.storage)) return;
@@ -122,13 +131,13 @@ class Web3AuthNoModal extends SafeEventEmitter {
     }
     throw WalletInitializationError.notReady(`No wallet is ready`);
   }
-
   /**
    * Connect to a specific wallet connector
    * @param connectorName - Key of the wallet connector to use.
    */
   async connectTo(connectorName, loginParams) {
-    if (!this.getConnector(connectorName) || !this.commonJRPCProvider) throw WalletInitializationError.notFound(`Please add wallet connector for ${connectorName} wallet, before connecting`);
+    const connector = this.getConnector(connectorName, loginParams === null || loginParams === void 0 ? void 0 : loginParams.chainNamespace);
+    if (!connector || !this.commonJRPCProvider) throw WalletInitializationError.notFound(`Please add wallet connector for ${connectorName} wallet, before connecting`);
     return new Promise((resolve, reject) => {
       this.once(CONNECTOR_EVENTS.CONNECTED, _ => {
         resolve(this.provider);
@@ -136,7 +145,6 @@ class Web3AuthNoModal extends SafeEventEmitter {
       this.once(CONNECTOR_EVENTS.ERRORED, err => {
         reject(err);
       });
-      const connector = this.getConnector(connectorName);
       const initialChain = this.getInitialChainIdForConnector(connector);
       const finalLoginParams = _objectSpread(_objectSpread({}, loginParams), {}, {
         chainId: initialChain.chainId
@@ -186,7 +194,6 @@ class Web3AuthNoModal extends SafeEventEmitter {
       chain: this.currentChain,
       chains: this.coreOptions.chains
     });
-
     // sync chainId
     this.commonJRPCProvider.on("chainChanged", chainId => this.setCurrentChain(chainId));
   }
@@ -212,7 +219,6 @@ class Web3AuthNoModal extends SafeEventEmitter {
       projectConfig,
       coreOptions: this.coreOptions
     };
-
     // add injected connectors
     const isMipdEnabled = (_this$coreOptions$mul = this.coreOptions.multiInjectedProviderDiscovery) !== null && _this$coreOptions$mul !== void 0 ? _this$coreOptions$mul : true;
     const chainNamespaces = new Set(this.coreOptions.chains.map(chain => chain.chainNamespace));
@@ -247,7 +253,6 @@ class Web3AuthNoModal extends SafeEventEmitter {
         connectorFns.push(...evmMipd.getProviders().map(injectedEvmConnector));
       }
     }
-
     // add WalletConnectV2 connector if enabled
     if (projectConfig.wallet_connect_enabled && projectConfig.wallet_connect_project_id && (chainNamespaces.has(CHAIN_NAMESPACES.SOLANA) || chainNamespaces.has(CHAIN_NAMESPACES.EIP155))) {
       const {
@@ -266,10 +271,12 @@ class Web3AuthNoModal extends SafeEventEmitter {
     }
   }
   setConnectors(connectors) {
-    const connectorSet = new Set(this.connectors.map(connector => connector.name));
+    const getConnectorKey = connector => `${connector.connectorNamespace}-${connector.name}`;
+    const connectorSet = new Set(this.connectors.map(getConnectorKey));
     const newConnectors = connectors.map(connector => {
-      if (connectorSet.has(connector.name)) return null;
-      connectorSet.add(connector.name);
+      const key = getConnectorKey(connector);
+      if (connectorSet.has(key)) return null;
+      connectorSet.add(key);
       return connector;
     }).filter(connector => connector !== null);
     if (newConnectors.length > 0) {
@@ -364,7 +371,6 @@ class Web3AuthNoModal extends SafeEventEmitter {
     if (this.status === CONNECTOR_STATUS.CONNECTED) throw WalletInitializationError.notReady("Already connected");
     if (this.status === CONNECTOR_STATUS.READY) throw WalletInitializationError.notReady("Connector is already initialized");
   }
-
   /**
    * Gets the initial chain configuration for a connector
    * @throws WalletInitializationError If no chain is found for the connector's namespace

package/dist/lib.esm/plugins/nft-checkout-plugin/embed.js

@@ -2,7 +2,7 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { randomId } from '@toruslabs/base-controllers';
 import { THEME_MODES } from '@web3auth/auth';
 import loglevel from 'loglevel';
-import { NFT_CHECKOUT_BUILD_ENV, NFT_CHECKOUT_URLS, NFT_CHECKOUT_EMBED_MESSAGE_TYPES } from './enums.js';
+import { NFT_CHECKOUT_URLS, NFT_CHECKOUT_BUILD_ENV, NFT_CHECKOUT_EMBED_MESSAGE_TYPES } from './enums.js';
 import { getTheme, htmlToElement } from './utils.js';
 
 // preload for iframe doesn't work https://bugs.chromium.org/p/chromium/issues/detail?id=593267
@@ -47,13 +47,11 @@ class NFTCheckoutEmbed {
       whiteLabel
     } = params || {};
     this.buildEnv = buildEnv;
-
     // construct nft checkout url
     const nftCheckoutIframeUrl = new URL(NFT_CHECKOUT_URLS[this.buildEnv]);
     const hashParams = new URLSearchParams();
     hashParams.append("origin", window.location.origin);
     nftCheckoutIframeUrl.hash = hashParams.toString();
-
     // create iframe
     const colorScheme = getTheme((whiteLabel === null || whiteLabel === void 0 ? void 0 : whiteLabel.mode) || THEME_MODES.light);
     const nftCheckoutIframe = htmlToElement(`<iframe
@@ -97,7 +95,6 @@ class NFTCheckoutEmbed {
     if (!this.isInitialized) throw new Error("Call init() first");
     const nftCheckoutIframe = this.getIframe();
     if (!nftCheckoutIframe) throw new Error("Iframe is not initialized");
-
     // send message to iframe
     const nftCheckoutOrigin = new URL(NFT_CHECKOUT_URLS[this.buildEnv]).origin;
     nftCheckoutIframe.contentWindow.postMessage({

package/dist/lib.esm/plugins/nft-checkout-plugin/plugin.js

@@ -1,9 +1,16 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { SafeEventEmitter } from '@web3auth/auth';
-import { NFTCheckoutEmbed } from './embed.js';
-import { EVM_PLUGINS, PLUGIN_STATUS, PLUGIN_NAMESPACES, PLUGIN_EVENTS } from '../../base/plugin/IPlugin.js';
-import { NFTCheckoutPluginError } from '../../base/plugin/errors.js';
+import '../../base/errors/index.js';
+import '@toruslabs/base-controllers';
+import '../../base/wallet/index.js';
 import { CONNECTOR_STATUS } from '../../base/connector/constants.js';
+import 'jwt-decode';
+import '../../base/loglevel.js';
+import { NFTCheckoutPluginError } from '../../base/plugin/errors.js';
+import { EVM_PLUGINS, PLUGIN_STATUS, PLUGIN_NAMESPACES, PLUGIN_EVENTS } from '../../base/plugin/IPlugin.js';
+import '@toruslabs/constants';
+import '@toruslabs/http-helpers';
+import { NFTCheckoutEmbed } from './embed.js';
 
 class NFTCheckoutPlugin extends SafeEventEmitter {
   constructor(params) {

package/dist/lib.esm/plugins/wallet-services-plugin/plugin.js

@@ -1,12 +1,16 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { SafeEventEmitter } from '@web3auth/auth';
-import { CHAIN_NAMESPACES } from '../../base/chain/IChainInterface.js';
-import { log } from '../../base/loglevel.js';
+import '../../base/errors/index.js';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 import { WALLET_CONNECTORS } from '../../base/wallet/index.js';
-export { BUTTON_POSITION, CONFIRMATION_STRATEGY } from '@web3auth/ws-embed';
+import { CONNECTOR_STATUS } from '../../base/connector/constants.js';
+import 'jwt-decode';
+import { log } from '../../base/loglevel.js';
 import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 import { EVM_PLUGINS, PLUGIN_STATUS, PLUGIN_NAMESPACES, PLUGIN_EVENTS } from '../../base/plugin/IPlugin.js';
-import { CONNECTOR_STATUS } from '../../base/connector/constants.js';
+import '@toruslabs/constants';
+import '@toruslabs/http-helpers';
+export { BUTTON_POSITION, CONFIRMATION_STRATEGY } from '@web3auth/ws-embed';
 
 // TODO: support project config items here. incl. key export flag, multiple chains
 class WalletServicesPlugin extends SafeEventEmitter {
@@ -31,13 +35,11 @@ class WalletServicesPlugin extends SafeEventEmitter {
     if (web3auth.provider && !this.SUPPORTED_CONNECTORS.includes(web3auth.connectedConnectorName)) throw WalletServicesPluginError.notInitialized();
     const currentChainConfig = web3auth.currentChain;
     if (![CHAIN_NAMESPACES.EIP155, CHAIN_NAMESPACES.SOLANA].includes(currentChainConfig.chainNamespace)) throw WalletServicesPluginError.unsupportedChainNamespace();
-
     // Not connected yet to auth
     if (web3auth.provider) {
       this.provider = web3auth.provider;
     }
     this.web3auth = web3auth;
-
     // Auth connector uses WS embed
     const authInstance = web3auth.getConnector(WALLET_CONNECTORS.AUTH);
     if (!authInstance || !authInstance.wsEmbed) throw WalletServicesPluginError.web3AuthNotConnected();

package/dist/lib.esm/providers/account-abstraction-provider/providers/AccountAbstractionProvider.js

@@ -5,9 +5,20 @@ export { SMART_ACCOUNT } from '@toruslabs/ethereum-controllers';
 import { providerErrors, JRPCEngine, providerFromEngine } from '@web3auth/auth';
 import { defineChain, createPublicClient, http } from 'viem';
 import { createPaymasterClient, createBundlerClient } from 'viem/account-abstraction';
-import { CHAIN_NAMESPACES } from '../../../base/chain/IChainInterface.js';
 import { WalletInitializationError } from '../../../base/errors/index.js';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
+import '../../../base/wallet/index.js';
+import '../../../base/connector/constants.js';
+import 'jwt-decode';
+import '../../../base/loglevel.js';
+import '../../../base/plugin/errors.js';
+import '../../../base/plugin/IPlugin.js';
+import '@toruslabs/constants';
+import '@toruslabs/http-helpers';
 import { BaseProvider } from '../../base-provider/baseProvider.js';
+import '../../base-provider/CommonJRPCProvider.js';
+import '../../base-provider/commonPrivateKeyProvider.js';
+import '../../base-provider/utils.js';
 import { createAaMiddleware, eoaProviderAsMiddleware } from '../rpc/ethRpcMiddlewares.js';
 import { getProviderHandlers } from './utils.js';
 
@@ -93,7 +104,6 @@ class AccountAbstractionProvider extends BaseProvider {
       owner: eoaProvider,
       client: this._publicClient
     });
-
     // setup bundler and paymaster
     if (this.config.paymasterConfig) {
       var _this$config$paymaste;
@@ -113,7 +123,6 @@ class AccountAbstractionProvider extends BaseProvider {
       chain,
       eoaProvider
     });
-
     // setup rpc engine and AA middleware
     const engine = new JRPCEngine();
     const aaMiddleware = await createAaMiddleware({

package/dist/lib.esm/providers/account-abstraction-provider/providers/utils.js

@@ -2,7 +2,17 @@ import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { isHexString, addHexPrefix } from '@ethereumjs/util';
 import { providerErrors } from '@web3auth/auth';
 import { createWalletClient, http } from 'viem';
+import '../../../base/errors/index.js';
+import '@toruslabs/base-controllers';
+import '@babel/runtime/helpers/defineProperty';
+import '../../../base/wallet/index.js';
+import '../../../base/connector/constants.js';
+import 'jwt-decode';
 import { log } from '../../../base/loglevel.js';
+import '../../../base/plugin/errors.js';
+import '../../../base/plugin/IPlugin.js';
+import '@toruslabs/constants';
+import '@toruslabs/http-helpers';
 
 function getProviderHandlers({
   bundlerClient,

package/dist/lib.esm/providers/account-abstraction-provider/rpc/ethRpcMiddlewares.js

@@ -8,7 +8,6 @@ async function createAaMiddleware({
   const [eoaAddress] = await eoaProvider.request({
     method: "eth_accounts"
   });
-
   /**
    * Validates the keyholder address, and returns a normalized (i.e. lowercase)
    * copy of it.
@@ -67,7 +66,6 @@ async function createAaMiddleware({
     const txParams = req.params[0] || {
       from: ""
     };
-
     // normalize sender address
     if (txParams.from) {
       txParams.from = await normalizeSignSenderAddress(txParams.from, req);

package/dist/lib.esm/providers/base-provider/baseProvider.js

@@ -3,6 +3,15 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { BaseController, createEventEmitterProxy } from '@toruslabs/base-controllers';
 import { rpcErrors } from '@web3auth/auth';
 import { WalletInitializationError, WalletProviderError } from '../../base/errors/index.js';
+import '../../base/wallet/index.js';
+import '../../base/connector/constants.js';
+import 'jwt-decode';
+import '../../base/loglevel.js';
+import '../../base/plugin/errors.js';
+import '../../base/plugin/IPlugin.js';
+import '@toruslabs/constants';
+import '@toruslabs/http-helpers';
+import { EIP1193_EVENTS } from './utils.js';
 
 class BaseProvider extends BaseController {
   constructor({
@@ -92,14 +101,33 @@ class BaseProvider extends BaseController {
     if (this._providerEngineProxy) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       this._providerEngineProxy.setTarget(provider);
-      // re-emit events from provider
-      this._providerEngineProxy.eventNames().forEach(event => {
+      // we want events to propagate from Ethereum provider -> wrapper provider (e.g. CommonJRPC provider) -> SDK -> dapp
+      // ensure that only one handler is added for each event
+      const reEmitHandler = event => {
+        // listen to the event from the Ethereum provider
         provider.on(event, (...args) => {
-          // eslint-disable-next-line
+          // handle chainChanged event: update chainId state
+          if (event === EIP1193_EVENTS.CHAIN_CHANGED) {
+            const chainId = args[0];
+            this.update({
+              chainId
+            });
+          }
+          // re-emit the event
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
           this.emit(event, ...args);
         });
+      };
+      // handle existing events
+      this.eventNames().forEach(event => {
+        reEmitHandler(event);
+      });
+      // handle when a new listener is added
+      this.on("newListener", event => {
+        // skip if the event already exists
+        if (this.listenerCount(event) > 0) return;
+        reEmitHandler(event);
       });
-      this.handleChainChangedProvider();
     } else {
       this._providerEngineProxy = createEventEmitterProxy(provider);
     }
@@ -117,14 +145,6 @@ class BaseProvider extends BaseController {
   getChain(chainId) {
     return this.config.chains.find(chain => chain.chainId === chainId);
   }
-  handleChainChangedProvider() {
-    // This is only added because we don't have ethereum and solana private key providers anymore
-    this.provider.on("chainChanged", chainId => {
-      this.update({
-        chainId
-      });
-    });
-  }
 }
 
 export { BaseProvider };

package/dist/lib.esm/providers/base-provider/index.js

@@ -1,5 +1,5 @@
 export { BaseProvider } from './baseProvider.js';
 export { CommonJRPCProvider } from './CommonJRPCProvider.js';
 export { CommonPrivateKeyProvider } from './commonPrivateKeyProvider.js';
-export { createRandomId } from './utils.js';
+export { EIP1193_EVENTS, createRandomId } from './utils.js';
 export { getED25519Key } from '@web3auth/auth';

package/dist/lib.esm/providers/base-provider/utils.js

@@ -2,5 +2,13 @@ import getCreateRandomId from 'json-rpc-random-id';
 export { getED25519Key } from '@web3auth/auth';
 
 const createRandomId = getCreateRandomId();
+var EIP1193_EVENTS;
+(function (EIP1193_EVENTS) {
+  EIP1193_EVENTS["ACCOUNTS_CHANGED"] = "accountsChanged";
+  EIP1193_EVENTS["CHAIN_CHANGED"] = "chainChanged";
+  EIP1193_EVENTS["CONNECT"] = "connect";
+  EIP1193_EVENTS["DISCONNECT"] = "disconnect";
+  EIP1193_EVENTS["MESSAGE"] = "message";
+})(EIP1193_EVENTS || (EIP1193_EVENTS = {}));
 
-export { createRandomId };
+export { EIP1193_EVENTS, createRandomId };

package/dist/lib.esm/providers/ethereum-mpc-provider/providers/signingProviders/EthereumSigningProvider.js

@@ -2,14 +2,27 @@ import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { isHexString } from '@ethereumjs/util';
 import { providerErrors, JRPCEngine, providerFromEngine, rpcErrors } from '@web3auth/auth';
-import { CHAIN_NAMESPACES } from '../../../../base/chain/IChainInterface.js';
 import { WalletInitializationError } from '../../../../base/errors/index.js';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
+import '../../../../base/wallet/index.js';
+import '../../../../base/connector/constants.js';
+import 'jwt-decode';
+import '../../../../base/loglevel.js';
+import '../../../../base/plugin/errors.js';
+import '../../../../base/plugin/IPlugin.js';
+import '@toruslabs/constants';
+import '@toruslabs/http-helpers';
 import { BaseProvider } from '../../../base-provider/baseProvider.js';
-import { createEthAccountMiddleware } from '../../rpc/ethRpcMiddlewares.js';
-import { getProviderHandlers } from './signingUtils.js';
+import '../../../base-provider/CommonJRPCProvider.js';
+import '../../../base-provider/commonPrivateKeyProvider.js';
+import '../../../base-provider/utils.js';
 import { TransactionFormatter } from '../../../ethereum-provider/providers/privateKeyProviders/TransactionFormatter/formatter.js';
+import '../../../ethereum-provider/providers/privateKeyProviders/TransactionFormatter/interfaces.js';
+import '../../../ethereum-provider/providers/converter.js';
 import { createEthMiddleware, createEthChainSwitchMiddleware } from '../../../ethereum-provider/rpc/ethRpcMiddlewares.js';
 import { createEthJsonRpcClient } from '../../../ethereum-provider/rpc/jrpcClient.js';
+import { createEthAccountMiddleware } from '../../rpc/ethRpcMiddlewares.js';
+import { getProviderHandlers } from './signingUtils.js';
 
 var _EthereumSigningProvider;
 class EthereumSigningProvider extends BaseProvider {

package/dist/lib.esm/providers/ethereum-mpc-provider/providers/signingProviders/signingUtils.js

@@ -4,7 +4,19 @@ import { concatSig } from '@toruslabs/base-controllers';
 import { providerErrors } from '@web3auth/auth';
 import { hashMessage, Signature } from 'ethers';
 import { validateTypedData, hexToBytes, hashTypedData } from 'viem';
+import '../../../../base/errors/index.js';
+import '@babel/runtime/helpers/defineProperty';
+import '../../../../base/wallet/index.js';
+import '../../../../base/connector/constants.js';
+import 'jwt-decode';
 import { log } from '../../../../base/loglevel.js';
+import '../../../../base/plugin/errors.js';
+import '../../../../base/plugin/IPlugin.js';
+import '@toruslabs/constants';
+import '@toruslabs/http-helpers';
+import 'bignumber.js';
+import '../../../ethereum-provider/providers/converter.js';
+import 'bn.js';
 import { validateTypedSignMessageDataV4 } from '../../../ethereum-provider/providers/privateKeyProviders/TransactionFormatter/utils.js';
 import { SignTypedDataVersion } from '../../../ethereum-provider/providers/privateKeyProviders/TransactionFormatter/interfaces.js';
 
@@ -25,12 +37,10 @@ async function signTx(txParams, sign, txFormatter) {
     r,
     s
   } = vrs;
-
   // mpc-core-kit workaround (revert back to 0/1)
   if (v > 1) {
     v = v - 27;
   }
-
   // addSignature will handle the v value
   const tx = ethTx;
   tx.signature = Signature.from({