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

package/dist/lib.esm/noModal.js

@@ -1,296 +1,339 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { SafeEventEmitter, LOGIN_PROVIDER } from '@web3auth/auth';
-import deepmerge from 'deepmerge';
+import { SafeEventEmitter } from '@web3auth/auth';
+import { authConnector } from './connectors/auth-connector/authConnector.js';
 import { getChainConfig } from './base/chain/config.js';
-import { CHAIN_NAMESPACES, ADAPTER_NAMESPACES } from './base/chain/IChainInterface.js';
+import { CONNECTOR_NAMESPACES } from './base/chain/IChainInterface.js';
 import { WalletInitializationError, WalletLoginError } from './base/errors/index.js';
+import { WALLET_CONNECTORS } from './base/wallet/index.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 { fetchProjectConfig } from './base/utils.js';
-import { WALLET_ADAPTERS } from './base/wallet/index.js';
-import { storageAvailable } from './base/adapter/utils.js';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
+import './providers/base-provider/utils.js';
 import { CommonJRPCProvider } from './providers/base-provider/CommonJRPCProvider.js';
-import { PLUGIN_NAMESPACES, PLUGIN_STATUS } from './base/plugin/IPlugin.js';
-import { ADAPTER_STATUS, ADAPTER_EVENTS } from './base/adapter/constants.js';
-import { cloneDeep } from '@toruslabs/base-controllers';
+import './providers/base-provider/commonPrivateKeyProvider.js';
 
