@web3auth/no-modal 10.0.0-alpha.1 → 10.0.0-beta.0

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

@@ -1,11 +1,21 @@
 'use strict';
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
+var bs58 = require('@toruslabs/bs58');
 var utils = require('@walletconnect/utils');
 var auth = require('@web3auth/auth');
 var wsEmbed = require('@web3auth/ws-embed');
-var bs58 = require('bs58');
 var index = require('../../base/errors/index.js');
+require('@toruslabs/base-controllers');
+require('@babel/runtime/helpers/defineProperty');
+require('../../base/wallet/index.js');
+require('../../base/connector/constants.js');
+require('jwt-decode');
+require('../../base/loglevel.js');
+require('../../base/plugin/errors.js');
+require('../../base/plugin/IPlugin.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
 var config = require('./config.js');
 
 async function getLastActiveSession(signClient) {
@@ -119,7 +129,7 @@ function getSolProviderHandlers({
     },
     signMessage: async req => {
       const methodRes = await sendJrpcRequest(connector, `solana:${config.SOLANA_CAIP_CHAIN_MAP[chainId]}`, wsEmbed.SOLANA_METHOD_TYPES.SIGN_MESSAGE, {
-        message: bs58.encode(Buffer.from(req.params.data, "utf-8"))
+        message: bs58.bs58.encode(Buffer.from(req.params.data, "utf-8"))
       });
       return methodRes.signature;
     },

package/dist/lib.cjs/index.js

@@ -3,34 +3,30 @@
 var config = require('./base/chain/config.js');
 var IChainInterface = require('./base/chain/IChainInterface.js');
 var index = require('./base/composables/index.js');
-var index$1 = require('./base/errors/index.js');
-var loglevel = require('./base/loglevel.js');
-var IProvider = require('./base/provider/IProvider.js');
-var utils$1 = require('./base/utils.js');
-var index$2 = require('./base/wallet/index.js');
-var noModal = require('./noModal.js');
 var baseConnector = require('./base/connector/baseConnector.js');
 var constants = require('./base/connector/constants.js');
 var auth = require('@web3auth/auth');
 var utils = require('./base/connector/utils.js');
+var index$1 = require('./base/errors/index.js');
+var loglevel = require('./base/loglevel.js');
 var errors = require('./base/plugin/errors.js');
 var IPlugin = require('./base/plugin/IPlugin.js');
-var baseControllers = require('@toruslabs/base-controllers');
+var IProvider = require('./base/provider/IProvider.js');
+var utils$1 = require('./base/utils.js');
+var index$2 = require('./base/wallet/index.js');
 var authConnector = require('./connectors/auth-connector/authConnector.js');
 var baseEvmConnector = require('./connectors/base-evm-connector/baseEvmConnector.js');
 var baseSolanaConnector = require('./connectors/base-solana-connector/baseSolanaConnector.js');
 var coinbaseConnector = require('./connectors/coinbase-connector/coinbaseConnector.js');
 var injectedEvmConnector = require('./connectors/injected-evm-connector/injectedEvmConnector.js');
 var mipd = require('mipd');
-var app = require('@wallet-standard/app');
 var index$3 = require('./connectors/injected-solana-connector/index.js');
-var walletStandardConnector = require('./connectors/injected-solana-connector/walletStandardConnector.js');
 var config$1 = require('./connectors/wallet-connect-v2-connector/config.js');
 var walletConnectV2Connector = require('./connectors/wallet-connect-v2-connector/walletConnectV2Connector.js');
 var WalletConnectV2Provider = require('./connectors/wallet-connect-v2-connector/WalletConnectV2Provider.js');
+var noModal = require('./noModal.js');
 var embed = require('./plugins/nft-checkout-plugin/embed.js');
 var plugin = require('./plugins/nft-checkout-plugin/plugin.js');
-var wsEmbed = require('@web3auth/ws-embed');
 var plugin$1 = require('./plugins/wallet-services-plugin/plugin.js');
 var AccountAbstractionProvider = require('./providers/account-abstraction-provider/providers/AccountAbstractionProvider.js');
 var ethereumControllers = require('@toruslabs/ethereum-controllers');
@@ -48,12 +44,15 @@ var jrpcClient = require('./providers/ethereum-provider/rpc/jrpcClient.js');
 var walletMidddleware = require('./providers/ethereum-provider/rpc/walletMidddleware.js');
 var utils$4 = require('./providers/solana-provider/providers/injectedProviders/utils.js');
 var walletStandardProvider = require('./providers/solana-provider/providers/injectedProviders/walletStandardProvider.js');
-var solanaPrivateKeyProvider = require('./providers/solana-provider/providers/privateKeyProvider/solanaPrivateKeyProvider.js');
 var JrpcClient = require('./providers/solana-provider/rpc/JrpcClient.js');
 var solanaRpcMiddlewares = require('./providers/solana-provider/rpc/solanaRpcMiddlewares.js');
 var solanaWallet = require('./providers/solana-provider/solanaWallet.js');
 var xrplPrivateKeyProvider = require('./providers/xrpl-provider/providers/privateKeyProviders/xrplPrivateKeyProvider.js');
 var xrplWalletUtils = require('./providers/xrpl-provider/providers/privateKeyProviders/xrplWalletUtils.js');
+var baseControllers = require('@toruslabs/base-controllers');
+var app = require('@wallet-standard/app');
+var walletStandardConnector = require('./connectors/injected-solana-connector/walletStandardConnector.js');
+var wsEmbed = require('@web3auth/ws-embed');
 
 
 
@@ -61,35 +60,16 @@ exports.getChainConfig = config.getChainConfig;
 exports.getEvmChainConfig = config.getEvmChainConfig;
 exports.getSolanaChainConfig = config.getSolanaChainConfig;
 exports.getXrplChainConfig = config.getXrplChainConfig;
-exports.CHAIN_NAMESPACES = IChainInterface.CHAIN_NAMESPACES;
 exports.CONNECTOR_NAMESPACES = IChainInterface.CONNECTOR_NAMESPACES;
 exports.Web3AuthContextKey = index.Web3AuthContextKey;
-exports.WalletInitializationError = index$1.WalletInitializationError;
-exports.WalletLoginError = index$1.WalletLoginError;
-exports.WalletOperationsError = index$1.WalletOperationsError;
-exports.WalletProviderError = index$1.WalletProviderError;
-exports.Web3AuthError = index$1.Web3AuthError;
-exports.serializeError = index$1.serializeError;
-exports.log = loglevel.log;
-exports.PROVIDER_EVENTS = IProvider.PROVIDER_EVENTS;
-exports.fetchProjectConfig = utils$1.fetchProjectConfig;
-exports.fetchWalletRegistry = utils$1.fetchWalletRegistry;
-exports.isHexStrict = utils$1.isHexStrict;
-exports.normalizeWalletName = utils$1.normalizeWalletName;
-exports.signerHost = utils$1.signerHost;
-exports.CONNECTOR_NAMES = index$2.CONNECTOR_NAMES;
-exports.EVM_CONNECTORS = index$2.EVM_CONNECTORS;
-exports.MULTI_CHAIN_CONNECTORS = index$2.MULTI_CHAIN_CONNECTORS;
-exports.SOLANA_CONNECTORS = index$2.SOLANA_CONNECTORS;
-exports.WALLET_CONNECTORS = index$2.WALLET_CONNECTORS;
-exports.Web3AuthNoModal = noModal.Web3AuthNoModal;
 exports.BaseConnector = baseConnector.BaseConnector;
 exports.CONNECTOR_CATEGORY = constants.CONNECTOR_CATEGORY;
 exports.CONNECTOR_EVENTS = constants.CONNECTOR_EVENTS;
 exports.CONNECTOR_STATUS = constants.CONNECTOR_STATUS;
-Object.defineProperty(exports, "LOGIN_PROVIDER", {
+exports.SMART_ACCOUNT_WALLET_SCOPE = constants.SMART_ACCOUNT_WALLET_SCOPE;
+Object.defineProperty(exports, "AUTH_CONNECTION", {
 	enumerable: true,
-	get: function () { return auth.LOGIN_PROVIDER; }
+	get: function () { return auth.AUTH_CONNECTION; }
 });
 Object.defineProperty(exports, "UX_MODE", {
 	enumerable: true,
@@ -108,6 +88,13 @@ exports.clearToken = utils.clearToken;
 exports.getSavedToken = utils.getSavedToken;
 exports.saveToken = utils.saveToken;
 exports.storageAvailable = utils.storageAvailable;
+exports.WalletInitializationError = index$1.WalletInitializationError;
+exports.WalletLoginError = index$1.WalletLoginError;
+exports.WalletOperationsError = index$1.WalletOperationsError;
+exports.WalletProviderError = index$1.WalletProviderError;
+exports.Web3AuthError = index$1.Web3AuthError;
+exports.serializeError = index$1.serializeError;
+exports.log = loglevel.log;
 exports.NFTCheckoutPluginError = errors.NFTCheckoutPluginError;
 exports.WalletServicesPluginError = errors.WalletServicesPluginError;
 exports.EVM_PLUGINS = IPlugin.EVM_PLUGINS;
@@ -116,10 +103,17 @@ exports.PLUGIN_NAMESPACES = IPlugin.PLUGIN_NAMESPACES;
 exports.PLUGIN_STATUS = IPlugin.PLUGIN_STATUS;
 exports.SOLANA_PLUGINS = IPlugin.SOLANA_PLUGINS;
 exports.WALLET_PLUGINS = IPlugin.WALLET_PLUGINS;
-Object.defineProperty(exports, "cloneDeep", {
-	enumerable: true,
-	get: function () { return baseControllers.cloneDeep; }
-});
+exports.PROVIDER_EVENTS = IProvider.PROVIDER_EVENTS;
+exports.fetchProjectConfig = utils$1.fetchProjectConfig;
+exports.fetchWalletRegistry = utils$1.fetchWalletRegistry;
+exports.isHexStrict = utils$1.isHexStrict;
+exports.normalizeWalletName = utils$1.normalizeWalletName;
+exports.signerHost = utils$1.signerHost;
+exports.CONNECTOR_NAMES = index$2.CONNECTOR_NAMES;
+exports.EVM_CONNECTORS = index$2.EVM_CONNECTORS;
+exports.MULTI_CHAIN_CONNECTORS = index$2.MULTI_CHAIN_CONNECTORS;
+exports.SOLANA_CONNECTORS = index$2.SOLANA_CONNECTORS;
+exports.WALLET_CONNECTORS = index$2.WALLET_CONNECTORS;
 exports.authConnector = authConnector.authConnector;
 exports.BaseEvmConnector = baseEvmConnector.BaseEvmConnector;
 exports.BaseSolanaConnector = baseSolanaConnector.BaseSolanaConnector;
@@ -129,16 +123,23 @@ Object.defineProperty(exports, "createMipd", {
 	enumerable: true,
 	get: function () { return mipd.createStore; }
 });
-Object.defineProperty(exports, "createSolanaMipd", {
+exports.hasSolanaWalletStandardFeatures = index$3.hasSolanaWalletStandardFeatures;
+Object.defineProperty(exports, "DEFAULT_EIP155_METHODS", {
 	enumerable: true,
-	get: function () { return app.getWallets; }
+	get: function () { return config$1.DEFAULT_EIP155_METHODS; }
+});
+Object.defineProperty(exports, "DEFAULT_EIP_155_EVENTS", {
+	enumerable: true,
+	get: function () { return config$1.DEFAULT_EIP_155_EVENTS; }
+});
+Object.defineProperty(exports, "DEFAULT_SOLANA_EVENTS", {
+	enumerable: true,
+	get: function () { return config$1.DEFAULT_SOLANA_EVENTS; }
+});
+Object.defineProperty(exports, "DEFAULT_SOLANA_METHODS", {
+	enumerable: true,
+	get: function () { return config$1.DEFAULT_SOLANA_METHODS; }
 });
-exports.hasSolanaWalletStandardFeatures = index$3.hasSolanaWalletStandardFeatures;
-exports.walletStandardConnector = walletStandardConnector.walletStandardConnector;
-exports.DEFAULT_EIP155_METHODS = config$1.DEFAULT_EIP155_METHODS;
-exports.DEFAULT_EIP_155_EVENTS = config$1.DEFAULT_EIP_155_EVENTS;
-exports.DEFAULT_SOLANA_EVENTS = config$1.DEFAULT_SOLANA_EVENTS;
-exports.DEFAULT_SOLANA_METHODS = config$1.DEFAULT_SOLANA_METHODS;
 exports.SOLANA_CAIP_CHAIN_MAP = config$1.SOLANA_CAIP_CHAIN_MAP;
 exports.getNamespacesFromChains = config$1.getNamespacesFromChains;
 exports.getRequiredNamespaces = config$1.getRequiredNamespaces;
@@ -147,16 +148,9 @@ exports.getSupportedMethodsByNamespace = config$1.getSupportedMethodsByNamespace
 exports.getWalletConnectV2Settings = config$1.getWalletConnectV2Settings;
 exports.walletConnectV2Connector = walletConnectV2Connector.walletConnectV2Connector;
 exports.WalletConnectV2Provider = WalletConnectV2Provider.WalletConnectV2Provider;
+exports.Web3AuthNoModal = noModal.Web3AuthNoModal;
 exports.NFTCheckoutEmbed = embed.NFTCheckoutEmbed;
 exports.nftCheckoutPlugin = plugin.nftCheckoutPlugin;
-Object.defineProperty(exports, "BUTTON_POSITION", {
-	enumerable: true,
-	get: function () { return wsEmbed.BUTTON_POSITION; }
-});
-Object.defineProperty(exports, "CONFIRMATION_STRATEGY", {
-	enumerable: true,
-	get: function () { return wsEmbed.CONFIRMATION_STRATEGY; }
-});
 exports.walletServicesPlugin = plugin$1.walletServicesPlugin;
 exports.accountAbstractionProvider = AccountAbstractionProvider.accountAbstractionProvider;
 Object.defineProperty(exports, "BiconomySmartAccount", {
@@ -186,6 +180,10 @@ Object.defineProperty(exports, "TrustSmartAccount", {
 exports.BaseProvider = baseProvider.BaseProvider;
 exports.CommonJRPCProvider = CommonJRPCProvider.CommonJRPCProvider;
 exports.CommonPrivateKeyProvider = commonPrivateKeyProvider.CommonPrivateKeyProvider;
+Object.defineProperty(exports, "EIP1193_EVENTS", {
+	enumerable: true,
+	get: function () { return utils$2.EIP1193_EVENTS; }
+});
 exports.createRandomId = utils$2.createRandomId;
 exports.EthereumSigningProvider = EthereumSigningProvider.EthereumSigningProvider;
 exports.EIP1559APIEndpoint = constants$1.EIP1559APIEndpoint;
@@ -194,7 +192,10 @@ exports.LegacyGasAPIEndpoint = constants$1.LegacyGasAPIEndpoint;
 exports.TRANSACTION_ENVELOPE_TYPES = constants$1.TRANSACTION_ENVELOPE_TYPES;
 exports.TRANSACTION_TYPES = constants$1.TRANSACTION_TYPES;
 exports.TransactionFormatter = formatter.TransactionFormatter;
-exports.SignTypedDataVersion = interfaces.SignTypedDataVersion;
+Object.defineProperty(exports, "SignTypedDataVersion", {
+	enumerable: true,
+	get: function () { return interfaces.SignTypedDataVersion; }
+});
 exports.fetchEip1159GasEstimates = utils$3.fetchEip1159GasEstimates;
 exports.fetchLegacyGasPriceEstimates = utils$3.fetchLegacyGasPriceEstimates;
 exports.normalizeGWEIDecimalNumbers = utils$3.normalizeGWEIDecimalNumbers;
@@ -208,7 +209,6 @@ exports.createEthProviderConfigMiddleware = jrpcClient.createEthProviderConfigMi
 exports.createWalletMiddleware = walletMidddleware.createWalletMiddleware;
 exports.getSolanaChainByChainConfig = utils$4.getSolanaChainByChainConfig;
 exports.WalletStandardProvider = walletStandardProvider.WalletStandardProvider;
-exports.SolanaPrivateKeyProvider = solanaPrivateKeyProvider.SolanaPrivateKeyProvider;
 exports.createConfigMiddleware = JrpcClient.createConfigMiddleware;
 exports.createSolanaChainIdMiddleware = JrpcClient.createSolanaChainIdMiddleware;
 exports.createSolanaJsonRpcClient = JrpcClient.createSolanaJsonRpcClient;
@@ -223,3 +223,24 @@ exports.createSolanaMiddleware = solanaRpcMiddlewares.createSolanaMiddleware;
 exports.SolanaWallet = solanaWallet.SolanaWallet;
 exports.XrplPrivateKeyProvider = xrplPrivateKeyProvider.XrplPrivateKeyProvider;
 exports.getProviderHandlers = xrplWalletUtils.getProviderHandlers;
+Object.defineProperty(exports, "CHAIN_NAMESPACES", {
+	enumerable: true,
+	get: function () { return baseControllers.CHAIN_NAMESPACES; }
+});
+Object.defineProperty(exports, "cloneDeep", {
+	enumerable: true,
+	get: function () { return baseControllers.cloneDeep; }
+});
+Object.defineProperty(exports, "createSolanaMipd", {
+	enumerable: true,
+	get: function () { return app.getWallets; }
+});
+exports.walletStandardConnector = walletStandardConnector.walletStandardConnector;
+Object.defineProperty(exports, "BUTTON_POSITION", {
+	enumerable: true,
+	get: function () { return wsEmbed.BUTTON_POSITION; }
+});
+Object.defineProperty(exports, "CONFIRMATION_STRATEGY", {
+	enumerable: true,
+	get: function () { return wsEmbed.CONFIRMATION_STRATEGY; }
+});

package/dist/lib.cjs/noModal.js

@@ -1,20 +1,27 @@
 'use strict';
 
+var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var auth = require('@web3auth/auth');
+var deepmerge = require('deepmerge');
 var authConnector = require('./connectors/auth-connector/authConnector.js');
-var config = require('./base/chain/config.js');
-var IChainInterface = require('./base/chain/IChainInterface.js');
 var index = require('./base/errors/index.js');
-var loglevel = require('./base/loglevel.js');
-var utils = require('./base/utils.js');
+var IChainInterface = require('./base/chain/IChainInterface.js');
 var index$1 = require('./base/wallet/index.js');
-var CommonJRPCProvider = require('./providers/base-provider/CommonJRPCProvider.js');
+var constants = require('./base/connector/constants.js');
 var utils$1 = require('./base/connector/utils.js');
+var loglevel = require('./base/loglevel.js');
+require('./base/plugin/errors.js');
 var IPlugin = require('./base/plugin/IPlugin.js');
-var constants = require('./base/connector/constants.js');
+var utils = require('./base/utils.js');
+var baseControllers = require('@toruslabs/base-controllers');
+require('./providers/base-provider/utils.js');
+var CommonJRPCProvider = require('./providers/base-provider/CommonJRPCProvider.js');
+require('./providers/base-provider/commonPrivateKeyProvider.js');
+var metamaskConnector = require('./connectors/metamask-connector/metamaskConnector.js');
 
+const _excluded = ["walletScope"];
 const CONNECTOR_CACHE_KEY = "Web3Auth-cachedConnector";
 const CURRENT_CHAIN_CACHE_KEY = "Web3Auth-currentChain";
 class Web3AuthNoModal extends auth.SafeEventEmitter {
@@ -31,25 +38,13 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     _defineProperty(this, "storage", "localStorage");
     if (!options.clientId) throw index.WalletInitializationError.invalidParams("Please provide a valid clientId in constructor");
     if (options.enableLogging) loglevel.log.enableAll();else loglevel.log.setLevel("error");
-    // TODO: This is fine. we get chains from project config. we can throw in init instead
-    if (!options.chains || options.chains.length === 0) {
-      throw index.WalletInitializationError.invalidParams("Please provide chains");
-    }
-    const {
-      chains
-    } = options;
-    // validate chain namespace of each chain config
-    for (const chain of chains) {
-      if (!chain.chainNamespace || !Object.values(IChainInterface.CHAIN_NAMESPACES).includes(chain.chainNamespace)) throw index.WalletInitializationError.invalidParams("Please provide a valid chainNamespace in chains");
-    }
     if (options.storageType === "session") this.storage = "sessionStorage";
-    this.coreOptions = _objectSpread(_objectSpread({}, options), {}, {
-      chains: chains.map(chain => _objectSpread(_objectSpread({}, config.getChainConfig(chain === null || chain === void 0 ? void 0 : chain.chainNamespace, chain === null || chain === void 0 ? void 0 : chain.chainId, options.clientId) || {}), chain))
-    });
-    this.currentChainId = options.defaultChainId || chains[0].chainId;
+    this.coreOptions = options;
+    this.currentChainId = options.defaultChainId;
   }
   get currentChain() {
-    return this.coreOptions.chains.find(chain => chain.chainId === this.currentChainId);
+    var _this$coreOptions$cha;
+    return (_this$coreOptions$cha = this.coreOptions.chains) === null || _this$coreOptions$cha === void 0 ? void 0 : _this$coreOptions$cha.find(chain => chain.chainId === this.currentChainId);
   }
   get connected() {
     return Boolean(this.connectedConnector);
@@ -61,14 +56,13 @@ class Web3AuthNoModal extends auth.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 {
@@ -78,16 +72,17 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       loglevel.log.error("Failed to fetch project configurations", e);
       throw index.WalletInitializationError.notReady("failed to fetch project configurations", e);
     }
-
+    // init config
+    this.initAccountAbstractionConfig(projectConfig);
+    this.initChainsConfig(projectConfig);
+    this.initCachedConnectorAndChainId();
     // setup common JRPC provider
     await this.setupCommonJRPCProvider();
-
     // initialize connectors
     this.on(constants.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 === constants.CONNECTOR_STATUS.NOT_READY) {
         this.status = constants.CONNECTOR_STATUS.READY;
@@ -99,8 +94,16 @@ class Web3AuthNoModal extends auth.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 === IChainInterface.CONNECTOR_NAMESPACES.MULTICHAIN) return true;
+        return connector.connectorNamespace === chainNamespace;
+      }
+      return true;
+    }) || null;
   }
   clearCache() {
     if (!utils$1.storageAvailable(this.storage)) return;
@@ -109,7 +112,8 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     this.cachedConnector = null;
   }
   async switchChain(params) {
-    if (params.chainId === this.currentChain.chainId) return;
+    var _this$currentChain2;
+    if (params.chainId === ((_this$currentChain2 = this.currentChain) === null || _this$currentChain2 === void 0 ? void 0 : _this$currentChain2.chainId)) return;
     const newChainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId);
     if (!newChainConfig) throw index.WalletInitializationError.invalidParams("Invalid chainId");
     if (this.status === constants.CONNECTOR_STATUS.CONNECTED && this.connectedConnector) {
@@ -124,13 +128,13 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     }
     throw index.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 index.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 index.WalletInitializationError.notFound(`Please add wallet connector for ${connectorName} wallet, before connecting`);
     return new Promise((resolve, reject) => {
       this.once(constants.CONNECTOR_EVENTS.CONNECTED, _ => {
         resolve(this.provider);
@@ -138,7 +142,6 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       this.once(constants.CONNECTOR_EVENTS.ERRORED, err => {
         reject(err);
       });
-      const connector = this.getConnector(connectorName);
       const initialChain = this.getInitialChainIdForConnector(connector);
       const finalLoginParams = _objectSpread(_objectSpread({}, loginParams), {}, {
         chainId: initialChain.chainId
@@ -176,6 +179,89 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
   getPlugin(name) {
     return this.plugins[name] || null;
   }
+  initChainsConfig(projectConfig) {
+    // merge chains from project config with core options, core options chains will take precedence over project config chains
+    const chainMap = new Map();
+    const allChains = [...(projectConfig.chains || []), ...(this.coreOptions.chains || [])];
+    for (const chain of allChains) {
+      const existingChain = chainMap.get(chain.chainId);
+      if (!existingChain) chainMap.set(chain.chainId, chain);else chainMap.set(chain.chainId, _objectSpread(_objectSpread({}, existingChain), chain));
+    }
+    this.coreOptions.chains = Array.from(chainMap.values());
+    // validate chains and namespaces
+    if (this.coreOptions.chains.length === 0) {
+      loglevel.log.error("chain info not found. Please configure chains on dashboard at https://dashboard.web3auth.io");
+      throw index.WalletInitializationError.invalidParams("Please configure chains on dashboard at https://dashboard.web3auth.io");
+    }
+    const validChainNamespaces = new Set(Object.values(baseControllers.CHAIN_NAMESPACES));
+    for (const chain of this.coreOptions.chains) {
+      if (!chain.chainNamespace || !validChainNamespaces.has(chain.chainNamespace)) {
+        loglevel.log.error(`Please provide a valid chainNamespace in chains for chain ${chain.chainId}`);
+        throw index.WalletInitializationError.invalidParams(`Please provide a valid chainNamespace in chains for chain ${chain.chainId}`);
+      }
+      if (chain.chainNamespace !== baseControllers.CHAIN_NAMESPACES.OTHER && !utils.isHexStrict(chain.chainId)) {
+        loglevel.log.error(`Please provide a valid chainId in chains for chain ${chain.chainId}`);
+        throw index.WalletInitializationError.invalidParams(`Please provide a valid chainId as hex string in chains for chain ${chain.chainId}`);
+      }
+      if (chain.chainNamespace !== baseControllers.CHAIN_NAMESPACES.OTHER) {
+        try {
+          new URL(chain.rpcTarget);
+        } catch (error) {
+          // TODO: add support for chain.wsTarget
+          loglevel.log.error(`Please provide a valid rpcTarget in chains for chain ${chain.chainId}`, error);
+          throw index.WalletInitializationError.invalidParams(`Please provide a valid rpcTarget in chains for chain ${chain.chainId}`);
+        }
+      }
+    }
+    // if AA is enabled, filter out chains that are not AA-supported
+    if (this.coreOptions.accountAbstractionConfig) {
+      // write a for loop over accountAbstractionConfig.chains and check if the chainId is valid
+      for (const chain of this.coreOptions.accountAbstractionConfig.chains) {
+        if (!utils.isHexStrict(chain.chainId)) {
+          loglevel.log.error(`Please provide a valid chainId in accountAbstractionConfig.chains for chain ${chain.chainId}`);
+          throw index.WalletInitializationError.invalidParams(`Please provide a valid chainId in accountAbstractionConfig.chains for chain ${chain.chainId}`);
+        }
+        try {
+          var _chain$bundlerConfig;
+          new URL((_chain$bundlerConfig = chain.bundlerConfig) === null || _chain$bundlerConfig === void 0 ? void 0 : _chain$bundlerConfig.url);
+        } catch (error) {
+          loglevel.log.error(`Please provide a valid bundlerConfig.url in accountAbstractionConfig.chains for chain ${chain.chainId}`, error);
+          throw index.WalletInitializationError.invalidParams(`Please provide a valid bundlerConfig.url in accountAbstractionConfig.chains for chain ${chain.chainId}`);
+        }
+        if (!chainMap.has(chain.chainId)) {
+          loglevel.log.error(`Please provide chain config for AA chain in accountAbstractionConfig.chains for chain ${chain.chainId}`);
+          throw index.WalletInitializationError.invalidParams(`Please provide chain config for AA chain in accountAbstractionConfig.chains for chain ${chain.chainId}`);
+        }
+      }
+      // const aaSupportedChainIds = new Set(
+      //   this.coreOptions.accountAbstractionConfig?.chains
+      //     ?.filter((chain) => chain.chainId && chain.bundlerConfig?.url)
+      //     .map((chain) => chain.chainId) || []
+      // );
+      // this.coreOptions.chains = this.coreOptions.chains.filter(
+      //   (chain) => chain.chainNamespace !== CHAIN_NAMESPACES.EIP155 || aaSupportedChainIds.has(chain.chainId)
+      // );
+      // if (this.coreOptions.chains.length === 0) {
+      //   log.error("Account Abstraction is enabled but no supported chains found");
+      //   throw WalletInitializationError.invalidParams("Account Abstraction is enabled but no supported chains found");
+      // }
+    }
+  }
+  initAccountAbstractionConfig(projectConfig) {
+    const isAAEnabled = Boolean(this.coreOptions.accountAbstractionConfig || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.smartAccounts));
+    if (!isAAEnabled) return;
+    // merge project config with core options, code config take precedence over project config
+    const _ref = (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.smartAccounts) || {},
+      {
+        walletScope
+      } = _ref,
+      configWithoutWalletScope = _objectWithoutProperties(_ref, _excluded);
+    this.coreOptions.accountAbstractionConfig = deepmerge(configWithoutWalletScope || {}, this.coreOptions.accountAbstractionConfig || {});
+    // determine if we should use AA with external wallet
+    if (this.coreOptions.useAAWithExternalWallet === undefined) {
+      this.coreOptions.useAAWithExternalWallet = walletScope === constants.SMART_ACCOUNT_WALLET_SCOPE.ALL;
+    }
+  }
   initCachedConnectorAndChainId() {
     this.cachedConnector = utils$1.storageAvailable(this.storage) ? window[this.storage].getItem(CONNECTOR_CACHE_KEY) : null;
     // init chainId using cached chainId if it exists and is valid, otherwise use the defaultChainId or the first chain
@@ -188,7 +274,6 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       chain: this.currentChain,
       chains: this.coreOptions.chains
     });
-
     // sync chainId
     this.commonJRPCProvider.on("chainChanged", chainId => this.setCurrentChain(chainId));
   }
@@ -214,13 +299,13 @@ class Web3AuthNoModal extends auth.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 isExternalWalletEnabled = Boolean(projectConfig.externalWalletAuth);
+    const isMipdEnabled = isExternalWalletEnabled && ((_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));
     if (isMipdEnabled) {
       // Solana chains
-      if (chainNamespaces.has(IChainInterface.CHAIN_NAMESPACES.SOLANA)) {
+      if (chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.SOLANA)) {
         const {
           createSolanaMipd,
           hasSolanaWalletStandardFeatures,
@@ -235,7 +320,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
         connectorFns.push(...solanaMipd.get().filter(wallet => hasSolanaWalletStandardFeatures(wallet)).map(walletStandardConnector));
       }
       // EVM chains
-      if (chainNamespaces.has(IChainInterface.CHAIN_NAMESPACES.EIP155)) {
+      if (chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.EIP155)) {
         const {
           createMipd,
           injectedEvmConnector
@@ -249,9 +334,10 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
         connectorFns.push(...evmMipd.getProviders().map(injectedEvmConnector));
       }
     }
-
-    // add WalletConnectV2 connector if enabled
-    if (projectConfig.wallet_connect_enabled && projectConfig.wallet_connect_project_id && (chainNamespaces.has(IChainInterface.CHAIN_NAMESPACES.SOLANA) || chainNamespaces.has(IChainInterface.CHAIN_NAMESPACES.EIP155))) {
+    // it's safe to add it here as if there is a MetaMask injected provider, this won't override it
+    connectorFns.push(metamaskConnector.metaMaskConnector());
+    // add WalletConnectV2 connector if external wallets are enabled
+    if (isExternalWalletEnabled && (chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.SOLANA) || chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.EIP155))) {
       const {
         walletConnectV2Connector
       } = await Promise.resolve().then(function () { return require('./connectors/wallet-connect-v2-connector/index.js'); });
@@ -268,10 +354,12 @@ class Web3AuthNoModal extends auth.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) {
@@ -284,16 +372,24 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
   }
   subscribeToConnectorEvents(connector) {
     connector.on(constants.CONNECTOR_EVENTS.CONNECTED, async data => {
+      var _this$currentChain3, _accountAbstractionCo;
       if (!this.commonJRPCProvider) throw index.WalletInitializationError.notFound(`CommonJrpcProvider not found`);
       const {
         provider
       } = data;
       let finalProvider = provider.provider || provider;
-      // setup aa provider for external wallets on EVM chains, for in app wallet, it uses WS provider which already supports AA
+      // setup AA provider for external wallets on EVM chains, no need for app wallet as it uses WS provider which already supports AA
       const {
         accountAbstractionConfig
       } = this.coreOptions;
-      if (this.currentChain.chainNamespace === IChainInterface.CHAIN_NAMESPACES.EIP155 && accountAbstractionConfig && data.connector !== index$1.WALLET_CONNECTORS.AUTH && this.coreOptions.useAAWithExternalWallet) {
+      const doesAASupportCurrentChain = ((_this$currentChain3 = this.currentChain) === null || _this$currentChain3 === void 0 ? void 0 : _this$currentChain3.chainNamespace) === baseControllers.CHAIN_NAMESPACES.EIP155 && (accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo = accountAbstractionConfig.chains) === null || _accountAbstractionCo === void 0 ? void 0 : _accountAbstractionCo.some(chain => {
+        var _this$currentChain4;
+        return chain.chainId === ((_this$currentChain4 = this.currentChain) === null || _this$currentChain4 === void 0 ? void 0 : _this$currentChain4.chainId);
+      }));
+      const isExternalWalletAndAAEnabled = data.connector !== index$1.WALLET_CONNECTORS.AUTH && this.coreOptions.useAAWithExternalWallet;
+      if (isExternalWalletAndAAEnabled && doesAASupportCurrentChain) {
+        var _accountAbstractionCo2;
+        const aaChainIds = new Set((accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo2 = accountAbstractionConfig.chains) === null || _accountAbstractionCo2 === void 0 ? void 0 : _accountAbstractionCo2.map(chain => chain.chainId)) || []);
         const {
           accountAbstractionProvider
         } = await Promise.resolve().then(function () { return require('./providers/account-abstraction-provider/index.js'); });
@@ -301,10 +397,9 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
           accountAbstractionConfig,
           provider,
           chain: this.currentChain,
-          chains: this.coreOptions.chains
+          chains: this.coreOptions.chains.filter(chain => aaChainIds.has(chain.chainId))
         });
         finalProvider = aaProvider;
-        // TODO: when switching chains to Solana or other chains, we need to switch to the non-AA provider
       }
       this.commonJRPCProvider.updateProviderEngineProxy(finalProvider);
       this.connectedConnectorName = data.connector;
@@ -366,14 +461,14 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     if (this.status === constants.CONNECTOR_STATUS.CONNECTED) throw index.WalletInitializationError.notReady("Already connected");
     if (this.status === constants.CONNECTOR_STATUS.READY) throw index.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
    */
   getInitialChainIdForConnector(connector) {
+    var _initialChain;
     let initialChain = this.currentChain;
-    if (initialChain.chainNamespace !== connector.connectorNamespace && connector.connectorNamespace !== IChainInterface.CONNECTOR_NAMESPACES.MULTICHAIN) {
+    if (((_initialChain = initialChain) === null || _initialChain === void 0 ? void 0 : _initialChain.chainNamespace) !== connector.connectorNamespace && connector.connectorNamespace !== IChainInterface.CONNECTOR_NAMESPACES.MULTICHAIN) {
       initialChain = this.coreOptions.chains.find(x => x.chainNamespace === connector.connectorNamespace);
       if (!initialChain) throw index.WalletInitializationError.invalidParams(`No chain found for ${connector.connectorNamespace}`);
     }
@@ -399,10 +494,11 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
   connectToPlugins(data) {
     Object.values(this.plugins).map(async plugin => {
       try {
+        var _this$currentChain5;
         // skip if it's not compatible with the connector
         if (!plugin.SUPPORTED_CONNECTORS.includes("all") && !plugin.SUPPORTED_CONNECTORS.includes(data.connector)) return;
         // skip if it's not compatible with the current chain
-        if (plugin.pluginNamespace !== IPlugin.PLUGIN_NAMESPACES.MULTICHAIN && plugin.pluginNamespace !== this.currentChain.chainNamespace) return;
+        if (plugin.pluginNamespace !== IPlugin.PLUGIN_NAMESPACES.MULTICHAIN && plugin.pluginNamespace !== ((_this$currentChain5 = this.currentChain) === null || _this$currentChain5 === void 0 ? void 0 : _this$currentChain5.chainNamespace)) return;
         // skip if it's already connected
         if (plugin.status === IPlugin.PLUGIN_STATUS.CONNECTED) return;
         await plugin.initWithWeb3Auth(this, this.coreOptions.uiConfig);