@dynamic-labs/ethereum-aa 3.0.0-alpha.9 → 3.0.0

package/src/utils/createEcsdaKernelAccountClient.cjs

@@ -4,7 +4,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
-var ecdsaValidator = require('@zerodev/ecdsa-validator');
 var accounts = require('@zerodev/sdk/accounts');
 var clients = require('@zerodev/sdk/clients');
 var viem = require('viem');
@@ -24,29 +23,33 @@ const getZeroDevPaymasterRPC = (projectId, provider) => {
     return rpc;
 };
 const isERC20 = (value) => viem.isAddress(value);
-const createEcdsaKernelAccountClient = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ chain, projectId, signer, provider, index, paymaster = 'SPONSOR', entryPointAddress, }) {
+const createEcdsaKernelAccountClient = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, index, paymaster = 'SPONSOR', entryPointAddress, kernelVersion, ecdsaValidator, }) {
+    const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, provider);
+    const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, provider);
     const publicClient = viem.createPublicClient({
-        transport: viem.http(getZeroDevBundlerRPC(projectId, provider)),
+        transport: viem.http(resolvedBundlerRpc),
     });
-    const ecdsaValidator$1 = yield ecdsaValidator.signerToEcdsaValidator(publicClient, {
+    const validator = yield ecdsaValidator(publicClient, {
         entryPoint: entryPointAddress,
+        kernelVersion,
         signer,
     });
     const account = yield accounts.createKernelAccount(publicClient, {
         entryPoint: entryPointAddress,
         index,
+        kernelVersion,
         plugins: {
-            sudo: ecdsaValidator$1,
+            sudo: validator,
         },
     });
     const zerodevPaymaster = clients.createZeroDevPaymasterClient({
         chain: chain,
         entryPoint: entryPointAddress,
-        transport: viem.http(getZeroDevPaymasterRPC(projectId, provider)),
+        transport: viem.http(resolvedPaymasterRpc),
     });
     const kernelClient = clients.createKernelAccountClient({
         account,
-        bundlerTransport: viem.http(getZeroDevBundlerRPC(projectId, provider)),
+        bundlerTransport: viem.http(resolvedBundlerRpc),
         chain,
         entryPoint: entryPointAddress,
         middleware: paymaster !== 'NONE'

package/src/utils/createEcsdaKernelAccountClient.d.ts

@@ -3,17 +3,22 @@ import { KernelAccountClient } from '@zerodev/sdk/clients';
 import { SmartAccountSigner } from 'permissionless/accounts';
 import { EntryPoint } from 'permissionless/types';
 import { Address, HttpTransport, Chain } from 'viem';
+import { GetKernelVersion } from '@zerodev/sdk/types';
 export type BundlerProvider = 'STACKUP' | 'PIMLICO' | 'ALCHEMY' | 'GELATO';
 export type ERC20Paymaster = Address;
 export type PaymasterType = 'NONE' | 'SPONSOR' | ERC20Paymaster;
 export declare const getZeroDevBundlerRPC: (projectId: string, provider?: BundlerProvider) => string;
 export declare const getZeroDevPaymasterRPC: (projectId: string, provider?: BundlerProvider) => string;
-export declare const createEcdsaKernelAccountClient: <entryPoint extends EntryPoint, TChain extends Chain | undefined = Chain | undefined, TSource extends string = "custom", TAddress extends `0x${string}` = `0x${string}`>({ chain, projectId, signer, provider, index, paymaster, entryPointAddress, }: {
+export declare const createEcdsaKernelAccountClient: <entryPoint extends EntryPoint, TChain extends Chain | undefined = Chain | undefined, TSource extends string = "custom", TAddress extends `0x${string}` = `0x${string}`>({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, index, paymaster, entryPointAddress, kernelVersion, ecdsaValidator, }: {
+    bundlerRpc?: string;
     chain: TChain;
     projectId: string;
     signer: SmartAccountSigner<TSource, TAddress>;
     paymaster: PaymasterType;
+    paymasterRpc?: string;
     entryPointAddress: entryPoint;
     provider?: BundlerProvider;
     index?: bigint;
+    kernelVersion: GetKernelVersion<entryPoint>;
+    ecdsaValidator: any;
 }) => Promise<KernelAccountClient<entryPoint, HttpTransport, TChain, KernelSmartAccount<entryPoint, HttpTransport, TChain>>>;

package/src/utils/createEcsdaKernelAccountClient.js

@@ -1,6 +1,5 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
-import { signerToEcdsaValidator } from '@zerodev/ecdsa-validator';
 import { createKernelAccount } from '@zerodev/sdk/accounts';
 import { createZeroDevPaymasterClient, createKernelAccountClient } from '@zerodev/sdk/clients';
 import { createPublicClient, http, isAddress } from 'viem';
@@ -20,29 +19,33 @@ const getZeroDevPaymasterRPC = (projectId, provider) => {
     return rpc;
 };
 const isERC20 = (value) => isAddress(value);
-const createEcdsaKernelAccountClient = (_a) => __awaiter(void 0, [_a], void 0, function* ({ chain, projectId, signer, provider, index, paymaster = 'SPONSOR', entryPointAddress, }) {
+const createEcdsaKernelAccountClient = (_a) => __awaiter(void 0, [_a], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, index, paymaster = 'SPONSOR', entryPointAddress, kernelVersion, ecdsaValidator, }) {
+    const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, provider);
+    const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, provider);
     const publicClient = createPublicClient({
-        transport: http(getZeroDevBundlerRPC(projectId, provider)),
+        transport: http(resolvedBundlerRpc),
     });
-    const ecdsaValidator = yield signerToEcdsaValidator(publicClient, {
+    const validator = yield ecdsaValidator(publicClient, {
         entryPoint: entryPointAddress,
+        kernelVersion,
         signer,
     });
     const account = yield createKernelAccount(publicClient, {
         entryPoint: entryPointAddress,
         index,
+        kernelVersion,
         plugins: {
-            sudo: ecdsaValidator,
+            sudo: validator,
         },
     });
     const zerodevPaymaster = createZeroDevPaymasterClient({
         chain: chain,
         entryPoint: entryPointAddress,
-        transport: http(getZeroDevPaymasterRPC(projectId, provider)),
+        transport: http(resolvedPaymasterRpc),
     });
     const kernelClient = createKernelAccountClient({
         account,
-        bundlerTransport: http(getZeroDevBundlerRPC(projectId, provider)),
+        bundlerTransport: http(resolvedBundlerRpc),
         chain,
         entryPoint: entryPointAddress,
         middleware: paymaster !== 'NONE'

package/src/utils/fetchChain.cjs

@@ -4,7 +4,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
-var viemUtils = require('@dynamic-labs/viem-utils');
+var ethereumCore = require('@dynamic-labs/ethereum-core');
 var logger = require('./logger.cjs');
 
 const cachedChainIdKey = 'dynamic_zd_chain_id';
@@ -12,11 +12,11 @@ const fetchChain = (projectId) => _tslib.__awaiter(void 0, void 0, void 0, funct
     try {
         const cachedChainId = localStorage.getItem(cachedChainIdKey);
         if (cachedChainId) {
-            return viemUtils.chainsMap[cachedChainId];
+            return ethereumCore.chainsMap[cachedChainId];
         }
         const response = yield (yield fetch(`https://prod-api.zerodev.app/projects/${projectId}`)).json();
         localStorage.setItem(cachedChainIdKey, response.chainId);
-        return viemUtils.chainsMap[response.chainId];
+        return ethereumCore.chainsMap[response.chainId];
     }
     catch (err) {
         logger.logger.error('Failed to fetch ZeroDev project settings from ZeroDev API ' +

package/src/utils/fetchChain.js

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
-import { chainsMap } from '@dynamic-labs/viem-utils';
+import { chainsMap } from '@dynamic-labs/ethereum-core';
 import { logger } from './logger.js';
 
 const cachedChainIdKey = 'dynamic_zd_chain_id';