@zerodev/sdk 4.0.6 → 4.0.8

package/dist/cjs/kernel-zerodev/client/create-client.d.ts

@@ -1,4 +1,4 @@
-import { type HttpTransport, type PublicErc4337Client } from "@alchemy/aa-core";
+import { type PublicErc4337Client, type HttpTransport } from "@alchemy/aa-core";
 import { type Chain } from "viem";
 import type { PaymasterAndBundlerProviders } from "../paymaster/types.js";
 interface ZeroDevClientConfig {

package/dist/cjs/kernel-zerodev/client/create-client.js

@@ -4,15 +4,44 @@ exports.createZeroDevPublicErc4337Client = void 0;
 const aa_core_1 = require("@alchemy/aa-core");
 const viem_1 = require("viem");
 const constants_js_1 = require("../constants.js");
+function isMethodInErc4337RpcSchema(variable) {
+    return [
+        "eth_sendUserOperation",
+        "eth_estimateUserOperationGas",
+        "eth_getUserOperationReceipt",
+        "eth_getUserOperationByHash",
+        "eth_supportedEntryPoints",
+        "eth_maxPriorityFeePerGas",
+    ].includes(variable);
+}
 const createZeroDevPublicErc4337Client = ({ chain, rpcUrl, projectId, bundlerProvider, }) => {
+    const erc4337Transport = (0, viem_1.http)(rpcUrl, {
+        fetchOptions: {
+            headers: rpcUrl === constants_js_1.BUNDLER_URL ? { projectId, bundlerProvider } : {},
+        },
+        name: "Connected bundler network",
+        key: "connected-bundler-network",
+    });
+    const publicTransport = (0, viem_1.http)(constants_js_1.CHAIN_ID_TO_NODE[chain.id]);
     let client = (0, aa_core_1.createPublicErc4337FromClient)((0, viem_1.createPublicClient)({
         chain,
-        transport: (0, viem_1.http)(rpcUrl, {
-            fetchOptions: {
-                headers: rpcUrl === constants_js_1.BUNDLER_URL ? { projectId, bundlerProvider } : {},
+        transport: (0, viem_1.custom)({
+            async request({ method, params }) {
+                let response;
+                if (isMethodInErc4337RpcSchema(method)) {
+                    response = await erc4337Transport({ chain }).request({
+                        method,
+                        params,
+                    });
+                }
+                else {
+                    response = await publicTransport({ chain }).request({
+                        method,
+                        params,
+                    });
+                }
+                return response;
             },
-            name: "Connected bundler network",
-            key: "connected-bundler-network",
         }),
     }));
     return client;

package/dist/cjs/kernel-zerodev/client/create-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-client.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/client/create-client.ts"],"names":[],"mappings":";;;AAAA,8CAI0B;AAC1B,+BAA4D;AAC5D,kDAA8C;AAUvC,MAAM,gCAAgC,GAAG,CAAC,EAC/C,KAAK,EACL,MAAM,EACN,SAAS,EACT,eAAe,GACK,EAAsC,EAAE;IAC5D,IAAI,MAAM,GAAG,IAAA,uCAA6B,EACxC,IAAA,yBAAkB,EAAC;QACjB,KAAK;QACL,SAAS,EAAE,IAAA,WAAI,EAAC,MAAM,EAAE;YACtB,YAAY,EAAE;gBACZ,OAAO,EAAE,MAAM,KAAK,0BAAW,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE;aACtE;YACD,IAAI,EAAE,2BAA2B;YACjC,GAAG,EAAE,2BAA2B;SACjC,CAAC;KACH,CAAC,CACH,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AApBW,QAAA,gCAAgC,oCAoB3C","sourcesContent":["import {\n  createPublicErc4337FromClient,\n  type HttpTransport,\n  type PublicErc4337Client,\n} from \"@alchemy/aa-core\";\nimport { http, createPublicClient, type Chain } from \"viem\";\nimport { BUNDLER_URL } from \"../constants.js\";\nimport type { PaymasterAndBundlerProviders } from \"../paymaster/types.js\";\n\ninterface ZeroDevClientConfig {\n  chain: Chain;\n  projectId: string;\n  rpcUrl?: string;\n  bundlerProvider?: PaymasterAndBundlerProviders;\n}\n\nexport const createZeroDevPublicErc4337Client = ({\n  chain,\n  rpcUrl,\n  projectId,\n  bundlerProvider,\n}: ZeroDevClientConfig): PublicErc4337Client<HttpTransport> => {\n  let client = createPublicErc4337FromClient(\n    createPublicClient({\n      chain,\n      transport: http(rpcUrl, {\n        fetchOptions: {\n          headers: rpcUrl === BUNDLER_URL ? { projectId, bundlerProvider } : {},\n        },\n        name: \"Connected bundler network\",\n        key: \"connected-bundler-network\",\n      }),\n    })\n  );\n\n  return client;\n};\n"]}
+{"version":3,"file":"create-client.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/client/create-client.ts"],"names":[],"mappings":";;;AAAA,8CAK0B;AAC1B,+BAAoE;AACpE,kDAAgE;AAYhE,SAAS,0BAA0B,CACjC,QAAgB;IAEhB,OACE;QACE,uBAAuB;QACvB,8BAA8B;QAC9B,6BAA6B;QAC7B,4BAA4B;QAC5B,0BAA0B;QAC1B,0BAA0B;KAE7B,CAAC,QAAQ,CAAC,QAAqC,CAAC,CAAC;AACpD,CAAC;AAEM,MAAM,gCAAgC,GAAG,CAAC,EAC/C,KAAK,EACL,MAAM,EACN,SAAS,EACT,eAAe,GACK,EAAsC,EAAE;IAC5D,MAAM,gBAAgB,GAAG,IAAA,WAAI,EAAC,MAAM,EAAE;QACpC,YAAY,EAAE;YACZ,OAAO,EAAE,MAAM,KAAK,0BAAW,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE;SACtE;QACD,IAAI,EAAE,2BAA2B;QACjC,GAAG,EAAE,2BAA2B;KACjC,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,+BAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,IAAI,MAAM,GAAG,IAAA,uCAA6B,EACxC,IAAA,yBAAkB,EAAC;QACjB,KAAK;QACL,SAAS,EAAE,IAAA,aAAM,EAAC;YAChB,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE;gBAC9B,IAAI,QAAQ,CAAC;gBACb,IAAI,0BAA0B,CAAC,MAAM,CAAC,EAAE;oBACtC,QAAQ,GAAG,MAAM,gBAAgB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC;wBACnD,MAAM;wBACN,MAAM;qBACA,CAAC,CAAC;iBACX;qBAAM;oBACL,QAAQ,GAAG,MAAM,eAAe,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC;wBAClD,MAAM;wBACN,MAAM;qBACA,CAAC,CAAC;iBACX;gBACD,OAAO,QAAQ,CAAC;YAClB,CAAC;SACF,CAAC;KACH,CAAC,CACH,CAAC;IAEF,OAAO,MAAuD,CAAC;AACjE,CAAC,CAAC;AAtCW,QAAA,gCAAgC,oCAsC3C","sourcesContent":["import {\n  createPublicErc4337FromClient,\n  type PublicErc4337Client,\n  type Erc337RpcSchema,\n  type HttpTransport,\n} from \"@alchemy/aa-core\";\nimport { http, createPublicClient, type Chain, custom } from \"viem\";\nimport { BUNDLER_URL, CHAIN_ID_TO_NODE } from \"../constants.js\";\nimport type { PaymasterAndBundlerProviders } from \"../paymaster/types.js\";\n\ninterface ZeroDevClientConfig {\n  chain: Chain;\n  projectId: string;\n  rpcUrl?: string;\n  bundlerProvider?: PaymasterAndBundlerProviders;\n}\n\ntype MethodsOfErc4337RpcSchema = Erc337RpcSchema[number][\"Method\"];\n\nfunction isMethodInErc4337RpcSchema(\n  variable: string\n): variable is MethodsOfErc4337RpcSchema {\n  return (\n    [\n      \"eth_sendUserOperation\",\n      \"eth_estimateUserOperationGas\",\n      \"eth_getUserOperationReceipt\",\n      \"eth_getUserOperationByHash\",\n      \"eth_supportedEntryPoints\",\n      \"eth_maxPriorityFeePerGas\",\n    ] as const\n  ).includes(variable as MethodsOfErc4337RpcSchema);\n}\n\nexport const createZeroDevPublicErc4337Client = ({\n  chain,\n  rpcUrl,\n  projectId,\n  bundlerProvider,\n}: ZeroDevClientConfig): PublicErc4337Client<HttpTransport> => {\n  const erc4337Transport = http(rpcUrl, {\n    fetchOptions: {\n      headers: rpcUrl === BUNDLER_URL ? { projectId, bundlerProvider } : {},\n    },\n    name: \"Connected bundler network\",\n    key: \"connected-bundler-network\",\n  });\n  const publicTransport = http(CHAIN_ID_TO_NODE[chain.id]);\n  let client = createPublicErc4337FromClient(\n    createPublicClient({\n      chain,\n      transport: custom({\n        async request({ method, params }) {\n          let response;\n          if (isMethodInErc4337RpcSchema(method)) {\n            response = await erc4337Transport({ chain }).request({\n              method,\n              params,\n            } as any);\n          } else {\n            response = await publicTransport({ chain }).request({\n              method,\n              params,\n            } as any);\n          }\n          return response;\n        },\n      }),\n    })\n  );\n\n  return client as unknown as PublicErc4337Client<HttpTransport>;\n};\n"]}

package/dist/cjs/kernel-zerodev/provider.js

@@ -115,22 +115,18 @@ class ZeroDevProvider extends aa_core_1.SmartAccountProvider {
                 const initCode = await this.account.getInitCode();
                 let hash = "";
                 let i = 0;
-                let maxFeePerGas = 0n;
-                let maxPriorityFeePerGas = 0n;
-                let request;
                 const nonce = await this.account.getNonce();
+                const uoStruct = await (0, aa_core_1.asyncPipe)(this.dummyPaymasterDataMiddleware, this.feeDataGetter, this.paymasterDataMiddleware, this.gasEstimator, this.customMiddleware ?? aa_core_1.noOpMiddleware, async (struct) => ({ ...struct, ...overrides }))({
+                    initCode,
+                    sender: this.getAddress(),
+                    nonce,
+                    callData,
+                    signature: await this.account
+                        .getValidator()
+                        .getDynamicDummySignature(await this.getAddress(), callData),
+                });
+                let request;
                 do {
-                    const uoStruct = await (0, aa_core_1.asyncPipe)(this.dummyPaymasterDataMiddleware, this.feeDataGetter, this.paymasterDataMiddleware, this.gasEstimator, this.customMiddleware ?? aa_core_1.noOpMiddleware, async (struct) => ({ ...struct, ...overrides }))({
-                        initCode,
-                        sender: this.getAddress(),
-                        nonce,
-                        callData,
-                        signature: await this.account
-                            .getValidator()
-                            .getDynamicDummySignature(await this.getAddress(), callData),
-                        maxFeePerGas,
-                        maxPriorityFeePerGas,
-                    });
                     request = (0, aa_core_1.deepHexlify)(await (0, aa_core_1.resolveProperties)(uoStruct));
                     if (!(0, ERC4337_utils_js_1.isValidRequest)(request)) {
                         throw new Error(`Request is missing parameters. All properties on UserOperationStruct must be set. uo: ${JSON.stringify(request, null, 2)}`);
@@ -141,10 +137,10 @@ class ZeroDevProvider extends aa_core_1.SmartAccountProvider {
                     }
                     catch (error) {
                         if (this.isReplacementOpError(error) && i++ < this.sendTxMaxRetries) {
-                            maxFeePerGas = (BigInt(request.maxFeePerGas) * 113n) / 100n;
-                            maxPriorityFeePerGas =
+                            uoStruct.maxFeePerGas = (BigInt(request.maxFeePerGas) * 113n) / 100n;
+                            uoStruct.maxPriorityFeePerGas =
                                 (BigInt(request.maxPriorityFeePerGas) * 113n) / 100n;
-                            console.log(`After ${this.sendTxRetryIntervalMs / 60000} minutes, resending tx with Increased Gas fees: maxFeePerGas: ${maxFeePerGas}, maxPriorityFeePerGas: ${maxPriorityFeePerGas}`);
+                            console.log(`After ${this.sendTxRetryIntervalMs / 60000} minutes, resending tx with Increased Gas fees: maxFeePerGas: ${uoStruct.maxFeePerGas}, maxPriorityFeePerGas: ${uoStruct.maxPriorityFeePerGas}`);
                             await new Promise((resolve) => setTimeout(resolve, this.sendTxRetryIntervalMs));
                             continue;
                         }

package/dist/cjs/kernel-zerodev/provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/kernel-zerodev/provider.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  fromHex,\n  type Address,\n  type Chain,\n  type Hash,\n  type Hex,\n  type HttpTransport,\n  type RpcTransactionRequest,\n} from \"viem\";\nimport {\n  deepHexlify,\n  resolveProperties,\n  type SmartAccountProviderOpts,\n  getChain,\n  type UserOperationCallData,\n  type BatchUserOperationCallData,\n  type SendUserOperationResult,\n  asyncPipe,\n  noOpMiddleware,\n  type UserOperationStruct,\n  type BytesLike,\n  SmartAccountProvider,\n  type AccountMiddlewareFn,\n  type UserOperationOverrides,\n} from \"@alchemy/aa-core\";\nimport {\n  BUNDLER_URL,\n  DEFAULT_SEND_TX_MAX_RETRIES,\n  DEFAULT_SEND_TX_RETRY_INTERVAL_MS,\n  ENTRYPOINT_ADDRESS,\n  minPriorityFeePerBidDefaults,\n} from \"./constants.js\";\nimport { KernelSmartContractAccount, isKernelAccount } from \"./account.js\";\nimport { withZeroDevGasEstimator } from \"./middleware/gas-estimator.js\";\nimport { isValidRequest } from \"./utils/ERC4337-utils.js\";\nimport { InvalidOperation } from \"./errors.js\";\nimport { withZeroDevPaymasterAndData } from \"./middleware/paymaster.js\";\nimport { createZeroDevPublicErc4337Client } from \"./client/create-client.js\";\nimport type {\n  PaymasterAndBundlerProviders,\n  PaymasterConfig,\n  PaymasterPolicy,\n} from \"./paymaster/types.js\";\n\nexport type ZeroDevProviderConfig = {\n  projectId: string;\n  chain: Chain | number;\n  entryPointAddress?: Address;\n  rpcUrl?: string;\n  account?: KernelSmartContractAccount;\n  bundlerProvider?: PaymasterAndBundlerProviders;\n  opts?: SmartAccountProviderOpts & {\n    sendTxMaxRetries?: number;\n    sendTxRetryIntervalMs?: number;\n  };\n};\n\nexport enum Operation {\n  Call,\n  DelegateCall,\n}\n\ntype UserOpDataOperationTypes<T> = T extends UserOperationCallData\n  ? Operation.Call | Operation.DelegateCall\n  : T extends BatchUserOperationCallData\n  ? Operation.Call\n  : never;\n\nexport class ZeroDevProvider extends SmartAccountProvider<HttpTransport> {\n  protected projectId: string;\n  protected sendTxMaxRetries: number;\n  protected sendTxRetryIntervalMs: number;\n\n  constructor({\n    projectId,\n    chain,\n    entryPointAddress = ENTRYPOINT_ADDRESS,\n    rpcUrl = BUNDLER_URL,\n    account,\n    bundlerProvider,\n    opts,\n  }: ZeroDevProviderConfig) {\n    const _chain = typeof chain === \"number\" ? getChain(chain) : chain;\n    const rpcClient = createZeroDevPublicErc4337Client({\n      chain: _chain,\n      rpcUrl,\n      projectId,\n      bundlerProvider,\n    });\n\n    super(rpcClient, entryPointAddress, _chain, account, {\n      ...opts,\n      txMaxRetries: opts?.txMaxRetries ?? 10,\n      txRetryIntervalMs: opts?.txRetryIntervalMs ?? 10000,\n      minPriorityFeePerBid:\n        opts?.minPriorityFeePerBid ??\n        minPriorityFeePerBidDefaults.get(_chain.id),\n    });\n\n    this.projectId = projectId;\n    this.sendTxMaxRetries =\n      opts?.sendTxMaxRetries ?? DEFAULT_SEND_TX_MAX_RETRIES;\n    this.sendTxRetryIntervalMs =\n      opts?.sendTxRetryIntervalMs ?? DEFAULT_SEND_TX_RETRY_INTERVAL_MS;\n\n    withZeroDevGasEstimator(this);\n  }\n\n  getProjectId = (): string => this.projectId;\n\n  sendTransaction = async (\n    request: RpcTransactionRequest,\n    operation: UserOpDataOperationTypes<UserOperationCallData> = Operation.Call\n  ): Promise<Hash> => {\n    if (!request.to) {\n      throw new Error(\"transaction is missing to address\");\n    }\n\n    const overrides: UserOperationOverrides = {};\n    if (request.maxFeePerGas) {\n      overrides.maxFeePerGas = request.maxFeePerGas;\n    }\n    if (request.maxPriorityFeePerGas) {\n      overrides.maxPriorityFeePerGas = request.maxPriorityFeePerGas;\n    }\n\n    const { hash } = await this.sendUserOperation(\n      {\n        target: request.to,\n        data: request.data ?? \"0x\",\n        value: request.value ? fromHex(request.value, \"bigint\") : 0n,\n      },\n      overrides,\n      operation\n    );\n\n    return await this.waitForUserOperationTransaction(hash as Hash);\n  };\n\n  sendUserOperation = async <\n    T extends UserOperationCallData | BatchUserOperationCallData\n  >(\n    data: T,\n    overrides?: UserOperationOverrides,\n    operation: UserOpDataOperationTypes<T> = Operation.Call as UserOpDataOperationTypes<T>\n  ): Promise<SendUserOperationResult> => {\n    if (!isKernelAccount(this.account)) {\n      throw new Error(\"account not connected!\");\n    }\n    if (!this.account.validator) {\n      throw new Error(\"validator not connected!\");\n    }\n\n    let callData: BytesLike = \"0x\";\n\n    if (Array.isArray(data)) {\n      if (operation === Operation.Call) {\n        callData = await this.account.encodeBatchExecute(data);\n      } else {\n        throw InvalidOperation;\n      }\n    } else if (isKernelAccount(this.account)) {\n      if (operation === Operation.DelegateCall) {\n        callData = await this.account.encodeExecuteDelegate(\n          data.target,\n          data.value ?? 0n,\n          data.data\n        );\n      } else if (operation === Operation.Call) {\n        callData = await this.account.encodeExecute(\n          data.target,\n          data.value ?? 0n,\n          data.data\n        );\n      } else {\n        throw InvalidOperation;\n      }\n    } else {\n      throw InvalidOperation;\n    }\n\n    const initCode = await this.account.getInitCode();\n    let hash: string = \"\";\n    let i = 0;\n    let maxFeePerGas = 0n;\n    let maxPriorityFeePerGas = 0n;\n    let request: UserOperationStruct;\n\n    const nonce = await this.account.getNonce();\n    do {\n      const uoStruct = await asyncPipe(\n        this.dummyPaymasterDataMiddleware,\n        this.feeDataGetter,\n        this.paymasterDataMiddleware,\n        this.gasEstimator,\n        this.customMiddleware ?? noOpMiddleware,\n        async (struct) => ({ ...struct, ...overrides })\n      )({\n        initCode,\n        sender: this.getAddress(),\n        nonce,\n        callData,\n        signature: await this.account\n          .getValidator()\n          .getDynamicDummySignature(await this.getAddress(), callData as Hex),\n        maxFeePerGas,\n        maxPriorityFeePerGas,\n      } as UserOperationStruct);\n      request = deepHexlify(await resolveProperties(uoStruct));\n\n      if (!isValidRequest(request)) {\n        // this pretty prints the uo\n        throw new Error(\n          `Request is missing parameters. All properties on UserOperationStruct must be set. uo: ${JSON.stringify(\n            request,\n            null,\n            2\n          )}`\n        );\n      }\n\n      request.signature = await this.account.validator.getSignature(request);\n      try {\n        hash = await this.rpcClient.sendUserOperation(\n          request,\n          this.entryPointAddress\n        );\n      } catch (error: any) {\n        if (this.isReplacementOpError(error) && i++ < this.sendTxMaxRetries) {\n          maxFeePerGas = (BigInt(request.maxFeePerGas) * 113n) / 100n;\n          maxPriorityFeePerGas =\n            (BigInt(request.maxPriorityFeePerGas) * 113n) / 100n;\n          console.log(\n            `After ${\n              this.sendTxRetryIntervalMs / 60000\n            } minutes, resending tx with Increased Gas fees: maxFeePerGas: ${maxFeePerGas}, maxPriorityFeePerGas: ${maxPriorityFeePerGas}`\n          );\n          await new Promise((resolve) =>\n            setTimeout(resolve, this.sendTxRetryIntervalMs)\n          );\n          continue;\n        }\n        throw this.unwrapError(error);\n      }\n    } while (hash === \"\");\n\n    return {\n      hash,\n      request,\n    };\n  };\n\n  isReplacementOpError(errorIn: any): boolean {\n    if (errorIn.cause != null) {\n      const failedOpMessage: string | undefined = errorIn?.cause?.message;\n      return (\n        (failedOpMessage?.includes(\n          \"replacement op must increase maxFeePerGas and MaxPriorityFeePerGas\"\n        ) ||\n          failedOpMessage?.match(/.*replacement.*underpriced.*/) !== null) ??\n        false\n      );\n    }\n    return false;\n  }\n\n  unwrapError(errorIn: any): Error {\n    if (errorIn?.cause != null) {\n      let paymasterInfo: string = \"\";\n      let failedOpMessage: string | undefined = errorIn?.cause?.message;\n      if (failedOpMessage?.includes(\"FailedOp\") === true) {\n        // TODO: better error extraction methods will be needed\n        const matched = failedOpMessage.match(/FailedOp\\((.*)\\)/);\n        if (matched != null) {\n          const split = matched[1].split(\",\");\n          paymasterInfo = `(paymaster address: ${split[1]})`;\n          failedOpMessage = split[2];\n        }\n      }\n      const error = new Error(\n        `The bundler has failed to include UserOperation in a batch: ${failedOpMessage} ${paymasterInfo}`\n      );\n      error.stack = errorIn.stack;\n      return error;\n    }\n    return errorIn;\n  }\n\n  getAccount: () => KernelSmartContractAccount = () => {\n    if (!isKernelAccount(this.account)) {\n      throw new Error(\"account not connected!\");\n    }\n    return this.account;\n  };\n\n  dummyPaymasterDataMiddleware: AccountMiddlewareFn = async (\n    struct: UserOperationStruct\n  ): Promise<UserOperationStruct> => {\n    struct.paymasterAndData =\n      \"0xfe7dbcab8aaee4eb67943c1e6be95b1d065985c6000000000000000000000000000000000000000000000000000001869aa31cf400000000000000000000000000000000000000000000000000000000000000007dfe2190f34af27b265bae608717cdc9368b471fc0c097ab7b4088f255b4961e57b039e7e571b15221081c5dce7bcb93459b27a3ab65d2f8a889f4a40b4022801b\";\n    return struct;\n  };\n\n  withZeroDevPaymasterAndData(config: PaymasterConfig<PaymasterPolicy>) {\n    if (!this.isConnected()) {\n      throw new Error(\n        \"ZeroDevProvider: account is not set, did you call `connect` first?\"\n      );\n    }\n\n    return withZeroDevPaymasterAndData(this, config);\n  }\n\n  request: (args: { method: string; params?: any[] }) => Promise<any> = async (\n    args\n  ) => {\n    const { method, params } = args;\n    switch (method) {\n      case \"eth_chainId\":\n        return this.chain.id;\n      case \"eth_sendTransaction\":\n        const [tx] = params as [RpcTransactionRequest];\n        return this.sendTransaction(tx);\n      case \"personal_sign\":\n        if (!this.account) {\n          throw new Error(\"account not connected!\");\n        }\n        const [data, address] = params!;\n        if (address !== (await this.getAddress())) {\n          throw new Error(\n            \"cannot sign for address that is not the current account\"\n          );\n        }\n        // @ts-ignore\n        return this.account.signWithEip6492(data);\n      default:\n        // @ts-ignore\n        return this.rpcClient.request(args);\n    }\n  };\n}\n"]}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/kernel-zerodev/provider.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  fromHex,\n  type Address,\n  type Chain,\n  type Hash,\n  type Hex,\n  type HttpTransport,\n  type RpcTransactionRequest,\n} from \"viem\";\nimport {\n  deepHexlify,\n  resolveProperties,\n  type SmartAccountProviderOpts,\n  getChain,\n  type UserOperationCallData,\n  type BatchUserOperationCallData,\n  type SendUserOperationResult,\n  asyncPipe,\n  noOpMiddleware,\n  type UserOperationStruct,\n  type BytesLike,\n  SmartAccountProvider,\n  type AccountMiddlewareFn,\n  type UserOperationOverrides,\n} from \"@alchemy/aa-core\";\nimport {\n  BUNDLER_URL,\n  DEFAULT_SEND_TX_MAX_RETRIES,\n  DEFAULT_SEND_TX_RETRY_INTERVAL_MS,\n  ENTRYPOINT_ADDRESS,\n  minPriorityFeePerBidDefaults,\n} from \"./constants.js\";\nimport { KernelSmartContractAccount, isKernelAccount } from \"./account.js\";\nimport { withZeroDevGasEstimator } from \"./middleware/gas-estimator.js\";\nimport { isValidRequest } from \"./utils/ERC4337-utils.js\";\nimport { InvalidOperation } from \"./errors.js\";\nimport { withZeroDevPaymasterAndData } from \"./middleware/paymaster.js\";\nimport { createZeroDevPublicErc4337Client } from \"./client/create-client.js\";\nimport type {\n  PaymasterAndBundlerProviders,\n  PaymasterConfig,\n  PaymasterPolicy,\n} from \"./paymaster/types.js\";\n\nexport type ZeroDevProviderConfig = {\n  projectId: string;\n  chain: Chain | number;\n  entryPointAddress?: Address;\n  rpcUrl?: string;\n  account?: KernelSmartContractAccount;\n  bundlerProvider?: PaymasterAndBundlerProviders;\n  opts?: SmartAccountProviderOpts & {\n    sendTxMaxRetries?: number;\n    sendTxRetryIntervalMs?: number;\n  };\n};\n\nexport enum Operation {\n  Call,\n  DelegateCall,\n}\n\ntype UserOpDataOperationTypes<T> = T extends UserOperationCallData\n  ? Operation.Call | Operation.DelegateCall\n  : T extends BatchUserOperationCallData\n  ? Operation.Call\n  : never;\n\nexport class ZeroDevProvider extends SmartAccountProvider<HttpTransport> {\n  protected projectId: string;\n  protected sendTxMaxRetries: number;\n  protected sendTxRetryIntervalMs: number;\n\n  constructor({\n    projectId,\n    chain,\n    entryPointAddress = ENTRYPOINT_ADDRESS,\n    rpcUrl = BUNDLER_URL,\n    account,\n    bundlerProvider,\n    opts,\n  }: ZeroDevProviderConfig) {\n    const _chain = typeof chain === \"number\" ? getChain(chain) : chain;\n    const rpcClient = createZeroDevPublicErc4337Client({\n      chain: _chain,\n      rpcUrl,\n      projectId,\n      bundlerProvider,\n    });\n\n    super(rpcClient, entryPointAddress, _chain, account, {\n      ...opts,\n      txMaxRetries: opts?.txMaxRetries ?? 10,\n      txRetryIntervalMs: opts?.txRetryIntervalMs ?? 10000,\n      minPriorityFeePerBid:\n        opts?.minPriorityFeePerBid ??\n        minPriorityFeePerBidDefaults.get(_chain.id),\n    });\n\n    this.projectId = projectId;\n    this.sendTxMaxRetries =\n      opts?.sendTxMaxRetries ?? DEFAULT_SEND_TX_MAX_RETRIES;\n    this.sendTxRetryIntervalMs =\n      opts?.sendTxRetryIntervalMs ?? DEFAULT_SEND_TX_RETRY_INTERVAL_MS;\n\n    withZeroDevGasEstimator(this);\n  }\n\n  getProjectId = (): string => this.projectId;\n\n  sendTransaction = async (\n    request: RpcTransactionRequest,\n    operation: UserOpDataOperationTypes<UserOperationCallData> = Operation.Call\n  ): Promise<Hash> => {\n    if (!request.to) {\n      throw new Error(\"transaction is missing to address\");\n    }\n\n    const overrides: UserOperationOverrides = {};\n    if (request.maxFeePerGas) {\n      overrides.maxFeePerGas = request.maxFeePerGas;\n    }\n    if (request.maxPriorityFeePerGas) {\n      overrides.maxPriorityFeePerGas = request.maxPriorityFeePerGas;\n    }\n\n    const { hash } = await this.sendUserOperation(\n      {\n        target: request.to,\n        data: request.data ?? \"0x\",\n        value: request.value ? fromHex(request.value, \"bigint\") : 0n,\n      },\n      overrides,\n      operation\n    );\n\n    return await this.waitForUserOperationTransaction(hash as Hash);\n  };\n\n  sendUserOperation = async <\n    T extends UserOperationCallData | BatchUserOperationCallData\n  >(\n    data: T,\n    overrides?: UserOperationOverrides,\n    operation: UserOpDataOperationTypes<T> = Operation.Call as UserOpDataOperationTypes<T>\n  ): Promise<SendUserOperationResult> => {\n    if (!isKernelAccount(this.account)) {\n      throw new Error(\"account not connected!\");\n    }\n    if (!this.account.validator) {\n      throw new Error(\"validator not connected!\");\n    }\n\n    let callData: BytesLike = \"0x\";\n\n    if (Array.isArray(data)) {\n      if (operation === Operation.Call) {\n        callData = await this.account.encodeBatchExecute(data);\n      } else {\n        throw InvalidOperation;\n      }\n    } else if (isKernelAccount(this.account)) {\n      if (operation === Operation.DelegateCall) {\n        callData = await this.account.encodeExecuteDelegate(\n          data.target,\n          data.value ?? 0n,\n          data.data\n        );\n      } else if (operation === Operation.Call) {\n        callData = await this.account.encodeExecute(\n          data.target,\n          data.value ?? 0n,\n          data.data\n        );\n      } else {\n        throw InvalidOperation;\n      }\n    } else {\n      throw InvalidOperation;\n    }\n\n    const initCode = await this.account.getInitCode();\n    let hash: string = \"\";\n    let i = 0;\n    const nonce = await this.account.getNonce();\n    const uoStruct = await asyncPipe(\n      this.dummyPaymasterDataMiddleware,\n      this.feeDataGetter,\n      this.paymasterDataMiddleware,\n      this.gasEstimator,\n      this.customMiddleware ?? noOpMiddleware,\n      async (struct) => ({ ...struct, ...overrides })\n    )({\n      initCode,\n      sender: this.getAddress(),\n      nonce,\n      callData,\n      signature: await this.account\n        .getValidator()\n        .getDynamicDummySignature(await this.getAddress(), callData as Hex),\n    } as UserOperationStruct);\n    let request: UserOperationStruct;\n    do {\n      request = deepHexlify(await resolveProperties(uoStruct));\n\n      if (!isValidRequest(request)) {\n        // this pretty prints the uo\n        throw new Error(\n          `Request is missing parameters. All properties on UserOperationStruct must be set. uo: ${JSON.stringify(\n            request,\n            null,\n            2\n          )}`\n        );\n      }\n\n      request.signature = await this.account.validator.getSignature(request);\n      try {\n        hash = await this.rpcClient.sendUserOperation(\n          request,\n          this.entryPointAddress\n        );\n      } catch (error: any) {\n        if (this.isReplacementOpError(error) && i++ < this.sendTxMaxRetries) {\n          uoStruct.maxFeePerGas = (BigInt(request.maxFeePerGas) * 113n) / 100n;\n          uoStruct.maxPriorityFeePerGas =\n            (BigInt(request.maxPriorityFeePerGas) * 113n) / 100n;\n\n          console.log(\n            `After ${\n              this.sendTxRetryIntervalMs / 60000\n            } minutes, resending tx with Increased Gas fees: maxFeePerGas: ${\n              uoStruct.maxFeePerGas\n            }, maxPriorityFeePerGas: ${uoStruct.maxPriorityFeePerGas}`\n          );\n          await new Promise((resolve) =>\n            setTimeout(resolve, this.sendTxRetryIntervalMs)\n          );\n          continue;\n        }\n        throw this.unwrapError(error);\n      }\n    } while (hash === \"\");\n\n    return {\n      hash,\n      request,\n    };\n  };\n\n  isReplacementOpError(errorIn: any): boolean {\n    if (errorIn.cause != null) {\n      const failedOpMessage: string | undefined = errorIn?.cause?.message;\n      return (\n        (failedOpMessage?.includes(\n          \"replacement op must increase maxFeePerGas and MaxPriorityFeePerGas\"\n        ) ||\n          failedOpMessage?.match(/.*replacement.*underpriced.*/) !== null) ??\n        false\n      );\n    }\n    return false;\n  }\n\n  unwrapError(errorIn: any): Error {\n    if (errorIn?.cause != null) {\n      let paymasterInfo: string = \"\";\n      let failedOpMessage: string | undefined = errorIn?.cause?.message;\n      if (failedOpMessage?.includes(\"FailedOp\") === true) {\n        // TODO: better error extraction methods will be needed\n        const matched = failedOpMessage.match(/FailedOp\\((.*)\\)/);\n        if (matched != null) {\n          const split = matched[1].split(\",\");\n          paymasterInfo = `(paymaster address: ${split[1]})`;\n          failedOpMessage = split[2];\n        }\n      }\n      const error = new Error(\n        `The bundler has failed to include UserOperation in a batch: ${failedOpMessage} ${paymasterInfo}`\n      );\n      error.stack = errorIn.stack;\n      return error;\n    }\n    return errorIn;\n  }\n\n  getAccount: () => KernelSmartContractAccount = () => {\n    if (!isKernelAccount(this.account)) {\n      throw new Error(\"account not connected!\");\n    }\n    return this.account;\n  };\n\n  dummyPaymasterDataMiddleware: AccountMiddlewareFn = async (\n    struct: UserOperationStruct\n  ): Promise<UserOperationStruct> => {\n    struct.paymasterAndData =\n      \"0xfe7dbcab8aaee4eb67943c1e6be95b1d065985c6000000000000000000000000000000000000000000000000000001869aa31cf400000000000000000000000000000000000000000000000000000000000000007dfe2190f34af27b265bae608717cdc9368b471fc0c097ab7b4088f255b4961e57b039e7e571b15221081c5dce7bcb93459b27a3ab65d2f8a889f4a40b4022801b\";\n    return struct;\n  };\n\n  withZeroDevPaymasterAndData(config: PaymasterConfig<PaymasterPolicy>) {\n    if (!this.isConnected()) {\n      throw new Error(\n        \"ZeroDevProvider: account is not set, did you call `connect` first?\"\n      );\n    }\n\n    return withZeroDevPaymasterAndData(this, config);\n  }\n\n  request: (args: { method: string; params?: any[] }) => Promise<any> = async (\n    args\n  ) => {\n    const { method, params } = args;\n    switch (method) {\n      case \"eth_chainId\":\n        return this.chain.id;\n      case \"eth_sendTransaction\":\n        const [tx] = params as [RpcTransactionRequest];\n        return this.sendTransaction(tx);\n      case \"personal_sign\":\n        if (!this.account) {\n          throw new Error(\"account not connected!\");\n        }\n        const [data, address] = params!;\n        if (address !== (await this.getAddress())) {\n          throw new Error(\n            \"cannot sign for address that is not the current account\"\n          );\n        }\n        // @ts-ignore\n        return this.account.signWithEip6492(data);\n      default:\n        // @ts-ignore\n        return this.rpcClient.request(args);\n    }\n  };\n}\n"]}

