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

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

@@ -49,13 +49,11 @@ class NFTCheckoutEmbed {
       whiteLabel
     } = params || {};
     this.buildEnv = buildEnv;
-
     // construct nft checkout url
     const nftCheckoutIframeUrl = new URL(enums.NFT_CHECKOUT_URLS[this.buildEnv]);
     const hashParams = new URLSearchParams();
     hashParams.append("origin", window.location.origin);
     nftCheckoutIframeUrl.hash = hashParams.toString();
-
     // create iframe
     const colorScheme = utils.getTheme((whiteLabel === null || whiteLabel === void 0 ? void 0 : whiteLabel.mode) || auth.THEME_MODES.light);
     const nftCheckoutIframe = utils.htmlToElement(`<iframe
@@ -99,7 +97,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(enums.NFT_CHECKOUT_URLS[this.buildEnv]).origin;
     nftCheckoutIframe.contentWindow.postMessage({

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

@@ -2,17 +2,24 @@
 
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var auth = require('@web3auth/auth');
-var embed = require('./embed.js');
-var IPlugin = require('../../base/plugin/IPlugin.js');
+require('../../base/errors/index.js');
+require('@toruslabs/base-controllers');
+require('../../base/wallet/index.js');
+var constants = require('../../base/connector/constants.js');
+require('jwt-decode');
+require('../../base/loglevel.js');
 var errors = require('../../base/plugin/errors.js');
-var constants = require('../../base/adapter/constants.js');
+var IPlugin = require('../../base/plugin/IPlugin.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+var embed = require('./embed.js');
 
 class NFTCheckoutPlugin extends auth.SafeEventEmitter {
   constructor(params) {
     super();
     _defineProperty(this, "name", IPlugin.EVM_PLUGINS.NFT_CHECKOUT);
     _defineProperty(this, "status", IPlugin.PLUGIN_STATUS.DISCONNECTED);
-    _defineProperty(this, "SUPPORTED_ADAPTERS", ["all"]);
+    _defineProperty(this, "SUPPORTED_CONNECTORS", ["all"]);
     _defineProperty(this, "pluginNamespace", IPlugin.PLUGIN_NAMESPACES.EIP155);
     _defineProperty(this, "web3auth", null);
     _defineProperty(this, "nftCheckoutEmbedInstance", null);
@@ -35,7 +42,7 @@ class NFTCheckoutPlugin extends auth.SafeEventEmitter {
     if (!this.isInitialized) throw errors.NFTCheckoutPluginError.notInitialized();
     this.emit(IPlugin.PLUGIN_EVENTS.CONNECTING);
     this.status = IPlugin.PLUGIN_STATUS.CONNECTING;
-    if (this.web3auth.status !== constants.ADAPTER_STATUS.CONNECTED) throw errors.NFTCheckoutPluginError.web3AuthNotConnected();
+    if (this.web3auth.status !== constants.CONNECTOR_STATUS.CONNECTED) throw errors.NFTCheckoutPluginError.web3AuthNotConnected();
     if (!this.web3auth.provider) throw errors.NFTCheckoutPluginError.providerRequired();
     const accounts = await this.web3auth.provider.request({
       method: "eth_accounts"
@@ -67,5 +74,10 @@ class NFTCheckoutPlugin extends auth.SafeEventEmitter {
     return Promise.resolve();
   }
 }
+const nftCheckoutPlugin = params => {
+  return () => {
+    return new NFTCheckoutPlugin(params);
+  };
+};
 
-exports.NFTCheckoutPlugin = NFTCheckoutPlugin;
+exports.nftCheckoutPlugin = nftCheckoutPlugin;

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

@@ -1,94 +1,51 @@
 'use strict';
 
-var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var auth = require('@web3auth/auth');
-var WsEmbed = require('@web3auth/ws-embed');
-var IChainInterface = require('../../base/chain/IChainInterface.js');
-var loglevel = require('../../base/loglevel.js');
+require('../../base/errors/index.js');
+var baseControllers = require('@toruslabs/base-controllers');
 var index = require('../../base/wallet/index.js');
+var constants = require('../../base/connector/constants.js');
+require('jwt-decode');
+var loglevel = require('../../base/loglevel.js');
 var errors = require('../../base/plugin/errors.js');
 var IPlugin = require('../../base/plugin/IPlugin.js');
-var constants = require('../../base/adapter/constants.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+var wsEmbed = require('@web3auth/ws-embed');
 
+// TODO: support project config items here. incl. key export flag, multiple chains
 class WalletServicesPlugin extends auth.SafeEventEmitter {
-  constructor(options = {}) {
-    super();
+  constructor(...args) {
+    super(...args);
     _defineProperty(this, "name", IPlugin.EVM_PLUGINS.WALLET_SERVICES);
     _defineProperty(this, "status", IPlugin.PLUGIN_STATUS.DISCONNECTED);
-    _defineProperty(this, "SUPPORTED_ADAPTERS", [index.WALLET_ADAPTERS.AUTH, index.WALLET_ADAPTERS.SFA]);
+    _defineProperty(this, "SUPPORTED_CONNECTORS", [index.WALLET_CONNECTORS.AUTH, index.WALLET_CONNECTORS.SFA]);
     _defineProperty(this, "pluginNamespace", IPlugin.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 errors.WalletServicesPluginError.web3authRequired();
-    if (web3auth.provider && !this.SUPPORTED_ADAPTERS.includes(web3auth.connectedAdapterName)) throw errors.WalletServicesPluginError.notInitialized();
-    if (![IChainInterface.CHAIN_NAMESPACES.EIP155, IChainInterface.CHAIN_NAMESPACES.SOLANA].includes(web3auth.coreOptions.chainConfig.chainNamespace)) throw errors.WalletServicesPluginError.unsupportedChainNamespace();
+    if (web3auth.provider && !this.SUPPORTED_CONNECTORS.includes(web3auth.connectedConnectorName)) throw errors.WalletServicesPluginError.notInitialized();
+    const currentChainConfig = web3auth.currentChain;
+    if (![baseControllers.CHAIN_NAMESPACES.EIP155, baseControllers.CHAIN_NAMESPACES.SOLANA].includes(currentChainConfig.chainNamespace)) throw errors.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 errors.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 errors.WalletServicesPluginError.invalidParams("blockExplorerUrl is required in chainConfig");
-    if (!connectedChainConfig.displayName) throw errors.WalletServicesPluginError.invalidParams("displayName is required in chainConfig");
-    if (!connectedChainConfig.logo) throw errors.WalletServicesPluginError.invalidParams("logo is required in chainConfig");
-    if (!connectedChainConfig.ticker) throw errors.WalletServicesPluginError.invalidParams("ticker is required in chainConfig");
-    if (!connectedChainConfig.tickerName) throw errors.WalletServicesPluginError.invalidParams("tickerName is required in chainConfig");
-    const hasAaProvider = web3auth.coreOptions.accountAbstractionProvider && (web3auth.connectedAdapterName === index.WALLET_ADAPTERS.AUTH || web3auth.connectedAdapterName !== index.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(index.WALLET_CONNECTORS.AUTH);
+    if (!authInstance || !authInstance.wsEmbed) throw errors.WalletServicesPluginError.web3AuthNotConnected();
+    this.wsEmbedInstance = authInstance.wsEmbed;
     this.isInitialized = true;
     this.status = IPlugin.PLUGIN_STATUS.READY;
     this.emit(IPlugin.PLUGIN_EVENTS.READY);
@@ -96,11 +53,8 @@ class WalletServicesPlugin extends auth.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 errors.WalletServicesPluginError.notInitialized();
     this.emit(IPlugin.PLUGIN_EVENTS.CONNECTING);
     this.status = IPlugin.PLUGIN_STATUS.CONNECTING;
@@ -110,21 +64,12 @@ class WalletServicesPlugin extends auth.SafeEventEmitter {
         this.provider = this.web3auth.provider;
       }
     }
-    if (this.web3auth.status !== constants.ADAPTER_STATUS.CONNECTED) {
+    if (this.web3auth.status !== constants.CONNECTOR_STATUS.CONNECTED) {
       throw errors.WalletServicesPluginError.web3AuthNotConnected();
     } else if (!this.web3auth.provider) {
       throw errors.WalletServicesPluginError.providerRequired();
     }
-    if (!sessionId) {
-      throw errors.WalletServicesPluginError.web3AuthNotConnected();
-    }
     try {
-      await this.wsEmbedInstance.loginWithSessionId({
-        sessionId,
-        sessionNamespace
-      });
-      this.subscribeToProviderEvents(this.provider);
-      this.subscribeToWalletEvents();
       this.emit(IPlugin.PLUGIN_EVENTS.CONNECTED);
       this.status = IPlugin.PLUGIN_STATUS.CONNECTED;
     } catch (error) {
@@ -136,150 +81,51 @@ class WalletServicesPlugin extends auth.SafeEventEmitter {
     }
   }
   async showWalletConnectScanner(showWalletConnectParams) {
-    if (!this.wsEmbedInstance.isLoggedIn) throw errors.WalletServicesPluginError.walletPluginNotConnected();
+    var _this$wsEmbedInstance2;
+    if (!((_this$wsEmbedInstance2 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance2 !== void 0 && _this$wsEmbedInstance2.isLoggedIn)) throw errors.WalletServicesPluginError.walletPluginNotConnected();
     return this.wsEmbedInstance.showWalletConnectScanner(showWalletConnectParams);
   }
   async showCheckout(showCheckoutParams) {
-    if (!this.wsEmbedInstance.isLoggedIn) throw errors.WalletServicesPluginError.walletPluginNotConnected();
+    var _this$wsEmbedInstance3;
+    if (!((_this$wsEmbedInstance3 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance3 !== void 0 && _this$wsEmbedInstance3.isLoggedIn)) throw errors.WalletServicesPluginError.walletPluginNotConnected();
     return this.wsEmbedInstance.showCheckout(showCheckoutParams);
   }
   async showWalletUi(showWalletUiParams) {
-    if (!this.wsEmbedInstance.isLoggedIn) throw errors.WalletServicesPluginError.walletPluginNotConnected();
+    var _this$wsEmbedInstance4;
+    if (!((_this$wsEmbedInstance4 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance4 !== void 0 && _this$wsEmbedInstance4.isLoggedIn)) throw errors.WalletServicesPluginError.walletPluginNotConnected();
     return this.wsEmbedInstance.showWalletUi(showWalletUiParams);
   }
   async showSwap(showSwapParams) {
-    if (!this.wsEmbedInstance.isLoggedIn) throw errors.WalletServicesPluginError.walletPluginNotConnected();
+    var _this$wsEmbedInstance5;
+    if (!((_this$wsEmbedInstance5 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance5 !== void 0 && _this$wsEmbedInstance5.isLoggedIn)) throw errors.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 !== IPlugin.PLUGIN_STATUS.CONNECTED) throw errors.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(IPlugin.PLUGIN_EVENTS.DISCONNECTED);
-      this.status = IPlugin.PLUGIN_STATUS.DISCONNECTED;
-    } else {
-      throw errors.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) === constants.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(constants.ADAPTER_EVENTS.CONNECTED, data => {
-      this.provider = data.provider || web3Auth.provider;
-      if (!this.provider) throw errors.WalletServicesPluginError.web3AuthNotConnected();
-      this.subscribeToProviderEvents(this.provider);
-    });
-    web3Auth.on(constants.ADAPTER_EVENTS.DISCONNECTED, async () => {
-      this.provider = null;
-      if (this.wsEmbedInstance.isLoggedIn) {
-        await this.wsEmbedInstance.logout();
-      }
-    });
-  }
-  async sessionConfig() {
-    if (!this.provider) throw errors.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 errors.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 !== constants.ADAPTER_STATUS.CONNECTED) throw errors.WalletServicesPluginError.web3AuthNotConnected();
-    const walletServicesSessionConfig = await this.walletServicesSessionConfig();
-    if (address !== ((_walletServicesSessio = walletServicesSessionConfig.accounts) === null || _walletServicesSessio === void 0 ? void 0 : _walletServicesSessio[0])) {
-      throw errors.WalletServicesPluginError.invalidSession();
-    }
-  }
-  async setChainID(chainId) {
-    const [sessionConfig, walletServicesSessionConfig] = await Promise.all([this.sessionConfig(), this.walletServicesSessionConfig()]);
-    const {
-      chainConfig
-    } = sessionConfig || {};
-    if (!chainConfig.blockExplorerUrl) throw errors.WalletServicesPluginError.invalidParams("blockExplorerUrl is required in chainConfig");
-    if (!chainConfig.displayName) throw errors.WalletServicesPluginError.invalidParams("displayName is required in chainConfig");
-    if (!chainConfig.logo) throw errors.WalletServicesPluginError.invalidParams("logo is required in chainConfig");
-    if (!chainConfig.ticker) throw errors.WalletServicesPluginError.invalidParams("ticker is required in chainConfig");
-    if (!chainConfig.tickerName) throw errors.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
-          loglevel.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
-        loglevel.log.error("WalletServicesPlugin: Error switching chain");
-      }
     }
+    this.emit(IPlugin.PLUGIN_EVENTS.DISCONNECTED);
+    this.status = IPlugin.PLUGIN_STATUS.DISCONNECTED;
   }
 }
+const walletServicesPlugin = () => {
+  return () => {
+    return new WalletServicesPlugin();
+  };
+};
 
 Object.defineProperty(exports, "BUTTON_POSITION", {
-  enumerable: true,
-  get: function () { return WsEmbed.BUTTON_POSITION; }
+    enumerable: true,
+    get: function () { return wsEmbed.BUTTON_POSITION; }
 });
 Object.defineProperty(exports, "CONFIRMATION_STRATEGY", {
-  enumerable: true,
-  get: function () { return WsEmbed.CONFIRMATION_STRATEGY; }
+    enumerable: true,
+    get: function () { return wsEmbed.CONFIRMATION_STRATEGY; }
 });
-exports.WalletServicesPlugin = WalletServicesPlugin;
+exports.walletServicesPlugin = walletServicesPlugin;

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

@@ -0,0 +1,32 @@
+'use strict';
+
+var AccountAbstractionProvider = require('./providers/AccountAbstractionProvider.js');
+var ethereumControllers = require('@toruslabs/ethereum-controllers');
+
+
+
+exports.accountAbstractionProvider = AccountAbstractionProvider.accountAbstractionProvider;
+Object.defineProperty(exports, "BiconomySmartAccount", {
+	enumerable: true,
+	get: function () { return ethereumControllers.BiconomySmartAccount; }
+});
+Object.defineProperty(exports, "KernelSmartAccount", {
+	enumerable: true,
+	get: function () { return ethereumControllers.KernelSmartAccount; }
+});
+Object.defineProperty(exports, "NexusSmartAccount", {
+	enumerable: true,
+	get: function () { return ethereumControllers.NexusSmartAccount; }
+});
+Object.defineProperty(exports, "SMART_ACCOUNT", {
+	enumerable: true,
+	get: function () { return ethereumControllers.SMART_ACCOUNT; }
+});
+Object.defineProperty(exports, "SafeSmartAccount", {
+	enumerable: true,
+	get: function () { return ethereumControllers.SafeSmartAccount; }
+});
+Object.defineProperty(exports, "TrustSmartAccount", {
+	enumerable: true,
+	get: function () { return ethereumControllers.TrustSmartAccount; }
+});

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

@@ -2,14 +2,26 @@
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var ethereumControllers = require('@toruslabs/ethereum-controllers');
 var auth = require('@web3auth/auth');
 var viem = require('viem');
 var accountAbstraction = require('viem/account-abstraction');
-var IChainInterface = require('../../../base/chain/IChainInterface.js');
 var index = require('../../../base/errors/index.js');
+var baseControllers = require('@toruslabs/base-controllers');
+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 baseProvider = require('../../base-provider/baseProvider.js');
+require('../../base-provider/CommonJRPCProvider.js');
+require('../../base-provider/commonPrivateKeyProvider.js');
+require('../../base-provider/utils.js');
 var ethRpcMiddlewares = require('../rpc/ethRpcMiddlewares.js');
 var utils = require('./utils.js');
-var baseProvider = require('../../base-provider/baseProvider.js');
 
 var _AccountAbstractionProvider;
 class AccountAbstractionProvider extends baseProvider.BaseProvider {
@@ -21,11 +33,14 @@ class AccountAbstractionProvider extends baseProvider.BaseProvider {
       config,
       state
     });
-    _defineProperty(this, "PROVIDER_CHAIN_NAMESPACE", IChainInterface.CHAIN_NAMESPACES.EIP155);
+    _defineProperty(this, "PROVIDER_CHAIN_NAMESPACE", baseControllers.CHAIN_NAMESPACES.EIP155);
     _defineProperty(this, "_smartAccount", void 0);
     _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;
@@ -51,43 +66,45 @@ class AccountAbstractionProvider extends baseProvider.BaseProvider {
   }
   async setupProvider(eoaProvider) {
     var _this$config$bundlerC;
+    const {
+      currentChain
+    } = this;
     const {
       chainNamespace
-    } = this.config.chainConfig;
+    } = currentChain;
     if (chainNamespace !== this.PROVIDER_CHAIN_NAMESPACE) throw index.WalletInitializationError.incompatibleChainNameSpace("Invalid chain namespace");
     const chain = viem.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 = viem.createPublicClient({
       chain,
-      transport: viem.http(this.config.chainConfig.rpcTarget)
+      transport: viem.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;
@@ -107,7 +124,6 @@ class AccountAbstractionProvider extends baseProvider.BaseProvider {
       chain,
       eoaProvider
     });
-
     // setup rpc engine and AA middleware
     const engine = new auth.JRPCEngine();
     const aaMiddleware = await ethRpcMiddlewares.createAaMiddleware({
@@ -119,8 +135,12 @@ class AccountAbstractionProvider extends baseProvider.BaseProvider {
     engine.push(eoaMiddleware);
     const provider = auth.providerFromEngine(engine);
     this.updateProviderEngineProxy(provider);
-    eoaProvider.once("chainChanged", () => {
+    eoaProvider.once("chainChanged", chainId => {
+      this.update({
+        chainId
+      });
       this.setupChainSwitchMiddleware();
+      this.emit("chainChanged", chainId);
     });
   }
   async updateAccount(_params) {
@@ -133,32 +153,89 @@ class AccountAbstractionProvider extends baseProvider.BaseProvider {
     throw auth.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: IChainInterface.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 ethereumControllers.SMART_ACCOUNT.BICONOMY:
+      {
+        const {
+          BiconomySmartAccount
+        } = await import('@toruslabs/ethereum-controllers');
+        smartAccountInit = new BiconomySmartAccount(smartAccountConfig);
+        break;
+      }
+    case ethereumControllers.SMART_ACCOUNT.KERNEL:
+      {
+        const {
+          KernelSmartAccount
+        } = await import('@toruslabs/ethereum-controllers');
+        smartAccountInit = new KernelSmartAccount(smartAccountConfig);
+        break;
+      }
+    case ethereumControllers.SMART_ACCOUNT.NEXUS:
+      {
+        const {
+          NexusSmartAccount
+        } = await import('@toruslabs/ethereum-controllers');
+        smartAccountInit = new NexusSmartAccount(smartAccountConfig);
+        break;
+      }
+    case ethereumControllers.SMART_ACCOUNT.SAFE:
+      {
+        const {
+          SafeSmartAccount
+        } = await import('@toruslabs/ethereum-controllers');
+        smartAccountInit = new SafeSmartAccount(smartAccountConfig);
+        break;
+      }
+    case ethereumControllers.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
+  });
+};
 
-exports.AccountAbstractionProvider = AccountAbstractionProvider;
+Object.defineProperty(exports, "SMART_ACCOUNT", {
+    enumerable: true,
+    get: function () { return ethereumControllers.SMART_ACCOUNT; }
+});
+exports.accountAbstractionProvider = accountAbstractionProvider;