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

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

@@ -70,8 +70,7 @@ class WalletConnectV2Connector extends BaseConnector {
     super.checkInitializationRequirements({
       chainConfig
     });
-    // use a global wc project id if not provided
-    const projectId = ((_this$connectorOption6 = this.connectorOptions.connectorSettings) === null || _this$connectorOption6 === void 0 || (_this$connectorOption6 = _this$connectorOption6.walletConnectInitOptions) === null || _this$connectorOption6 === void 0 ? void 0 : _this$connectorOption6.projectId) || "d3c63f19f9582f8ba48e982057eb096b";
+    const projectId = (_this$connectorOption6 = this.connectorOptions.connectorSettings) === null || _this$connectorOption6 === void 0 || (_this$connectorOption6 = _this$connectorOption6.walletConnectInitOptions) === null || _this$connectorOption6 === void 0 ? void 0 : _this$connectorOption6.projectId;
     const wc2Settings = await getWalletConnectV2Settings(this.coreOptions.chains, projectId);
     if (!this.connectorOptions.loginSettings || Object.keys(this.connectorOptions.loginSettings).length === 0) {
       this.connectorOptions.loginSettings = wc2Settings.loginSettings;
@@ -387,23 +386,14 @@ class WalletConnectV2Connector extends BaseConnector {
 }
 const walletConnectV2Connector = params => {
   return ({
-    projectConfig,
-    coreOptions
+    coreOptions,
+    projectConfig
   }) => {
-    let {
-      projectId
-    } = (params === null || params === void 0 ? void 0 : params.walletConnectInitOptions) || {};
-    // use project config if projectId is not set
-    if (projectConfig) {
-      const {
-        wallet_connect_enabled: walletConnectEnabled,
-        wallet_connect_project_id: walletConnectProjectId
-      } = projectConfig;
-      if (walletConnectEnabled && walletConnectProjectId && !projectId) projectId = walletConnectProjectId;
-    }
+    var _params$walletConnect;
+    const projectId = (params === null || params === void 0 || (_params$walletConnect = params.walletConnectInitOptions) === null || _params$walletConnect === void 0 ? void 0 : _params$walletConnect.projectId) || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.walletConnectProjectId);
     const connectorSettings = _objectSpread(_objectSpread({}, params), {}, {
       walletConnectInitOptions: _objectSpread(_objectSpread({}, params === null || params === void 0 ? void 0 : params.walletConnectInitOptions), {}, {
-        projectId
+        projectId: projectId
       })
     });
     return new WalletConnectV2Connector({

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

@@ -2,7 +2,7 @@ import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { bs58 } from '@toruslabs/bs58';
 import { getAccountsFromNamespaces, parseAccountId } from '@walletconnect/utils';
 import { providerErrors, rpcErrors } from '@web3auth/auth';
-import { SOLANA_METHOD_TYPES, EVM_METHOD_TYPES } from '@web3auth/ws-embed';
+import { EVM_METHOD_TYPES, SOLANA_METHOD_TYPES } from '@web3auth/ws-embed';
 import { WalletLoginError } from '../../base/errors/index.js';
 import '@toruslabs/base-controllers';
 import '@babel/runtime/helpers/defineProperty';

package/dist/lib.esm/index.js

@@ -2,7 +2,7 @@ export { getChainConfig, getEvmChainConfig, getSolanaChainConfig, getXrplChainCo
 export { CONNECTOR_NAMESPACES } from './base/chain/IChainInterface.js';
 export { Web3AuthContextKey } from './base/composables/index.js';
 export { BaseConnector } from './base/connector/baseConnector.js';
-export { CONNECTOR_CATEGORY, CONNECTOR_EVENTS, CONNECTOR_STATUS } from './base/connector/constants.js';
+export { CONNECTOR_CATEGORY, CONNECTOR_EVENTS, CONNECTOR_STATUS, SMART_ACCOUNT_WALLET_SCOPE } from './base/connector/constants.js';
 export { AUTH_CONNECTION, UX_MODE, WEB3AUTH_NETWORK, getED25519Key } from '@web3auth/auth';
 export { checkIfTokenIsExpired, clearToken, getSavedToken, saveToken, storageAvailable } from './base/connector/utils.js';
 export { WalletInitializationError, WalletLoginError, WalletOperationsError, WalletProviderError, Web3AuthError, serializeError } from './base/errors/index.js';
@@ -42,7 +42,6 @@ export { createEthChainIdMiddleware, createEthJsonRpcClient, createEthProviderCo
 export { createWalletMiddleware } from './providers/ethereum-provider/rpc/walletMidddleware.js';
 export { getSolanaChainByChainConfig } from './providers/solana-provider/providers/injectedProviders/utils.js';
 export { WalletStandardProvider } from './providers/solana-provider/providers/injectedProviders/walletStandardProvider.js';
-export { SolanaPrivateKeyProvider } from './providers/solana-provider/providers/privateKeyProvider/solanaPrivateKeyProvider.js';
 export { createConfigMiddleware, createSolanaChainIdMiddleware, createSolanaJsonRpcClient, createSolanaProviderConfigMiddleware } from './providers/solana-provider/rpc/JrpcClient.js';
 export { createGenericJRPCMiddleware, createGetAccountsMiddleware, createGetPublicKeyMiddleware, createRequestAccountsMiddleware, createSolanaAccountMiddleware, createSolanaChainSwitchMiddleware, createSolanaMiddleware } from './providers/solana-provider/rpc/solanaRpcMiddlewares.js';
 export { SolanaWallet } from './providers/solana-provider/solanaWallet.js';

package/dist/lib.esm/noModal.js

@@ -1,22 +1,25 @@
+import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { SafeEventEmitter } from '@web3auth/auth';
+import deepmerge from 'deepmerge';
 import { authConnector } from './connectors/auth-connector/authConnector.js';
-import { getChainConfig } from './base/chain/config.js';
-import { CONNECTOR_NAMESPACES } from './base/chain/IChainInterface.js';
 import { WalletInitializationError, WalletLoginError } from './base/errors/index.js';
+import { CONNECTOR_NAMESPACES } from './base/chain/IChainInterface.js';
 import { WALLET_CONNECTORS } from './base/wallet/index.js';
-import { CONNECTOR_STATUS, CONNECTOR_EVENTS } from './base/connector/constants.js';
+import { CONNECTOR_STATUS, CONNECTOR_EVENTS, SMART_ACCOUNT_WALLET_SCOPE } 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 { fetchProjectConfig, isHexStrict } from './base/utils.js';
 import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 import './providers/base-provider/utils.js';
 import { CommonJRPCProvider } from './providers/base-provider/CommonJRPCProvider.js';
 import './providers/base-provider/commonPrivateKeyProvider.js';
+import { metaMaskConnector } from './connectors/metamask-connector/metamaskConnector.js';
 
+const _excluded = ["walletScope"];
 const CONNECTOR_CACHE_KEY = "Web3Auth-cachedConnector";
 const CURRENT_CHAIN_CACHE_KEY = "Web3Auth-currentChain";
 class Web3AuthNoModal extends SafeEventEmitter {
@@ -33,25 +36,13 @@ class Web3AuthNoModal extends SafeEventEmitter {
     _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");
-    // 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");
-    }
-    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), {}, {
-      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.currentChainId = options.defaultChainId || chains[0].chainId;
+    this.coreOptions = options;
+    this.currentChainId = options.defaultChainId;
   }
   get currentChain() {
-    return this.coreOptions.chains.find(chain => chain.chainId === this.currentChainId);
+    var _this$coreOptions$cha;
+    return (_this$coreOptions$cha = this.coreOptions.chains) === null || _this$coreOptions$cha === void 0 ? void 0 : _this$coreOptions$cha.find(chain => chain.chainId === this.currentChainId);
   }
   get connected() {
     return Boolean(this.connectedConnector);
@@ -70,7 +61,6 @@ class Web3AuthNoModal extends SafeEventEmitter {
     throw new Error("Not implemented");
   }
   async init() {
-    this.initCachedConnectorAndChainId();
     // get project config
     let projectConfig;
     try {
@@ -80,6 +70,10 @@ class Web3AuthNoModal extends SafeEventEmitter {
       log.error("Failed to fetch project configurations", e);
       throw WalletInitializationError.notReady("failed to fetch project configurations", e);
     }
+    // init config
+    this.initAccountAbstractionConfig(projectConfig);
+    this.initChainsConfig(projectConfig);
+    this.initCachedConnectorAndChainId();
     // setup common JRPC provider
     await this.setupCommonJRPCProvider();
     // initialize connectors
@@ -116,7 +110,8 @@ class Web3AuthNoModal extends SafeEventEmitter {
     this.cachedConnector = null;
   }
   async switchChain(params) {
-    if (params.chainId === this.currentChain.chainId) return;
+    var _this$currentChain2;
+    if (params.chainId === ((_this$currentChain2 = this.currentChain) === null || _this$currentChain2 === void 0 ? void 0 : _this$currentChain2.chainId)) return;
     const newChainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId);
     if (!newChainConfig) throw WalletInitializationError.invalidParams("Invalid chainId");
     if (this.status === CONNECTOR_STATUS.CONNECTED && this.connectedConnector) {
@@ -182,6 +177,89 @@ class Web3AuthNoModal extends SafeEventEmitter {
   getPlugin(name) {
     return this.plugins[name] || null;
   }
+  initChainsConfig(projectConfig) {
+    // merge chains from project config with core options, core options chains will take precedence over project config chains
+    const chainMap = new Map();
+    const allChains = [...(projectConfig.chains || []), ...(this.coreOptions.chains || [])];
+    for (const chain of allChains) {
+      const existingChain = chainMap.get(chain.chainId);
+      if (!existingChain) chainMap.set(chain.chainId, chain);else chainMap.set(chain.chainId, _objectSpread(_objectSpread({}, existingChain), chain));
+    }
+    this.coreOptions.chains = Array.from(chainMap.values());
+    // validate chains and namespaces
+    if (this.coreOptions.chains.length === 0) {
+      log.error("chain info not found. Please configure chains on dashboard at https://dashboard.web3auth.io");
+      throw WalletInitializationError.invalidParams("Please configure chains on dashboard at https://dashboard.web3auth.io");
+    }
+    const validChainNamespaces = new Set(Object.values(CHAIN_NAMESPACES));
+    for (const chain of this.coreOptions.chains) {
+      if (!chain.chainNamespace || !validChainNamespaces.has(chain.chainNamespace)) {
+        log.error(`Please provide a valid chainNamespace in chains for chain ${chain.chainId}`);
+        throw WalletInitializationError.invalidParams(`Please provide a valid chainNamespace in chains for chain ${chain.chainId}`);
+      }
+      if (chain.chainNamespace !== CHAIN_NAMESPACES.OTHER && !isHexStrict(chain.chainId)) {
+        log.error(`Please provide a valid chainId in chains for chain ${chain.chainId}`);
+        throw WalletInitializationError.invalidParams(`Please provide a valid chainId as hex string in chains for chain ${chain.chainId}`);
+      }
+      if (chain.chainNamespace !== CHAIN_NAMESPACES.OTHER) {
+        try {
+          new URL(chain.rpcTarget);
+        } catch (error) {
+          // TODO: add support for chain.wsTarget
+          log.error(`Please provide a valid rpcTarget in chains for chain ${chain.chainId}`, error);
+          throw WalletInitializationError.invalidParams(`Please provide a valid rpcTarget in chains for chain ${chain.chainId}`);
+        }
+      }
+    }
+    // if AA is enabled, filter out chains that are not AA-supported
+    if (this.coreOptions.accountAbstractionConfig) {
+      // write a for loop over accountAbstractionConfig.chains and check if the chainId is valid
+      for (const chain of this.coreOptions.accountAbstractionConfig.chains) {
+        if (!isHexStrict(chain.chainId)) {
+          log.error(`Please provide a valid chainId in accountAbstractionConfig.chains for chain ${chain.chainId}`);
+          throw WalletInitializationError.invalidParams(`Please provide a valid chainId in accountAbstractionConfig.chains for chain ${chain.chainId}`);
+        }
+        try {
+          var _chain$bundlerConfig;
+          new URL((_chain$bundlerConfig = chain.bundlerConfig) === null || _chain$bundlerConfig === void 0 ? void 0 : _chain$bundlerConfig.url);
+        } catch (error) {
+          log.error(`Please provide a valid bundlerConfig.url in accountAbstractionConfig.chains for chain ${chain.chainId}`, error);
+          throw WalletInitializationError.invalidParams(`Please provide a valid bundlerConfig.url in accountAbstractionConfig.chains for chain ${chain.chainId}`);
+        }
+        if (!chainMap.has(chain.chainId)) {
+          log.error(`Please provide chain config for AA chain in accountAbstractionConfig.chains for chain ${chain.chainId}`);
+          throw WalletInitializationError.invalidParams(`Please provide chain config for AA chain in accountAbstractionConfig.chains for chain ${chain.chainId}`);
+        }
+      }
+      // const aaSupportedChainIds = new Set(
+      //   this.coreOptions.accountAbstractionConfig?.chains
+      //     ?.filter((chain) => chain.chainId && chain.bundlerConfig?.url)
+      //     .map((chain) => chain.chainId) || []
+      // );
+      // this.coreOptions.chains = this.coreOptions.chains.filter(
+      //   (chain) => chain.chainNamespace !== CHAIN_NAMESPACES.EIP155 || aaSupportedChainIds.has(chain.chainId)
+      // );
+      // if (this.coreOptions.chains.length === 0) {
+      //   log.error("Account Abstraction is enabled but no supported chains found");
+      //   throw WalletInitializationError.invalidParams("Account Abstraction is enabled but no supported chains found");
+      // }
+    }
+  }
+  initAccountAbstractionConfig(projectConfig) {
+    const isAAEnabled = Boolean(this.coreOptions.accountAbstractionConfig || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.smartAccounts));
+    if (!isAAEnabled) return;
+    // merge project config with core options, code config take precedence over project config
+    const _ref = (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.smartAccounts) || {},
+      {
+        walletScope
+      } = _ref,
+      configWithoutWalletScope = _objectWithoutProperties(_ref, _excluded);
+    this.coreOptions.accountAbstractionConfig = deepmerge(configWithoutWalletScope || {}, this.coreOptions.accountAbstractionConfig || {});
+    // determine if we should use AA with external wallet
+    if (this.coreOptions.useAAWithExternalWallet === undefined) {
+      this.coreOptions.useAAWithExternalWallet = walletScope === SMART_ACCOUNT_WALLET_SCOPE.ALL;
+    }
+  }
   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
@@ -220,7 +298,8 @@ class Web3AuthNoModal extends SafeEventEmitter {
       coreOptions: this.coreOptions
     };
     // add injected connectors
-    const isMipdEnabled = (_this$coreOptions$mul = this.coreOptions.multiInjectedProviderDiscovery) !== null && _this$coreOptions$mul !== void 0 ? _this$coreOptions$mul : true;
+    const isExternalWalletEnabled = Boolean(projectConfig.externalWalletAuth);
+    const isMipdEnabled = isExternalWalletEnabled && ((_this$coreOptions$mul = this.coreOptions.multiInjectedProviderDiscovery) !== null && _this$coreOptions$mul !== void 0 ? _this$coreOptions$mul : true);
     const chainNamespaces = new Set(this.coreOptions.chains.map(chain => chain.chainNamespace));
     if (isMipdEnabled) {
       // Solana chains
@@ -253,8 +332,10 @@ class Web3AuthNoModal extends SafeEventEmitter {
         connectorFns.push(...evmMipd.getProviders().map(injectedEvmConnector));
       }
     }
-    // add WalletConnectV2 connector if enabled
-    if (projectConfig.wallet_connect_enabled && projectConfig.wallet_connect_project_id && (chainNamespaces.has(CHAIN_NAMESPACES.SOLANA) || chainNamespaces.has(CHAIN_NAMESPACES.EIP155))) {
+    // it's safe to add it here as if there is a MetaMask injected provider, this won't override it
+    connectorFns.push(metaMaskConnector());
+    // add WalletConnectV2 connector if external wallets are enabled
+    if (isExternalWalletEnabled && (chainNamespaces.has(CHAIN_NAMESPACES.SOLANA) || chainNamespaces.has(CHAIN_NAMESPACES.EIP155))) {
       const {
         walletConnectV2Connector
       } = await import('./connectors/wallet-connect-v2-connector/index.js');
@@ -289,16 +370,24 @@ class Web3AuthNoModal extends SafeEventEmitter {
   }
   subscribeToConnectorEvents(connector) {
     connector.on(CONNECTOR_EVENTS.CONNECTED, async data => {
+      var _this$currentChain3, _accountAbstractionCo;
       if (!this.commonJRPCProvider) throw WalletInitializationError.notFound(`CommonJrpcProvider not found`);
       const {
         provider
       } = data;
       let finalProvider = provider.provider || provider;
-      // setup aa provider for external wallets on EVM chains, for in app wallet, it uses WS provider which already supports AA
+      // setup AA provider for external wallets on EVM chains, no need for app wallet as it uses WS provider which already supports AA
       const {
         accountAbstractionConfig
       } = this.coreOptions;
-      if (this.currentChain.chainNamespace === CHAIN_NAMESPACES.EIP155 && accountAbstractionConfig && data.connector !== WALLET_CONNECTORS.AUTH && this.coreOptions.useAAWithExternalWallet) {
+      const doesAASupportCurrentChain = ((_this$currentChain3 = this.currentChain) === null || _this$currentChain3 === void 0 ? void 0 : _this$currentChain3.chainNamespace) === CHAIN_NAMESPACES.EIP155 && (accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo = accountAbstractionConfig.chains) === null || _accountAbstractionCo === void 0 ? void 0 : _accountAbstractionCo.some(chain => {
+        var _this$currentChain4;
+        return chain.chainId === ((_this$currentChain4 = this.currentChain) === null || _this$currentChain4 === void 0 ? void 0 : _this$currentChain4.chainId);
+      }));
+      const isExternalWalletAndAAEnabled = data.connector !== WALLET_CONNECTORS.AUTH && this.coreOptions.useAAWithExternalWallet;
+      if (isExternalWalletAndAAEnabled && doesAASupportCurrentChain) {
+        var _accountAbstractionCo2;
+        const aaChainIds = new Set((accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo2 = accountAbstractionConfig.chains) === null || _accountAbstractionCo2 === void 0 ? void 0 : _accountAbstractionCo2.map(chain => chain.chainId)) || []);
         const {
           accountAbstractionProvider
         } = await import('./providers/account-abstraction-provider/index.js');
@@ -306,10 +395,9 @@ class Web3AuthNoModal extends SafeEventEmitter {
           accountAbstractionConfig,
           provider,
           chain: this.currentChain,
-          chains: this.coreOptions.chains
+          chains: this.coreOptions.chains.filter(chain => aaChainIds.has(chain.chainId))
         });
         finalProvider = aaProvider;
-        // TODO: when switching chains to Solana or other chains, we need to switch to the non-AA provider
       }
       this.commonJRPCProvider.updateProviderEngineProxy(finalProvider);
       this.connectedConnectorName = data.connector;
@@ -376,8 +464,9 @@ class Web3AuthNoModal extends SafeEventEmitter {
    * @throws WalletInitializationError If no chain is found for the connector's namespace
    */
   getInitialChainIdForConnector(connector) {
+    var _initialChain;
     let initialChain = this.currentChain;
-    if (initialChain.chainNamespace !== connector.connectorNamespace && connector.connectorNamespace !== CONNECTOR_NAMESPACES.MULTICHAIN) {
+    if (((_initialChain = initialChain) === null || _initialChain === void 0 ? void 0 : _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}`);
     }
@@ -403,10 +492,11 @@ class Web3AuthNoModal extends SafeEventEmitter {
   connectToPlugins(data) {
     Object.values(this.plugins).map(async plugin => {
       try {
+        var _this$currentChain5;
         // skip if it's not compatible with the connector
         if (!plugin.SUPPORTED_CONNECTORS.includes("all") && !plugin.SUPPORTED_CONNECTORS.includes(data.connector)) return;
         // skip if it's not compatible with the current chain
-        if (plugin.pluginNamespace !== PLUGIN_NAMESPACES.MULTICHAIN && plugin.pluginNamespace !== this.currentChain.chainNamespace) return;
+        if (plugin.pluginNamespace !== PLUGIN_NAMESPACES.MULTICHAIN && plugin.pluginNamespace !== ((_this$currentChain5 = this.currentChain) === null || _this$currentChain5 === void 0 ? void 0 : _this$currentChain5.chainNamespace)) return;
         // skip if it's already connected
         if (plugin.status === PLUGIN_STATUS.CONNECTED) return;
         await plugin.initWithWeb3Auth(this, this.coreOptions.uiConfig);

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

@@ -34,7 +34,7 @@ class WalletServicesPlugin extends SafeEventEmitter {
     if (!web3auth) throw WalletServicesPluginError.web3authRequired();
     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();
+    if (![CHAIN_NAMESPACES.EIP155, CHAIN_NAMESPACES.SOLANA].includes(currentChainConfig === null || currentChainConfig === void 0 ? void 0 : currentChainConfig.chainNamespace)) throw WalletServicesPluginError.unsupportedChainNamespace();
     // Not connected yet to auth
     if (web3auth.provider) {
       this.provider = web3auth.provider;

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

@@ -64,7 +64,7 @@ class AccountAbstractionProvider extends BaseProvider {
     });
   }
   async setupProvider(eoaProvider) {
-    var _this$config$bundlerC;
+    var _bundlerConfig$transp;
     const {
       currentChain
     } = this;
@@ -72,6 +72,12 @@ class AccountAbstractionProvider extends BaseProvider {
       chainNamespace
     } = currentChain;
     if (chainNamespace !== this.PROVIDER_CHAIN_NAMESPACE) throw WalletInitializationError.incompatibleChainNameSpace("Invalid chain namespace");
+    const bundlerAndPaymasterConfig = this.config.smartAccountChainsConfig.find(config => config.chainId === currentChain.chainId);
+    if (!bundlerAndPaymasterConfig) throw WalletInitializationError.invalidProviderConfigError(`Bundler and paymaster config not found for chain ${currentChain.chainId}`);
+    const {
+      bundlerConfig,
+      paymasterConfig
+    } = bundlerAndPaymasterConfig;
     const chain = defineChain({
       id: Number.parseInt(currentChain.chainId, 16),
       // id in number form
@@ -105,16 +111,16 @@ class AccountAbstractionProvider extends BaseProvider {
       client: this._publicClient
     });
     // setup bundler and paymaster
-    if (this.config.paymasterConfig) {
-      var _this$config$paymaste;
-      this._paymasterClient = createPaymasterClient(_objectSpread(_objectSpread({}, this.config.paymasterConfig), {}, {
-        transport: (_this$config$paymaste = this.config.paymasterConfig.transport) !== null && _this$config$paymaste !== void 0 ? _this$config$paymaste : http(this.config.paymasterConfig.url)
+    if (paymasterConfig) {
+      var _paymasterConfig$tran;
+      this._paymasterClient = createPaymasterClient(_objectSpread(_objectSpread({}, paymasterConfig), {}, {
+        transport: (_paymasterConfig$tran = paymasterConfig.transport) !== null && _paymasterConfig$tran !== void 0 ? _paymasterConfig$tran : http(paymasterConfig.url)
       }));
     }
-    this._bundlerClient = createBundlerClient(_objectSpread(_objectSpread({}, this.config.bundlerConfig), {}, {
+    this._bundlerClient = createBundlerClient(_objectSpread(_objectSpread({}, bundlerConfig), {}, {
       account: this.smartAccount,
       client: this._publicClient,
-      transport: (_this$config$bundlerC = this.config.bundlerConfig.transport) !== null && _this$config$bundlerC !== void 0 ? _this$config$bundlerC : http(this.config.bundlerConfig.url),
+      transport: (_bundlerConfig$transp = bundlerConfig.transport) !== null && _bundlerConfig$transp !== void 0 ? _bundlerConfig$transp : http(bundlerConfig.url),
       paymaster: this._paymasterClient
     }));
     const providerHandlers = getProviderHandlers({
@@ -175,10 +181,11 @@ const accountAbstractionProvider = async ({
   let smartAccountInit;
   const {
     smartAccountType,
-    smartAccountConfig,
-    bundlerConfig,
-    paymasterConfig
+    chains: smartAccountChainsConfig
   } = accountAbstractionConfig;
+  const {
+    smartAccountConfig
+  } = smartAccountChainsConfig.find(config => config.chainId === chain.chainId) || {};
   switch (smartAccountType) {
     case SMART_ACCOUNT.BICONOMY:
       {
@@ -228,8 +235,7 @@ const accountAbstractionProvider = async ({
     smartAccountInit,
     chain,
     chains,
-    bundlerConfig,
-    paymasterConfig
+    smartAccountChainsConfig
   });
 };
 

package/dist/lib.esm/providers/solana-provider/rpc/solanaRpcMiddlewares.js

@@ -73,7 +73,7 @@ function createSolanaMiddleware(providerHandlers) {
     requestAccounts
   }), createGetAccountsMiddleware({
     getAccounts
-  }), createGenericJRPCMiddleware(SOLANA_METHOD_TYPES.SIGN_TRANSACTION, signTransaction), createGenericJRPCMiddleware(SOLANA_METHOD_TYPES.SEND_TRANSACTION, signAndSendTransaction), createGenericJRPCMiddleware(SOLANA_METHOD_TYPES.SIGN_ALL_TRANSACTIONS, signAllTransactions), createGenericJRPCMiddleware(SOLANA_METHOD_TYPES.SIGN_MESSAGE, signMessage), createGenericJRPCMiddleware("solanaPrivateKey", getPrivateKey), createGenericJRPCMiddleware("private_key", getPrivateKey), createGenericJRPCMiddleware("public_key", getPublicKey), createGenericJRPCMiddleware("solanaPublicKey", getPublicKey), createGenericJRPCMiddleware("solanaSecretKey", getSecretKey)]);
+  }), createGenericJRPCMiddleware(SOLANA_METHOD_TYPES.SIGN_TRANSACTION, signTransaction), createGenericJRPCMiddleware(SOLANA_METHOD_TYPES.SEND_TRANSACTION, signAndSendTransaction), createGenericJRPCMiddleware(SOLANA_METHOD_TYPES.SIGN_ALL_TRANSACTIONS, signAllTransactions), createGenericJRPCMiddleware(SOLANA_METHOD_TYPES.SIGN_MESSAGE, signMessage), createGenericJRPCMiddleware(SOLANA_METHOD_TYPES.SOLANA_PRIVATE_KEY, getPrivateKey), createGenericJRPCMiddleware(SOLANA_METHOD_TYPES.PRIVATE_KEY, getPrivateKey), createGenericJRPCMiddleware("public_key", getPublicKey), createGenericJRPCMiddleware("solanaPublicKey", getPublicKey), createGenericJRPCMiddleware("solanaSecretKey", getSecretKey)]);
 }
 function createSolanaChainSwitchMiddleware({
   switchSolanaChain