package/dist/esm/kernel-zerodev/client/create-client.d.ts

@@ -1,4 +1,4 @@
-import { type HttpTransport, type PublicErc4337Client } from "@alchemy/aa-core";
+import { type PublicErc4337Client, type HttpTransport } from "@alchemy/aa-core";
 import { type Chain } from "viem";
 import type { PaymasterAndBundlerProviders } from "../paymaster/types.js";
 interface ZeroDevClientConfig {

package/dist/esm/kernel-zerodev/client/create-client.js

@@ -1,15 +1,44 @@
 import { createPublicErc4337FromClient, } from "@alchemy/aa-core";
-import { http, createPublicClient } from "viem";
-import { BUNDLER_URL } from "../constants.js";
+import { http, createPublicClient, custom } from "viem";
+import { BUNDLER_URL, CHAIN_ID_TO_NODE } from "../constants.js";
+function isMethodInErc4337RpcSchema(variable) {
+    return [
+        "eth_sendUserOperation",
+        "eth_estimateUserOperationGas",
+        "eth_getUserOperationReceipt",
+        "eth_getUserOperationByHash",
+        "eth_supportedEntryPoints",
+        "eth_maxPriorityFeePerGas",
+    ].includes(variable);
+}
 export const createZeroDevPublicErc4337Client = ({ chain, rpcUrl, projectId, bundlerProvider, }) => {
+    const erc4337Transport = http(rpcUrl, {
+        fetchOptions: {
+            headers: rpcUrl === BUNDLER_URL ? { projectId, bundlerProvider } : {},
+        },
+        name: "Connected bundler network",
+        key: "connected-bundler-network",
+    });
+    const publicTransport = http(CHAIN_ID_TO_NODE[chain.id]);
     let client = createPublicErc4337FromClient(createPublicClient({
         chain,
-        transport: http(rpcUrl, {
-            fetchOptions: {
-                headers: rpcUrl === BUNDLER_URL ? { projectId, bundlerProvider } : {},
+        transport: custom({
+            async request({ method, params }) {
+                let response;
+                if (isMethodInErc4337RpcSchema(method)) {
+                    response = await erc4337Transport({ chain }).request({
+                        method,
+                        params,
+                    });
+                }
+                else {
+                    response = await publicTransport({ chain }).request({
+                        method,
+                        params,
+                    });
+                }
+                return response;
             },
-            name: "Connected bundler network",
-            key: "connected-bundler-network",
         }),
     }));
     return client;

package/dist/esm/kernel-zerodev/client/create-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-client.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/client/create-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,GAG9B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAc,MAAM,MAAM,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAU9C,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC,EAC/C,KAAK,EACL,MAAM,EACN,SAAS,EACT,eAAe,GACK,EAAsC,EAAE;IAC5D,IAAI,MAAM,GAAG,6BAA6B,CACxC,kBAAkB,CAAC;QACjB,KAAK;QACL,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE;YACtB,YAAY,EAAE;gBACZ,OAAO,EAAE,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE;aACtE;YACD,IAAI,EAAE,2BAA2B;YACjC,GAAG,EAAE,2BAA2B;SACjC,CAAC;KACH,CAAC,CACH,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC","sourcesContent":["import {\n  createPublicErc4337FromClient,\n  type HttpTransport,\n  type PublicErc4337Client,\n} from \"@alchemy/aa-core\";\nimport { http, createPublicClient, type Chain } from \"viem\";\nimport { BUNDLER_URL } from \"../constants.js\";\nimport type { PaymasterAndBundlerProviders } from \"../paymaster/types.js\";\n\ninterface ZeroDevClientConfig {\n  chain: Chain;\n  projectId: string;\n  rpcUrl?: string;\n  bundlerProvider?: PaymasterAndBundlerProviders;\n}\n\nexport const createZeroDevPublicErc4337Client = ({\n  chain,\n  rpcUrl,\n  projectId,\n  bundlerProvider,\n}: ZeroDevClientConfig): PublicErc4337Client<HttpTransport> => {\n  let client = createPublicErc4337FromClient(\n    createPublicClient({\n      chain,\n      transport: http(rpcUrl, {\n        fetchOptions: {\n          headers: rpcUrl === BUNDLER_URL ? { projectId, bundlerProvider } : {},\n        },\n        name: \"Connected bundler network\",\n        key: \"connected-bundler-network\",\n      }),\n    })\n  );\n\n  return client;\n};\n"]}
+{"version":3,"file":"create-client.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/client/create-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,GAI9B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAc,MAAM,EAAE,MAAM,MAAM,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAYhE,SAAS,0BAA0B,CACjC,QAAgB;IAEhB,OACE;QACE,uBAAuB;QACvB,8BAA8B;QAC9B,6BAA6B;QAC7B,4BAA4B;QAC5B,0BAA0B;QAC1B,0BAA0B;KAE7B,CAAC,QAAQ,CAAC,QAAqC,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC,EAC/C,KAAK,EACL,MAAM,EACN,SAAS,EACT,eAAe,GACK,EAAsC,EAAE;IAC5D,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,EAAE;QACpC,YAAY,EAAE;YACZ,OAAO,EAAE,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE;SACtE;QACD,IAAI,EAAE,2BAA2B;QACjC,GAAG,EAAE,2BAA2B;KACjC,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,IAAI,MAAM,GAAG,6BAA6B,CACxC,kBAAkB,CAAC;QACjB,KAAK;QACL,SAAS,EAAE,MAAM,CAAC;YAChB,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE;gBAC9B,IAAI,QAAQ,CAAC;gBACb,IAAI,0BAA0B,CAAC,MAAM,CAAC,EAAE;oBACtC,QAAQ,GAAG,MAAM,gBAAgB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC;wBACnD,MAAM;wBACN,MAAM;qBACA,CAAC,CAAC;iBACX;qBAAM;oBACL,QAAQ,GAAG,MAAM,eAAe,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC;wBAClD,MAAM;wBACN,MAAM;qBACA,CAAC,CAAC;iBACX;gBACD,OAAO,QAAQ,CAAC;YAClB,CAAC;SACF,CAAC;KACH,CAAC,CACH,CAAC;IAEF,OAAO,MAAuD,CAAC;AACjE,CAAC,CAAC","sourcesContent":["import {\n  createPublicErc4337FromClient,\n  type PublicErc4337Client,\n  type Erc337RpcSchema,\n  type HttpTransport,\n} from \"@alchemy/aa-core\";\nimport { http, createPublicClient, type Chain, custom } from \"viem\";\nimport { BUNDLER_URL, CHAIN_ID_TO_NODE } from \"../constants.js\";\nimport type { PaymasterAndBundlerProviders } from \"../paymaster/types.js\";\n\ninterface ZeroDevClientConfig {\n  chain: Chain;\n  projectId: string;\n  rpcUrl?: string;\n  bundlerProvider?: PaymasterAndBundlerProviders;\n}\n\ntype MethodsOfErc4337RpcSchema = Erc337RpcSchema[number][\"Method\"];\n\nfunction isMethodInErc4337RpcSchema(\n  variable: string\n): variable is MethodsOfErc4337RpcSchema {\n  return (\n    [\n      \"eth_sendUserOperation\",\n      \"eth_estimateUserOperationGas\",\n      \"eth_getUserOperationReceipt\",\n      \"eth_getUserOperationByHash\",\n      \"eth_supportedEntryPoints\",\n      \"eth_maxPriorityFeePerGas\",\n    ] as const\n  ).includes(variable as MethodsOfErc4337RpcSchema);\n}\n\nexport const createZeroDevPublicErc4337Client = ({\n  chain,\n  rpcUrl,\n  projectId,\n  bundlerProvider,\n}: ZeroDevClientConfig): PublicErc4337Client<HttpTransport> => {\n  const erc4337Transport = http(rpcUrl, {\n    fetchOptions: {\n      headers: rpcUrl === BUNDLER_URL ? { projectId, bundlerProvider } : {},\n    },\n    name: \"Connected bundler network\",\n    key: \"connected-bundler-network\",\n  });\n  const publicTransport = http(CHAIN_ID_TO_NODE[chain.id]);\n  let client = createPublicErc4337FromClient(\n    createPublicClient({\n      chain,\n      transport: custom({\n        async request({ method, params }) {\n          let response;\n          if (isMethodInErc4337RpcSchema(method)) {\n            response = await erc4337Transport({ chain }).request({\n              method,\n              params,\n            } as any);\n          } else {\n            response = await publicTransport({ chain }).request({\n              method,\n              params,\n            } as any);\n          }\n          return response;\n        },\n      }),\n    })\n  );\n\n  return client as unknown as PublicErc4337Client<HttpTransport>;\n};\n"]}

package/dist/esm/kernel-zerodev/provider.js

@@ -112,22 +112,18 @@ export class ZeroDevProvider extends SmartAccountProvider {
                 const initCode = await this.account.getInitCode();
                 let hash = "";
                 let i = 0;
-                let maxFeePerGas = 0n;
-                let maxPriorityFeePerGas = 0n;
-                let request;
                 const nonce = await this.account.getNonce();
+                const uoStruct = await asyncPipe(this.dummyPaymasterDataMiddleware, this.feeDataGetter, this.paymasterDataMiddleware, this.gasEstimator, this.customMiddleware ?? noOpMiddleware, async (struct) => ({ ...struct, ...overrides }))({
+                    initCode,
+                    sender: this.getAddress(),
+                    nonce,
+                    callData,
+                    signature: await this.account
+                        .getValidator()
+                        .getDynamicDummySignature(await this.getAddress(), callData),
+                });
+                let request;
                 do {
-                    const uoStruct = await asyncPipe(this.dummyPaymasterDataMiddleware, this.feeDataGetter, this.paymasterDataMiddleware, this.gasEstimator, this.customMiddleware ?? noOpMiddleware, async (struct) => ({ ...struct, ...overrides }))({
-                        initCode,
-                        sender: this.getAddress(),
-                        nonce,
-                        callData,
-                        signature: await this.account
-                            .getValidator()
-                            .getDynamicDummySignature(await this.getAddress(), callData),
-                        maxFeePerGas,
-                        maxPriorityFeePerGas,
-                    });
                     request = deepHexlify(await resolveProperties(uoStruct));
                     if (!isValidRequest(request)) {
                         throw new Error(`Request is missing parameters. All properties on UserOperationStruct must be set. uo: ${JSON.stringify(request, null, 2)}`);
@@ -138,10 +134,10 @@ export class ZeroDevProvider extends SmartAccountProvider {
                     }
                     catch (error) {
                         if (this.isReplacementOpError(error) && i++ < this.sendTxMaxRetries) {
-                            maxFeePerGas = (BigInt(request.maxFeePerGas) * 113n) / 100n;
-                            maxPriorityFeePerGas =
+                            uoStruct.maxFeePerGas = (BigInt(request.maxFeePerGas) * 113n) / 100n;
+                            uoStruct.maxPriorityFeePerGas =
                                 (BigInt(request.maxPriorityFeePerGas) * 113n) / 100n;
-                            console.log(`After ${this.sendTxRetryIntervalMs / 60000} minutes, resending tx with Increased Gas fees: maxFeePerGas: ${maxFeePerGas}, maxPriorityFeePerGas: ${maxPriorityFeePerGas}`);
+                            console.log(`After ${this.sendTxRetryIntervalMs / 60000} minutes, resending tx with Increased Gas fees: maxFeePerGas: ${uoStruct.maxFeePerGas}, maxPriorityFeePerGas: ${uoStruct.maxPriorityFeePerGas}`);
                             await new Promise((resolve) => setTimeout(resolve, this.sendTxRetryIntervalMs));
                             continue;
                         }

package/dist/esm/kernel-zerodev/provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/kernel-zerodev/provider.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  fromHex,\n  type Address,\n  type Chain,\n  type Hash,\n  type Hex,\n  type HttpTransport,\n  type RpcTransactionRequest,\n} from \"viem\";\nimport {\n  deepHexlify,\n  resolveProperties,\n  type SmartAccountProviderOpts,\n  getChain,\n  type UserOperationCallData,\n  type BatchUserOperationCallData,\n  type SendUserOperationResult,\n  asyncPipe,\n  noOpMiddleware,\n  type UserOperationStruct,\n  type BytesLike,\n  SmartAccountProvider,\n  type AccountMiddlewareFn,\n  type UserOperationOverrides,\n} from \"@alchemy/aa-core\";\nimport {\n  BUNDLER_URL,\n  DEFAULT_SEND_TX_MAX_RETRIES,\n  DEFAULT_SEND_TX_RETRY_INTERVAL_MS,\n  ENTRYPOINT_ADDRESS,\n  minPriorityFeePerBidDefaults,\n} from \"./constants.js\";\nimport { KernelSmartContractAccount, isKernelAccount } from \"./account.js\";\nimport { withZeroDevGasEstimator } from \"./middleware/gas-estimator.js\";\nimport { isValidRequest } from \"./utils/ERC4337-utils.js\";\nimport { InvalidOperation } from \"./errors.js\";\nimport { withZeroDevPaymasterAndData } from \"./middleware/paymaster.js\";\nimport { createZeroDevPublicErc4337Client } from \"./client/create-client.js\";\nimport type {\n  PaymasterAndBundlerProviders,\n  PaymasterConfig,\n  PaymasterPolicy,\n} from \"./paymaster/types.js\";\n\nexport type ZeroDevProviderConfig = {\n  projectId: string;\n  chain: Chain | number;\n  entryPointAddress?: Address;\n  rpcUrl?: string;\n  account?: KernelSmartContractAccount;\n  bundlerProvider?: PaymasterAndBundlerProviders;\n  opts?: SmartAccountProviderOpts & {\n    sendTxMaxRetries?: number;\n    sendTxRetryIntervalMs?: number;\n  };\n};\n\nexport enum Operation {\n  Call,\n  DelegateCall,\n}\n\ntype UserOpDataOperationTypes<T> = T extends UserOperationCallData\n  ? Operation.Call | Operation.DelegateCall\n  : T extends BatchUserOperationCallData\n  ? Operation.Call\n  : never;\n\nexport class ZeroDevProvider extends SmartAccountProvider<HttpTransport> {\n  protected projectId: string;\n  protected sendTxMaxRetries: number;\n  protected sendTxRetryIntervalMs: number;\n\n  constructor({\n    projectId,\n    chain,\n    entryPointAddress = ENTRYPOINT_ADDRESS,\n    rpcUrl = BUNDLER_URL,\n    account,\n    bundlerProvider,\n    opts,\n  }: ZeroDevProviderConfig) {\n    const _chain = typeof chain === \"number\" ? getChain(chain) : chain;\n    const rpcClient = createZeroDevPublicErc4337Client({\n      chain: _chain,\n      rpcUrl,\n      projectId,\n      bundlerProvider,\n    });\n\n    super(rpcClient, entryPointAddress, _chain, account, {\n      ...opts,\n      txMaxRetries: opts?.txMaxRetries ?? 10,\n      txRetryIntervalMs: opts?.txRetryIntervalMs ?? 10000,\n      minPriorityFeePerBid:\n        opts?.minPriorityFeePerBid ??\n        minPriorityFeePerBidDefaults.get(_chain.id),\n    });\n\n    this.projectId = projectId;\n    this.sendTxMaxRetries =\n      opts?.sendTxMaxRetries ?? DEFAULT_SEND_TX_MAX_RETRIES;\n    this.sendTxRetryIntervalMs =\n      opts?.sendTxRetryIntervalMs ?? DEFAULT_SEND_TX_RETRY_INTERVAL_MS;\n\n    withZeroDevGasEstimator(this);\n  }\n\n  getProjectId = (): string => this.projectId;\n\n  sendTransaction = async (\n    request: RpcTransactionRequest,\n    operation: UserOpDataOperationTypes<UserOperationCallData> = Operation.Call\n  ): Promise<Hash> => {\n    if (!request.to) {\n      throw new Error(\"transaction is missing to address\");\n    }\n\n    const overrides: UserOperationOverrides = {};\n    if (request.maxFeePerGas) {\n      overrides.maxFeePerGas = request.maxFeePerGas;\n    }\n    if (request.maxPriorityFeePerGas) {\n      overrides.maxPriorityFeePerGas = request.maxPriorityFeePerGas;\n    }\n\n    const { hash } = await this.sendUserOperation(\n      {\n        target: request.to,\n        data: request.data ?? \"0x\",\n        value: request.value ? fromHex(request.value, \"bigint\") : 0n,\n      },\n      overrides,\n      operation\n    );\n\n    return await this.waitForUserOperationTransaction(hash as Hash);\n  };\n\n  sendUserOperation = async <\n    T extends UserOperationCallData | BatchUserOperationCallData\n  >(\n    data: T,\n    overrides?: UserOperationOverrides,\n    operation: UserOpDataOperationTypes<T> = Operation.Call as UserOpDataOperationTypes<T>\n  ): Promise<SendUserOperationResult> => {\n    if (!isKernelAccount(this.account)) {\n      throw new Error(\"account not connected!\");\n    }\n    if (!this.account.validator) {\n      throw new Error(\"validator not connected!\");\n    }\n\n    let callData: BytesLike = \"0x\";\n\n    if (Array.isArray(data)) {\n      if (operation === Operation.Call) {\n        callData = await this.account.encodeBatchExecute(data);\n      } else {\n        throw InvalidOperation;\n      }\n    } else if (isKernelAccount(this.account)) {\n      if (operation === Operation.DelegateCall) {\n        callData = await this.account.encodeExecuteDelegate(\n          data.target,\n          data.value ?? 0n,\n          data.data\n        );\n      } else if (operation === Operation.Call) {\n        callData = await this.account.encodeExecute(\n          data.target,\n          data.value ?? 0n,\n          data.data\n        );\n      } else {\n        throw InvalidOperation;\n      }\n    } else {\n      throw InvalidOperation;\n    }\n\n    const initCode = await this.account.getInitCode();\n    let hash: string = \"\";\n    let i = 0;\n    let maxFeePerGas = 0n;\n    let maxPriorityFeePerGas = 0n;\n    let request: UserOperationStruct;\n\n    const nonce = await this.account.getNonce();\n    do {\n      const uoStruct = await asyncPipe(\n        this.dummyPaymasterDataMiddleware,\n        this.feeDataGetter,\n        this.paymasterDataMiddleware,\n        this.gasEstimator,\n        this.customMiddleware ?? noOpMiddleware,\n        async (struct) => ({ ...struct, ...overrides })\n      )({\n        initCode,\n        sender: this.getAddress(),\n        nonce,\n        callData,\n        signature: await this.account\n          .getValidator()\n          .getDynamicDummySignature(await this.getAddress(), callData as Hex),\n        maxFeePerGas,\n        maxPriorityFeePerGas,\n      } as UserOperationStruct);\n      request = deepHexlify(await resolveProperties(uoStruct));\n\n      if (!isValidRequest(request)) {\n        // this pretty prints the uo\n        throw new Error(\n          `Request is missing parameters. All properties on UserOperationStruct must be set. uo: ${JSON.stringify(\n            request,\n            null,\n            2\n          )}`\n        );\n      }\n\n      request.signature = await this.account.validator.getSignature(request);\n      try {\n        hash = await this.rpcClient.sendUserOperation(\n          request,\n          this.entryPointAddress\n        );\n      } catch (error: any) {\n        if (this.isReplacementOpError(error) && i++ < this.sendTxMaxRetries) {\n          maxFeePerGas = (BigInt(request.maxFeePerGas) * 113n) / 100n;\n          maxPriorityFeePerGas =\n            (BigInt(request.maxPriorityFeePerGas) * 113n) / 100n;\n          console.log(\n            `After ${\n              this.sendTxRetryIntervalMs / 60000\n            } minutes, resending tx with Increased Gas fees: maxFeePerGas: ${maxFeePerGas}, maxPriorityFeePerGas: ${maxPriorityFeePerGas}`\n          );\n          await new Promise((resolve) =>\n            setTimeout(resolve, this.sendTxRetryIntervalMs)\n          );\n          continue;\n        }\n        throw this.unwrapError(error);\n      }\n    } while (hash === \"\");\n\n    return {\n      hash,\n      request,\n    };\n  };\n\n  isReplacementOpError(errorIn: any): boolean {\n    if (errorIn.cause != null) {\n      const failedOpMessage: string | undefined = errorIn?.cause?.message;\n      return (\n        (failedOpMessage?.includes(\n          \"replacement op must increase maxFeePerGas and MaxPriorityFeePerGas\"\n        ) ||\n          failedOpMessage?.match(/.*replacement.*underpriced.*/) !== null) ??\n        false\n      );\n    }\n    return false;\n  }\n\n  unwrapError(errorIn: any): Error {\n    if (errorIn?.cause != null) {\n      let paymasterInfo: string = \"\";\n      let failedOpMessage: string | undefined = errorIn?.cause?.message;\n      if (failedOpMessage?.includes(\"FailedOp\") === true) {\n        // TODO: better error extraction methods will be needed\n        const matched = failedOpMessage.match(/FailedOp\\((.*)\\)/);\n        if (matched != null) {\n          const split = matched[1].split(\",\");\n          paymasterInfo = `(paymaster address: ${split[1]})`;\n          failedOpMessage = split[2];\n        }\n      }\n      const error = new Error(\n        `The bundler has failed to include UserOperation in a batch: ${failedOpMessage} ${paymasterInfo}`\n      );\n      error.stack = errorIn.stack;\n      return error;\n    }\n    return errorIn;\n  }\n\n  getAccount: () => KernelSmartContractAccount = () => {\n    if (!isKernelAccount(this.account)) {\n      throw new Error(\"account not connected!\");\n    }\n    return this.account;\n  };\n\n  dummyPaymasterDataMiddleware: AccountMiddlewareFn = async (\n    struct: UserOperationStruct\n  ): Promise<UserOperationStruct> => {\n    struct.paymasterAndData =\n      \"0xfe7dbcab8aaee4eb67943c1e6be95b1d065985c6000000000000000000000000000000000000000000000000000001869aa31cf400000000000000000000000000000000000000000000000000000000000000007dfe2190f34af27b265bae608717cdc9368b471fc0c097ab7b4088f255b4961e57b039e7e571b15221081c5dce7bcb93459b27a3ab65d2f8a889f4a40b4022801b\";\n    return struct;\n  };\n\n  withZeroDevPaymasterAndData(config: PaymasterConfig<PaymasterPolicy>) {\n    if (!this.isConnected()) {\n      throw new Error(\n        \"ZeroDevProvider: account is not set, did you call `connect` first?\"\n      );\n    }\n\n    return withZeroDevPaymasterAndData(this, config);\n  }\n\n  request: (args: { method: string; params?: any[] }) => Promise<any> = async (\n    args\n  ) => {\n    const { method, params } = args;\n    switch (method) {\n      case \"eth_chainId\":\n        return this.chain.id;\n      case \"eth_sendTransaction\":\n        const [tx] = params as [RpcTransactionRequest];\n        return this.sendTransaction(tx);\n      case \"personal_sign\":\n        if (!this.account) {\n          throw new Error(\"account not connected!\");\n        }\n        const [data, address] = params!;\n        if (address !== (await this.getAddress())) {\n          throw new Error(\n            \"cannot sign for address that is not the current account\"\n          );\n        }\n        // @ts-ignore\n        return this.account.signWithEip6492(data);\n      default:\n        // @ts-ignore\n        return this.rpcClient.request(args);\n    }\n  };\n}\n"]}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/kernel-zerodev/provider.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  fromHex,\n  type Address,\n  type Chain,\n  type Hash,\n  type Hex,\n  type HttpTransport,\n  type RpcTransactionRequest,\n} from \"viem\";\nimport {\n  deepHexlify,\n  resolveProperties,\n  type SmartAccountProviderOpts,\n  getChain,\n  type UserOperationCallData,\n  type BatchUserOperationCallData,\n  type SendUserOperationResult,\n  asyncPipe,\n  noOpMiddleware,\n  type UserOperationStruct,\n  type BytesLike,\n  SmartAccountProvider,\n  type AccountMiddlewareFn,\n  type UserOperationOverrides,\n} from \"@alchemy/aa-core\";\nimport {\n  BUNDLER_URL,\n  DEFAULT_SEND_TX_MAX_RETRIES,\n  DEFAULT_SEND_TX_RETRY_INTERVAL_MS,\n  ENTRYPOINT_ADDRESS,\n  minPriorityFeePerBidDefaults,\n} from \"./constants.js\";\nimport { KernelSmartContractAccount, isKernelAccount } from \"./account.js\";\nimport { withZeroDevGasEstimator } from \"./middleware/gas-estimator.js\";\nimport { isValidRequest } from \"./utils/ERC4337-utils.js\";\nimport { InvalidOperation } from \"./errors.js\";\nimport { withZeroDevPaymasterAndData } from \"./middleware/paymaster.js\";\nimport { createZeroDevPublicErc4337Client } from \"./client/create-client.js\";\nimport type {\n  PaymasterAndBundlerProviders,\n  PaymasterConfig,\n  PaymasterPolicy,\n} from \"./paymaster/types.js\";\n\nexport type ZeroDevProviderConfig = {\n  projectId: string;\n  chain: Chain | number;\n  entryPointAddress?: Address;\n  rpcUrl?: string;\n  account?: KernelSmartContractAccount;\n  bundlerProvider?: PaymasterAndBundlerProviders;\n  opts?: SmartAccountProviderOpts & {\n    sendTxMaxRetries?: number;\n    sendTxRetryIntervalMs?: number;\n  };\n};\n\nexport enum Operation {\n  Call,\n  DelegateCall,\n}\n\ntype UserOpDataOperationTypes<T> = T extends UserOperationCallData\n  ? Operation.Call | Operation.DelegateCall\n  : T extends BatchUserOperationCallData\n  ? Operation.Call\n  : never;\n\nexport class ZeroDevProvider extends SmartAccountProvider<HttpTransport> {\n  protected projectId: string;\n  protected sendTxMaxRetries: number;\n  protected sendTxRetryIntervalMs: number;\n\n  constructor({\n    projectId,\n    chain,\n    entryPointAddress = ENTRYPOINT_ADDRESS,\n    rpcUrl = BUNDLER_URL,\n    account,\n    bundlerProvider,\n    opts,\n  }: ZeroDevProviderConfig) {\n    const _chain = typeof chain === \"number\" ? getChain(chain) : chain;\n    const rpcClient = createZeroDevPublicErc4337Client({\n      chain: _chain,\n      rpcUrl,\n      projectId,\n      bundlerProvider,\n    });\n\n    super(rpcClient, entryPointAddress, _chain, account, {\n      ...opts,\n      txMaxRetries: opts?.txMaxRetries ?? 10,\n      txRetryIntervalMs: opts?.txRetryIntervalMs ?? 10000,\n      minPriorityFeePerBid:\n        opts?.minPriorityFeePerBid ??\n        minPriorityFeePerBidDefaults.get(_chain.id),\n    });\n\n    this.projectId = projectId;\n    this.sendTxMaxRetries =\n      opts?.sendTxMaxRetries ?? DEFAULT_SEND_TX_MAX_RETRIES;\n    this.sendTxRetryIntervalMs =\n      opts?.sendTxRetryIntervalMs ?? DEFAULT_SEND_TX_RETRY_INTERVAL_MS;\n\n    withZeroDevGasEstimator(this);\n  }\n\n  getProjectId = (): string => this.projectId;\n\n  sendTransaction = async (\n    request: RpcTransactionRequest,\n    operation: UserOpDataOperationTypes<UserOperationCallData> = Operation.Call\n  ): Promise<Hash> => {\n    if (!request.to) {\n      throw new Error(\"transaction is missing to address\");\n    }\n\n    const overrides: UserOperationOverrides = {};\n    if (request.maxFeePerGas) {\n      overrides.maxFeePerGas = request.maxFeePerGas;\n    }\n    if (request.maxPriorityFeePerGas) {\n      overrides.maxPriorityFeePerGas = request.maxPriorityFeePerGas;\n    }\n\n    const { hash } = await this.sendUserOperation(\n      {\n        target: request.to,\n        data: request.data ?? \"0x\",\n        value: request.value ? fromHex(request.value, \"bigint\") : 0n,\n      },\n      overrides,\n      operation\n    );\n\n    return await this.waitForUserOperationTransaction(hash as Hash);\n  };\n\n  sendUserOperation = async <\n    T extends UserOperationCallData | BatchUserOperationCallData\n  >(\n    data: T,\n    overrides?: UserOperationOverrides,\n    operation: UserOpDataOperationTypes<T> = Operation.Call as UserOpDataOperationTypes<T>\n  ): Promise<SendUserOperationResult> => {\n    if (!isKernelAccount(this.account)) {\n      throw new Error(\"account not connected!\");\n    }\n    if (!this.account.validator) {\n      throw new Error(\"validator not connected!\");\n    }\n\n    let callData: BytesLike = \"0x\";\n\n    if (Array.isArray(data)) {\n      if (operation === Operation.Call) {\n        callData = await this.account.encodeBatchExecute(data);\n      } else {\n        throw InvalidOperation;\n      }\n    } else if (isKernelAccount(this.account)) {\n      if (operation === Operation.DelegateCall) {\n        callData = await this.account.encodeExecuteDelegate(\n          data.target,\n          data.value ?? 0n,\n          data.data\n        );\n      } else if (operation === Operation.Call) {\n        callData = await this.account.encodeExecute(\n          data.target,\n          data.value ?? 0n,\n          data.data\n        );\n      } else {\n        throw InvalidOperation;\n      }\n    } else {\n      throw InvalidOperation;\n    }\n\n    const initCode = await this.account.getInitCode();\n    let hash: string = \"\";\n    let i = 0;\n    const nonce = await this.account.getNonce();\n    const uoStruct = await asyncPipe(\n      this.dummyPaymasterDataMiddleware,\n      this.feeDataGetter,\n      this.paymasterDataMiddleware,\n      this.gasEstimator,\n      this.customMiddleware ?? noOpMiddleware,\n      async (struct) => ({ ...struct, ...overrides })\n    )({\n      initCode,\n      sender: this.getAddress(),\n      nonce,\n      callData,\n      signature: await this.account\n        .getValidator()\n        .getDynamicDummySignature(await this.getAddress(), callData as Hex),\n    } as UserOperationStruct);\n    let request: UserOperationStruct;\n    do {\n      request = deepHexlify(await resolveProperties(uoStruct));\n\n      if (!isValidRequest(request)) {\n        // this pretty prints the uo\n        throw new Error(\n          `Request is missing parameters. All properties on UserOperationStruct must be set. uo: ${JSON.stringify(\n            request,\n            null,\n            2\n          )}`\n        );\n      }\n\n      request.signature = await this.account.validator.getSignature(request);\n      try {\n        hash = await this.rpcClient.sendUserOperation(\n          request,\n          this.entryPointAddress\n        );\n      } catch (error: any) {\n        if (this.isReplacementOpError(error) && i++ < this.sendTxMaxRetries) {\n          uoStruct.maxFeePerGas = (BigInt(request.maxFeePerGas) * 113n) / 100n;\n          uoStruct.maxPriorityFeePerGas =\n            (BigInt(request.maxPriorityFeePerGas) * 113n) / 100n;\n\n          console.log(\n            `After ${\n              this.sendTxRetryIntervalMs / 60000\n            } minutes, resending tx with Increased Gas fees: maxFeePerGas: ${\n              uoStruct.maxFeePerGas\n            }, maxPriorityFeePerGas: ${uoStruct.maxPriorityFeePerGas}`\n          );\n          await new Promise((resolve) =>\n            setTimeout(resolve, this.sendTxRetryIntervalMs)\n          );\n          continue;\n        }\n        throw this.unwrapError(error);\n      }\n    } while (hash === \"\");\n\n    return {\n      hash,\n      request,\n    };\n  };\n\n  isReplacementOpError(errorIn: any): boolean {\n    if (errorIn.cause != null) {\n      const failedOpMessage: string | undefined = errorIn?.cause?.message;\n      return (\n        (failedOpMessage?.includes(\n          \"replacement op must increase maxFeePerGas and MaxPriorityFeePerGas\"\n        ) ||\n          failedOpMessage?.match(/.*replacement.*underpriced.*/) !== null) ??\n        false\n      );\n    }\n    return false;\n  }\n\n  unwrapError(errorIn: any): Error {\n    if (errorIn?.cause != null) {\n      let paymasterInfo: string = \"\";\n      let failedOpMessage: string | undefined = errorIn?.cause?.message;\n      if (failedOpMessage?.includes(\"FailedOp\") === true) {\n        // TODO: better error extraction methods will be needed\n        const matched = failedOpMessage.match(/FailedOp\\((.*)\\)/);\n        if (matched != null) {\n          const split = matched[1].split(\",\");\n          paymasterInfo = `(paymaster address: ${split[1]})`;\n          failedOpMessage = split[2];\n        }\n      }\n      const error = new Error(\n        `The bundler has failed to include UserOperation in a batch: ${failedOpMessage} ${paymasterInfo}`\n      );\n      error.stack = errorIn.stack;\n      return error;\n    }\n    return errorIn;\n  }\n\n  getAccount: () => KernelSmartContractAccount = () => {\n    if (!isKernelAccount(this.account)) {\n      throw new Error(\"account not connected!\");\n    }\n    return this.account;\n  };\n\n  dummyPaymasterDataMiddleware: AccountMiddlewareFn = async (\n    struct: UserOperationStruct\n  ): Promise<UserOperationStruct> => {\n    struct.paymasterAndData =\n      \"0xfe7dbcab8aaee4eb67943c1e6be95b1d065985c6000000000000000000000000000000000000000000000000000001869aa31cf400000000000000000000000000000000000000000000000000000000000000007dfe2190f34af27b265bae608717cdc9368b471fc0c097ab7b4088f255b4961e57b039e7e571b15221081c5dce7bcb93459b27a3ab65d2f8a889f4a40b4022801b\";\n    return struct;\n  };\n\n  withZeroDevPaymasterAndData(config: PaymasterConfig<PaymasterPolicy>) {\n    if (!this.isConnected()) {\n      throw new Error(\n        \"ZeroDevProvider: account is not set, did you call `connect` first?\"\n      );\n    }\n\n    return withZeroDevPaymasterAndData(this, config);\n  }\n\n  request: (args: { method: string; params?: any[] }) => Promise<any> = async (\n    args\n  ) => {\n    const { method, params } = args;\n    switch (method) {\n      case \"eth_chainId\":\n        return this.chain.id;\n      case \"eth_sendTransaction\":\n        const [tx] = params as [RpcTransactionRequest];\n        return this.sendTransaction(tx);\n      case \"personal_sign\":\n        if (!this.account) {\n          throw new Error(\"account not connected!\");\n        }\n        const [data, address] = params!;\n        if (address !== (await this.getAddress())) {\n          throw new Error(\n            \"cannot sign for address that is not the current account\"\n          );\n        }\n        // @ts-ignore\n        return this.account.signWithEip6492(data);\n      default:\n        // @ts-ignore\n        return this.rpcClient.request(args);\n    }\n  };\n}\n"]}

package/dist/types/kernel-zerodev/client/create-client.d.ts

@@ -1,4 +1,4 @@
-import { type HttpTransport, type PublicErc4337Client } from "@alchemy/aa-core";
+import { type PublicErc4337Client, type HttpTransport } from "@alchemy/aa-core";
 import { type Chain } from "viem";
 import type { PaymasterAndBundlerProviders } from "../paymaster/types.js";
 interface ZeroDevClientConfig {

package/dist/types/kernel-zerodev/client/create-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-client.d.ts","sourceRoot":"","sources":["../../../../src/kernel-zerodev/client/create-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACzB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAA4B,KAAK,KAAK,EAAE,MAAM,MAAM,CAAC;AAE5D,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAE1E,UAAU,mBAAmB;IAC3B,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,4BAA4B,CAAC;CAChD;AAED,eAAO,MAAM,gCAAgC,mDAK1C,mBAAmB,KAAG,oBAAoB,aAAa,CAezD,CAAC"}
+{"version":3,"file":"create-client.d.ts","sourceRoot":"","sources":["../../../../src/kernel-zerodev/client/create-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,mBAAmB,EAExB,KAAK,aAAa,EACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAA4B,KAAK,KAAK,EAAU,MAAM,MAAM,CAAC;AAEpE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAE1E,UAAU,mBAAmB;IAC3B,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,4BAA4B,CAAC;CAChD;AAmBD,eAAO,MAAM,gCAAgC,mDAK1C,mBAAmB,KAAG,oBAAoB,aAAa,CAiCzD,CAAC"}

package/dist/types/kernel-zerodev/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../src/kernel-zerodev/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,IAAI,EAET,KAAK,aAAa,EAClB,KAAK,qBAAqB,EAC3B,MAAM,MAAM,CAAC;AACd,OAAO,EAGL,KAAK,wBAAwB,EAE7B,KAAK,qBAAqB,EAC1B,KAAK,0BAA0B,EAC/B,KAAK,uBAAuB,EAK5B,oBAAoB,EACpB,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,EAC5B,MAAM,kBAAkB,CAAC;AAQ1B,OAAO,EAAE,0BAA0B,EAAmB,MAAM,cAAc,CAAC;AAM3E,OAAO,KAAK,EACV,4BAA4B,EAC5B,eAAe,EACf,eAAe,EAChB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,0BAA0B,CAAC;IACrC,eAAe,CAAC,EAAE,4BAA4B,CAAC;IAC/C,IAAI,CAAC,EAAE,wBAAwB,GAAG;QAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,qBAAqB,CAAC,EAAE,MAAM,CAAC;KAChC,CAAC;CACH,CAAC;AAEF,oBAAY,SAAS;IACnB,IAAI,IAAA;IACJ,YAAY,IAAA;CACb;AAED,KAAK,wBAAwB,CAAC,CAAC,IAAI,CAAC,SAAS,qBAAqB,GAC9D,SAAS,CAAC,IAAI,GAAG,SAAS,CAAC,YAAY,GACvC,CAAC,SAAS,0BAA0B,GACpC,SAAS,CAAC,IAAI,GACd,KAAK,CAAC;AAEV,qBAAa,eAAgB,SAAQ,oBAAoB,CAAC,aAAa,CAAC;IACtE,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC;IACnC,SAAS,CAAC,qBAAqB,EAAE,MAAM,CAAC;gBAE5B,EACV,SAAS,EACT,KAAK,EACL,iBAAsC,EACtC,MAAoB,EACpB,OAAO,EACP,eAAe,EACf,IAAI,GACL,EAAE,qBAAqB;IA2BxB,YAAY,QAAO,MAAM,CAAmB;IAE5C,eAAe,YACJ,qBAAqB,cACnB,yBAAyB,qBAAqB,CAAC,KACzD,QAAQ,IAAI,CAAC,CAwBd;IAEF,iBAAiB,sFAIH,sBAAsB,8CAEjC,QAAQ,uBAAuB,CAAC,CAyGjC;IAEF,oBAAoB,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO;IAc3C,WAAW,CAAC,OAAO,EAAE,GAAG,GAAG,KAAK;IAsBhC,UAAU,EAAE,MAAM,0BAA0B,CAK1C;IAEF,4BAA4B,EAAE,mBAAmB,CAM/C;IAEF,2BAA2B,CAAC,MAAM,EAAE,eAAe,CAAC,eAAe,CAAC;;;IAUpE,OAAO,EAAE,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAA;KAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CA0BjE;CACH"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../src/kernel-zerodev/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,IAAI,EAET,KAAK,aAAa,EAClB,KAAK,qBAAqB,EAC3B,MAAM,MAAM,CAAC;AACd,OAAO,EAGL,KAAK,wBAAwB,EAE7B,KAAK,qBAAqB,EAC1B,KAAK,0BAA0B,EAC/B,KAAK,uBAAuB,EAK5B,oBAAoB,EACpB,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,EAC5B,MAAM,kBAAkB,CAAC;AAQ1B,OAAO,EAAE,0BAA0B,EAAmB,MAAM,cAAc,CAAC;AAM3E,OAAO,KAAK,EACV,4BAA4B,EAC5B,eAAe,EACf,eAAe,EAChB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,0BAA0B,CAAC;IACrC,eAAe,CAAC,EAAE,4BAA4B,CAAC;IAC/C,IAAI,CAAC,EAAE,wBAAwB,GAAG;QAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,qBAAqB,CAAC,EAAE,MAAM,CAAC;KAChC,CAAC;CACH,CAAC;AAEF,oBAAY,SAAS;IACnB,IAAI,IAAA;IACJ,YAAY,IAAA;CACb;AAED,KAAK,wBAAwB,CAAC,CAAC,IAAI,CAAC,SAAS,qBAAqB,GAC9D,SAAS,CAAC,IAAI,GAAG,SAAS,CAAC,YAAY,GACvC,CAAC,SAAS,0BAA0B,GACpC,SAAS,CAAC,IAAI,GACd,KAAK,CAAC;AAEV,qBAAa,eAAgB,SAAQ,oBAAoB,CAAC,aAAa,CAAC;IACtE,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC;IACnC,SAAS,CAAC,qBAAqB,EAAE,MAAM,CAAC;gBAE5B,EACV,SAAS,EACT,KAAK,EACL,iBAAsC,EACtC,MAAoB,EACpB,OAAO,EACP,eAAe,EACf,IAAI,GACL,EAAE,qBAAqB;IA2BxB,YAAY,QAAO,MAAM,CAAmB;IAE5C,eAAe,YACJ,qBAAqB,cACnB,yBAAyB,qBAAqB,CAAC,KACzD,QAAQ,IAAI,CAAC,CAwBd;IAEF,iBAAiB,sFAIH,sBAAsB,8CAEjC,QAAQ,uBAAuB,CAAC,CAuGjC;IAEF,oBAAoB,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO;IAc3C,WAAW,CAAC,OAAO,EAAE,GAAG,GAAG,KAAK;IAsBhC,UAAU,EAAE,MAAM,0BAA0B,CAK1C;IAEF,4BAA4B,EAAE,mBAAmB,CAM/C;IAEF,2BAA2B,CAAC,MAAM,EAAE,eAAe,CAAC,eAAe,CAAC;;;IAUpE,OAAO,EAAE,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAA;KAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CA0BjE;CACH"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zerodev/sdk",
-  "version": "4.0.6",
+  "version": "4.0.8",
   "description": "A collection of ERC-4337 compliant smart contract account interfaces",
   "author": "ZeroDev",
   "license": "MIT",

package/src/kernel-zerodev/client/create-client.ts

@@ -1,10 +1,11 @@
 import {
   createPublicErc4337FromClient,
-  type HttpTransport,
   type PublicErc4337Client,
+  type Erc337RpcSchema,
+  type HttpTransport,
 } from "@alchemy/aa-core";
-import { http, createPublicClient, type Chain } from "viem";
-import { BUNDLER_URL } from "../constants.js";
+import { http, createPublicClient, type Chain, custom } from "viem";
+import { BUNDLER_URL, CHAIN_ID_TO_NODE } from "../constants.js";
 import type { PaymasterAndBundlerProviders } from "../paymaster/types.js";
 
 interface ZeroDevClientConfig {
@@ -14,24 +15,59 @@ interface ZeroDevClientConfig {
   bundlerProvider?: PaymasterAndBundlerProviders;
 }
 
+type MethodsOfErc4337RpcSchema = Erc337RpcSchema[number]["Method"];
+
+function isMethodInErc4337RpcSchema(
+  variable: string
+): variable is MethodsOfErc4337RpcSchema {
+  return (
+    [
+      "eth_sendUserOperation",
+      "eth_estimateUserOperationGas",
+      "eth_getUserOperationReceipt",
+      "eth_getUserOperationByHash",
+      "eth_supportedEntryPoints",
+      "eth_maxPriorityFeePerGas",
+    ] as const
+  ).includes(variable as MethodsOfErc4337RpcSchema);
+}
+
 export const createZeroDevPublicErc4337Client = ({
   chain,
   rpcUrl,
   projectId,
   bundlerProvider,
 }: ZeroDevClientConfig): PublicErc4337Client<HttpTransport> => {
+  const erc4337Transport = http(rpcUrl, {
+    fetchOptions: {
+      headers: rpcUrl === BUNDLER_URL ? { projectId, bundlerProvider } : {},
+    },
+    name: "Connected bundler network",
+    key: "connected-bundler-network",
+  });
+  const publicTransport = http(CHAIN_ID_TO_NODE[chain.id]);
   let client = createPublicErc4337FromClient(
     createPublicClient({
       chain,
-      transport: http(rpcUrl, {
-        fetchOptions: {
-          headers: rpcUrl === BUNDLER_URL ? { projectId, bundlerProvider } : {},
+      transport: custom({
+        async request({ method, params }) {
+          let response;
+          if (isMethodInErc4337RpcSchema(method)) {
+            response = await erc4337Transport({ chain }).request({
+              method,
+              params,
+            } as any);
+          } else {
+            response = await publicTransport({ chain }).request({
+              method,
+              params,
+            } as any);
+          }
+          return response;
         },
-        name: "Connected bundler network",
-        key: "connected-bundler-network",
       }),
     })
   );
 
-  return client;
+  return client as unknown as PublicErc4337Client<HttpTransport>;
 };

package/src/kernel-zerodev/provider.ts

@@ -182,30 +182,25 @@ export class ZeroDevProvider extends SmartAccountProvider<HttpTransport> {
     const initCode = await this.account.getInitCode();
     let hash: string = "";
     let i = 0;
-    let maxFeePerGas = 0n;
-    let maxPriorityFeePerGas = 0n;
-    let request: UserOperationStruct;
-
     const nonce = await this.account.getNonce();
+    const uoStruct = await asyncPipe(
+      this.dummyPaymasterDataMiddleware,
+      this.feeDataGetter,
+      this.paymasterDataMiddleware,
+      this.gasEstimator,
+      this.customMiddleware ?? noOpMiddleware,
+      async (struct) => ({ ...struct, ...overrides })
+    )({
+      initCode,
+      sender: this.getAddress(),
+      nonce,
+      callData,
+      signature: await this.account
+        .getValidator()
+        .getDynamicDummySignature(await this.getAddress(), callData as Hex),
+    } as UserOperationStruct);
+    let request: UserOperationStruct;
     do {
-      const uoStruct = await asyncPipe(
-        this.dummyPaymasterDataMiddleware,
-        this.feeDataGetter,
-        this.paymasterDataMiddleware,
-        this.gasEstimator,
-        this.customMiddleware ?? noOpMiddleware,
-        async (struct) => ({ ...struct, ...overrides })
-      )({
-        initCode,
-        sender: this.getAddress(),
-        nonce,
-        callData,
-        signature: await this.account
-          .getValidator()
-          .getDynamicDummySignature(await this.getAddress(), callData as Hex),
-        maxFeePerGas,
-        maxPriorityFeePerGas,
-      } as UserOperationStruct);
       request = deepHexlify(await resolveProperties(uoStruct));
 
       if (!isValidRequest(request)) {
@@ -227,13 +222,16 @@ export class ZeroDevProvider extends SmartAccountProvider<HttpTransport> {
         );
       } catch (error: any) {
         if (this.isReplacementOpError(error) && i++ < this.sendTxMaxRetries) {
-          maxFeePerGas = (BigInt(request.maxFeePerGas) * 113n) / 100n;
-          maxPriorityFeePerGas =
+          uoStruct.maxFeePerGas = (BigInt(request.maxFeePerGas) * 113n) / 100n;
+          uoStruct.maxPriorityFeePerGas =
             (BigInt(request.maxPriorityFeePerGas) * 113n) / 100n;
+
           console.log(
             `After ${
               this.sendTxRetryIntervalMs / 60000
-            } minutes, resending tx with Increased Gas fees: maxFeePerGas: ${maxFeePerGas}, maxPriorityFeePerGas: ${maxPriorityFeePerGas}`
+            } minutes, resending tx with Increased Gas fees: maxFeePerGas: ${
+              uoStruct.maxFeePerGas
+            }, maxPriorityFeePerGas: ${uoStruct.maxPriorityFeePerGas}`
           );
           await new Promise((resolve) =>
             setTimeout(resolve, this.sendTxRetryIntervalMs)