@dynamic-labs/ethereum-aa 4.0.0-alpha.2 → 4.0.0-alpha.21

package/src/ZeroDevConnector.d.ts

@@ -1,14 +1,12 @@
 import { KernelAccountClient } from '@zerodev/sdk/clients';
 import { KernelSmartAccount } from '@zerodev/sdk/accounts';
-import { toMultiChainECDSAValidator } from '@zerodev/multi-chain-validator';
 import { Account, PublicClient, Transport, WalletClient } from 'viem';
 import { type Chain as ViemChain } from 'viem/chains';
 import { EntryPoint } from 'permissionless/types';
 import { KERNEL_VERSION_TYPE } from '@zerodev/sdk/types';
-import { signerToEcdsaValidator } from '@zerodev/ecdsa-validator';
-import { Provider, ProviderEnum } from '@dynamic-labs/sdk-api-core';
-import { Chain, IAccountAbstractionWalletConnector, ISendBalanceWalletConnector, InternalWalletConnector, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { EthereumWallet } from '@dynamic-labs/ethereum-core';
+import { Provider, ProviderEnum, ProviderMultichainAccountAbstractionProviders } from '@dynamic-labs/sdk-api-core';
+import { Chain, IAccountAbstractionWalletConnector, ISendBalanceWalletConnector, InternalWalletConnector, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { EvmNetwork, GenericNetwork, IUITransaction, WalletUiUtils } from '@dynamic-labs/types';
 import { BundlerProvider } from './utils';
@@ -22,11 +20,13 @@ type ZeroDevConnectorProps = {
     bundlerProvider: BundlerProvider | undefined;
 };
 type IZeroDevConnector = IAccountAbstractionWalletConnector & ISendBalanceWalletConnector;
+type KernelClient = KernelAccountClient<EntryPoint, Transport, ViemChain, KernelSmartAccount<EntryPoint>>;
 export declare class ZeroDevConnector extends WalletConnectorBase<typeof EthereumWallet> implements IZeroDevConnector {
-    projectId: string;
-    kernelClient: KernelAccountClient<EntryPoint, Transport, ViemChain, KernelSmartAccount<EntryPoint>> | undefined;
+    clientId: string;
     eoaConnector: InternalWalletConnector | undefined;
-    kernelClientWithSponsorship: KernelAccountClient<EntryPoint, Transport, ViemChain, KernelSmartAccount<EntryPoint>> | undefined;
+    eoaAddress: string | undefined;
+    private providerMap;
+    private eoaConnectorMap;
     ChainWallet: typeof EthereumWallet;
     connectedChain: Chain;
     supportedChains: Chain[];
@@ -36,6 +36,8 @@ export declare class ZeroDevConnector extends WalletConnectorBase<typeof Ethereu
     entryPoint: EntryPoint;
     kernelVersion: KERNEL_VERSION_TYPE;
     ecdsaProviderType: string | undefined;
+    defaultChainId: string | undefined;
+    providersFromApi: ProviderMultichainAccountAbstractionProviders[];
     static bundlerProvider: BundlerProvider | undefined;
     static bundlerRpc: string | undefined;
     static paymasterRpc: string | undefined;
@@ -56,9 +58,17 @@ export declare class ZeroDevConnector extends WalletConnectorBase<typeof Ethereu
     };
     private _walletUiUtils;
     constructor(opts: ZeroDevConnectorProps);
-    getEntryPoint(entryPoint: string | undefined): "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789" | "0x0000000071727De22E5E9d8BAf0edAc6f37da032";
-    getKernelVersion(kernelVersion: string | undefined): KERNEL_VERSION_TYPE;
-    getEcdsaValidator(ecdsaProviderType: string | undefined): typeof signerToEcdsaValidator | typeof toMultiChainECDSAValidator;
+    get currentNetworkProvider(): {
+        kernelClient: KernelClient;
+        kernelClientWithSponsorship: KernelClient;
+    } | undefined;
+    get lastUsedChainId(): string;
+    get kernelClient(): KernelClient | undefined;
+    get kernelClientWithSponsorship(): KernelClient | undefined;
+    supportsNetworkSwitching(): boolean;
+    switchNetwork({ networkChainId, }: {
+        networkChainId?: number | string;
+    }): Promise<void>;
     /**
      * @deprecated You should get the EOA connector by passing the SCW to getEOAConnector,
      * from the useSmartWallet hook
@@ -66,10 +76,18 @@ export declare class ZeroDevConnector extends WalletConnectorBase<typeof Ethereu
     getEOAConnector(): InternalWalletConnector | undefined;
     getAccountAbstractionProvider({ withSponsorship, }?: {
         withSponsorship?: boolean;
-    }): KernelAccountClient<EntryPoint> | undefined;
+    }): KernelClient | undefined;
     endSession(): Promise<void>;
-    setEoaConnector(connector: InternalWalletConnector): Promise<void>;
-    private checkIsProjectChainEnabled;
+    registerEoa({ smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector, }: {
+        smartWalletAddress: string;
+        eoaAddress: string;
+        eoaConnector: InternalWalletConnector;
+        shouldSetEoaConnector: boolean;
+    }): Promise<void>;
+    private setEoaConnector;
+    private warnIfProjectChainNotEnabled;
+    private generateProviderMap;
+    private getKernelClientWithoutSponsorshipValidation;
     private getKernelClientWithSponsorshipValidation;
     getAddress(): Promise<string | undefined>;
     getConnectedAccounts(): Promise<string[]>;
@@ -2895,44 +2913,44 @@ export declare class ZeroDevConnector extends WalletConnectorBase<typeof Ethereu
             [x: `address[${string}]`]: undefined;
             [x: `bool[${string}]`]: undefined;
             [x: `bytes[${string}]`]: undefined;
-            [x: `bytes9[${string}]`]: undefined;
             [x: `bytes1[${string}]`]: undefined;
-            [x: `bytes32[${string}]`]: undefined;
-            [x: `bytes31[${string}]`]: undefined;
-            [x: `bytes30[${string}]`]: undefined;
-            [x: `bytes29[${string}]`]: undefined;
-            [x: `bytes28[${string}]`]: undefined;
-            [x: `bytes27[${string}]`]: undefined;
-            [x: `bytes26[${string}]`]: undefined;
-            [x: `bytes25[${string}]`]: undefined;
-            [x: `bytes24[${string}]`]: undefined;
-            [x: `bytes23[${string}]`]: undefined;
-            [x: `bytes22[${string}]`]: undefined;
-            [x: `bytes21[${string}]`]: undefined;
-            [x: `bytes20[${string}]`]: undefined;
-            [x: `bytes19[${string}]`]: undefined;
             [x: `bytes2[${string}]`]: undefined;
-            [x: `bytes18[${string}]`]: undefined;
-            [x: `bytes17[${string}]`]: undefined;
-            [x: `bytes16[${string}]`]: undefined;
-            [x: `bytes15[${string}]`]: undefined;
-            [x: `bytes14[${string}]`]: undefined;
-            [x: `bytes13[${string}]`]: undefined;
-            [x: `bytes12[${string}]`]: undefined;
-            [x: `bytes11[${string}]`]: undefined;
-            [x: `bytes10[${string}]`]: undefined;
-            [x: `bytes8[${string}]`]: undefined;
-            [x: `bytes7[${string}]`]: undefined;
-            [x: `bytes6[${string}]`]: undefined;
-            [x: `bytes5[${string}]`]: undefined;
-            [x: `bytes4[${string}]`]: undefined;
             [x: `bytes3[${string}]`]: undefined;
+            [x: `bytes4[${string}]`]: undefined;
+            [x: `bytes5[${string}]`]: undefined;
+            [x: `bytes6[${string}]`]: undefined;
+            [x: `bytes7[${string}]`]: undefined;
+            [x: `bytes8[${string}]`]: undefined;
+            [x: `bytes9[${string}]`]: undefined;
+            [x: `bytes10[${string}]`]: undefined;
+            [x: `bytes11[${string}]`]: undefined;
+            [x: `bytes12[${string}]`]: undefined;
+            [x: `bytes13[${string}]`]: undefined;
+            [x: `bytes14[${string}]`]: undefined;
+            [x: `bytes15[${string}]`]: undefined;
+            [x: `bytes16[${string}]`]: undefined;
+            [x: `bytes17[${string}]`]: undefined;
+            [x: `bytes18[${string}]`]: undefined;
+            [x: `bytes19[${string}]`]: undefined;
+            [x: `bytes20[${string}]`]: undefined;
+            [x: `bytes21[${string}]`]: undefined;
+            [x: `bytes22[${string}]`]: undefined;
+            [x: `bytes23[${string}]`]: undefined;
+            [x: `bytes24[${string}]`]: undefined;
+            [x: `bytes25[${string}]`]: undefined;
+            [x: `bytes26[${string}]`]: undefined;
+            [x: `bytes27[${string}]`]: undefined;
+            [x: `bytes28[${string}]`]: undefined;
+            [x: `bytes29[${string}]`]: undefined;
+            [x: `bytes30[${string}]`]: undefined;
+            [x: `bytes31[${string}]`]: undefined;
+            [x: `bytes32[${string}]`]: undefined;
             [x: `int[${string}]`]: undefined;
-            [x: `int40[${string}]`]: undefined;
-            [x: `int32[${string}]`]: undefined;
-            [x: `int24[${string}]`]: undefined;
-            [x: `int16[${string}]`]: undefined;
             [x: `int8[${string}]`]: undefined;
+            [x: `int16[${string}]`]: undefined;
+            [x: `int24[${string}]`]: undefined;
+            [x: `int32[${string}]`]: undefined;
+            [x: `int40[${string}]`]: undefined;
             [x: `int48[${string}]`]: undefined;
             [x: `int56[${string}]`]: undefined;
             [x: `int64[${string}]`]: undefined;
@@ -2961,11 +2979,11 @@ export declare class ZeroDevConnector extends WalletConnectorBase<typeof Ethereu
             [x: `int248[${string}]`]: undefined;
             [x: `int256[${string}]`]: undefined;
             [x: `uint[${string}]`]: undefined;
-            [x: `uint40[${string}]`]: undefined;
-            [x: `uint32[${string}]`]: undefined;
-            [x: `uint24[${string}]`]: undefined;
-            [x: `uint16[${string}]`]: undefined;
             [x: `uint8[${string}]`]: undefined;
+            [x: `uint16[${string}]`]: undefined;
+            [x: `uint24[${string}]`]: undefined;
+            [x: `uint32[${string}]`]: undefined;
+            [x: `uint40[${string}]`]: undefined;
             [x: `uint48[${string}]`]: undefined;
             [x: `uint56[${string}]`]: undefined;
             [x: `uint64[${string}]`]: undefined;
@@ -2997,43 +3015,43 @@ export declare class ZeroDevConnector extends WalletConnectorBase<typeof Ethereu
             address?: undefined;
             bool?: undefined;
             bytes?: undefined;
-            bytes9?: undefined;
             bytes1?: undefined;
-            bytes32?: undefined;
-            bytes31?: undefined;
-            bytes30?: undefined;
-            bytes29?: undefined;
-            bytes28?: undefined;
-            bytes27?: undefined;
-            bytes26?: undefined;
-            bytes25?: undefined;
-            bytes24?: undefined;
-            bytes23?: undefined;
-            bytes22?: undefined;
-            bytes21?: undefined;
-            bytes20?: undefined;
-            bytes19?: undefined;
             bytes2?: undefined;
-            bytes18?: undefined;
-            bytes17?: undefined;
-            bytes16?: undefined;
-            bytes15?: undefined;
-            bytes14?: undefined;
-            bytes13?: undefined;
-            bytes12?: undefined;
-            bytes11?: undefined;
-            bytes10?: undefined;
-            bytes8?: undefined;
-            bytes7?: undefined;
-            bytes6?: undefined;
-            bytes5?: undefined;
-            bytes4?: undefined;
             bytes3?: undefined;
-            int40?: undefined;
-            int32?: undefined;
-            int24?: undefined;
-            int16?: undefined;
+            bytes4?: undefined;
+            bytes5?: undefined;
+            bytes6?: undefined;
+            bytes7?: undefined;
+            bytes8?: undefined;
+            bytes9?: undefined;
+            bytes10?: undefined;
+            bytes11?: undefined;
+            bytes12?: undefined;
+            bytes13?: undefined;
+            bytes14?: undefined;
+            bytes15?: undefined;
+            bytes16?: undefined;
+            bytes17?: undefined;
+            bytes18?: undefined;
+            bytes19?: undefined;
+            bytes20?: undefined;
+            bytes21?: undefined;
+            bytes22?: undefined;
+            bytes23?: undefined;
+            bytes24?: undefined;
+            bytes25?: undefined;
+            bytes26?: undefined;
+            bytes27?: undefined;
+            bytes28?: undefined;
+            bytes29?: undefined;
+            bytes30?: undefined;
+            bytes31?: undefined;
+            bytes32?: undefined;
             int8?: undefined;
+            int16?: undefined;
+            int24?: undefined;
+            int32?: undefined;
+            int40?: undefined;
             int48?: undefined;
             int56?: undefined;
             int64?: undefined;
@@ -3061,11 +3079,11 @@ export declare class ZeroDevConnector extends WalletConnectorBase<typeof Ethereu
             int240?: undefined;
             int248?: undefined;
             int256?: undefined;
-            uint40?: undefined;
-            uint32?: undefined;
-            uint24?: undefined;
-            uint16?: undefined;
             uint8?: undefined;
+            uint16?: undefined;
+            uint24?: undefined;
+            uint32?: undefined;
+            uint40?: undefined;
             uint48?: undefined;
             uint56?: undefined;
             uint64?: undefined;

package/src/ZeroDevConnector.js

@@ -1,27 +1,32 @@
 'use client'
 import { __awaiter } from '../_virtual/_tslib.js';
-import { toMultiChainECDSAValidator } from '@zerodev/multi-chain-validator';
 import { publicActions, custom, createWalletClient, isHex, fromHex, formatEther } from 'viem';
-import { ENTRYPOINT_ADDRESS_V07, ENTRYPOINT_ADDRESS_V06, walletClientToSmartAccountSigner } from 'permissionless/utils';
-import { KERNEL_V3_1, KERNEL_V3_0, KERNEL_V2_4 } from '@zerodev/sdk/constants';
-import { signerToEcdsaValidator } from '@zerodev/ecdsa-validator';
-import { ProviderEntryPointVersionEnum, ProviderKernelVersionEnum } from '@dynamic-labs/sdk-api-core';
-import { WalletConnectorBase, isTurnkeyWalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { EthereumWallet, confirmationTransport, chainsMap, isEthWalletConnector, unFormatTransaction, createViemUiTransaction } from '@dynamic-labs/ethereum-core';
-import { parseEvmNetworks, DynamicError, DeferredPromise, wrapMethodWithCallback, TransactionGasCannotBeSponsoredError, InsufficientFundsError } from '@dynamic-labs/utils';
-import { cachedChainIdKey, fetchChain } from './utils/fetchChain.js';
+import { toAccount } from 'viem/accounts';
+import { walletClientToSmartAccountSigner } from 'permissionless/utils';
+import { EthereumWallet, isEthWalletConnector, chainsMap, confirmationTransport, unFormatTransaction, createViemUiTransaction } from '@dynamic-labs/ethereum-core';
+import { WalletConnectorBase, eventListenerHandlers } from '@dynamic-labs/wallet-connector-core';
+import { parseEvmNetworks, StorageService, DeferredPromise, parseChainId, DynamicError, wrapMethodWithCallback, TransactionGasCannotBeSponsoredError, InsufficientFundsError } from '@dynamic-labs/utils';
+import { ZERO_DEV_LAST_USED_CHAIN_ID_KEY } from './constants.js';
 import { logger } from './utils/logger.js';
 import { createEcdsaKernelAccountClient } from './utils/createEcsdaKernelAccountClient.js';
+import { getEcdsaValidator } from './utils/getEcdsaValidator.js';
+import { getEntryPoint } from './utils/getEntryPoint.js';
+import { getKernelVersion } from './utils/getKernelVersion.js';
 
 class ZeroDevConnector extends WalletConnectorBase {
     constructor(opts) {
         var _a, _b, _c, _d;
         super(opts);
+        // provider map maintains the kernel clients per chain
+        this.providerMap = {};
+        // eoa connector map maintains the eoa address and connector for each smart wallet address
+        this.eoaConnectorMap = {};
         this.ChainWallet = EthereumWallet;
         this.connectedChain = 'EVM';
         this.supportedChains = ['ETH', 'EVM'];
         this.isGasSponsorshipDisabled = false;
         this.isEmbeddedWallet = true;
+        this.providersFromApi = [];
         this.name = 'ZeroDev';
         this.overrideKey = 'zerodev';
         this.walletFallback = {
@@ -31,59 +36,64 @@ class ZeroDevConnector extends WalletConnectorBase {
             },
             name: 'ZeroDev',
         };
-        const zeroDevProjectId = (_a = opts.apiProviders.zerodev) === null || _a === void 0 ? void 0 : _a.clientId;
-        if (!zeroDevProjectId) {
-            throw new Error('Missing ZeroDev project ID provided. Add your ZeroDev project id to your project configuration via the Dynamic Labs dashboard.');
-        }
-        this.projectId = zeroDevProjectId;
         this._walletUiUtils = opts.walletUiUtils;
         this.evmNetworks = parseEvmNetworks(opts.evmNetworks);
-        this.entryPoint = this.getEntryPoint((_b = opts.apiProviders.zerodev) === null || _b === void 0 ? void 0 : _b.entryPointVersion);
-        this.kernelVersion = this.getKernelVersion((_c = opts.apiProviders.zerodev) === null || _c === void 0 ? void 0 : _c.kernelVersion);
+        this.entryPoint = getEntryPoint((_a = opts.apiProviders.zerodev) === null || _a === void 0 ? void 0 : _a.entryPointVersion);
+        this.kernelVersion = getKernelVersion((_b = opts.apiProviders.zerodev) === null || _b === void 0 ? void 0 : _b.kernelVersion, this.entryPoint);
+        // this is the list of providers from the api that are used for multi-chain account abstraction
+        this.providersFromApi =
+            ((_c = opts.apiProviders.zerodev) === null || _c === void 0 ? void 0 : _c.multichainAccountAbstractionProviders) || [];
+        const [defaultProvider] = this.providersFromApi;
+        this.clientId = defaultProvider === null || defaultProvider === void 0 ? void 0 : defaultProvider.clientId;
+        if (!this.clientId) {
+            throw new Error('Missing ZeroDev project ID provided. Add your ZeroDev project id to your project configuration via the Dynamic Labs dashboard.');
+        }
+        this.defaultChainId = defaultProvider === null || defaultProvider === void 0 ? void 0 : defaultProvider.chain;
         this.ecdsaProviderType = (_d = opts.apiProviders.zerodev) === null || _d === void 0 ? void 0 : _d.ecdsaProviderType;
     }
-    getEntryPoint(entryPoint) {
-        if (entryPoint === undefined ||
-            entryPoint === ProviderEntryPointVersionEnum.V7) {
-            return ENTRYPOINT_ADDRESS_V07;
+    get currentNetworkProvider() {
+        // check if the last used chain id is in the provider map
+        if (this.providerMap[this.lastUsedChainId]) {
+            return this.providerMap[this.lastUsedChainId];
         }
-        else if (entryPoint === ProviderEntryPointVersionEnum.V6) {
-            return ENTRYPOINT_ADDRESS_V06;
-        }
-        else {
-            logger.error('Invalid entry point version', entryPoint);
-            return ENTRYPOINT_ADDRESS_V07;
+        // if not, check if the default chain id is in the provider map
+        if (this.defaultChainId) {
+            return this.providerMap[this.defaultChainId];
         }
+        // if no chain id is found, return undefined
+        return undefined;
     }
-    getKernelVersion(kernelVersion) {
-        if (kernelVersion === ProviderKernelVersionEnum.V31 ||
-            (kernelVersion === undefined &&
-                this.entryPoint === ENTRYPOINT_ADDRESS_V07)) {
-            return KERNEL_V3_1;
-        }
-        else if (kernelVersion === ProviderKernelVersionEnum.V30) {
-            return KERNEL_V3_0;
-        }
-        else if (kernelVersion === ProviderKernelVersionEnum.V24 ||
-            this.entryPoint === ENTRYPOINT_ADDRESS_V06 // v0.6 only supports v2.4
-        ) {
-            return KERNEL_V2_4;
-        }
-        else {
-            logger.error('Invalid kernel version', kernelVersion);
-            return KERNEL_V3_1;
-        }
+    get lastUsedChainId() {
+        var _a;
+        const storedChainId = StorageService.getItem(ZERO_DEV_LAST_USED_CHAIN_ID_KEY);
+        // returning string of unknown if no chain id is found to result in undefined provider lookup
+        return (_a = storedChainId !== null && storedChainId !== void 0 ? storedChainId : this.defaultChainId) !== null && _a !== void 0 ? _a : 'unknown';
     }
-    getEcdsaValidator(ecdsaProviderType) {
-        if (ecdsaProviderType === 'zerodev_signer_to_ecdsa') {
-            return signerToEcdsaValidator;
-        }
-        else if (ecdsaProviderType === 'zerodev_multi_chain') {
-            return toMultiChainECDSAValidator;
-        }
-        else {
-            return signerToEcdsaValidator;
-        }
+    get kernelClient() {
+        var _a;
+        return (_a = this.currentNetworkProvider) === null || _a === void 0 ? void 0 : _a.kernelClient;
+    }
+    get kernelClientWithSponsorship() {
+        var _a;
+        return (_a = this.currentNetworkProvider) === null || _a === void 0 ? void 0 : _a.kernelClientWithSponsorship;
+    }
+    supportsNetworkSwitching() {
+        return (Object.keys(this.providerMap).length > 1 && this.evmNetworks.length > 1);
+    }
+    switchNetwork(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ networkChainId, }) {
+            if (!this.supportsNetworkSwitching())
+                return;
+            if (!networkChainId)
+                return;
+            const chainId = networkChainId.toString();
+            if (!this.providerMap[chainId]) {
+                throw new Error(`No provider found for chainId: ${chainId}`);
+            }
+            StorageService.setItem(ZERO_DEV_LAST_USED_CHAIN_ID_KEY, chainId);
+            const { handleChainChange } = eventListenerHandlers(this);
+            handleChainChange(chainId);
+        });
     }
     /**
      * @deprecated You should get the EOA connector by passing the SCW to getEOAConnector,
@@ -100,10 +110,22 @@ class ZeroDevConnector extends WalletConnectorBase {
     }
     endSession() {
         return __awaiter(this, void 0, void 0, function* () {
-            localStorage.removeItem(cachedChainIdKey);
+            StorageService.removeItem(ZERO_DEV_LAST_USED_CHAIN_ID_KEY);
         });
     }
-    setEoaConnector(connector) {
+    registerEoa(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector = false, }) {
+            this.eoaConnectorMap[smartWalletAddress] = {
+                eoaAddress,
+                eoaConnector,
+            };
+            // if this is the primary wallet, set the eoa connector and kernel clients
+            if (shouldSetEoaConnector && this.eoaAddress !== eoaAddress) {
+                yield this.setEoaConnector(eoaAddress, eoaConnector);
+            }
+        });
+    }
+    setEoaConnector(eoaAddress, connector) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!connector) {
                 logger.error('No EOA connector provided');
@@ -111,24 +133,76 @@ class ZeroDevConnector extends WalletConnectorBase {
             }
             this.kernelClientDeferredPromise = new DeferredPromise();
             this.eoaConnector = connector;
+            this.eoaAddress = eoaAddress;
             if (isEthWalletConnector(this.eoaConnector) &&
                 !this.eoaConnector.getActiveAccount()) {
                 yield this.eoaConnector.getConnectedAccounts();
             }
             const signer = yield this.eoaConnector.getSigner();
-            if (!(signer === null || signer === void 0 ? void 0 : signer.account)) {
-                logger.error('No signer account found');
-                return;
+            signer.account = toAccount(eoaAddress);
+            yield this.generateProviderMap(signer);
+            this.evmNetworks = this.evmNetworks.filter((network) => Boolean(this.providerMap[network.chainId]));
+            this.kernelClientDeferredPromise.resolve();
+        });
+    }
+    warnIfProjectChainNotEnabled(chainId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            let chainIdToCheck = chainId;
+            if (!chainIdToCheck) {
+                const client = yield this.getPublicClient();
+                chainIdToCheck = (_a = client === null || client === void 0 ? void 0 : client.chain) === null || _a === void 0 ? void 0 : _a.id;
+            }
+            const isProjectChainEnabled = this.evmNetworks.some((network) => network.chainId === chainIdToCheck);
+            if (!isProjectChainEnabled) {
+                logger.error(`Please make sure to enable (${chainIdToCheck}) in the Dynamic dashboard (https://app.dynamic.xyz/dashboard/configurations#evm).`);
+            }
+        });
+    }
+    generateProviderMap(signer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // reset the chains provider map when eoa connector changes
+            this.providerMap = {};
+            for (const provider of this.providersFromApi) {
+                if (!this.providerMap[provider.chain]) {
+                    const [kernelClient, kernelClientWithSponsorship] = yield Promise.all([
+                        this.getKernelClientWithoutSponsorshipValidation({
+                            chainId: provider.chain,
+                            projectId: provider.clientId,
+                            signer,
+                        }),
+                        this.getKernelClientWithSponsorshipValidation({
+                            chainId: provider.chain,
+                            projectId: provider.clientId,
+                            signer,
+                        }),
+                    ]);
+                    this.providerMap[provider.chain] = {
+                        kernelClient,
+                        kernelClientWithSponsorship,
+                    };
+                }
+                yield this.warnIfProjectChainNotEnabled(parseChainId(provider.chain));
             }
+        });
+    }
+    getKernelClientWithoutSponsorshipValidation(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ projectId, signer, chainId, }) {
+            if (chainId && this.providerMap[chainId]) {
+                return this.providerMap[chainId].kernelClient;
+            }
+            const { eoaConnector } = this;
+            if (!eoaConnector)
+                throw new DynamicError('No EOA connector');
             const kernelClient = yield createEcdsaKernelAccountClient({
                 bundlerRpc: ZeroDevConnector.bundlerRpc,
-                chain: yield fetchChain(this.projectId),
-                ecdsaValidator: this.getEcdsaValidator(this.ecdsaProviderType),
+                chain: chainsMap[chainId],
+                ecdsaValidator: getEcdsaValidator(this.ecdsaProviderType),
                 entryPointAddress: this.entryPoint,
                 kernelVersion: this.kernelVersion,
                 paymaster: 'NONE',
                 paymasterRpc: ZeroDevConnector.paymasterRpc,
-                projectId: this.projectId,
+                projectId,
                 provider: ZeroDevConnector.bundlerProvider,
                 signer: walletClientToSmartAccountSigner(signer),
             });
@@ -136,51 +210,34 @@ class ZeroDevConnector extends WalletConnectorBase {
                 this._walletUiUtils.disabledConfirmationOnce();
                 return original(...args);
             });
-            this.kernelClient = kernelClient;
-            // set the provider with sponsorship enabled
-            yield this.getKernelClientWithSponsorshipValidation();
-            yield this.checkIsProjectChainEnabled();
-            this.kernelClientDeferredPromise.resolve();
+            return kernelClient;
         });
     }
-    checkIsProjectChainEnabled() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const client = yield this.getPublicClient();
-            const chainName = (_a = client === null || client === void 0 ? void 0 : client.chain) === null || _a === void 0 ? void 0 : _a.name;
-            const chainId = (_b = client === null || client === void 0 ? void 0 : client.chain) === null || _b === void 0 ? void 0 : _b.id;
-            const isProjectChainEnabled = this.evmNetworks.some((network) => network.chainId === chainId);
-            if (!isProjectChainEnabled) {
-                logger.error(`Please make sure to enable ${chainName} (${chainId}) in the Dynamic dashboard (https://app.dynamic.xyz/dashboard/configurations#evm).`);
-            }
-        });
-    }
-    getKernelClientWithSponsorshipValidation() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.kernelClientWithSponsorship) {
-                return this.kernelClientWithSponsorship;
+    getKernelClientWithSponsorshipValidation(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ projectId, signer, chainId, }) {
+            if (chainId && this.providerMap[chainId]) {
+                return this.providerMap[chainId].kernelClientWithSponsorship;
             }
             const { eoaConnector } = this;
             if (!eoaConnector)
                 throw new DynamicError('No EOA connector');
-            const signer = yield eoaConnector.getSigner();
-            this.kernelClientWithSponsorship = yield createEcdsaKernelAccountClient({
+            const kernelClientWithSponsorship = yield createEcdsaKernelAccountClient({
                 bundlerRpc: ZeroDevConnector.bundlerRpc,
-                chain: yield fetchChain(this.projectId),
-                ecdsaValidator: this.getEcdsaValidator(this.ecdsaProviderType),
+                chain: chainsMap[chainId],
+                ecdsaValidator: getEcdsaValidator(this.ecdsaProviderType),
                 entryPointAddress: this.entryPoint,
                 kernelVersion: this.kernelVersion,
                 paymaster: 'SPONSOR',
                 paymasterRpc: ZeroDevConnector.paymasterRpc,
-                projectId: this.projectId,
+                projectId,
                 provider: ZeroDevConnector.bundlerProvider,
                 signer: walletClientToSmartAccountSigner(signer),
             });
-            wrapMethodWithCallback(this.kernelClientWithSponsorship, 'sendUserOperation', (original, ...args) => {
+            wrapMethodWithCallback(kernelClientWithSponsorship, 'sendUserOperation', (original, ...args) => {
                 this._walletUiUtils.disabledConfirmationOnce();
                 return original(...args);
             });
-            return this.kernelClientWithSponsorship;
+            return kernelClientWithSponsorship;
         });
     }
     getAddress() {
@@ -221,7 +278,10 @@ class ZeroDevConnector extends WalletConnectorBase {
                     this._walletUiUtils.disabledConfirmationOnce();
                     const effectiveProvider = this.isGasSponsorshipDisabled
                         ? provider
-                        : yield this.getKernelClientWithSponsorshipValidation();
+                        : this.kernelClientWithSponsorship;
+                    if (!effectiveProvider) {
+                        throw new DynamicError('No provider');
+                    }
                     const response = yield effectiveProvider.sendTransaction(unFormatTransaction(transaction));
                     return response;
                 }
@@ -259,7 +319,7 @@ class ZeroDevConnector extends WalletConnectorBase {
         var _a;
         const provider = this.kernelClient;
         if (!provider)
-            throw new DynamicError('No provider');
+            return undefined;
         const transport = this.getTransport(provider);
         const address = (_a = provider.account) === null || _a === void 0 ? void 0 : _a.address;
         const walletClient = createWalletClient({
@@ -274,7 +334,7 @@ class ZeroDevConnector extends WalletConnectorBase {
             var _a;
             const provider = (_a = this.kernelClient) === null || _a === void 0 ? void 0 : _a.extend(publicActions);
             if (!provider)
-                throw new DynamicError('No provider');
+                return undefined;
             return provider;
         });
     }
@@ -286,7 +346,10 @@ class ZeroDevConnector extends WalletConnectorBase {
     canSponsorTransactionGas(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const kernelClientWithSponsorship = yield this.getKernelClientWithSponsorshipValidation();
+                const { kernelClientWithSponsorship } = this;
+                if (!kernelClientWithSponsorship) {
+                    throw new DynamicError('No kernel client with sponsorship found');
+                }
                 const userOperation = {
                     callData: yield kernelClientWithSponsorship.account.encodeCallData({
                         data: transaction.data ? transaction.data : '0x',
@@ -347,23 +410,14 @@ class ZeroDevConnector extends WalletConnectorBase {
         });
     }
     validateActiveWallet(expectedAddress) {
-        const _super = Object.create(null, {
-            validateActiveWallet: { get: () => super.validateActiveWallet }
-        });
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const eoaConnector = this === null || this === void 0 ? void 0 : this.eoaConnector;
-            if (eoaConnector && isTurnkeyWalletConnector(eoaConnector)) {
-                const verifiedCredentials = eoaConnector === null || eoaConnector === void 0 ? void 0 : eoaConnector.verifiedCredentials;
-                const expectedEoaAddress = (_a = verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find((vc) => vc.smartWalletRefAddress === expectedAddress)) === null || _a === void 0 ? void 0 : _a.address;
-                if (!expectedEoaAddress) {
-                    throw new DynamicError('No EOA connector');
-                }
-                yield (eoaConnector === null || eoaConnector === void 0 ? void 0 : eoaConnector.validateActiveWallet(expectedEoaAddress));
-            }
-            else {
-                yield _super.validateActiveWallet.call(this, expectedAddress);
+            const eoa = this.eoaConnectorMap[expectedAddress];
+            if (!eoa) {
+                throw new DynamicError('No EOA connector');
             }
+            const { eoaAddress, eoaConnector } = eoa;
+            yield eoaConnector.validateActiveWallet(eoaAddress);
+            yield this.setEoaConnector(eoaAddress, eoaConnector);
         });
     }
 }