@dynamic-labs/ethereum-aa 4.87.0 → 4.87.2

package/CHANGELOG.md

@@ -1,4 +1,15 @@
 
+### [4.87.2](https://github.com/dynamic-labs/dynamic-auth/compare/v4.87.1...v4.87.2) (2026-06-03)
+
+
+### Bug Fixes
+
+* allow for using v2 zerodev projects ([#11449](https://github.com/dynamic-labs/dynamic-auth/issues/11449)) ([9242698](https://github.com/dynamic-labs/dynamic-auth/commit/9242698670db92b03ad1afc776e674ec9a7e7e54))
+* e2e: ensure MFA item is detached before logout ([#11452](https://github.com/dynamic-labs/dynamic-auth/issues/11452)) ([5a4c67e](https://github.com/dynamic-labs/dynamic-auth/commit/5a4c67e93b66a548346c1065fb373c675f0054a0))
+
+### [4.87.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.87.0...v4.87.1) (2026-06-03)
+
+
 ## [4.87.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.86.0...v4.87.0) (2026-06-02)
 
 

package/package.cjs

@@ -3,6 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.87.0";
+var version = "4.87.2";
 
 exports.version = version;

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.87.0";
+var version = "4.87.2";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum-aa",
-  "version": "4.87.0",
+  "version": "4.87.2",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -18,18 +18,18 @@
   },
   "homepage": "https://www.dynamic.xyz/",
   "dependencies": {
-    "@dynamic-labs/sdk-api-core": "0.0.985",
+    "@dynamic-labs/sdk-api-core": "0.0.1015",
     "@zerodev/ecdsa-validator": "5.4.9",
     "@zerodev/multi-chain-ecdsa-validator": "5.4.5",
     "@zerodev/sdk": "5.5.7",
-    "@dynamic-labs/assert-package-version": "4.87.0",
-    "@dynamic-labs/ethereum-aa-core": "4.87.0",
-    "@dynamic-labs/ethereum-core": "4.87.0",
-    "@dynamic-labs/logger": "4.87.0",
-    "@dynamic-labs/types": "4.87.0",
-    "@dynamic-labs/utils": "4.87.0",
-    "@dynamic-labs/wallet-book": "4.87.0",
-    "@dynamic-labs/wallet-connector-core": "4.87.0"
+    "@dynamic-labs/assert-package-version": "4.87.2",
+    "@dynamic-labs/ethereum-aa-core": "4.87.2",
+    "@dynamic-labs/ethereum-core": "4.87.2",
+    "@dynamic-labs/logger": "4.87.2",
+    "@dynamic-labs/types": "4.87.2",
+    "@dynamic-labs/utils": "4.87.2",
+    "@dynamic-labs/wallet-book": "4.87.2",
+    "@dynamic-labs/wallet-connector-core": "4.87.2"
   },
   "peerDependencies": {
     "viem": "^2.45.3"

package/src/ZeroDevConnector.cjs

@@ -23,7 +23,7 @@ var signEip7702Authorization = require('./utils/signEip7702Authorization/signEip
 
 class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
     constructor(opts) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         super(opts);
         // Provider map maintains kernel clients per wallet address and chain
         // Structure: { [walletAddress]: { [chainId]: { kernelClient, ... } } }
@@ -63,15 +63,16 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             (_j = (_h = opts.apiProviders.zerodev) === null || _h === void 0 ? void 0 : _h.zerodevBundlerRpcUrl) !== null && _j !== void 0 ? _j : ZeroDevConnector.bundlerRpcDefault;
         this.paymasterRpc =
             (_l = (_k = opts.apiProviders.zerodev) === null || _k === void 0 ? void 0 : _k.zerodevPaymasterRpcUrl) !== null && _l !== void 0 ? _l : ZeroDevConnector.paymasterRpcDefault;
+        this.projectVersion = (_m = opts.apiProviders.zerodev) === null || _m === void 0 ? void 0 : _m.zerodevProjectVersion;
         this.kernelDelegationAddress =
-            (_o = (_m = opts.apiProviders.zerodev) === null || _m === void 0 ? void 0 : _m.zerodevKernelDelegationAddress) !== null && _o !== void 0 ? _o : ZeroDevConnector.kernelDelegationAddressDefault;
-        this.apiKernelVersion = getKernelVersion.getKernelVersion((_p = opts.apiProviders.zerodev) === null || _p === void 0 ? void 0 : _p.kernelVersion, this.entryPoint);
-        this.kernelVersion = getKernelVersion.getKernelVersion((_q = opts.apiProviders.zerodev) === null || _q === void 0 ? void 0 : _q.kernelVersion, this.entryPoint);
+            (_p = (_o = opts.apiProviders.zerodev) === null || _o === void 0 ? void 0 : _o.zerodevKernelDelegationAddress) !== null && _p !== void 0 ? _p : ZeroDevConnector.kernelDelegationAddressDefault;
+        this.apiKernelVersion = getKernelVersion.getKernelVersion((_q = opts.apiProviders.zerodev) === null || _q === void 0 ? void 0 : _q.kernelVersion, this.entryPoint);
+        this.kernelVersion = getKernelVersion.getKernelVersion((_r = opts.apiProviders.zerodev) === null || _r === void 0 ? void 0 : _r.kernelVersion, this.entryPoint);
         this.enableKernelV3Migration =
-            (_s = (_r = opts.apiProviders.zerodev) === null || _r === void 0 ? void 0 : _r.enableKernelV3Migration) !== null && _s !== void 0 ? _s : false;
+            (_t = (_s = opts.apiProviders.zerodev) === null || _s === void 0 ? void 0 : _s.enableKernelV3Migration) !== null && _t !== void 0 ? _t : false;
         // this is the list of providers from the api that are used for multi-chain account abstraction
         this.providersFromApi =
-            ((_t = opts.apiProviders.zerodev) === null || _t === void 0 ? void 0 : _t.multichainAccountAbstractionProviders) || [];
+            ((_u = opts.apiProviders.zerodev) === null || _u === void 0 ? void 0 : _u.multichainAccountAbstractionProviders) || [];
         const enabledZerodevNetworks = this.providersFromApi.map((provider) => provider.chain);
         this.evmNetworks = utils.parseEvmNetworks(opts.evmNetworks).filter((network) => enabledZerodevNetworks.includes(network.chainId.toString()));
         const [defaultProvider] = this.providersFromApi;
@@ -80,7 +81,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             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 = (_u = opts.apiProviders.zerodev) === null || _u === void 0 ? void 0 : _u.ecdsaProviderType;
+        this.ecdsaProviderType = (_v = opts.apiProviders.zerodev) === null || _v === void 0 ? void 0 : _v.ecdsaProviderType;
     }
     confirmTransactionStatus() {
         throw new Error('confirmTransactionStatus not implemented in ZeroDevConnector');
@@ -388,12 +389,14 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                 apiKernelVersion: this.apiKernelVersion,
                 bundlerRpc: bundlerRpcOverride !== null && bundlerRpcOverride !== void 0 ? bundlerRpcOverride : this.bundlerRpc,
                 chain,
+                chainId: utils.parseChainId(chainId),
                 enableKernelV3Migration: this.enableKernelV3Migration,
                 entryPoint: this.entryPoint,
                 kernelVersion: this.kernelVersion,
                 paymaster,
                 paymasterRpc: paymasterRpcOverride !== null && paymasterRpcOverride !== void 0 ? paymasterRpcOverride : this.paymasterRpc,
                 projectId,
+                projectVersion: this.projectVersion,
                 provider: this.bundlerProvider,
                 publicClientRpc: this.getPublicRpcForChain(chainId),
                 signer,

package/src/ZeroDevConnector.d.ts

@@ -32,6 +32,7 @@ export declare class ZeroDevConnector extends AccountAbstractionBaseConnector im
     bundlerProvider: ZerodevBundlerProvider;
     bundlerRpc: string | undefined;
     paymasterRpc: string | undefined;
+    projectVersion: string | undefined;
     kernelDelegationAddress: `0x${string}` | undefined;
     static bundlerProviderDefault: ZerodevBundlerProvider | undefined;
     static bundlerRpcDefault: string | undefined;

package/src/ZeroDevConnector.js

@@ -19,7 +19,7 @@ import { signEip7702Authorization } from './utils/signEip7702Authorization/signE
 
 class ZeroDevConnector extends AccountAbstractionBaseConnector {
     constructor(opts) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         super(opts);
         // Provider map maintains kernel clients per wallet address and chain
         // Structure: { [walletAddress]: { [chainId]: { kernelClient, ... } } }
@@ -59,15 +59,16 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             (_j = (_h = opts.apiProviders.zerodev) === null || _h === void 0 ? void 0 : _h.zerodevBundlerRpcUrl) !== null && _j !== void 0 ? _j : ZeroDevConnector.bundlerRpcDefault;
         this.paymasterRpc =
             (_l = (_k = opts.apiProviders.zerodev) === null || _k === void 0 ? void 0 : _k.zerodevPaymasterRpcUrl) !== null && _l !== void 0 ? _l : ZeroDevConnector.paymasterRpcDefault;
+        this.projectVersion = (_m = opts.apiProviders.zerodev) === null || _m === void 0 ? void 0 : _m.zerodevProjectVersion;
         this.kernelDelegationAddress =
-            (_o = (_m = opts.apiProviders.zerodev) === null || _m === void 0 ? void 0 : _m.zerodevKernelDelegationAddress) !== null && _o !== void 0 ? _o : ZeroDevConnector.kernelDelegationAddressDefault;
-        this.apiKernelVersion = getKernelVersion((_p = opts.apiProviders.zerodev) === null || _p === void 0 ? void 0 : _p.kernelVersion, this.entryPoint);
-        this.kernelVersion = getKernelVersion((_q = opts.apiProviders.zerodev) === null || _q === void 0 ? void 0 : _q.kernelVersion, this.entryPoint);
+            (_p = (_o = opts.apiProviders.zerodev) === null || _o === void 0 ? void 0 : _o.zerodevKernelDelegationAddress) !== null && _p !== void 0 ? _p : ZeroDevConnector.kernelDelegationAddressDefault;
+        this.apiKernelVersion = getKernelVersion((_q = opts.apiProviders.zerodev) === null || _q === void 0 ? void 0 : _q.kernelVersion, this.entryPoint);
+        this.kernelVersion = getKernelVersion((_r = opts.apiProviders.zerodev) === null || _r === void 0 ? void 0 : _r.kernelVersion, this.entryPoint);
         this.enableKernelV3Migration =
-            (_s = (_r = opts.apiProviders.zerodev) === null || _r === void 0 ? void 0 : _r.enableKernelV3Migration) !== null && _s !== void 0 ? _s : false;
+            (_t = (_s = opts.apiProviders.zerodev) === null || _s === void 0 ? void 0 : _s.enableKernelV3Migration) !== null && _t !== void 0 ? _t : false;
         // this is the list of providers from the api that are used for multi-chain account abstraction
         this.providersFromApi =
-            ((_t = opts.apiProviders.zerodev) === null || _t === void 0 ? void 0 : _t.multichainAccountAbstractionProviders) || [];
+            ((_u = opts.apiProviders.zerodev) === null || _u === void 0 ? void 0 : _u.multichainAccountAbstractionProviders) || [];
         const enabledZerodevNetworks = this.providersFromApi.map((provider) => provider.chain);
         this.evmNetworks = parseEvmNetworks(opts.evmNetworks).filter((network) => enabledZerodevNetworks.includes(network.chainId.toString()));
         const [defaultProvider] = this.providersFromApi;
@@ -76,7 +77,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             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 = (_u = opts.apiProviders.zerodev) === null || _u === void 0 ? void 0 : _u.ecdsaProviderType;
+        this.ecdsaProviderType = (_v = opts.apiProviders.zerodev) === null || _v === void 0 ? void 0 : _v.ecdsaProviderType;
     }
     confirmTransactionStatus() {
         throw new Error('confirmTransactionStatus not implemented in ZeroDevConnector');
@@ -384,12 +385,14 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                 apiKernelVersion: this.apiKernelVersion,
                 bundlerRpc: bundlerRpcOverride !== null && bundlerRpcOverride !== void 0 ? bundlerRpcOverride : this.bundlerRpc,
                 chain,
+                chainId: parseChainId(chainId),
                 enableKernelV3Migration: this.enableKernelV3Migration,
                 entryPoint: this.entryPoint,
                 kernelVersion: this.kernelVersion,
                 paymaster,
                 paymasterRpc: paymasterRpcOverride !== null && paymasterRpcOverride !== void 0 ? paymasterRpcOverride : this.paymasterRpc,
                 projectId,
+                projectVersion: this.projectVersion,
                 provider: this.bundlerProvider,
                 publicClientRpc: this.getPublicRpcForChain(chainId),
                 signer,

package/src/utils/createEcdsaKernelAccountClient.cjs

@@ -15,19 +15,21 @@ exports.PaymasterTypeEnum = void 0;
     PaymasterTypeEnum["NONE"] = "NONE";
     PaymasterTypeEnum["SPONSOR"] = "SPONSOR";
 })(exports.PaymasterTypeEnum || (exports.PaymasterTypeEnum = {}));
-const getZeroDevBundlerRPC = (projectId, provider) => {
-    let rpc = `https://rpc.zerodev.app/api/v2/bundler/${projectId}`;
-    if (provider) {
-        rpc += `?bundlerProvider=${provider}`;
+const getZeroDevBundlerRPC = (projectId, chainId, projectVersion, provider) => {
+    if (projectVersion === 'v2' && chainId) {
+        const base = `https://rpc.zerodev.app/api/v3/${projectId}/chain/${chainId}`;
+        return provider ? `${base}?provider=${provider}` : base;
     }
-    return rpc;
+    const base = `https://rpc.zerodev.app/api/v2/bundler/${projectId}`;
+    return provider ? `${base}?bundlerProvider=${provider}` : base;
 };
-const getZeroDevPaymasterRPC = (projectId, provider) => {
-    let rpc = `https://rpc.zerodev.app/api/v2/paymaster/${projectId}`;
-    if (provider) {
-        rpc += `?paymasterProvider=${provider}`;
+const getZeroDevPaymasterRPC = (projectId, chainId, projectVersion, provider) => {
+    if (projectVersion === 'v2' && chainId) {
+        const base = `https://rpc.zerodev.app/api/v3/${projectId}/chain/${chainId}`;
+        return provider ? `${base}?provider=${provider}` : base;
     }
-    return rpc;
+    const base = `https://rpc.zerodev.app/api/v2/paymaster/${projectId}`;
+    return provider ? `${base}?paymasterProvider=${provider}` : base;
 };
 const isERC20 = (value) => viem.isAddress(value);
 const createPublicAndPaymasterClients = (bundlerRpc, paymasterRpc, chain, publicClientRpc) => {
@@ -69,9 +71,10 @@ const createKernelClientConfig = (account, bundlerRpc, chain, publicClient, paym
         estimateFeesPerGas: (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ bundlerClient }) { return actions.getUserOperationGasPrice(bundlerClient); }),
     },
 });
-const createEcdsaKernelAccountClient = (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, paymaster = exports.PaymasterTypeEnum.SPONSOR, entryPoint, kernelVersion, ecdsaValidator: ecdsaValidator$1, enableKernelV3Migration, publicClientRpc, apiKernelVersion, }) {
-    const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, provider);
-    const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, provider);
+const createEcdsaKernelAccountClient = (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ bundlerRpc, chain, chainId, paymasterRpc, projectId, projectVersion, signer, provider, paymaster = exports.PaymasterTypeEnum.SPONSOR, entryPoint, kernelVersion, ecdsaValidator: ecdsaValidator$1, enableKernelV3Migration, publicClientRpc, apiKernelVersion, }) {
+    const resolvedChainId = chainId !== null && chainId !== void 0 ? chainId : chain === null || chain === void 0 ? void 0 : chain.id;
+    const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, resolvedChainId, projectVersion, provider);
+    const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, resolvedChainId, projectVersion, provider);
     const { publicClient, zerodevPaymaster } = createPublicAndPaymasterClients(resolvedBundlerRpc, resolvedPaymasterRpc, chain, publicClientRpc);
     const validator = yield ecdsaValidator$1(publicClient, {
         entryPoint,
@@ -100,9 +103,10 @@ const createEcdsaKernelAccountClient = (_b) => _tslib.__awaiter(void 0, [_b], vo
     const clientConfig = createKernelClientConfig(selectedAccount, resolvedBundlerRpc, chain, publicClient, paymasterHandler);
     return clients.createKernelAccountClient(clientConfig);
 });
-const createEcdsaKernelAccountClientWith7702 = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, paymaster = exports.PaymasterTypeEnum.SPONSOR, entryPoint, kernelVersion, publicClientRpc, eip7702Auth, }) {
-    const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, provider);
-    const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, provider);
+const createEcdsaKernelAccountClientWith7702 = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function* ({ bundlerRpc, chain, chainId, paymasterRpc, projectId, projectVersion, signer, provider, paymaster = exports.PaymasterTypeEnum.SPONSOR, entryPoint, kernelVersion, publicClientRpc, eip7702Auth, }) {
+    const resolvedChainId = chainId !== null && chainId !== void 0 ? chainId : chain === null || chain === void 0 ? void 0 : chain.id;
+    const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, resolvedChainId, projectVersion, provider);
+    const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, resolvedChainId, projectVersion, provider);
     const { publicClient, zerodevPaymaster } = createPublicAndPaymasterClients(resolvedBundlerRpc, resolvedPaymasterRpc, chain, publicClientRpc);
     const account = yield accounts.createKernelAccount(publicClient, {
         eip7702Account: signer,

package/src/utils/createEcdsaKernelAccountClient.d.ts

@@ -11,12 +11,14 @@ export declare enum PaymasterTypeEnum {
     NONE = "NONE",
     SPONSOR = "SPONSOR"
 }
-export declare const getZeroDevBundlerRPC: (projectId: string, provider?: ZerodevBundlerProvider) => string;
-export declare const getZeroDevPaymasterRPC: (projectId: string, provider?: ZerodevBundlerProvider) => string;
+export declare const getZeroDevBundlerRPC: (projectId: string, chainId: number | undefined, projectVersion?: string, provider?: ZerodevBundlerProvider) => string;
+export declare const getZeroDevPaymasterRPC: (projectId: string, chainId: number | undefined, projectVersion?: string, provider?: ZerodevBundlerProvider) => string;
 type CommonClientParams<TChain extends Chain | undefined = Chain | undefined> = {
     bundlerRpc?: string;
     chain: TChain;
+    chainId?: number;
     projectId: string;
+    projectVersion?: string;
     signer: WalletClient<Transport, ViemChain, Account>;
     paymaster: PaymasterType;
     paymasterRpc?: string;
@@ -27,10 +29,10 @@ type CommonClientParams<TChain extends Chain | undefined = Chain | undefined> =
     publicClientRpc?: string;
     apiKernelVersion: KERNEL_VERSION_TYPE;
 };
-export declare const createEcdsaKernelAccountClient: <entryPoint extends EntryPointVersion, TChain extends Chain | undefined = Chain | undefined>({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, paymaster, entryPoint, kernelVersion, ecdsaValidator, enableKernelV3Migration, publicClientRpc, apiKernelVersion, }: CommonClientParams<TChain> & {
+export declare const createEcdsaKernelAccountClient: <entryPoint extends EntryPointVersion, TChain extends Chain | undefined = Chain | undefined>({ bundlerRpc, chain, chainId, paymasterRpc, projectId, projectVersion, signer, provider, paymaster, entryPoint, kernelVersion, ecdsaValidator, enableKernelV3Migration, publicClientRpc, apiKernelVersion, }: CommonClientParams<TChain> & {
     ecdsaValidator: any;
 }) => Promise<KernelAccountClient<Transport, ViemChain, SmartAccount, Client, RpcSchema>>;
-export declare const createEcdsaKernelAccountClientWith7702: <TChain extends Chain | undefined = Chain | undefined>({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, paymaster, entryPoint, kernelVersion, publicClientRpc, eip7702Auth, }: CommonClientParams<TChain> & {
+export declare const createEcdsaKernelAccountClientWith7702: <TChain extends Chain | undefined = Chain | undefined>({ bundlerRpc, chain, chainId, paymasterRpc, projectId, projectVersion, signer, provider, paymaster, entryPoint, kernelVersion, publicClientRpc, eip7702Auth, }: CommonClientParams<TChain> & {
     eip7702Auth?: SignAuthorizationReturnType;
 }) => Promise<KernelAccountClient<Transport, ViemChain, SmartAccount, Client, RpcSchema>>;
 export {};

package/src/utils/createEcdsaKernelAccountClient.js

@@ -11,19 +11,21 @@ var PaymasterTypeEnum;
     PaymasterTypeEnum["NONE"] = "NONE";
     PaymasterTypeEnum["SPONSOR"] = "SPONSOR";
 })(PaymasterTypeEnum || (PaymasterTypeEnum = {}));
-const getZeroDevBundlerRPC = (projectId, provider) => {
-    let rpc = `https://rpc.zerodev.app/api/v2/bundler/${projectId}`;
-    if (provider) {
-        rpc += `?bundlerProvider=${provider}`;
+const getZeroDevBundlerRPC = (projectId, chainId, projectVersion, provider) => {
+    if (projectVersion === 'v2' && chainId) {
+        const base = `https://rpc.zerodev.app/api/v3/${projectId}/chain/${chainId}`;
+        return provider ? `${base}?provider=${provider}` : base;
     }
-    return rpc;
+    const base = `https://rpc.zerodev.app/api/v2/bundler/${projectId}`;
+    return provider ? `${base}?bundlerProvider=${provider}` : base;
 };
-const getZeroDevPaymasterRPC = (projectId, provider) => {
-    let rpc = `https://rpc.zerodev.app/api/v2/paymaster/${projectId}`;
-    if (provider) {
-        rpc += `?paymasterProvider=${provider}`;
+const getZeroDevPaymasterRPC = (projectId, chainId, projectVersion, provider) => {
+    if (projectVersion === 'v2' && chainId) {
+        const base = `https://rpc.zerodev.app/api/v3/${projectId}/chain/${chainId}`;
+        return provider ? `${base}?provider=${provider}` : base;
     }
-    return rpc;
+    const base = `https://rpc.zerodev.app/api/v2/paymaster/${projectId}`;
+    return provider ? `${base}?paymasterProvider=${provider}` : base;
 };
 const isERC20 = (value) => isAddress(value);
 const createPublicAndPaymasterClients = (bundlerRpc, paymasterRpc, chain, publicClientRpc) => {
@@ -65,9 +67,10 @@ const createKernelClientConfig = (account, bundlerRpc, chain, publicClient, paym
         estimateFeesPerGas: (_a) => __awaiter(void 0, [_a], void 0, function* ({ bundlerClient }) { return getUserOperationGasPrice(bundlerClient); }),
     },
 });
-const createEcdsaKernelAccountClient = (_b) => __awaiter(void 0, [_b], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, paymaster = PaymasterTypeEnum.SPONSOR, entryPoint, kernelVersion, ecdsaValidator, enableKernelV3Migration, publicClientRpc, apiKernelVersion, }) {
-    const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, provider);
-    const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, provider);
+const createEcdsaKernelAccountClient = (_b) => __awaiter(void 0, [_b], void 0, function* ({ bundlerRpc, chain, chainId, paymasterRpc, projectId, projectVersion, signer, provider, paymaster = PaymasterTypeEnum.SPONSOR, entryPoint, kernelVersion, ecdsaValidator, enableKernelV3Migration, publicClientRpc, apiKernelVersion, }) {
+    const resolvedChainId = chainId !== null && chainId !== void 0 ? chainId : chain === null || chain === void 0 ? void 0 : chain.id;
+    const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, resolvedChainId, projectVersion, provider);
+    const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, resolvedChainId, projectVersion, provider);
     const { publicClient, zerodevPaymaster } = createPublicAndPaymasterClients(resolvedBundlerRpc, resolvedPaymasterRpc, chain, publicClientRpc);
     const validator = yield ecdsaValidator(publicClient, {
         entryPoint,
@@ -96,9 +99,10 @@ const createEcdsaKernelAccountClient = (_b) => __awaiter(void 0, [_b], void 0, f
     const clientConfig = createKernelClientConfig(selectedAccount, resolvedBundlerRpc, chain, publicClient, paymasterHandler);
     return createKernelAccountClient(clientConfig);
 });
-const createEcdsaKernelAccountClientWith7702 = (_c) => __awaiter(void 0, [_c], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, paymaster = PaymasterTypeEnum.SPONSOR, entryPoint, kernelVersion, publicClientRpc, eip7702Auth, }) {
-    const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, provider);
-    const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, provider);
+const createEcdsaKernelAccountClientWith7702 = (_c) => __awaiter(void 0, [_c], void 0, function* ({ bundlerRpc, chain, chainId, paymasterRpc, projectId, projectVersion, signer, provider, paymaster = PaymasterTypeEnum.SPONSOR, entryPoint, kernelVersion, publicClientRpc, eip7702Auth, }) {
+    const resolvedChainId = chainId !== null && chainId !== void 0 ? chainId : chain === null || chain === void 0 ? void 0 : chain.id;
+    const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, resolvedChainId, projectVersion, provider);
+    const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, resolvedChainId, projectVersion, provider);
     const { publicClient, zerodevPaymaster } = createPublicAndPaymasterClients(resolvedBundlerRpc, resolvedPaymasterRpc, chain, publicClientRpc);
     const account = yield createKernelAccount(publicClient, {
         eip7702Account: signer,