-const ADAPTER_CACHE_KEY = "Web3Auth-cachedAdapter";
+const CONNECTOR_CACHE_KEY = "Web3Auth-cachedConnector";
+const CURRENT_CHAIN_CACHE_KEY = "Web3Auth-currentChain";
 class Web3AuthNoModal extends SafeEventEmitter {
   constructor(options) {
-    var _options$chainConfig, _options$chainConfig2, _options$chainConfig3, _options$chainConfig4;
     super();
     _defineProperty(this, "coreOptions", void 0);
-    _defineProperty(this, "connectedAdapterName", null);
-    _defineProperty(this, "status", ADAPTER_STATUS.NOT_READY);
-    _defineProperty(this, "cachedAdapter", null);
-    _defineProperty(this, "walletAdapters", {});
+    _defineProperty(this, "connectedConnectorName", null);
+    _defineProperty(this, "status", CONNECTOR_STATUS.NOT_READY);
+    _defineProperty(this, "cachedConnector", null);
+    _defineProperty(this, "currentChainId", void 0);
+    _defineProperty(this, "connectors", []);
     _defineProperty(this, "commonJRPCProvider", null);
     _defineProperty(this, "plugins", {});
     _defineProperty(this, "storage", "localStorage");
     if (!options.clientId) throw WalletInitializationError.invalidParams("Please provide a valid clientId in constructor");
     if (options.enableLogging) log.enableAll();else log.setLevel("error");
-    if (!options.privateKeyProvider && !options.chainConfig) {
-      throw WalletInitializationError.invalidParams("Please provide chainConfig or privateKeyProvider");
+    // TODO: This is fine. we get chains from project config. we can throw in init instead
+    if (!options.chains || options.chains.length === 0) {
+      throw WalletInitializationError.invalidParams("Please provide chains");
     }
-    options.chainConfig = options.chainConfig || options.privateKeyProvider.currentChainConfig;
-    if (!((_options$chainConfig = options.chainConfig) !== null && _options$chainConfig !== void 0 && _options$chainConfig.chainNamespace) || !Object.values(CHAIN_NAMESPACES).includes((_options$chainConfig2 = options.chainConfig) === null || _options$chainConfig2 === void 0 ? void 0 : _options$chainConfig2.chainNamespace)) throw WalletInitializationError.invalidParams("Please provide a valid chainNamespace in chainConfig");
-    if (options.storageKey === "session") this.storage = "sessionStorage";
-    this.cachedAdapter = storageAvailable(this.storage) ? window[this.storage].getItem(ADAPTER_CACHE_KEY) : null;
+    const {
+      chains
+    } = options;
+    // validate chain namespace of each chain config
+    for (const chain of chains) {
+      if (!chain.chainNamespace || !Object.values(CHAIN_NAMESPACES).includes(chain.chainNamespace)) throw WalletInitializationError.invalidParams("Please provide a valid chainNamespace in chains");
+    }
+    if (options.storageType === "session") this.storage = "sessionStorage";
     this.coreOptions = _objectSpread(_objectSpread({}, options), {}, {
-      chainConfig: _objectSpread(_objectSpread({}, getChainConfig((_options$chainConfig3 = options.chainConfig) === null || _options$chainConfig3 === void 0 ? void 0 : _options$chainConfig3.chainNamespace, (_options$chainConfig4 = options.chainConfig) === null || _options$chainConfig4 === void 0 ? void 0 : _options$chainConfig4.chainId) || {}), options.chainConfig)
+      chains: chains.map(chain => _objectSpread(_objectSpread({}, getChainConfig(chain === null || chain === void 0 ? void 0 : chain.chainNamespace, chain === null || chain === void 0 ? void 0 : chain.chainId, options.clientId) || {}), chain))
     });
-    this.subscribeToAdapterEvents = this.subscribeToAdapterEvents.bind(this);
+    this.currentChainId = options.defaultChainId || chains[0].chainId;
+  }
+  get currentChain() {
+    return this.coreOptions.chains.find(chain => chain.chainId === this.currentChainId);
   }
   get connected() {
-    return Boolean(this.connectedAdapterName);
+    return Boolean(this.connectedConnector);
   }
   get provider() {
-    if (this.status !== ADAPTER_STATUS.NOT_READY && this.commonJRPCProvider) {
+    if (this.status !== CONNECTOR_STATUS.NOT_READY && this.commonJRPCProvider) {
       return this.commonJRPCProvider;
     }
     return null;
   }
+  get connectedConnector() {
+    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.commonJRPCProvider = await CommonJRPCProvider.getProviderInstance({
-      chainConfig: this.coreOptions.chainConfig
-    });
+    this.initCachedConnectorAndChainId();
+    // get project config
     let projectConfig;
     try {
       var _this$coreOptions$acc;
-      projectConfig = await fetchProjectConfig(this.coreOptions.clientId, this.coreOptions.web3AuthNetwork, (_this$coreOptions$acc = this.coreOptions.accountAbstractionProvider) === null || _this$coreOptions$acc === void 0 ? void 0 : _this$coreOptions$acc.config.smartAccountInit.name);
+      projectConfig = await fetchProjectConfig(this.coreOptions.clientId, this.coreOptions.web3AuthNetwork, (_this$coreOptions$acc = this.coreOptions.accountAbstractionConfig) === null || _this$coreOptions$acc === void 0 ? void 0 : _this$coreOptions$acc.smartAccountType);
     } catch (e) {
       log.error("Failed to fetch project configurations", e);
       throw WalletInitializationError.notReady("failed to fetch project configurations", e);
     }
-    const initPromises = Object.keys(this.walletAdapters).map(async adapterName => {
-      this.subscribeToAdapterEvents(this.walletAdapters[adapterName]);
-      // if adapter doesn't have any chain config yet then set it based on provided namespace and chainId.
-      // if no chainNamespace or chainId is being provided, it will connect with mainnet.
-      if (!this.walletAdapters[adapterName].chainConfigProxy) {
-        const providedChainConfig = this.coreOptions.chainConfig;
-        if (!providedChainConfig.chainNamespace) throw WalletInitializationError.invalidParams("Please provide chainNamespace in chainConfig");
-        this.walletAdapters[adapterName].setAdapterSettings({
-          chainConfig: providedChainConfig,
-          sessionTime: this.coreOptions.sessionTime,
-          clientId: this.coreOptions.clientId,
-          web3AuthNetwork: this.coreOptions.web3AuthNetwork,
-          useCoreKitKey: this.coreOptions.useCoreKitKey
-        });
-      } else {
-        this.walletAdapters[adapterName].setAdapterSettings({
-          sessionTime: this.coreOptions.sessionTime,
-          clientId: this.coreOptions.clientId,
-          web3AuthNetwork: this.coreOptions.web3AuthNetwork,
-          useCoreKitKey: this.coreOptions.useCoreKitKey
-        });
-      }
-      if (adapterName === WALLET_ADAPTERS.AUTH) {
-        const authAdapter = this.walletAdapters[adapterName];
-        const {
-          whitelabel
-        } = projectConfig;
-        this.coreOptions.uiConfig = deepmerge(cloneDeep(whitelabel || {}), this.coreOptions.uiConfig || {});
-        if (!this.coreOptions.uiConfig.mode) this.coreOptions.uiConfig.mode = "light";
-        const {
-          sms_otp_enabled: smsOtpEnabled,
-          whitelist,
-          key_export_enabled: keyExportEnabled
-        } = projectConfig;
-        if (smsOtpEnabled !== undefined) {
-          authAdapter.setAdapterSettings({
-            loginConfig: {
-              [LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
-                showOnModal: smsOtpEnabled,
-                showOnDesktop: smsOtpEnabled,
-                showOnMobile: smsOtpEnabled,
-                showOnSocialBackupFactor: smsOtpEnabled
-              }
-            }
-          });
-        }
-        if (whitelist) {
-          authAdapter.setAdapterSettings({
-            originData: whitelist.signed_urls
-          });
-        }
-        if (typeof keyExportEnabled === "boolean") {
-          this.coreOptions.privateKeyProvider.setKeyExportFlag(keyExportEnabled);
-          // dont know if this is required or not.
-          this.commonJRPCProvider.setKeyExportFlag(keyExportEnabled);
-        }
-        if (this.coreOptions.privateKeyProvider) {
-          if (authAdapter.currentChainNamespace !== this.coreOptions.privateKeyProvider.currentChainConfig.chainNamespace) {
-            throw WalletInitializationError.incompatibleChainNameSpace("private key provider is not compatible with provided chainNamespace for auth adapter");
-          }
-          authAdapter.setAdapterSettings({
-            privateKeyProvider: this.coreOptions.privateKeyProvider
-          });
-        }
-        authAdapter.setAdapterSettings({
-          whiteLabel: this.coreOptions.uiConfig
-        });
-        if (!authAdapter.privateKeyProvider) {
-          throw WalletInitializationError.invalidParams("privateKeyProvider is required for auth adapter");
-        }
-      } else if (adapterName === WALLET_ADAPTERS.WALLET_CONNECT_V2) {
-        const walletConnectAdapter = this.walletAdapters[adapterName];
-        const {
-          wallet_connect_enabled: walletConnectEnabled,
-          wallet_connect_project_id: walletConnectProjectId
-        } = projectConfig;
-        if (walletConnectEnabled === false) {
-          throw WalletInitializationError.invalidParams("Please enable wallet connect v2 addon on dashboard");
-        }
-        if (!walletConnectProjectId) throw WalletInitializationError.invalidParams("Invalid wallet connect project id. Please configure it on the dashboard");
-        walletConnectAdapter.setAdapterSettings({
-          adapterSettings: {
-            walletConnectInitOptions: {
-              projectId: walletConnectProjectId
-            }
-          }
-        });
+    // 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.bind(this)));
+      // emit connector ready event
+      if (this.status === CONNECTOR_STATUS.NOT_READY) {
+        this.status = CONNECTOR_STATUS.READY;
+        this.emit(CONNECTOR_EVENTS.READY);
       }
-      return this.walletAdapters[adapterName].init({
-        autoConnect: this.cachedAdapter === adapterName
-      }).catch(e => log.error(e, adapterName));
     });
-    await Promise.all(initPromises);
-    if (this.status === ADAPTER_STATUS.NOT_READY) {
-      this.status = ADAPTER_STATUS.READY;
-      this.emit(ADAPTER_EVENTS.READY);
-    }
-  }
-  getAdapter(adapterName) {
-    return this.walletAdapters[adapterName] || null;
+    await this.loadConnectors({
+      projectConfig
+    });
+    await this.initPlugins();
   }
-  configureAdapter(adapter) {
-    this.checkInitRequirements();
-    const providedChainConfig = this.coreOptions.chainConfig;
-    if (!providedChainConfig.chainNamespace) throw WalletInitializationError.invalidParams("Please provide chainNamespace in chainConfig");
-    const adapterAlreadyExists = this.walletAdapters[adapter.name];
-    if (adapterAlreadyExists) throw WalletInitializationError.duplicateAdapterError(`Wallet adapter for ${adapter.name} already exists`);
-    if (adapter.adapterNamespace !== ADAPTER_NAMESPACES.MULTICHAIN && adapter.adapterNamespace !== providedChainConfig.chainNamespace) throw WalletInitializationError.incompatibleChainNameSpace(`This wallet adapter belongs to ${adapter.adapterNamespace} which is incompatible with currently used namespace: ${providedChainConfig.chainNamespace}`);
-    if (adapter.adapterNamespace === ADAPTER_NAMESPACES.MULTICHAIN && adapter.currentChainNamespace && providedChainConfig.chainNamespace !== adapter.currentChainNamespace) {
-      // chainConfig checks are already validated in constructor so using typecast is safe here.
-      adapter.setAdapterSettings({
-        chainConfig: providedChainConfig
-      });
-    }
-    this.walletAdapters[adapter.name] = adapter;
-    return this;
+  // 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;
-    window[this.storage].removeItem(ADAPTER_CACHE_KEY);
-    this.cachedAdapter = null;
-  }
-  async addChain(chainConfig) {
-    if (this.status === ADAPTER_STATUS.CONNECTED && this.connectedAdapterName) return this.walletAdapters[this.connectedAdapterName].addChain(chainConfig);
-    if (this.commonJRPCProvider) {
-      return this.commonJRPCProvider.addChain(chainConfig);
-    }
-    throw WalletInitializationError.notReady(`No wallet is ready`);
+    window[this.storage].removeItem(CONNECTOR_CACHE_KEY);
+    window[this.storage].removeItem(CURRENT_CHAIN_CACHE_KEY);
+    this.cachedConnector = null;
   }
   async switchChain(params) {
-    if (this.status === ADAPTER_STATUS.CONNECTED && this.connectedAdapterName) return this.walletAdapters[this.connectedAdapterName].switchChain(params);
+    if (params.chainId === this.currentChain.chainId) return;
+    const newChainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId);
+    if (!newChainConfig) throw WalletInitializationError.invalidParams("Invalid chainId");
+    if (this.status === CONNECTOR_STATUS.CONNECTED && this.connectedConnector) {
+      await this.connectedConnector.switchChain(params);
+      this.setCurrentChain(params.chainId);
+      return;
+    }
     if (this.commonJRPCProvider) {
-      return this.commonJRPCProvider.switchChain(params);
+      await this.commonJRPCProvider.switchChain(params);
+      this.setCurrentChain(params.chainId);
+      return;
     }
     throw WalletInitializationError.notReady(`No wallet is ready`);
   }
-
   /**
-   * Connect to a specific wallet adapter
-   * @param walletName - Key of the walletAdapter to use.
+   * Connect to a specific wallet connector
+   * @param connectorName - Key of the wallet connector to use.
    */
-  async connectTo(walletName, loginParams) {
-    if (!this.walletAdapters[walletName] || !this.commonJRPCProvider) throw WalletInitializationError.notFound(`Please add wallet adapter for ${walletName} wallet, before connecting`);
+  async connectTo(connectorName, loginParams) {
+    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(ADAPTER_EVENTS.CONNECTED, _ => {
+      this.once(CONNECTOR_EVENTS.CONNECTED, _ => {
         resolve(this.provider);
       });
-      this.once(ADAPTER_EVENTS.ERRORED, err => {
+      this.once(CONNECTOR_EVENTS.ERRORED, err => {
         reject(err);
       });
-      this.walletAdapters[walletName].connect(loginParams);
+      const initialChain = this.getInitialChainIdForConnector(connector);
+      const finalLoginParams = _objectSpread(_objectSpread({}, loginParams), {}, {
+        chainId: initialChain.chainId
+      });
+      connector.connect(finalLoginParams);
+      this.setCurrentChain(initialChain.chainId);
     });
   }
   async logout(options = {
     cleanup: false
   }) {
-    if (this.status !== ADAPTER_STATUS.CONNECTED || !this.connectedAdapterName) throw WalletLoginError.notConnectedError(`No wallet is connected`);
-    await this.walletAdapters[this.connectedAdapterName].disconnect(options);
+    if (this.status !== CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    await this.connectedConnector.disconnect(options);
   }
   async getUserInfo() {
-    log.debug("Getting user info", this.status, this.connectedAdapterName);
-    if (this.status !== ADAPTER_STATUS.CONNECTED || !this.connectedAdapterName) throw WalletLoginError.notConnectedError(`No wallet is connected`);
-    return this.walletAdapters[this.connectedAdapterName].getUserInfo();
+    var _this$connectedConnec;
+    log.debug("Getting user info", this.status, (_this$connectedConnec = this.connectedConnector) === null || _this$connectedConnec === void 0 ? void 0 : _this$connectedConnec.name);
+    if (this.status !== CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    return this.connectedConnector.getUserInfo();
   }
   async enableMFA(loginParams) {
-    if (this.status !== ADAPTER_STATUS.CONNECTED || !this.connectedAdapterName) throw WalletLoginError.notConnectedError(`No wallet is connected`);
-    if (this.connectedAdapterName !== WALLET_ADAPTERS.AUTH) throw WalletLoginError.unsupportedOperation(`EnableMFA is not supported for this adapter.`);
-    return this.walletAdapters[this.connectedAdapterName].enableMFA(loginParams);
+    if (this.status !== CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (this.connectedConnector.name !== WALLET_CONNECTORS.AUTH) throw WalletLoginError.unsupportedOperation(`EnableMFA is not supported for this connector.`);
+    return this.connectedConnector.enableMFA(loginParams);
   }
   async manageMFA(loginParams) {
-    if (this.status !== ADAPTER_STATUS.CONNECTED || !this.connectedAdapterName) throw WalletLoginError.notConnectedError(`No wallet is connected`);
-    if (this.connectedAdapterName !== WALLET_ADAPTERS.AUTH) throw WalletLoginError.unsupportedOperation(`ManageMFA is not supported for this adapter.`);
-    return this.walletAdapters[this.connectedAdapterName].manageMFA(loginParams);
+    if (this.status !== CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (this.connectedConnector.name !== WALLET_CONNECTORS.AUTH) throw WalletLoginError.unsupportedOperation(`ManageMFA is not supported for this connector.`);
+    return this.connectedConnector.manageMFA(loginParams);
   }
   async authenticateUser() {
-    if (this.status !== ADAPTER_STATUS.CONNECTED || !this.connectedAdapterName) throw WalletLoginError.notConnectedError(`No wallet is connected`);
-    return this.walletAdapters[this.connectedAdapterName].authenticateUser();
+    if (this.status !== CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    return this.connectedConnector.authenticateUser();
+  }
+  getPlugin(name) {
+    return this.plugins[name] || null;
+  }
+  initCachedConnectorAndChainId() {
+    this.cachedConnector = 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
+    const cachedChainId = storageAvailable(this.storage) ? window[this.storage].getItem(CURRENT_CHAIN_CACHE_KEY) : null;
+    const isCachedChainIdValid = cachedChainId && this.coreOptions.chains.some(chain => chain.chainId === cachedChainId);
+    this.currentChainId = isCachedChainIdValid ? cachedChainId : this.coreOptions.defaultChainId || this.coreOptions.chains[0].chainId;
   }
-  addPlugin(plugin) {
-    if (this.plugins[plugin.name]) throw WalletInitializationError.duplicateAdapterError(`Plugin ${plugin.name} already exist`);
-    if (plugin.pluginNamespace !== PLUGIN_NAMESPACES.MULTICHAIN && plugin.pluginNamespace !== this.coreOptions.chainConfig.chainNamespace) throw WalletInitializationError.incompatibleChainNameSpace(`This plugin belongs to ${plugin.pluginNamespace} namespace which is incompatible with currently used namespace: ${this.coreOptions.chainConfig.chainNamespace}`);
-    this.plugins[plugin.name] = plugin;
-    if (this.status === ADAPTER_STATUS.CONNECTED && this.connectedAdapterName) {
-      // web3auth is already connected. can initialize plugins
-      this.connectToPlugins({
-        adapter: this.connectedAdapterName
+  async setupCommonJRPCProvider() {
+    this.commonJRPCProvider = await CommonJRPCProvider.getProviderInstance({
+      chain: this.currentChain,
+      chains: this.coreOptions.chains
+    });
+    // sync chainId
+    this.commonJRPCProvider.on("chainChanged", chainId => this.setCurrentChain(chainId));
+  }
+  async setupConnector(connector) {
+    this.subscribeToConnectorEvents(connector);
+    try {
+      const initialChain = this.getInitialChainIdForConnector(connector);
+      await connector.init({
+        autoConnect: this.cachedConnector === connector.name,
+        chainId: initialChain.chainId
       });
+    } catch (e) {
+      log.error(e, connector.name);
     }
-    return this;
   }
-  getPlugin(name) {
-    return this.plugins[name] || null;
+  async loadConnectors({
+    projectConfig
+  }) {
+    var _this$coreOptions$mul;
+    // always add auth connector
+    const connectorFns = [...(this.coreOptions.connectors || []), authConnector()];
+    const config = {
+      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));
+    if (isMipdEnabled) {
+      // Solana chains
+      if (chainNamespaces.has(CHAIN_NAMESPACES.SOLANA)) {
+        const {
+          createSolanaMipd,
+          hasSolanaWalletStandardFeatures,
+          walletStandardConnector
+        } = await import('./connectors/injected-solana-connector/index.js');
+        const solanaMipd = createSolanaMipd();
+        // subscribe to new injected connectors
+        solanaMipd.on("register", async (...wallets) => {
+          const newConnectors = wallets.filter(hasSolanaWalletStandardFeatures).map(wallet => walletStandardConnector(wallet)(config));
+          this.setConnectors(newConnectors);
+        });
+        connectorFns.push(...solanaMipd.get().filter(wallet => hasSolanaWalletStandardFeatures(wallet)).map(walletStandardConnector));
+      }
+      // EVM chains
+      if (chainNamespaces.has(CHAIN_NAMESPACES.EIP155)) {
+        const {
+          createMipd,
+          injectedEvmConnector
+        } = await import('./connectors/injected-evm-connector/index.js');
+        const evmMipd = createMipd();
+        // subscribe to new injected connectors
+        evmMipd.subscribe(providerDetails => {
+          const newConnectors = providerDetails.map(providerDetail => injectedEvmConnector(providerDetail)(config));
+          this.setConnectors(newConnectors);
+        });
+        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 {
+        walletConnectV2Connector
+      } = await import('./connectors/wallet-connect-v2-connector/index.js');
+      connectorFns.push(walletConnectV2Connector());
+    }
+    const connectors = connectorFns.map(connectorFn => connectorFn(config));
+    this.setConnectors(connectors);
+  }
+  async initPlugins() {
+    const pluginFns = this.coreOptions.plugins || [];
+    for (const pluginFn of pluginFns) {
+      const plugin = pluginFn();
+      if (!this.plugins[plugin.name]) this.plugins[plugin.name] = plugin;
+    }
   }
-  subscribeToAdapterEvents(walletAdapter) {
-    walletAdapter.on(ADAPTER_EVENTS.CONNECTED, async data => {
+  setConnectors(connectors) {
+    const getConnectorKey = connector => `${connector.connectorNamespace}-${connector.name}`;
+    const connectorSet = new Set(this.connectors.map(getConnectorKey));
+    const newConnectors = connectors.map(connector => {
+      const key = getConnectorKey(connector);
+      if (connectorSet.has(key)) return null;
+      connectorSet.add(key);
+      return connector;
+    }).filter(connector => connector !== null);
+    if (newConnectors.length > 0) {
+      this.connectors = [...this.connectors, ...newConnectors];
+      // only emit new connectors
+      this.emit(CONNECTOR_EVENTS.CONNECTORS_UPDATED, {
+        connectors: newConnectors
+      });
+    }
+  }
+  subscribeToConnectorEvents(connector) {
+    connector.on(CONNECTOR_EVENTS.CONNECTED, async data => {
       if (!this.commonJRPCProvider) throw WalletInitializationError.notFound(`CommonJrpcProvider not found`);
       const {
         provider
       } = data;
       let finalProvider = provider.provider || provider;
-      // setup aa provider after adapter is connected and private key provider is setup
-      if (this.coreOptions.accountAbstractionProvider && (data.adapter === WALLET_ADAPTERS.AUTH || data.adapter !== WALLET_ADAPTERS.AUTH && this.coreOptions.useAAWithExternalWallet)) {
-        await this.coreOptions.accountAbstractionProvider.setupProvider(provider); // Don't change this to finalProvider
-        finalProvider = this.coreOptions.accountAbstractionProvider;
+      // setup aa provider for external wallets on EVM chains, for in app wallet, it uses WS provider which already supports AA
+      const {
+        accountAbstractionConfig
+      } = this.coreOptions;
+      if (this.currentChain.chainNamespace === CHAIN_NAMESPACES.EIP155 && accountAbstractionConfig && data.connector !== WALLET_CONNECTORS.AUTH && this.coreOptions.useAAWithExternalWallet) {
+        const {
+          accountAbstractionProvider
+        } = await import('./providers/account-abstraction-provider/index.js');
+        const aaProvider = await accountAbstractionProvider({
+          accountAbstractionConfig,
+          provider,
+          chain: this.currentChain,
+          chains: this.coreOptions.chains
+        });
+        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.connectedAdapterName = data.adapter;
-      this.status = ADAPTER_STATUS.CONNECTED;
-      this.cacheWallet(data.adapter);
-      log.debug("connected", this.status, this.connectedAdapterName);
+      this.connectedConnectorName = data.connector;
+      this.status = CONNECTOR_STATUS.CONNECTED;
+      this.cacheWallet(data.connector);
+      log.debug("connected", this.status, this.connectedConnectorName);
       this.connectToPlugins(data);
-      this.emit(ADAPTER_EVENTS.CONNECTED, _objectSpread({}, data));
+      this.emit(CONNECTOR_EVENTS.CONNECTED, _objectSpread({}, data));
     });
-    walletAdapter.on(ADAPTER_EVENTS.DISCONNECTED, async () => {
+    connector.on(CONNECTOR_EVENTS.DISCONNECTED, async () => {
       // get back to ready state for rehydrating.
-      this.status = ADAPTER_STATUS.READY;
+      this.status = CONNECTOR_STATUS.READY;
       if (storageAvailable(this.storage)) {
-        const cachedAdapter = window[this.storage].getItem(ADAPTER_CACHE_KEY);
-        if (this.connectedAdapterName === cachedAdapter) {
+        const cachedConnector = window[this.storage].getItem(CONNECTOR_CACHE_KEY);
+        if (this.connectedConnectorName === cachedConnector) {
           this.clearCache();
         }
       }
-      log.debug("disconnected", this.status, this.connectedAdapterName);
-      await Promise.all(Object.values(this.plugins).map(plugin => {
+      log.debug("disconnected", this.status, this.connectedConnectorName);
+      await Promise.all(Object.values(this.plugins).map(async plugin => {
+        if (!plugin.SUPPORTED_CONNECTORS.includes("all") && !plugin.SUPPORTED_CONNECTORS.includes(connector.name)) return;
+        if (plugin.status !== PLUGIN_STATUS.CONNECTED) return;
         return plugin.disconnect().catch(error => {
-          // swallow error if adapter doesn't supports this plugin.
+          // swallow error if connector doesn't supports this plugin.
           if (error.code === 5211) {
             return;
           }
@@ -298,63 +341,78 @@ class Web3AuthNoModal extends SafeEventEmitter {
           log.error(error);
         });
       }));
-      this.connectedAdapterName = null;
-      this.emit(ADAPTER_EVENTS.DISCONNECTED);
+      this.connectedConnectorName = null;
+      this.emit(CONNECTOR_EVENTS.DISCONNECTED);
     });
-    walletAdapter.on(ADAPTER_EVENTS.CONNECTING, data => {
-      this.status = ADAPTER_STATUS.CONNECTING;
-      this.emit(ADAPTER_EVENTS.CONNECTING, data);
-      log.debug("connecting", this.status, this.connectedAdapterName);
+    connector.on(CONNECTOR_EVENTS.CONNECTING, data => {
+      this.status = CONNECTOR_STATUS.CONNECTING;
+      this.emit(CONNECTOR_EVENTS.CONNECTING, data);
+      log.debug("connecting", this.status, this.connectedConnectorName);
     });
-    walletAdapter.on(ADAPTER_EVENTS.ERRORED, data => {
-      this.status = ADAPTER_STATUS.ERRORED;
+    connector.on(CONNECTOR_EVENTS.ERRORED, data => {
+      this.status = CONNECTOR_STATUS.ERRORED;
       this.clearCache();
-      this.emit(ADAPTER_EVENTS.ERRORED, data);
-      log.debug("errored", this.status, this.connectedAdapterName);
+      this.emit(CONNECTOR_EVENTS.ERRORED, data);
+      log.debug("errored", this.status, this.connectedConnectorName);
     });
-    walletAdapter.on(ADAPTER_EVENTS.ADAPTER_DATA_UPDATED, data => {
-      log.debug("adapter data updated", data);
-      this.emit(ADAPTER_EVENTS.ADAPTER_DATA_UPDATED, data);
+    connector.on(CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, data => {
+      log.debug("connector data updated", data);
+      this.emit(CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, data);
     });
-    walletAdapter.on(ADAPTER_EVENTS.CACHE_CLEAR, data => {
-      log.debug("adapter cache clear", data);
+    connector.on(CONNECTOR_EVENTS.CACHE_CLEAR, data => {
+      log.debug("connector cache clear", data);
       if (storageAvailable(this.storage)) {
         this.clearCache();
       }
     });
   }
   checkInitRequirements() {
-    if (this.status === ADAPTER_STATUS.CONNECTING) throw WalletInitializationError.notReady("Already pending connection");
-    if (this.status === ADAPTER_STATUS.CONNECTED) throw WalletInitializationError.notReady("Already connected");
-    if (this.status === ADAPTER_STATUS.READY) throw WalletInitializationError.notReady("Adapter is already initialized");
+    if (this.status === CONNECTOR_STATUS.CONNECTING) throw WalletInitializationError.notReady("Already pending connection");
+    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
+   */
+  getInitialChainIdForConnector(connector) {
+    let initialChain = this.currentChain;
+    if (initialChain.chainNamespace !== connector.connectorNamespace && connector.connectorNamespace !== CONNECTOR_NAMESPACES.MULTICHAIN) {
+      initialChain = this.coreOptions.chains.find(x => x.chainNamespace === connector.connectorNamespace);
+      if (!initialChain) throw WalletInitializationError.invalidParams(`No chain found for ${connector.connectorNamespace}`);
+    }
+    return initialChain;
   }
   cacheWallet(walletName) {
     if (!storageAvailable(this.storage)) return;
-    window[this.storage].setItem(ADAPTER_CACHE_KEY, walletName);
-    this.cachedAdapter = walletName;
+    // TODO: use the key from user + this
+    window[this.storage].setItem(CONNECTOR_CACHE_KEY, walletName);
+    this.cachedConnector = walletName;
+  }
+  setCurrentChain(chainId) {
+    if (chainId === this.currentChainId) return;
+    const newChain = this.coreOptions.chains.find(chain => chain.chainId === chainId);
+    if (!newChain) throw WalletInitializationError.invalidParams(`Invalid chainId: ${chainId}`);
+    this.currentChainId = chainId;
+    this.cacheCurrentChain(chainId);
+  }
+  cacheCurrentChain(chainId) {
+    if (!storageAvailable(this.storage)) return;
+    window[this.storage].setItem(CURRENT_CHAIN_CACHE_KEY, chainId);
   }
   connectToPlugins(data) {
     Object.values(this.plugins).map(async plugin => {
       try {
-        if (!plugin.SUPPORTED_ADAPTERS.includes("all") && !plugin.SUPPORTED_ADAPTERS.includes(data.adapter)) {
-          return;
-        }
+        // 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 !== PLUGIN_NAMESPACES.MULTICHAIN && plugin.pluginNamespace !== this.currentChain.chainNamespace) return;
+        // skip if it's already connected
         if (plugin.status === PLUGIN_STATUS.CONNECTED) return;
-        const {
-          authInstance
-        } = this.walletAdapters[this.connectedAdapterName];
-        const {
-          options,
-          sessionId,
-          sessionNamespace
-        } = authInstance || {};
-        await plugin.initWithWeb3Auth(this, options === null || options === void 0 ? void 0 : options.whiteLabel);
-        await plugin.connect({
-          sessionId,
-          sessionNamespace
-        });
+        await plugin.initWithWeb3Auth(this, this.coreOptions.uiConfig);
+        await plugin.connect();
       } catch (error) {
-        // swallow error if connector adapter doesn't supports this plugin.
+        // swallow error if connector connector doesn't supports this plugin.
         if (error.code === 5211) {
           return;
         }