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

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,16 +1,23 @@
 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 '../../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 { ADAPTER_STATUS } from '../../base/adapter/constants.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) {
     super();
     _defineProperty(this, "name", EVM_PLUGINS.NFT_CHECKOUT);
     _defineProperty(this, "status", PLUGIN_STATUS.DISCONNECTED);
-    _defineProperty(this, "SUPPORTED_ADAPTERS", ["all"]);
+    _defineProperty(this, "SUPPORTED_CONNECTORS", ["all"]);
     _defineProperty(this, "pluginNamespace", PLUGIN_NAMESPACES.EIP155);
     _defineProperty(this, "web3auth", null);
     _defineProperty(this, "nftCheckoutEmbedInstance", null);
@@ -33,7 +40,7 @@ class NFTCheckoutPlugin extends SafeEventEmitter {
     if (!this.isInitialized) throw NFTCheckoutPluginError.notInitialized();
     this.emit(PLUGIN_EVENTS.CONNECTING);
     this.status = PLUGIN_STATUS.CONNECTING;
-    if (this.web3auth.status !== ADAPTER_STATUS.CONNECTED) throw NFTCheckoutPluginError.web3AuthNotConnected();
+    if (this.web3auth.status !== CONNECTOR_STATUS.CONNECTED) throw NFTCheckoutPluginError.web3AuthNotConnected();
     if (!this.web3auth.provider) throw NFTCheckoutPluginError.providerRequired();
     const accounts = await this.web3auth.provider.request({
       method: "eth_accounts"
@@ -65,5 +72,10 @@ class NFTCheckoutPlugin extends SafeEventEmitter {
     return Promise.resolve();
   }
 }
+const nftCheckoutPlugin = params => {
+  return () => {
+    return new NFTCheckoutPlugin(params);
+  };
+};
 
-export { NFTCheckoutPlugin };
+export { nftCheckoutPlugin };

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

@@ -1,93 +1,49 @@
-import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { SafeEventEmitter } from '@web3auth/auth';
-import WsEmbed from '@web3auth/ws-embed';
-export { BUTTON_POSITION, CONFIRMATION_STRATEGY } from '@web3auth/ws-embed';
-import { CHAIN_NAMESPACES } from '../../base/chain/IChainInterface.js';
+import '../../base/errors/index.js';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
+import { WALLET_CONNECTORS } from '../../base/wallet/index.js';
+import { CONNECTOR_STATUS } from '../../base/connector/constants.js';
+import 'jwt-decode';
 import { log } from '../../base/loglevel.js';
-import { WALLET_ADAPTERS } from '../../base/wallet/index.js';
 import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 import { EVM_PLUGINS, PLUGIN_STATUS, PLUGIN_NAMESPACES, PLUGIN_EVENTS } from '../../base/plugin/IPlugin.js';
-import { ADAPTER_STATUS, ADAPTER_EVENTS } from '../../base/adapter/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 {
-  constructor(options = {}) {
-    super();
+  constructor(...args) {
+    super(...args);
     _defineProperty(this, "name", EVM_PLUGINS.WALLET_SERVICES);
     _defineProperty(this, "status", PLUGIN_STATUS.DISCONNECTED);
-    _defineProperty(this, "SUPPORTED_ADAPTERS", [WALLET_ADAPTERS.AUTH, WALLET_ADAPTERS.SFA]);
+    _defineProperty(this, "SUPPORTED_CONNECTORS", [WALLET_CONNECTORS.AUTH, WALLET_CONNECTORS.SFA]);
     _defineProperty(this, "pluginNamespace", PLUGIN_NAMESPACES.MULTICHAIN);
     _defineProperty(this, "wsEmbedInstance", void 0);
     _defineProperty(this, "provider", null);
     _defineProperty(this, "web3auth", null);
     _defineProperty(this, "isInitialized", false);
-    _defineProperty(this, "walletInitOptions", null);
-    const {
-      wsEmbedOpts,
-      walletInitOptions
-    } = options;
-    // we fake these checks here and get them from web3auth instance
-    this.wsEmbedInstance = new WsEmbed(wsEmbedOpts || {});
-    this.walletInitOptions = walletInitOptions || {};
   }
   get proxyProvider() {
-    return this.wsEmbedInstance.provider ? this.wsEmbedInstance.provider : null;
+    var _this$wsEmbedInstance;
+    return (_this$wsEmbedInstance = this.wsEmbedInstance) !== null && _this$wsEmbedInstance !== void 0 && _this$wsEmbedInstance.provider ? this.wsEmbedInstance.provider : null;
   }
-  async initWithWeb3Auth(web3auth, whiteLabel) {
-    var _this$walletInitOptio, _this$web3auth$coreOp;
+  async initWithWeb3Auth(web3auth, _whiteLabel) {
     if (this.isInitialized) return;
     if (!web3auth) throw WalletServicesPluginError.web3authRequired();
-    if (web3auth.provider && !this.SUPPORTED_ADAPTERS.includes(web3auth.connectedAdapterName)) throw WalletServicesPluginError.notInitialized();
-    if (![CHAIN_NAMESPACES.EIP155, CHAIN_NAMESPACES.SOLANA].includes(web3auth.coreOptions.chainConfig.chainNamespace)) throw WalletServicesPluginError.unsupportedChainNamespace();
+    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;
-    const mergedWhitelabelSettings = _objectSpread(_objectSpread({}, whiteLabel), this.walletInitOptions.whiteLabel || {});
-    const {
-      logoDark,
-      logoLight
-    } = mergedWhitelabelSettings || {};
-    if (!logoDark || !logoLight) throw WalletServicesPluginError.invalidParams("logoDark and logoLight are required in whiteLabel config");
-    this.wsEmbedInstance.web3AuthClientId = this.web3auth.coreOptions.clientId;
-    this.wsEmbedInstance.web3AuthNetwork = this.web3auth.coreOptions.web3AuthNetwork;
-    this.subscribeToWeb3AuthEvents(web3auth);
-    const connectedChainConfig = web3auth.coreOptions.chainConfig;
-    if (!connectedChainConfig.blockExplorerUrl) throw WalletServicesPluginError.invalidParams("blockExplorerUrl is required in chainConfig");
-    if (!connectedChainConfig.displayName) throw WalletServicesPluginError.invalidParams("displayName is required in chainConfig");
-    if (!connectedChainConfig.logo) throw WalletServicesPluginError.invalidParams("logo is required in chainConfig");
-    if (!connectedChainConfig.ticker) throw WalletServicesPluginError.invalidParams("ticker is required in chainConfig");
-    if (!connectedChainConfig.tickerName) throw WalletServicesPluginError.invalidParams("tickerName is required in chainConfig");
-    const hasAaProvider = web3auth.coreOptions.accountAbstractionProvider && (web3auth.connectedAdapterName === WALLET_ADAPTERS.AUTH || web3auth.connectedAdapterName !== WALLET_ADAPTERS.AUTH && web3auth.coreOptions.useAAWithExternalWallet);
-    let accountAbstractionConfig;
-    if (hasAaProvider) {
-      var _web3auth$coreOptions, _web3auth$coreOptions2, _web3auth$coreOptions3, _web3auth$coreOptions4, _web3auth$coreOptions5;
-      const smartAccountAddress = (_web3auth$coreOptions = web3auth.coreOptions.accountAbstractionProvider) === null || _web3auth$coreOptions === void 0 ? void 0 : _web3auth$coreOptions.smartAccount.address;
-      const smartAccountType = (_web3auth$coreOptions2 = web3auth.coreOptions.accountAbstractionProvider) === null || _web3auth$coreOptions2 === void 0 ? void 0 : _web3auth$coreOptions2.config.smartAccountInit.name;
-      const paymasterConfig = (_web3auth$coreOptions3 = web3auth.coreOptions.accountAbstractionProvider) === null || _web3auth$coreOptions3 === void 0 || (_web3auth$coreOptions3 = _web3auth$coreOptions3.config) === null || _web3auth$coreOptions3 === void 0 ? void 0 : _web3auth$coreOptions3.paymasterConfig;
-      const bundlerConfig = (_web3auth$coreOptions4 = web3auth.coreOptions.accountAbstractionProvider) === null || _web3auth$coreOptions4 === void 0 || (_web3auth$coreOptions4 = _web3auth$coreOptions4.config) === null || _web3auth$coreOptions4 === void 0 ? void 0 : _web3auth$coreOptions4.bundlerConfig;
-      const smartAccountConfig = (_web3auth$coreOptions5 = web3auth.coreOptions.accountAbstractionProvider) === null || _web3auth$coreOptions5 === void 0 ? void 0 : _web3auth$coreOptions5.config.smartAccountInit.options;
-
-      // TODO: fix this type casting when we start using accountAbstractionController
-      accountAbstractionConfig = {
-        smartAccountAddress: smartAccountAddress || undefined,
-        smartAccountType: smartAccountType || undefined,
-        paymasterConfig: paymasterConfig || undefined,
-        bundlerConfig: bundlerConfig || undefined,
-        smartAccountConfig: smartAccountConfig || undefined
-      };
-    } else if ((_this$walletInitOptio = this.walletInitOptions) !== null && _this$walletInitOptio !== void 0 && _this$walletInitOptio.accountAbstractionConfig && Object.keys(this.walletInitOptions.accountAbstractionConfig).length > 0) {
-      // if wallet services plugin is initialized with accountAbstractionConfig we enable wallet service AA without AA provider
-      accountAbstractionConfig = this.walletInitOptions.accountAbstractionConfig;
-    }
-    const finalInitOptions = _objectSpread(_objectSpread({}, this.walletInitOptions), {}, {
-      chainConfig: connectedChainConfig,
-      enableLogging: (_this$web3auth$coreOp = this.web3auth.coreOptions) === null || _this$web3auth$coreOp === void 0 ? void 0 : _this$web3auth$coreOp.enableLogging,
-      whiteLabel: mergedWhitelabelSettings,
-      accountAbstractionConfig
-    });
-    await this.wsEmbedInstance.init(finalInitOptions);
+    // Auth connector uses WS embed
+    const authInstance = web3auth.getConnector(WALLET_CONNECTORS.AUTH);
+    if (!authInstance || !authInstance.wsEmbed) throw WalletServicesPluginError.web3AuthNotConnected();
+    this.wsEmbedInstance = authInstance.wsEmbed;
     this.isInitialized = true;
     this.status = PLUGIN_STATUS.READY;
     this.emit(PLUGIN_EVENTS.READY);
@@ -95,11 +51,8 @@ class WalletServicesPlugin extends SafeEventEmitter {
   initWithProvider() {
     throw new Error("Method not implemented.");
   }
-  async connect({
-    sessionId,
-    sessionNamespace
-  }) {
-    // if web3auth is being used and connected to unsupported adapter throw error
+  async connect() {
+    // if web3auth is being used and connected to unsupported connector throw error
     if (!this.isInitialized) throw WalletServicesPluginError.notInitialized();
     this.emit(PLUGIN_EVENTS.CONNECTING);
     this.status = PLUGIN_STATUS.CONNECTING;
@@ -109,21 +62,12 @@ class WalletServicesPlugin extends SafeEventEmitter {
         this.provider = this.web3auth.provider;
       }
     }
-    if (this.web3auth.status !== ADAPTER_STATUS.CONNECTED) {
+    if (this.web3auth.status !== CONNECTOR_STATUS.CONNECTED) {
       throw WalletServicesPluginError.web3AuthNotConnected();
     } else if (!this.web3auth.provider) {
       throw WalletServicesPluginError.providerRequired();
     }
-    if (!sessionId) {
-      throw WalletServicesPluginError.web3AuthNotConnected();
-    }
     try {
-      await this.wsEmbedInstance.loginWithSessionId({
-        sessionId,
-        sessionNamespace
-      });
-      this.subscribeToProviderEvents(this.provider);
-      this.subscribeToWalletEvents();
       this.emit(PLUGIN_EVENTS.CONNECTED);
       this.status = PLUGIN_STATUS.CONNECTED;
     } catch (error) {
@@ -135,142 +79,43 @@ class WalletServicesPlugin extends SafeEventEmitter {
     }
   }
   async showWalletConnectScanner(showWalletConnectParams) {
-    if (!this.wsEmbedInstance.isLoggedIn) throw WalletServicesPluginError.walletPluginNotConnected();
+    var _this$wsEmbedInstance2;
+    if (!((_this$wsEmbedInstance2 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance2 !== void 0 && _this$wsEmbedInstance2.isLoggedIn)) throw WalletServicesPluginError.walletPluginNotConnected();
     return this.wsEmbedInstance.showWalletConnectScanner(showWalletConnectParams);
   }
   async showCheckout(showCheckoutParams) {
-    if (!this.wsEmbedInstance.isLoggedIn) throw WalletServicesPluginError.walletPluginNotConnected();
+    var _this$wsEmbedInstance3;
+    if (!((_this$wsEmbedInstance3 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance3 !== void 0 && _this$wsEmbedInstance3.isLoggedIn)) throw WalletServicesPluginError.walletPluginNotConnected();
     return this.wsEmbedInstance.showCheckout(showCheckoutParams);
   }
   async showWalletUi(showWalletUiParams) {
-    if (!this.wsEmbedInstance.isLoggedIn) throw WalletServicesPluginError.walletPluginNotConnected();
+    var _this$wsEmbedInstance4;
+    if (!((_this$wsEmbedInstance4 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance4 !== void 0 && _this$wsEmbedInstance4.isLoggedIn)) throw WalletServicesPluginError.walletPluginNotConnected();
     return this.wsEmbedInstance.showWalletUi(showWalletUiParams);
   }
   async showSwap(showSwapParams) {
-    if (!this.wsEmbedInstance.isLoggedIn) throw WalletServicesPluginError.walletPluginNotConnected();
+    var _this$wsEmbedInstance5;
+    if (!((_this$wsEmbedInstance5 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance5 !== void 0 && _this$wsEmbedInstance5.isLoggedIn)) throw WalletServicesPluginError.walletPluginNotConnected();
     return this.wsEmbedInstance.showSwap(showSwapParams);
   }
   async cleanup() {
-    return this.wsEmbedInstance.cleanUp();
+    var _this$wsEmbedInstance6;
+    return (_this$wsEmbedInstance6 = this.wsEmbedInstance) === null || _this$wsEmbedInstance6 === void 0 ? void 0 : _this$wsEmbedInstance6.cleanUp();
   }
   async disconnect() {
-    // if web3auth is being used and connected to unsupported adapter throw error
-    if (this.wsEmbedInstance.isLoggedIn) {
+    var _this$wsEmbedInstance7;
+    if (this.status !== PLUGIN_STATUS.CONNECTED) throw WalletServicesPluginError.invalidSession("Wallet Services plugin is not connected");
+    if ((_this$wsEmbedInstance7 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance7 !== void 0 && _this$wsEmbedInstance7.isLoggedIn) {
       await this.wsEmbedInstance.logout();
-      this.emit(PLUGIN_EVENTS.DISCONNECTED);
-      this.status = PLUGIN_STATUS.DISCONNECTED;
-    } else {
-      throw WalletServicesPluginError.invalidSession("Wallet Services plugin is not connected");
-    }
-  }
-  subscribeToWalletEvents() {
-    var _this$wsEmbedInstance;
-    (_this$wsEmbedInstance = this.wsEmbedInstance) === null || _this$wsEmbedInstance === void 0 || _this$wsEmbedInstance.provider.on("accountsChanged", (accounts = []) => {
-      if (accounts.length === 0) {
-        var _this$web3auth2, _this$web3auth3;
-        if (((_this$web3auth2 = this.web3auth) === null || _this$web3auth2 === void 0 ? void 0 : _this$web3auth2.status) === ADAPTER_STATUS.CONNECTED) (_this$web3auth3 = this.web3auth) === null || _this$web3auth3 === void 0 || _this$web3auth3.logout();
-      }
-    });
-  }
-  subscribeToProviderEvents(provider) {
-    provider.on("accountsChanged", (accounts = []) => {
-      this.setSelectedAddress(accounts[0]);
-    });
-    provider.on("chainChanged", chainId => {
-      this.setChainID(parseInt(chainId, 16));
-    });
-  }
-  subscribeToWeb3AuthEvents(web3Auth) {
-    web3Auth.on(ADAPTER_EVENTS.CONNECTED, data => {
-      this.provider = data.provider || web3Auth.provider;
-      if (!this.provider) throw WalletServicesPluginError.web3AuthNotConnected();
-      this.subscribeToProviderEvents(this.provider);
-    });
-    web3Auth.on(ADAPTER_EVENTS.DISCONNECTED, async () => {
-      this.provider = null;
-      if (this.wsEmbedInstance.isLoggedIn) {
-        await this.wsEmbedInstance.logout();
-      }
-    });
-  }
-  async sessionConfig() {
-    if (!this.provider) throw WalletServicesPluginError.web3AuthNotConnected();
-    const [accounts, chainId, chainConfig] = await Promise.all([this.provider.request({
-      method: "eth_accounts"
-    }), this.provider.request({
-      method: "eth_chainId"
-    }), this.provider.request({
-      method: "eth_provider_config"
-    })]);
-    return {
-      chainId: parseInt(chainId, 16),
-      accounts: accounts,
-      chainConfig: chainConfig
-    };
-  }
-  async walletServicesSessionConfig() {
-    if (!this.wsEmbedInstance.provider) throw WalletServicesPluginError.web3AuthNotConnected();
-    const [accounts, chainId] = await Promise.all([this.wsEmbedInstance.provider.request({
-      method: "eth_accounts"
-    }), this.wsEmbedInstance.provider.request({
-      method: "eth_chainId"
-    })]);
-    return {
-      chainId: parseInt(chainId, 16),
-      accounts: accounts
-    };
-  }
-  async setSelectedAddress(address) {
-    var _walletServicesSessio;
-    if (this.web3auth.status !== ADAPTER_STATUS.CONNECTED) throw WalletServicesPluginError.web3AuthNotConnected();
-    const walletServicesSessionConfig = await this.walletServicesSessionConfig();
-    if (address !== ((_walletServicesSessio = walletServicesSessionConfig.accounts) === null || _walletServicesSessio === void 0 ? void 0 : _walletServicesSessio[0])) {
-      throw WalletServicesPluginError.invalidSession();
-    }
-  }
-  async setChainID(chainId) {
-    const [sessionConfig, walletServicesSessionConfig] = await Promise.all([this.sessionConfig(), this.walletServicesSessionConfig()]);
-    const {
-      chainConfig
-    } = sessionConfig || {};
-    if (!chainConfig.blockExplorerUrl) throw WalletServicesPluginError.invalidParams("blockExplorerUrl is required in chainConfig");
-    if (!chainConfig.displayName) throw WalletServicesPluginError.invalidParams("displayName is required in chainConfig");
-    if (!chainConfig.logo) throw WalletServicesPluginError.invalidParams("logo is required in chainConfig");
-    if (!chainConfig.ticker) throw WalletServicesPluginError.invalidParams("ticker is required in chainConfig");
-    if (!chainConfig.tickerName) throw WalletServicesPluginError.invalidParams("tickerName is required in chainConfig");
-    if (chainId !== walletServicesSessionConfig.chainId && chainConfig) {
-      try {
-        var _this$wsEmbedInstance2, _this$wsEmbedInstance3;
-        await ((_this$wsEmbedInstance2 = this.wsEmbedInstance.provider) === null || _this$wsEmbedInstance2 === void 0 ? void 0 : _this$wsEmbedInstance2.request({
-          method: "wallet_addEthereumChain",
-          params: [{
-            chainId: chainConfig.chainId,
-            chainName: chainConfig.displayName,
-            rpcUrls: [chainConfig.rpcTarget],
-            blockExplorerUrls: [chainConfig.blockExplorerUrl],
-            nativeCurrency: {
-              name: chainConfig.tickerName,
-              symbol: chainConfig.ticker,
-              decimals: chainConfig.decimals || 18
-            },
-            iconUrls: [chainConfig.logo]
-          }]
-        }).catch(() => {
-          // TODO: throw more specific error from the controller
-          log.error("WalletServicesPlugin: Error adding chain");
-        }));
-        await ((_this$wsEmbedInstance3 = this.wsEmbedInstance.provider) === null || _this$wsEmbedInstance3 === void 0 ? void 0 : _this$wsEmbedInstance3.request({
-          method: "wallet_switchEthereumChain",
-          params: [{
-            chainId: chainConfig.chainId
-          }]
-        }));
-      } catch (error) {
-        // TODO: throw more specific error from the controller
-        log.error("WalletServicesPlugin: Error switching chain");
-      }
     }
+    this.emit(PLUGIN_EVENTS.DISCONNECTED);
+    this.status = PLUGIN_STATUS.DISCONNECTED;
   }
 }
+const walletServicesPlugin = () => {
+  return () => {
+    return new WalletServicesPlugin();
+  };
+};
 
-export { WalletServicesPlugin };
+export { walletServicesPlugin };

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

@@ -0,0 +1,2 @@
+export { accountAbstractionProvider } from './providers/AccountAbstractionProvider.js';
+export { BiconomySmartAccount, KernelSmartAccount, NexusSmartAccount, SMART_ACCOUNT, SafeSmartAccount, TrustSmartAccount } from '@toruslabs/ethereum-controllers';

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

@@ -1,13 +1,26 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import { SMART_ACCOUNT } from '@toruslabs/ethereum-controllers';
+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';
-import { BaseProvider } from '../../base-provider/baseProvider.js';
 
 var _AccountAbstractionProvider;
 class AccountAbstractionProvider extends BaseProvider {
@@ -24,6 +37,9 @@ class AccountAbstractionProvider extends BaseProvider {
     _defineProperty(this, "_publicClient", void 0);
     _defineProperty(this, "_bundlerClient", void 0);
     _defineProperty(this, "_paymasterClient", void 0);
+    this.update({
+      chainId: config.chain.chainId
+    });
   }
   get smartAccount() {
     return this._smartAccount;
@@ -49,43 +65,45 @@ class AccountAbstractionProvider extends BaseProvider {
   }
   async setupProvider(eoaProvider) {
     var _this$config$bundlerC;
+    const {
+      currentChain
+    } = this;
     const {
       chainNamespace
-    } = this.config.chainConfig;
+    } = currentChain;
     if (chainNamespace !== this.PROVIDER_CHAIN_NAMESPACE) throw WalletInitializationError.incompatibleChainNameSpace("Invalid chain namespace");
     const chain = defineChain({
-      id: Number.parseInt(this.config.chainConfig.chainId, 16),
+      id: Number.parseInt(currentChain.chainId, 16),
       // id in number form
-      name: this.config.chainConfig.displayName,
+      name: currentChain.displayName,
       rpcUrls: {
         default: {
-          http: [this.config.chainConfig.rpcTarget],
-          webSocket: [this.config.chainConfig.wsTarget]
+          http: [currentChain.rpcTarget],
+          webSocket: [currentChain.wsTarget]
         }
       },
-      blockExplorers: this.config.chainConfig.blockExplorerUrl ? {
+      blockExplorers: currentChain.blockExplorerUrl ? {
         default: {
           name: "explorer",
           // TODO: correct name if chain config has it
-          url: this.config.chainConfig.blockExplorerUrl
+          url: currentChain.blockExplorerUrl
         }
       } : undefined,
       nativeCurrency: {
-        name: this.config.chainConfig.tickerName,
-        symbol: this.config.chainConfig.ticker,
-        decimals: this.config.chainConfig.decimals || 18
+        name: currentChain.tickerName,
+        symbol: currentChain.ticker,
+        decimals: currentChain.decimals || 18
       }
     });
     // setup public client for viem smart account
     this._publicClient = createPublicClient({
       chain,
-      transport: http(this.config.chainConfig.rpcTarget)
+      transport: http(currentChain.rpcTarget)
     });
     this._smartAccount = await this.config.smartAccountInit.getSmartAccount({
       owner: eoaProvider,
       client: this._publicClient
     });
-
     // setup bundler and paymaster
     if (this.config.paymasterConfig) {
       var _this$config$paymaste;
@@ -105,7 +123,6 @@ class AccountAbstractionProvider extends BaseProvider {
       chain,
       eoaProvider
     });
-
     // setup rpc engine and AA middleware
     const engine = new JRPCEngine();
     const aaMiddleware = await createAaMiddleware({
@@ -117,8 +134,12 @@ class AccountAbstractionProvider extends BaseProvider {
     engine.push(eoaMiddleware);
     const provider = providerFromEngine(engine);
     this.updateProviderEngineProxy(provider);
-    eoaProvider.once("chainChanged", () => {
+    eoaProvider.once("chainChanged", chainId => {
+      this.update({
+        chainId
+      });
       this.setupChainSwitchMiddleware();
+      this.emit("chainChanged", chainId);
     });
   }
   async updateAccount(_params) {
@@ -131,32 +152,85 @@ class AccountAbstractionProvider extends BaseProvider {
     throw providerErrors.unsupportedMethod("lookupNetwork. Please call it on eoaProvider");
   }
   async setupChainSwitchMiddleware() {
-    const chainConfig = await this.state.eoaProvider.request({
-      method: "eth_provider_config"
-    });
-    this.update({
-      chainId: chainConfig.chainId
-    });
-    this.configure({
-      chainConfig: _objectSpread(_objectSpread({}, chainConfig), {}, {
-        chainNamespace: CHAIN_NAMESPACES.EIP155,
-        chainId: chainConfig.chainId,
-        rpcTarget: chainConfig.rpcTarget
-      })
-    });
     return this.setupProvider(this.state.eoaProvider);
   }
 }
 _AccountAbstractionProvider = AccountAbstractionProvider;
 _defineProperty(AccountAbstractionProvider, "getProviderInstance", async params => {
-  const providerFactory = new _AccountAbstractionProvider({
+  const providerInstance = new _AccountAbstractionProvider({
     config: params
   });
-  await providerFactory.setupProvider(params.eoaProvider);
-  providerFactory.update({
+  await providerInstance.setupProvider(params.eoaProvider);
+  providerInstance.update({
     eoaProvider: params.eoaProvider
   });
-  return providerFactory;
+  return providerInstance;
 });
+const accountAbstractionProvider = async ({
+  accountAbstractionConfig,
+  chain,
+  chains,
+  provider
+}) => {
+  let smartAccountInit;
+  const {
+    smartAccountType,
+    smartAccountConfig,
+    bundlerConfig,
+    paymasterConfig
+  } = accountAbstractionConfig;
+  switch (smartAccountType) {
+    case SMART_ACCOUNT.BICONOMY:
+      {
+        const {
+          BiconomySmartAccount
+        } = await import('@toruslabs/ethereum-controllers');
+        smartAccountInit = new BiconomySmartAccount(smartAccountConfig);
+        break;
+      }
+    case SMART_ACCOUNT.KERNEL:
+      {
+        const {
+          KernelSmartAccount
+        } = await import('@toruslabs/ethereum-controllers');
+        smartAccountInit = new KernelSmartAccount(smartAccountConfig);
+        break;
+      }
+    case SMART_ACCOUNT.NEXUS:
+      {
+        const {
+          NexusSmartAccount
+        } = await import('@toruslabs/ethereum-controllers');
+        smartAccountInit = new NexusSmartAccount(smartAccountConfig);
+        break;
+      }
+    case SMART_ACCOUNT.SAFE:
+      {
+        const {
+          SafeSmartAccount
+        } = await import('@toruslabs/ethereum-controllers');
+        smartAccountInit = new SafeSmartAccount(smartAccountConfig);
+        break;
+      }
+    case SMART_ACCOUNT.TRUST:
+      {
+        const {
+          TrustSmartAccount
+        } = await import('@toruslabs/ethereum-controllers');
+        smartAccountInit = new TrustSmartAccount(smartAccountConfig);
+        break;
+      }
+    default:
+      throw new Error("Smart account type not supported");
+  }
+  return AccountAbstractionProvider.getProviderInstance({
+    eoaProvider: provider,
+    smartAccountInit,
+    chain,
+    chains,
+    bundlerConfig,
+    paymasterConfig
+  });
+};
 
-export { AccountAbstractionProvider };
+export { accountAbstractionProvider };

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);