@dynamic-labs/ethereum-aa 3.2.0 → 3.4.0

package/src/ZeroDevConnector.js

@@ -1,27 +1,28 @@
 '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 { walletClientToSmartAccountSigner } from 'permissionless/utils';
 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 { WalletConnectorBase, eventListenerHandlers, isTurnkeyWalletConnector } 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 { getEntryPoint } from './utils/getEntryPoint.js';
+import { getEcdsaValidator } from './utils/getEcdsaValidator.js';
+import { getKernelVersion } from './utils/getKernelVersion.js';
 
 class ZeroDevConnector extends WalletConnectorBase {
     constructor(opts) {
         var _a, _b, _c, _d;
         super(opts);
+        this.providerMap = {};
         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 +32,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,7 +106,7 @@ 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) {
@@ -120,15 +126,63 @@ class ZeroDevConnector extends WalletConnectorBase {
                 logger.error('No signer account found');
                 return;
             }
+            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* () {
+            for (const provider of this.providersFromApi) {
+                if (!this.providerMap[provider.chain]) {
+                    this.providerMap[provider.chain] = {
+                        kernelClient: yield this.getKernelClientWithoutSponsorshipValidation({
+                            chainId: provider.chain,
+                            projectId: provider.clientId,
+                            signer,
+                        }),
+                        kernelClientWithSponsorship: yield this.getKernelClientWithSponsorshipValidation({
+                            chainId: provider.chain,
+                            projectId: provider.clientId,
+                            signer,
+                        }),
+                    };
+                }
+                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 +190,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();
-        });
-    }
-    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).`);
-            }
+            return kernelClient;
         });
     }
-    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 +258,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 +299,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 +314,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 +326,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',

package/src/constants.cjs

@@ -0,0 +1,8 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const ZERO_DEV_LAST_USED_CHAIN_ID_KEY = 'dynamic_zerodev_last_used_chain_id';
+
+exports.ZERO_DEV_LAST_USED_CHAIN_ID_KEY = ZERO_DEV_LAST_USED_CHAIN_ID_KEY;

package/src/constants.d.ts

@@ -0,0 +1 @@
+export declare const ZERO_DEV_LAST_USED_CHAIN_ID_KEY = "dynamic_zerodev_last_used_chain_id";

package/src/constants.js

@@ -0,0 +1,4 @@
+'use client'
+const ZERO_DEV_LAST_USED_CHAIN_ID_KEY = 'dynamic_zerodev_last_used_chain_id';
+
+export { ZERO_DEV_LAST_USED_CHAIN_ID_KEY };

package/src/index.cjs

@@ -3,10 +3,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var assertPackageVersion = require('@dynamic-labs/assert-package-version');
+var _package = require('../package.cjs');
 var ZeroDevConnector = require('./ZeroDevConnector.cjs');
 var ethereumAa = require('./ethereum-aa.cjs');
 var isZeroDevConnector = require('./utils/isZeroDevConnector.cjs');
 
+assertPackageVersion.assertPackageVersion('@dynamic-labs/ethereum-aa', _package.version);
 const ZeroDevSmartWalletConnectorsWithConfig = ({ bundlerProvider, bundlerRpc, paymasterRpc, } = {}) => {
     ZeroDevConnector.ZeroDevConnector.bundlerProvider = bundlerProvider;
     ZeroDevConnector.ZeroDevConnector.bundlerRpc = bundlerRpc;

package/src/index.js

@@ -1,8 +1,11 @@
 'use client'
+import { assertPackageVersion } from '@dynamic-labs/assert-package-version';
+import { version } from '../package.js';
 import { ZeroDevConnector } from './ZeroDevConnector.js';
 export { EthereumAaConnector } from './ethereum-aa.js';
 export { isZeroDevConnector } from './utils/isZeroDevConnector.js';
 
+assertPackageVersion('@dynamic-labs/ethereum-aa', version);
 const ZeroDevSmartWalletConnectorsWithConfig = ({ bundlerProvider, bundlerRpc, paymasterRpc, } = {}) => {
     ZeroDevConnector.bundlerProvider = bundlerProvider;
     ZeroDevConnector.bundlerRpc = bundlerRpc;

package/src/utils/createEcsdaKernelAccountClient.d.ts

@@ -21,4 +21,4 @@ export declare const createEcdsaKernelAccountClient: <entryPoint extends EntryPo
     index?: bigint;
     kernelVersion: GetKernelVersion<entryPoint>;
     ecdsaValidator: any;
-}) => Promise<KernelAccountClient<entryPoint, HttpTransport, TChain, KernelSmartAccount<entryPoint, HttpTransport, TChain>>>;
+}) => Promise<KernelAccountClient<entryPoint, HttpTransport, TChain, KernelSmartAccount<entryPoint>>>;

package/src/utils/{fetchChain.d.ts → fetchZeroDevChain.d.ts}

@@ -1,3 +1,3 @@
 import { type Chain } from 'viem/chains';
 export declare const cachedChainIdKey = "dynamic_zd_chain_id";
-export declare const fetchChain: (projectId: string) => Promise<Chain>;
+export declare const fetchZeroDevChain: (projectId: string) => Promise<Chain>;

package/src/utils/getEcdsaValidator.cjs

@@ -0,0 +1,21 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var ecdsaValidator = require('@zerodev/ecdsa-validator');
+var multiChainValidator = require('@zerodev/multi-chain-validator');
+
+const getEcdsaValidator = (ecdsaProviderType) => {
+    if (ecdsaProviderType === 'zerodev_signer_to_ecdsa') {
+        return ecdsaValidator.signerToEcdsaValidator;
+    }
+    else if (ecdsaProviderType === 'zerodev_multi_chain') {
+        return multiChainValidator.toMultiChainECDSAValidator;
+    }
+    else {
+        return ecdsaValidator.signerToEcdsaValidator;
+    }
+};
+
+exports.getEcdsaValidator = getEcdsaValidator;

package/src/utils/getEcdsaValidator.d.ts

@@ -0,0 +1,3 @@
+import { signerToEcdsaValidator } from '@zerodev/ecdsa-validator';
+import { toMultiChainECDSAValidator } from '@zerodev/multi-chain-validator';
+export declare const getEcdsaValidator: (ecdsaProviderType: string | undefined) => typeof signerToEcdsaValidator | typeof toMultiChainECDSAValidator;

package/src/utils/getEcdsaValidator.js

@@ -0,0 +1,17 @@
+'use client'
+import { signerToEcdsaValidator } from '@zerodev/ecdsa-validator';
+import { toMultiChainECDSAValidator } from '@zerodev/multi-chain-validator';
+
+const getEcdsaValidator = (ecdsaProviderType) => {
+    if (ecdsaProviderType === 'zerodev_signer_to_ecdsa') {
+        return signerToEcdsaValidator;
+    }
+    else if (ecdsaProviderType === 'zerodev_multi_chain') {
+        return toMultiChainECDSAValidator;
+    }
+    else {
+        return signerToEcdsaValidator;
+    }
+};
+
+export { getEcdsaValidator };

package/src/utils/getEntryPoint.cjs

@@ -0,0 +1,24 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var permissionless = require('permissionless');
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
+var logger = require('./logger.cjs');
+
+const getEntryPoint = (entryPoint) => {
+    if (entryPoint === undefined ||
+        entryPoint === sdkApiCore.ProviderEntryPointVersionEnum.V7) {
+        return permissionless.ENTRYPOINT_ADDRESS_V07;
+    }
+    else if (entryPoint === sdkApiCore.ProviderEntryPointVersionEnum.V6) {
+        return permissionless.ENTRYPOINT_ADDRESS_V06;
+    }
+    else {
+        logger.logger.error('Invalid entry point version', entryPoint);
+        return permissionless.ENTRYPOINT_ADDRESS_V07;
+    }
+};
+
+exports.getEntryPoint = getEntryPoint;

package/src/utils/getEntryPoint.d.ts

@@ -0,0 +1 @@
+export declare const getEntryPoint: (entryPoint: string | undefined) => "0x0000000071727De22E5E9d8BAf0edAc6f37da032" | "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789";

package/src/utils/getEntryPoint.js

@@ -0,0 +1,20 @@
+'use client'
+import { ENTRYPOINT_ADDRESS_V07, ENTRYPOINT_ADDRESS_V06 } from 'permissionless';
+import { ProviderEntryPointVersionEnum } from '@dynamic-labs/sdk-api-core';
+import { logger } from './logger.js';
+
+const getEntryPoint = (entryPoint) => {
+    if (entryPoint === undefined ||
+        entryPoint === ProviderEntryPointVersionEnum.V7) {
+        return ENTRYPOINT_ADDRESS_V07;
+    }
+    else if (entryPoint === ProviderEntryPointVersionEnum.V6) {
+        return ENTRYPOINT_ADDRESS_V06;
+    }
+    else {
+        logger.error('Invalid entry point version', entryPoint);
+        return ENTRYPOINT_ADDRESS_V07;
+    }
+};
+
+export { getEntryPoint };

package/src/utils/getKernelVersion.cjs

@@ -0,0 +1,31 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var permissionless = require('permissionless');
+var constants = require('@zerodev/sdk/constants');
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
+var logger = require('./logger.cjs');
+
+const getKernelVersion = (kernelVersion, entryPointAddress) => {
+    if (kernelVersion === sdkApiCore.ProviderKernelVersionEnum.V31 ||
+        (kernelVersion === undefined &&
+            entryPointAddress === permissionless.ENTRYPOINT_ADDRESS_V07)) {
+        return constants.KERNEL_V3_1;
+    }
+    else if (kernelVersion === sdkApiCore.ProviderKernelVersionEnum.V30) {
+        return constants.KERNEL_V3_0;
+    }
+    else if (kernelVersion === sdkApiCore.ProviderKernelVersionEnum.V24 ||
+        entryPointAddress === permissionless.ENTRYPOINT_ADDRESS_V06 // v0.6 only supports v2.4
+    ) {
+        return constants.KERNEL_V2_4;
+    }
+    else {
+        logger.logger.error('Invalid kernel version', kernelVersion);
+        return constants.KERNEL_V3_1;
+    }
+};
+
+exports.getKernelVersion = getKernelVersion;

package/src/utils/getKernelVersion.d.ts

@@ -0,0 +1,4 @@
+import { KERNEL_VERSION_TYPE } from '@zerodev/sdk/types';
+import { ProviderKernelVersionEnum } from '@dynamic-labs/sdk-api-core';
+import { getEntryPoint } from './getEntryPoint';
+export declare const getKernelVersion: (kernelVersion: ProviderKernelVersionEnum | undefined, entryPointAddress: ReturnType<typeof getEntryPoint>) => KERNEL_VERSION_TYPE;

package/src/utils/getKernelVersion.js

@@ -0,0 +1,27 @@
+'use client'
+import { ENTRYPOINT_ADDRESS_V07, ENTRYPOINT_ADDRESS_V06 } from 'permissionless';
+import { KERNEL_V3_1, KERNEL_V3_0, KERNEL_V2_4 } from '@zerodev/sdk/constants';
+import { ProviderKernelVersionEnum } from '@dynamic-labs/sdk-api-core';
+import { logger } from './logger.js';
+
+const getKernelVersion = (kernelVersion, entryPointAddress) => {
+    if (kernelVersion === ProviderKernelVersionEnum.V31 ||
+        (kernelVersion === undefined &&
+            entryPointAddress === ENTRYPOINT_ADDRESS_V07)) {
+        return KERNEL_V3_1;
+    }
+    else if (kernelVersion === ProviderKernelVersionEnum.V30) {
+        return KERNEL_V3_0;
+    }
+    else if (kernelVersion === ProviderKernelVersionEnum.V24 ||
+        entryPointAddress === ENTRYPOINT_ADDRESS_V06 // v0.6 only supports v2.4
+    ) {
+        return KERNEL_V2_4;
+    }
+    else {
+        logger.error('Invalid kernel version', kernelVersion);
+        return KERNEL_V3_1;
+    }
+};
+
+export { getKernelVersion };

package/src/utils/index.d.ts

@@ -1,4 +1,7 @@
-export * from './fetchChain';
+export * from './fetchZeroDevChain';
 export * from './logger';
 export * from './isZeroDevConnector';
 export * from './createEcsdaKernelAccountClient';
+export * from './getEntryPoint';
+export * from './getEcdsaValidator';
+export * from './getKernelVersion';

package/src/utils/fetchChain.cjs

@@ -1,29 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var _tslib = require('../../_virtual/_tslib.cjs');
-var ethereumCore = require('@dynamic-labs/ethereum-core');
-var logger = require('./logger.cjs');
-
-const cachedChainIdKey = 'dynamic_zd_chain_id';
-const fetchChain = (projectId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const cachedChainId = localStorage.getItem(cachedChainIdKey);
-        if (cachedChainId) {
-            return ethereumCore.chainsMap[cachedChainId];
-        }
-        const response = yield (yield fetch(`https://prod-api.zerodev.app/projects/${projectId}`)).json();
-        localStorage.setItem(cachedChainIdKey, response.chainId);
-        return ethereumCore.chainsMap[response.chainId];
-    }
-    catch (err) {
-        logger.logger.error('Failed to fetch ZeroDev project settings from ZeroDev API ' +
-            'This is needed to fetch the chain id so that we know which chain the smart contract is on');
-        throw err;
-    }
-});
-
-exports.cachedChainIdKey = cachedChainIdKey;
-exports.fetchChain = fetchChain;

package/src/utils/fetchChain.js

@@ -1,24 +0,0 @@
-'use client'
-import { __awaiter } from '../../_virtual/_tslib.js';
-import { chainsMap } from '@dynamic-labs/ethereum-core';
-import { logger } from './logger.js';
-
-const cachedChainIdKey = 'dynamic_zd_chain_id';
-const fetchChain = (projectId) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const cachedChainId = localStorage.getItem(cachedChainIdKey);
-        if (cachedChainId) {
-            return chainsMap[cachedChainId];
-        }
-        const response = yield (yield fetch(`https://prod-api.zerodev.app/projects/${projectId}`)).json();
-        localStorage.setItem(cachedChainIdKey, response.chainId);
-        return chainsMap[response.chainId];
-    }
-    catch (err) {
-        logger.error('Failed to fetch ZeroDev project settings from ZeroDev API ' +
-            'This is needed to fetch the chain id so that we know which chain the smart contract is on');
-        throw err;
-    }
-});
-
-export { cachedChainIdKey, fetchChain };