@zerodev/sdk 4.0.34 → 4.1.1

package/dist/cjs/kernel-zerodev/ethers-provider/account-signer.js.map

@@ -1 +1 @@
-{"version":3,"file":"account-signer.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/ethers-provider/account-signer.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  resolveProperties,\n  type AccountMiddlewareFn,\n  type FeeDataMiddleware,\n  type GasEstimatorMiddleware,\n  type PaymasterAndDataMiddleware,\n  type PublicErc4337Client,\n  type SignTypedDataParams,\n} from \"@alchemy/aa-core\";\nimport {\n  Signer,\n  type TypedDataSigner,\n  type TypedDataDomain,\n  type TypedDataField,\n} from \"@ethersproject/abstract-signer\";\nimport { hexlify } from \"@ethersproject/bytes\";\nimport { _TypedDataEncoder } from \"@ethersproject/hash\";\nimport type { Deferrable } from \"@ethersproject/properties\";\nimport {\n  type TransactionRequest,\n  type TransactionResponse,\n} from \"@ethersproject/providers\";\nimport { ZeroDevEthersProvider } from \"./ethers-provider.js\";\nimport type { SupportedValidators } from \"../validator/types.js\";\nimport type { KernelSmartContractAccount } from \"../account.js\";\nimport type { Hex } from \"viem\";\n\nconst hexlifyOptional = (value: any): `0x${string}` | undefined => {\n  if (value == null) {\n    return undefined;\n  }\n\n  return hexlify(value) as `0x${string}`;\n};\n\nexport class ZeroDevAccountSigner<V extends SupportedValidators>\n  extends Signer\n  implements TypedDataSigner\n{\n  private account?: KernelSmartContractAccount;\n\n  sendUserOperation;\n  waitForUserOperationTransaction;\n\n  constructor(readonly provider: ZeroDevEthersProvider<V>) {\n    super();\n    this.account = this.provider.accountProvider.getAccount();\n\n    this.sendUserOperation =\n      this.provider.accountProvider.sendUserOperation.bind(\n        this.provider.accountProvider\n      );\n    this.waitForUserOperationTransaction =\n      this.provider.accountProvider.waitForUserOperationTransaction.bind(\n        this.provider.accountProvider\n      );\n  }\n\n  getAddress(): Promise<string> {\n    if (!this.account) {\n      throw new Error(\n        \"connect the signer to a provider that has a connected account\"\n      );\n    }\n\n    return this.account.getAddress();\n  }\n\n  signMessage(message: string | Uint8Array): Promise<string> {\n    if (!this.account) {\n      throw new Error(\n        \"connect the signer to a provider that has a connected account\"\n      );\n    }\n\n    return this.account.signMessage(message);\n  }\n\n  signTypedData(params: SignTypedDataParams): Promise<string> {\n    if (!this.account) {\n      throw new Error(\n        \"connect the signer to a provider that has a connected account\"\n      );\n    }\n    if (params.types) {\n      delete params.types[\"EIP712Domain\"];\n    }\n\n    return this.account.signTypedData(params);\n  }\n\n  _signTypedData(\n    domain: TypedDataDomain,\n    types: Record<string, Array<TypedDataField>>,\n    value: Record<string, any>\n  ): Promise<string> {\n    if (!this.account) {\n      throw new Error(\n        \"connect the signer to a provider that has a connected account\"\n      );\n    }\n    const params = _TypedDataEncoder.getPayload(\n      domain,\n      types,\n      value\n    ) as SignTypedDataParams;\n    if (params.types) {\n      delete params.types[\"EIP712Domain\"];\n    }\n\n    return this.signTypedData(params);\n  }\n\n  async signMessageWith6492(_msg: string | Uint8Array): Promise<Hex> {\n    if (!this.account) {\n      throw new Error(\n        \"connect the signer to a provider that has a connected account\"\n      );\n    }\n    return this.account.signMessageWith6492(_msg);\n  }\n\n  async signTypedDataWith6492(params: SignTypedDataParams): Promise<Hex> {\n    if (!this.account) {\n      throw new Error(\n        \"connect the signer to a provider that has a connected account\"\n      );\n    }\n    return this.account.signTypedDataWith6492(params);\n  }\n\n  withPaymasterMiddleware = (overrides: {\n    dummyPaymasterDataMiddleware?: PaymasterAndDataMiddleware;\n    paymasterDataMiddleware?: PaymasterAndDataMiddleware;\n  }): this => {\n    this.provider.withPaymasterMiddleware(overrides);\n    return this;\n  };\n\n  withGasEstimator = (override: GasEstimatorMiddleware): this => {\n    this.provider.withGasEstimator(override);\n    return this;\n  };\n\n  withFeeDataGetter = (override: FeeDataMiddleware): this => {\n    this.provider.withFeeDataGetter(override);\n    return this;\n  };\n\n  withCustomMiddleware = (override: AccountMiddlewareFn): this => {\n    this.provider.withCustomMiddleware(override);\n    return this;\n  };\n\n  async sendTransaction(\n    transaction: Deferrable<TransactionRequest>\n  ): Promise<TransactionResponse> {\n    const resolved = await resolveProperties(transaction);\n    const txHash = await this.provider.accountProvider.sendTransaction({\n      // TODO: need to support gas fields as well\n      from: (await this.getAddress()) as `0x${string}`,\n      to: resolved.to as `0x${string}` | undefined,\n      data: hexlifyOptional(resolved.data),\n    });\n\n    return this.provider.getTransaction(txHash);\n  }\n\n  signTransaction(\n    _transaction: Deferrable<TransactionRequest>\n  ): Promise<string> {\n    throw new Error(\n      \"Transaction signing is not supported, use sendUserOperation instead\"\n    );\n  }\n\n  getPublicErc4337Client(): PublicErc4337Client {\n    return this.provider.getPublicErc4337Client();\n  }\n\n  connect(provider: ZeroDevEthersProvider<V>): ZeroDevAccountSigner<V> {\n    return new ZeroDevAccountSigner(provider);\n  }\n}\n"]}
+{"version":3,"file":"account-signer.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/ethers-provider/account-signer.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  resolveProperties,\n  type AccountMiddlewareFn,\n  type FeeDataMiddleware,\n  type GasEstimatorMiddleware,\n  type PaymasterAndDataMiddleware,\n  type PublicErc4337Client,\n  type SignTypedDataParams,\n} from \"@alchemy/aa-core\";\nimport {\n  Signer,\n  type TypedDataSigner,\n  type TypedDataDomain,\n  type TypedDataField,\n} from \"@ethersproject/abstract-signer\";\nimport { hexlify } from \"@ethersproject/bytes\";\nimport { _TypedDataEncoder } from \"@ethersproject/hash\";\nimport type { Deferrable } from \"@ethersproject/properties\";\nimport {\n  type TransactionRequest,\n  type TransactionResponse,\n} from \"@ethersproject/providers\";\nimport { ZeroDevEthersProvider } from \"./ethers-provider.js\";\nimport type { SupportedValidators } from \"../validator/types.js\";\nimport type { KernelSmartContractAccount } from \"../account.js\";\nimport type { Hex } from \"viem\";\n\nconst hexlifyOptional = (value: any): `0x${string}` | undefined => {\n  if (value == null) {\n    return undefined;\n  }\n\n  return hexlify(value) as `0x${string}`;\n};\n\nexport class ZeroDevAccountSigner<V extends SupportedValidators>\n  extends Signer\n  implements TypedDataSigner\n{\n  private account?: KernelSmartContractAccount;\n\n  sendUserOperation;\n  waitForUserOperationTransaction;\n\n  constructor(readonly provider: ZeroDevEthersProvider<V>) {\n    super();\n    this.account = this.provider.accountProvider.getAccount();\n\n    this.sendUserOperation =\n      this.provider.accountProvider.sendUserOperation.bind(\n        this.provider.accountProvider\n      );\n    this.waitForUserOperationTransaction =\n      this.provider.accountProvider.waitForUserOperationTransaction.bind(\n        this.provider.accountProvider\n      );\n  }\n\n  getAddress(): Promise<Hex> {\n    if (!this.account) {\n      throw new Error(\n        \"connect the signer to a provider that has a connected account\"\n      );\n    }\n\n    return this.account.getAddress();\n  }\n\n  signMessage(message: string | Uint8Array): Promise<string> {\n    if (!this.account) {\n      throw new Error(\n        \"connect the signer to a provider that has a connected account\"\n      );\n    }\n\n    return this.account.signMessage(message);\n  }\n\n  signTypedData(params: SignTypedDataParams): Promise<string> {\n    if (!this.account) {\n      throw new Error(\n        \"connect the signer to a provider that has a connected account\"\n      );\n    }\n    if (params.types) {\n      delete params.types[\"EIP712Domain\"];\n    }\n\n    return this.account.signTypedData(params);\n  }\n\n  _signTypedData(\n    domain: TypedDataDomain,\n    types: Record<string, Array<TypedDataField>>,\n    value: Record<string, any>\n  ): Promise<string> {\n    if (!this.account) {\n      throw new Error(\n        \"connect the signer to a provider that has a connected account\"\n      );\n    }\n    const params = _TypedDataEncoder.getPayload(\n      domain,\n      types,\n      value\n    ) as SignTypedDataParams;\n    if (params.types) {\n      delete params.types[\"EIP712Domain\"];\n    }\n\n    return this.signTypedData(params);\n  }\n\n  async signMessageWith6492(_msg: string | Uint8Array): Promise<Hex> {\n    if (!this.account) {\n      throw new Error(\n        \"connect the signer to a provider that has a connected account\"\n      );\n    }\n    return this.account.signMessageWith6492(_msg);\n  }\n\n  async signTypedDataWith6492(params: SignTypedDataParams): Promise<Hex> {\n    if (!this.account) {\n      throw new Error(\n        \"connect the signer to a provider that has a connected account\"\n      );\n    }\n    return this.account.signTypedDataWith6492(params);\n  }\n\n  withPaymasterMiddleware = (overrides: {\n    dummyPaymasterDataMiddleware?: PaymasterAndDataMiddleware;\n    paymasterDataMiddleware?: PaymasterAndDataMiddleware;\n  }): this => {\n    this.provider.withPaymasterMiddleware(overrides);\n    return this;\n  };\n\n  withGasEstimator = (override: GasEstimatorMiddleware): this => {\n    this.provider.withGasEstimator(override);\n    return this;\n  };\n\n  withFeeDataGetter = (override: FeeDataMiddleware): this => {\n    this.provider.withFeeDataGetter(override);\n    return this;\n  };\n\n  withCustomMiddleware = (override: AccountMiddlewareFn): this => {\n    this.provider.withCustomMiddleware(override);\n    return this;\n  };\n\n  async sendTransaction(\n    transaction: Deferrable<TransactionRequest>\n  ): Promise<TransactionResponse> {\n    const resolved = await resolveProperties(transaction);\n    const txHash = await this.provider.accountProvider.sendTransaction({\n      // TODO: need to support gas fields as well\n      from: (await this.getAddress()) as `0x${string}`,\n      to: resolved.to as `0x${string}` | undefined,\n      data: hexlifyOptional(resolved.data),\n    });\n\n    return this.provider.getTransaction(txHash);\n  }\n\n  signTransaction(\n    _transaction: Deferrable<TransactionRequest>\n  ): Promise<string> {\n    throw new Error(\n      \"Transaction signing is not supported, use sendUserOperation instead\"\n    );\n  }\n\n  getPublicErc4337Client(): PublicErc4337Client {\n    return this.provider.getPublicErc4337Client();\n  }\n\n  connect(provider: ZeroDevEthersProvider<V>): ZeroDevAccountSigner<V> {\n    return new ZeroDevAccountSigner(provider);\n  }\n}\n"]}

package/dist/cjs/kernel-zerodev/middleware/gas-estimator.js

@@ -54,8 +54,7 @@ const withZeroDevGasEstimator = (provider) => {
         request.preVerificationGas =
             (BigInt(preVerificationGas) * 12n) / 10n ?? request.preVerificationGas;
         request.verificationGasLimit =
-            (BigInt(verificationGasLimit) * 12n) / 10n ??
-                request.verificationGasLimit;
+            BigInt(verificationGasLimit) ?? request.verificationGasLimit;
         request.callGasLimit =
             (BigInt(callGasLimit) * 12n) / 10n ?? request.callGasLimit;
         return {

package/dist/cjs/kernel-zerodev/middleware/gas-estimator.js.map

@@ -1 +1 @@
-{"version":3,"file":"gas-estimator.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/middleware/gas-estimator.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ZeroDevProvider } from \"../provider.js\";\nimport {\n  deepHexlify,\n  type Hex,\n  type UserOperationStruct,\n  resolveProperties,\n  type BigNumberish,\n  type UserOperationEstimateGasResponse,\n} from \"@alchemy/aa-core\";\nimport { ENTRYPOINT_ADDRESS } from \"../constants.js\";\nimport { calcPreVerificationGas } from \"../utils/calc-pre-verification-gas.js\";\n\nexport const withZeroDevGasEstimator = (\n  provider: ZeroDevProvider\n): ZeroDevProvider => {\n  provider.withFeeDataGetter(async (struct) => {\n    let overrides = await resolveProperties({\n      maxFeePerGas: struct.maxFeePerGas ?? 0n,\n      maxPriorityFeePerGas: struct.maxPriorityFeePerGas ?? 0n,\n    });\n\n    let maxFeePerGas, maxPriorityFeePerGas;\n\n    try {\n      ({ maxFeePerGas, maxPriorityFeePerGas } = await eip1559GasPrice(\n        provider\n      ));\n    } catch (error: any) {\n      console.warn(\n        \"getGas: eth_maxPriorityFeePerGas failed, falling back to legacy gas price.\"\n      );\n    }\n\n    if (maxFeePerGas === undefined || maxPriorityFeePerGas === undefined) {\n      const feeData = await getFeeData(provider);\n      maxFeePerGas = feeData?.maxFeePerGas ? BigInt(feeData?.maxFeePerGas) : 0n;\n      maxPriorityFeePerGas = feeData.maxPriorityFeePerGas\n        ? BigInt(feeData.maxPriorityFeePerGas)\n        : 0n;\n    }\n\n    if (\n      maxFeePerGas < BigInt(overrides.maxFeePerGas) ||\n      maxPriorityFeePerGas < BigInt(overrides.maxPriorityFeePerGas)\n    ) {\n      return overrides;\n    }\n    return { maxFeePerGas, maxPriorityFeePerGas };\n  });\n\n  provider.withGasEstimator(async (struct) => {\n    if (\n      struct.callGasLimit !== undefined &&\n      struct.verificationGasLimit !== undefined &&\n      struct.preVerificationGas !== undefined\n    ) {\n      return struct;\n    }\n    const initCode = await provider.account?.getInitCode();\n    const initGas = await estimateCreationGas(provider, initCode);\n    const partialStruct: UserOperationStruct = {\n      ...struct,\n      callGasLimit:\n        initCode !== undefined && initCode.length > 2\n          ? BigInt(\"1000000\")\n          : BigInt(55000),\n      verificationGasLimit: BigInt(110000) + initGas,\n      preVerificationGas: BigInt(100000),\n    };\n\n    partialStruct.preVerificationGas = await getPreVerificationGas(\n      partialStruct\n    );\n\n    const request = deepHexlify(await resolveProperties(partialStruct));\n    let userOpGasEstimates: UserOperationEstimateGasResponse | undefined;\n    userOpGasEstimates = await provider.rpcClient.estimateUserOperationGas(\n      request,\n      ENTRYPOINT_ADDRESS\n    );\n    const { preVerificationGas, verificationGasLimit, callGasLimit } =\n      userOpGasEstimates;\n    request.preVerificationGas =\n      (BigInt(preVerificationGas) * 12n) / 10n ?? request.preVerificationGas;\n    request.verificationGasLimit =\n      (BigInt(verificationGasLimit) * 12n) / 10n ??\n      request.verificationGasLimit;\n    request.callGasLimit =\n      (BigInt(callGasLimit) * 12n) / 10n ?? request.callGasLimit;\n\n    return {\n      ...struct,\n      ...request,\n    };\n  });\n\n  return provider;\n};\n\nexport const estimateCreationGas = async (\n  provider: ZeroDevProvider,\n  initCode?: string\n): Promise<bigint> => {\n  if (initCode == null || initCode === \"0x\") return BigInt(0);\n  const deployerAddress = initCode.substring(0, 42) as Hex;\n  const deployerCallData = (\"0x\" + initCode.substring(42)) as Hex;\n  return await provider.rpcClient.estimateGas({\n    account: ENTRYPOINT_ADDRESS,\n    to: deployerAddress,\n    data: deployerCallData,\n  });\n};\n\n/**\n * should cover cost of putting calldata on-chain, and some overhead.\n * actual overhead depends on the expected bundle size\n */\nexport const getPreVerificationGas = async (\n  userOp: Partial<UserOperationStruct>\n): Promise<number> => {\n  const p = await resolveProperties(userOp);\n  return calcPreVerificationGas(p);\n};\n\nexport const eip1559GasPrice = async (provider: ZeroDevProvider) => {\n  const [fee, block] = await Promise.all([\n    provider.rpcClient.getMaxPriorityFeePerGas(),\n    provider.rpcClient.getBlock({ blockTag: \"latest\" }),\n  ]);\n\n  const tip = BigInt(fee);\n  const buffer = (tip / 100n) * 13n;\n  let maxPriorityFeePerGas = tip + buffer;\n  maxPriorityFeePerGas =\n    maxPriorityFeePerGas < provider.minPriorityFeePerBid\n      ? provider.minPriorityFeePerBid\n      : maxPriorityFeePerGas;\n  const maxFeePerGas = block.baseFeePerGas\n    ? BigInt(block.baseFeePerGas) * 2n + maxPriorityFeePerGas\n    : maxPriorityFeePerGas;\n\n  return { maxFeePerGas, maxPriorityFeePerGas };\n};\ninterface FeeData {\n  maxFeePerGas: BigNumberish | null;\n  maxPriorityFeePerGas: BigNumberish | null;\n}\n\nexport const getFeeData = async (\n  provider: ZeroDevProvider\n): Promise<FeeData> => {\n  const { block, gasPrice } = await resolveProperties({\n    block: provider.rpcClient.getBlock({ blockTag: \"latest\" }),\n    gasPrice: provider.rpcClient.getGasPrice().catch((error) => {\n      console.warn(\"Legacy: Failed to get gas price\", error);\n      return null;\n    }),\n  });\n\n  let maxFeePerGas = null;\n  let maxPriorityFeePerGas = null;\n\n  if (block && block.baseFeePerGas != null) {\n    // Set the tip to the min of the tip for the last block and 1.5 gwei\n    const minimumTip = BigInt(\"1500000000\");\n    maxPriorityFeePerGas = gasPrice ? gasPrice - block.baseFeePerGas : null;\n    if (\n      maxPriorityFeePerGas == null ||\n      maxPriorityFeePerGas - BigInt(0) ||\n      maxPriorityFeePerGas > minimumTip\n    ) {\n      maxPriorityFeePerGas = minimumTip;\n    }\n    maxPriorityFeePerGas =\n      maxPriorityFeePerGas < provider.minPriorityFeePerBid\n        ? provider.minPriorityFeePerBid\n        : maxPriorityFeePerGas;\n    maxFeePerGas =\n      block.baseFeePerGas * BigInt(2) + (maxPriorityFeePerGas ?? 0);\n  }\n\n  return { maxFeePerGas, maxPriorityFeePerGas };\n};\n"]}
+{"version":3,"file":"gas-estimator.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/middleware/gas-estimator.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ZeroDevProvider } from \"../provider.js\";\nimport {\n  deepHexlify,\n  type Hex,\n  type UserOperationStruct,\n  resolveProperties,\n  type BigNumberish,\n  type UserOperationEstimateGasResponse,\n} from \"@alchemy/aa-core\";\nimport { ENTRYPOINT_ADDRESS } from \"../constants.js\";\nimport { calcPreVerificationGas } from \"../utils/calc-pre-verification-gas.js\";\n\nexport const withZeroDevGasEstimator = (\n  provider: ZeroDevProvider\n): ZeroDevProvider => {\n  provider.withFeeDataGetter(async (struct) => {\n    let overrides = await resolveProperties({\n      maxFeePerGas: struct.maxFeePerGas ?? 0n,\n      maxPriorityFeePerGas: struct.maxPriorityFeePerGas ?? 0n,\n    });\n\n    let maxFeePerGas, maxPriorityFeePerGas;\n\n    try {\n      ({ maxFeePerGas, maxPriorityFeePerGas } = await eip1559GasPrice(\n        provider\n      ));\n    } catch (error: any) {\n      console.warn(\n        \"getGas: eth_maxPriorityFeePerGas failed, falling back to legacy gas price.\"\n      );\n    }\n\n    if (maxFeePerGas === undefined || maxPriorityFeePerGas === undefined) {\n      const feeData = await getFeeData(provider);\n      maxFeePerGas = feeData?.maxFeePerGas ? BigInt(feeData?.maxFeePerGas) : 0n;\n      maxPriorityFeePerGas = feeData.maxPriorityFeePerGas\n        ? BigInt(feeData.maxPriorityFeePerGas)\n        : 0n;\n    }\n\n    if (\n      maxFeePerGas < BigInt(overrides.maxFeePerGas) ||\n      maxPriorityFeePerGas < BigInt(overrides.maxPriorityFeePerGas)\n    ) {\n      return overrides;\n    }\n    return { maxFeePerGas, maxPriorityFeePerGas };\n  });\n\n  provider.withGasEstimator(async (struct) => {\n    if (\n      struct.callGasLimit !== undefined &&\n      struct.verificationGasLimit !== undefined &&\n      struct.preVerificationGas !== undefined\n    ) {\n      return struct;\n    }\n    const initCode = await provider.account?.getInitCode();\n    const initGas = await estimateCreationGas(provider, initCode);\n    const partialStruct: UserOperationStruct = {\n      ...struct,\n      callGasLimit:\n        initCode !== undefined && initCode.length > 2\n          ? BigInt(\"1000000\")\n          : BigInt(55000),\n      verificationGasLimit: BigInt(110000) + initGas,\n      preVerificationGas: BigInt(100000),\n    };\n\n    partialStruct.preVerificationGas = await getPreVerificationGas(\n      partialStruct\n    );\n\n    const request = deepHexlify(await resolveProperties(partialStruct));\n    let userOpGasEstimates: UserOperationEstimateGasResponse | undefined;\n    userOpGasEstimates = await provider.rpcClient.estimateUserOperationGas(\n      request,\n      ENTRYPOINT_ADDRESS\n    );\n    const { preVerificationGas, verificationGasLimit, callGasLimit } =\n      userOpGasEstimates;\n    request.preVerificationGas =\n      (BigInt(preVerificationGas) * 12n) / 10n ?? request.preVerificationGas;\n    request.verificationGasLimit =\n      BigInt(verificationGasLimit) ?? request.verificationGasLimit;\n    request.callGasLimit =\n      (BigInt(callGasLimit) * 12n) / 10n ?? request.callGasLimit;\n\n    return {\n      ...struct,\n      ...request,\n    };\n  });\n\n  return provider;\n};\n\nexport const estimateCreationGas = async (\n  provider: ZeroDevProvider,\n  initCode?: string\n): Promise<bigint> => {\n  if (initCode == null || initCode === \"0x\") return BigInt(0);\n  const deployerAddress = initCode.substring(0, 42) as Hex;\n  const deployerCallData = (\"0x\" + initCode.substring(42)) as Hex;\n  return await provider.rpcClient.estimateGas({\n    account: ENTRYPOINT_ADDRESS,\n    to: deployerAddress,\n    data: deployerCallData,\n  });\n};\n\n/**\n * should cover cost of putting calldata on-chain, and some overhead.\n * actual overhead depends on the expected bundle size\n */\nexport const getPreVerificationGas = async (\n  userOp: Partial<UserOperationStruct>\n): Promise<number> => {\n  const p = await resolveProperties(userOp);\n  return calcPreVerificationGas(p);\n};\n\nexport const eip1559GasPrice = async (provider: ZeroDevProvider) => {\n  const [fee, block] = await Promise.all([\n    provider.rpcClient.getMaxPriorityFeePerGas(),\n    provider.rpcClient.getBlock({ blockTag: \"latest\" }),\n  ]);\n\n  const tip = BigInt(fee);\n  const buffer = (tip / 100n) * 13n;\n  let maxPriorityFeePerGas = tip + buffer;\n  maxPriorityFeePerGas =\n    maxPriorityFeePerGas < provider.minPriorityFeePerBid\n      ? provider.minPriorityFeePerBid\n      : maxPriorityFeePerGas;\n  const maxFeePerGas = block.baseFeePerGas\n    ? BigInt(block.baseFeePerGas) * 2n + maxPriorityFeePerGas\n    : maxPriorityFeePerGas;\n\n  return { maxFeePerGas, maxPriorityFeePerGas };\n};\ninterface FeeData {\n  maxFeePerGas: BigNumberish | null;\n  maxPriorityFeePerGas: BigNumberish | null;\n}\n\nexport const getFeeData = async (\n  provider: ZeroDevProvider\n): Promise<FeeData> => {\n  const { block, gasPrice } = await resolveProperties({\n    block: provider.rpcClient.getBlock({ blockTag: \"latest\" }),\n    gasPrice: provider.rpcClient.getGasPrice().catch((error) => {\n      console.warn(\"Legacy: Failed to get gas price\", error);\n      return null;\n    }),\n  });\n\n  let maxFeePerGas = null;\n  let maxPriorityFeePerGas = null;\n\n  if (block && block.baseFeePerGas != null) {\n    // Set the tip to the min of the tip for the last block and 1.5 gwei\n    const minimumTip = BigInt(\"1500000000\");\n    maxPriorityFeePerGas = gasPrice ? gasPrice - block.baseFeePerGas : null;\n    if (\n      maxPriorityFeePerGas == null ||\n      maxPriorityFeePerGas - BigInt(0) ||\n      maxPriorityFeePerGas > minimumTip\n    ) {\n      maxPriorityFeePerGas = minimumTip;\n    }\n    maxPriorityFeePerGas =\n      maxPriorityFeePerGas < provider.minPriorityFeePerBid\n        ? provider.minPriorityFeePerBid\n        : maxPriorityFeePerGas;\n    maxFeePerGas =\n      block.baseFeePerGas * BigInt(2) + (maxPriorityFeePerGas ?? 0);\n  }\n\n  return { maxFeePerGas, maxPriorityFeePerGas };\n};\n"]}

package/dist/cjs/kernel-zerodev/middleware/paymaster.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zeroDevPaymasterAndDataMiddleware = exports.withZeroDevPaymasterAndData = void 0;
 const index_js_1 = require("../paymaster/index.js");
+const axios_1 = require("axios");
 const withZeroDevPaymasterAndData = (provider, paymasterConfig) => {
     provider.withPaymasterMiddleware((0, exports.zeroDevPaymasterAndDataMiddleware)(provider, paymasterConfig));
     return provider;
@@ -19,12 +20,24 @@ const zeroDevPaymasterAndDataMiddleware = (provider, paymasterConfig) => {
             const verificationGasLimit = BigInt("1000000");
             const callGasLimit = BigInt("55000");
             const paymaster = new index_js_1.Paymasters[paymasterConfig.policy](provider, paymasterConfig);
-            const paymasterResp = await paymaster.getPaymasterResponse({
-                ...struct,
-                preVerificationGas,
-                verificationGasLimit,
-                callGasLimit,
-            }, paymasterConfig.paymasterProvider);
+            let paymasterResp;
+            try {
+                paymasterResp = await paymaster.getPaymasterResponse({
+                    ...struct,
+                    preVerificationGas,
+                    verificationGasLimit,
+                    callGasLimit,
+                }, paymasterConfig.paymasterProvider);
+            }
+            catch (error) {
+                console.error(error);
+                if (paymasterConfig.onlySendSponsoredTransaction) {
+                    if (error instanceof axios_1.AxiosError)
+                        throw Error(error.response?.data.message);
+                    else
+                        throw error;
+                }
+            }
             if (paymasterConfig.onlySendSponsoredTransaction &&
                 (!paymasterResp ||
                     !paymasterResp.paymasterAndData ||

package/dist/cjs/kernel-zerodev/middleware/paymaster.js.map

@@ -1 +1 @@
-{"version":3,"file":"paymaster.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/middleware/paymaster.ts"],"names":[],"mappings":";;;AAEA,oDAAmD;AAG5C,MAAM,2BAA2B,GAAG,CACzC,QAAkB,EAClB,eAAiD,EACvC,EAAE;IACZ,QAAQ,CAAC,uBAAuB,CAC9B,IAAA,yCAAiC,EAAC,QAAQ,EAAE,eAAe,CAAC,CAC7D,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AATW,QAAA,2BAA2B,+BAStC;AAEK,MAAM,iCAAiC,GAAG,CAI/C,QAAkB,EAClB,eAAmC,EAG9B,EAAE;IACP,OAAO;QACL,4BAA4B,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YAC7C,MAAM,CAAC,gBAAgB;gBACrB,8aAA8a,CAAC;YACjb,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,uBAAuB,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YACxC,MAAM,kBAAkB,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC5C,MAAM,oBAAoB,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;YAC/C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;YACrC,MAAM,SAAS,GAAG,IAAI,qBAAU,CAAC,eAAe,CAAC,MAAM,CAAC,CACtD,QAAQ,EACR,eAAe,CAChB,CAAC;YACF,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,oBAAoB,CACxD;gBACE,GAAG,MAAM;gBACT,kBAAkB;gBAClB,oBAAoB;gBACpB,YAAY;aACb,EACD,eAAe,CAAC,iBAAiB,CAClC,CAAC;YACF,IACE,eAAe,CAAC,4BAA4B;gBAC5C,CAAC,CAAC,aAAa;oBACb,CAAC,aAAa,CAAC,gBAAgB;oBAC/B,aAAa,CAAC,gBAAgB,KAAK,IAAI,CAAC,EAC1C;gBACA,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YACD,IACE,CAAC,aAAa;gBACd,CAAC,aAAa,CAAC,gBAAgB;gBAC/B,aAAa,CAAC,gBAAgB,KAAK,IAAI,EACvC;gBACA,OAAO;oBACL,GAAG,MAAM;oBACT,gBAAgB,EAAE,IAAI;iBACvB,CAAC;aACH;YACD,OAAO;gBACL,GAAG,MAAM;gBACT,GAAG,aAAa;aACjB,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAxDW,QAAA,iCAAiC,qCAwD5C","sourcesContent":["import { type ConnectedSmartAccountProvider } from \"@alchemy/aa-core\";\nimport type { ZeroDevProvider } from \"../provider.js\";\nimport { Paymasters } from \"../paymaster/index.js\";\nimport type { PaymasterConfig, PaymasterPolicy } from \"../paymaster/types.js\";\n\nexport const withZeroDevPaymasterAndData = <Provider extends ZeroDevProvider>(\n  provider: Provider,\n  paymasterConfig: PaymasterConfig<PaymasterPolicy>\n): Provider => {\n  provider.withPaymasterMiddleware(\n    zeroDevPaymasterAndDataMiddleware(provider, paymasterConfig)\n  );\n\n  return provider;\n};\n\nexport const zeroDevPaymasterAndDataMiddleware = <\n  Provider extends ZeroDevProvider,\n  P extends PaymasterPolicy\n>(\n  provider: Provider,\n  paymasterConfig: PaymasterConfig<P>\n): Parameters<\n  ConnectedSmartAccountProvider[\"withPaymasterMiddleware\"]\n>[\"0\"] => {\n  return {\n    dummyPaymasterDataMiddleware: async (struct) => {\n      struct.paymasterAndData =\n        \"0xe93eca6595fe94091dc1af46aac2a8b5d79907700000000000000000000000000000000000000000000000000000000064ee5cd9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n      return struct;\n    },\n    paymasterDataMiddleware: async (struct) => {\n      const preVerificationGas = BigInt(\"100000\");\n      const verificationGasLimit = BigInt(\"1000000\");\n      const callGasLimit = BigInt(\"55000\");\n      const paymaster = new Paymasters[paymasterConfig.policy](\n        provider,\n        paymasterConfig\n      );\n      const paymasterResp = await paymaster.getPaymasterResponse(\n        {\n          ...struct,\n          preVerificationGas,\n          verificationGasLimit,\n          callGasLimit,\n        },\n        paymasterConfig.paymasterProvider\n      );\n      if (\n        paymasterConfig.onlySendSponsoredTransaction &&\n        (!paymasterResp ||\n          !paymasterResp.paymasterAndData ||\n          paymasterResp.paymasterAndData === \"0x\")\n      ) {\n        throw new Error(\"Transaction is not sponsored\");\n      }\n      if (\n        !paymasterResp ||\n        !paymasterResp.paymasterAndData ||\n        paymasterResp.paymasterAndData === \"0x\"\n      ) {\n        return {\n          ...struct,\n          paymasterAndData: \"0x\",\n        };\n      }\n      return {\n        ...struct,\n        ...paymasterResp,\n      };\n    },\n  };\n};\n"]}
+{"version":3,"file":"paymaster.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/middleware/paymaster.ts"],"names":[],"mappings":";;;AAEA,oDAAmD;AAEnD,iCAAmC;AAE5B,MAAM,2BAA2B,GAAG,CACzC,QAAkB,EAClB,eAAiD,EACvC,EAAE;IACZ,QAAQ,CAAC,uBAAuB,CAC9B,IAAA,yCAAiC,EAAC,QAAQ,EAAE,eAAe,CAAC,CAC7D,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AATW,QAAA,2BAA2B,+BAStC;AAEK,MAAM,iCAAiC,GAAG,CAI/C,QAAkB,EAClB,eAAmC,EAG9B,EAAE;IACP,OAAO;QACL,4BAA4B,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YAC7C,MAAM,CAAC,gBAAgB;gBACrB,8aAA8a,CAAC;YACjb,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,uBAAuB,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YACxC,MAAM,kBAAkB,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC5C,MAAM,oBAAoB,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;YAC/C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;YACrC,MAAM,SAAS,GAAG,IAAI,qBAAU,CAAC,eAAe,CAAC,MAAM,CAAC,CACtD,QAAQ,EACR,eAAe,CAChB,CAAC;YACF,IAAI,aAAa,CAAC;YAClB,IAAI;gBACF,aAAa,GAAG,MAAM,SAAS,CAAC,oBAAoB,CAClD;oBACE,GAAG,MAAM;oBACT,kBAAkB;oBAClB,oBAAoB;oBACpB,YAAY;iBACb,EACD,eAAe,CAAC,iBAAiB,CAClC,CAAC;aACH;YAAC,OAAO,KAAU,EAAE;gBACnB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACrB,IAAI,eAAe,CAAC,4BAA4B,EAAE;oBAChD,IAAI,KAAK,YAAY,kBAAU;wBAC7B,MAAM,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;;wBACvC,MAAM,KAAK,CAAC;iBAClB;aACF;YACD,IACE,eAAe,CAAC,4BAA4B;gBAC5C,CAAC,CAAC,aAAa;oBACb,CAAC,aAAa,CAAC,gBAAgB;oBAC/B,aAAa,CAAC,gBAAgB,KAAK,IAAI,CAAC,EAC1C;gBACA,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YACD,IACE,CAAC,aAAa;gBACd,CAAC,aAAa,CAAC,gBAAgB;gBAC/B,aAAa,CAAC,gBAAgB,KAAK,IAAI,EACvC;gBACA,OAAO;oBACL,GAAG,MAAM;oBACT,gBAAgB,EAAE,IAAI;iBACvB,CAAC;aACH;YACD,OAAO;gBACL,GAAG,MAAM;gBACT,GAAG,aAAa;aACjB,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAlEW,QAAA,iCAAiC,qCAkE5C","sourcesContent":["import { type ConnectedSmartAccountProvider } from \"@alchemy/aa-core\";\nimport type { ZeroDevProvider } from \"../provider.js\";\nimport { Paymasters } from \"../paymaster/index.js\";\nimport type { PaymasterConfig, PaymasterPolicy } from \"../paymaster/types.js\";\nimport { AxiosError } from \"axios\";\n\nexport const withZeroDevPaymasterAndData = <Provider extends ZeroDevProvider>(\n  provider: Provider,\n  paymasterConfig: PaymasterConfig<PaymasterPolicy>\n): Provider => {\n  provider.withPaymasterMiddleware(\n    zeroDevPaymasterAndDataMiddleware(provider, paymasterConfig)\n  );\n\n  return provider;\n};\n\nexport const zeroDevPaymasterAndDataMiddleware = <\n  Provider extends ZeroDevProvider,\n  P extends PaymasterPolicy\n>(\n  provider: Provider,\n  paymasterConfig: PaymasterConfig<P>\n): Parameters<\n  ConnectedSmartAccountProvider[\"withPaymasterMiddleware\"]\n>[\"0\"] => {\n  return {\n    dummyPaymasterDataMiddleware: async (struct) => {\n      struct.paymasterAndData =\n        \"0xe93eca6595fe94091dc1af46aac2a8b5d79907700000000000000000000000000000000000000000000000000000000064ee5cd9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n      return struct;\n    },\n    paymasterDataMiddleware: async (struct) => {\n      const preVerificationGas = BigInt(\"100000\");\n      const verificationGasLimit = BigInt(\"1000000\");\n      const callGasLimit = BigInt(\"55000\");\n      const paymaster = new Paymasters[paymasterConfig.policy](\n        provider,\n        paymasterConfig\n      );\n      let paymasterResp;\n      try {\n        paymasterResp = await paymaster.getPaymasterResponse(\n          {\n            ...struct,\n            preVerificationGas,\n            verificationGasLimit,\n            callGasLimit,\n          },\n          paymasterConfig.paymasterProvider\n        );\n      } catch (error: any) {\n        console.error(error);\n        if (paymasterConfig.onlySendSponsoredTransaction) {\n          if (error instanceof AxiosError)\n            throw Error(error.response?.data.message);\n          else throw error;\n        }\n      }\n      if (\n        paymasterConfig.onlySendSponsoredTransaction &&\n        (!paymasterResp ||\n          !paymasterResp.paymasterAndData ||\n          paymasterResp.paymasterAndData === \"0x\")\n      ) {\n        throw new Error(\"Transaction is not sponsored\");\n      }\n      if (\n        !paymasterResp ||\n        !paymasterResp.paymasterAndData ||\n        paymasterResp.paymasterAndData === \"0x\"\n      ) {\n        return {\n          ...struct,\n          paymasterAndData: \"0x\",\n        };\n      }\n      return {\n        ...struct,\n        ...paymasterResp,\n      };\n    },\n  };\n};\n"]}

package/dist/cjs/kernel-zerodev/paymaster/base.js

@@ -19,40 +19,43 @@ class Paymaster {
         });
     }
     async signUserOp({ userOp, callData, gasTokenAddress, erc20UserOp, erc20CallData, paymasterProvider, shouldOverrideFee = false, }) {
-        try {
-            const hexifiedUserOp = (0, aa_core_1.deepHexlify)(await (0, aa_core_1.resolveProperties)(userOp));
-            let resolvedERC20UserOp;
-            let hexifiedERC20UserOp;
-            if (erc20UserOp) {
-                resolvedERC20UserOp = await (0, aa_core_1.resolveProperties)(erc20UserOp);
-                hexifiedERC20UserOp = (0, ERC4337_utils_js_1.hexifyUserOp)(resolvedERC20UserOp);
-            }
-            const chainId = await (0, index_js_1.getChainId)(this.provider.getProjectId());
-            if (!chainId)
-                throw new Error("ChainId not found");
-            let requestBodyParams = Object.fromEntries(Object.entries({
-                projectId: this.provider.getProjectId(),
-                chainId,
-                userOp: hexifiedUserOp,
-                entryPointAddress: constants_js_1.ENTRYPOINT_ADDRESS,
-                callData: callData instanceof Promise ? await callData : callData,
-                tokenAddress: gasTokenAddress,
-                erc20UserOp: hexifiedERC20UserOp,
-                erc20CallData: erc20CallData instanceof Promise
-                    ? await erc20CallData
-                    : erc20CallData,
-                paymasterProvider,
-                shouldOverrideFee,
-            }).filter(([_, value]) => value !== undefined));
-            const { data: paymasterResp } = await axios_1.default.post(`${constants_js_1.PAYMASTER_URL}/sign`, {
-                ...requestBodyParams,
-            }, { headers: { "Content-Type": "application/json" } });
-            return paymasterResp;
-        }
-        catch (error) {
-            console.log(error);
-            return undefined;
+        const hexifiedUserOp = (0, aa_core_1.deepHexlify)(await (0, aa_core_1.resolveProperties)(userOp));
+        let resolvedERC20UserOp;
+        let hexifiedERC20UserOp;
+        if (erc20UserOp) {
+            resolvedERC20UserOp = await (0, aa_core_1.resolveProperties)(erc20UserOp);
+            hexifiedERC20UserOp = (0, ERC4337_utils_js_1.hexifyUserOp)(resolvedERC20UserOp);
         }
+        const chainId = await (0, index_js_1.getChainId)(this.provider.getProjectId());
+        if (!chainId)
+            throw new Error("ChainId not found");
+        let requestBodyParams = Object.fromEntries(Object.entries({
+            projectId: this.provider.getProjectId(),
+            chainId,
+            userOp: hexifiedUserOp,
+            entryPointAddress: constants_js_1.ENTRYPOINT_ADDRESS,
+            callData: callData instanceof Promise ? await callData : callData,
+            gasTokenData: gasTokenAddress && hexifiedERC20UserOp && erc20CallData
+                ? {
+                    tokenAddress: gasTokenAddress,
+                    erc20UserOp: hexifiedERC20UserOp,
+                    erc20CallData: erc20CallData instanceof Promise
+                        ? await erc20CallData
+                        : erc20CallData,
+                }
+                : undefined,
+            tokenAddress: gasTokenAddress,
+            erc20UserOp: hexifiedERC20UserOp,
+            erc20CallData: erc20CallData instanceof Promise
+                ? await erc20CallData
+                : erc20CallData,
+            paymasterProvider,
+            shouldOverrideFee,
+        }).filter(([_, value]) => value !== undefined));
+        const { data: paymasterResp } = await axios_1.default.post(`${constants_js_1.PAYMASTER_URL}/getPaymasterAndData`, {
+            ...requestBodyParams,
+        }, { headers: { "Content-Type": "application/json" } });
+        return paymasterResp;
     }
 }
 exports.Paymaster = Paymaster;

package/dist/cjs/kernel-zerodev/paymaster/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/paymaster/base.ts"],"names":[],"mappings":";;;;;;AAAA,8CAM0B;AAC1B,kDAA0B;AAC1B,kDAAoE;AAEpE,gEAAyD;AAEzD,8CAA6C;AAE7C,MAAsB,SAAS;IAC7B,YAAsB,QAAyB;QAAnC;;;;mBAAU,QAAQ;WAAiB;IAAG,CAAC;IAMzC,KAAK,CAAC,UAAU,CAAC,EACzB,MAAM,EACN,QAAQ,EACR,eAAe,EACf,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,iBAAiB,GAAG,KAAK,GAS1B;QACC,IAAI;YACF,MAAM,cAAc,GAAG,IAAA,qBAAW,EAAC,MAAM,IAAA,2BAAiB,EAAC,MAAM,CAAC,CAAC,CAAC;YACpE,IAAI,mBAAmB,CAAC;YACxB,IAAI,mBAAwB,CAAC;YAC7B,IAAI,WAAW,EAAE;gBACf,mBAAmB,GAAG,MAAM,IAAA,2BAAiB,EAAC,WAAW,CAAC,CAAC;gBAE3D,mBAAmB,GAAG,IAAA,+BAAY,EAAC,mBAAmB,CAAC,CAAC;aACzD;YACD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAU,EAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;YAC/D,IAAI,CAAC,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACnD,IAAI,iBAAiB,GAAG,MAAM,CAAC,WAAW,CACxC,MAAM,CAAC,OAAO,CAAC;gBACb,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE;gBACvC,OAAO;gBACP,MAAM,EAAE,cAAc;gBACtB,iBAAiB,EAAE,iCAAkB;gBACrC,QAAQ,EAAE,QAAQ,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,CAAC,CAAC,QAAQ;gBACjE,YAAY,EAAE,eAAe;gBAC7B,WAAW,EAAE,mBAAmB;gBAChC,aAAa,EACX,aAAa,YAAY,OAAO;oBAC9B,CAAC,CAAC,MAAM,aAAa;oBACrB,CAAC,CAAC,aAAa;gBACnB,iBAAiB;gBACjB,iBAAiB;aAClB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAC/C,CAAC;YACF,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,MAAM,eAAK,CAAC,IAAI,CAC9C,GAAG,4BAAa,OAAO,EACvB;gBACE,GAAG,iBAAiB;aACrB,EACD,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,EAAE,CACpD,CAAC;YACF,OAAO,aAAa,CAAC;SACtB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;CACF;AAjED,8BAiEC","sourcesContent":["import {\n  deepHexlify,\n  type BytesLike,\n  type PromiseOrValue,\n  type UserOperationStruct,\n  resolveProperties,\n} from \"@alchemy/aa-core\";\nimport axios from \"axios\";\nimport { ENTRYPOINT_ADDRESS, PAYMASTER_URL } from \"../constants.js\";\nimport type { ZeroDevProvider } from \"../provider.js\";\nimport { hexifyUserOp } from \"../utils/ERC4337-utils.js\";\nimport type { PaymasterAndBundlerProviders } from \"./types.js\";\nimport { getChainId } from \"../api/index.js\";\n\nexport abstract class Paymaster {\n  constructor(protected provider: ZeroDevProvider) {}\n  abstract getPaymasterResponse(\n    struct: UserOperationStruct,\n    paymasterProvider?: PaymasterAndBundlerProviders,\n    shouldOverrideFee?: boolean\n  ): Promise<UserOperationStruct | undefined>;\n  protected async signUserOp({\n    userOp,\n    callData,\n    gasTokenAddress,\n    erc20UserOp,\n    erc20CallData,\n    paymasterProvider,\n    shouldOverrideFee = false,\n  }: {\n    userOp: UserOperationStruct;\n    callData?: PromiseOrValue<BytesLike>;\n    gasTokenAddress?: string;\n    erc20UserOp?: Partial<UserOperationStruct>;\n    erc20CallData?: PromiseOrValue<BytesLike>;\n    paymasterProvider?: PaymasterAndBundlerProviders;\n    shouldOverrideFee?: boolean;\n  }): Promise<any> {\n    try {\n      const hexifiedUserOp = deepHexlify(await resolveProperties(userOp));\n      let resolvedERC20UserOp;\n      let hexifiedERC20UserOp: any;\n      if (erc20UserOp) {\n        resolvedERC20UserOp = await resolveProperties(erc20UserOp);\n\n        hexifiedERC20UserOp = hexifyUserOp(resolvedERC20UserOp);\n      }\n      const chainId = await getChainId(this.provider.getProjectId());\n      if (!chainId) throw new Error(\"ChainId not found\");\n      let requestBodyParams = Object.fromEntries(\n        Object.entries({\n          projectId: this.provider.getProjectId(),\n          chainId,\n          userOp: hexifiedUserOp,\n          entryPointAddress: ENTRYPOINT_ADDRESS,\n          callData: callData instanceof Promise ? await callData : callData,\n          tokenAddress: gasTokenAddress,\n          erc20UserOp: hexifiedERC20UserOp,\n          erc20CallData:\n            erc20CallData instanceof Promise\n              ? await erc20CallData\n              : erc20CallData,\n          paymasterProvider,\n          shouldOverrideFee,\n        }).filter(([_, value]) => value !== undefined)\n      );\n      const { data: paymasterResp } = await axios.post(\n        `${PAYMASTER_URL}/sign`,\n        {\n          ...requestBodyParams,\n        },\n        { headers: { \"Content-Type\": \"application/json\" } }\n      );\n      return paymasterResp;\n    } catch (error) {\n      console.log(error);\n      return undefined;\n    }\n  }\n}\n"]}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/paymaster/base.ts"],"names":[],"mappings":";;;;;;AAAA,8CAM0B;AAC1B,kDAA0B;AAC1B,kDAAoE;AAEpE,gEAAyD;AAEzD,8CAA6C;AAE7C,MAAsB,SAAS;IAC7B,YAAsB,QAAyB;QAAnC;;;;mBAAU,QAAQ;WAAiB;IAAG,CAAC;IAMzC,KAAK,CAAC,UAAU,CAAC,EACzB,MAAM,EACN,QAAQ,EACR,eAAe,EACf,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,iBAAiB,GAAG,KAAK,GAS1B;QACC,MAAM,cAAc,GAAG,IAAA,qBAAW,EAAC,MAAM,IAAA,2BAAiB,EAAC,MAAM,CAAC,CAAC,CAAC;QACpE,IAAI,mBAAmB,CAAC;QACxB,IAAI,mBAAwB,CAAC;QAC7B,IAAI,WAAW,EAAE;YACf,mBAAmB,GAAG,MAAM,IAAA,2BAAiB,EAAC,WAAW,CAAC,CAAC;YAE3D,mBAAmB,GAAG,IAAA,+BAAY,EAAC,mBAAmB,CAAC,CAAC;SACzD;QACD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAU,EAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;QAC/D,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACnD,IAAI,iBAAiB,GAAG,MAAM,CAAC,WAAW,CACxC,MAAM,CAAC,OAAO,CAAC;YACb,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE;YACvC,OAAO;YACP,MAAM,EAAE,cAAc;YACtB,iBAAiB,EAAE,iCAAkB;YACrC,QAAQ,EAAE,QAAQ,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,CAAC,CAAC,QAAQ;YACjE,YAAY,EACV,eAAe,IAAI,mBAAmB,IAAI,aAAa;gBACrD,CAAC,CAAC;oBACE,YAAY,EAAE,eAAe;oBAC7B,WAAW,EAAE,mBAAmB;oBAChC,aAAa,EACX,aAAa,YAAY,OAAO;wBAC9B,CAAC,CAAC,MAAM,aAAa;wBACrB,CAAC,CAAC,aAAa;iBACpB;gBACH,CAAC,CAAC,SAAS;YACf,YAAY,EAAE,eAAe;YAC7B,WAAW,EAAE,mBAAmB;YAChC,aAAa,EACX,aAAa,YAAY,OAAO;gBAC9B,CAAC,CAAC,MAAM,aAAa;gBACrB,CAAC,CAAC,aAAa;YACnB,iBAAiB;YACjB,iBAAiB;SAClB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAC/C,CAAC;QACF,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,MAAM,eAAK,CAAC,IAAI,CAC9C,GAAG,4BAAa,sBAAsB,EACtC;YACE,GAAG,iBAAiB;SACrB,EACD,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,EAAE,CACpD,CAAC;QACF,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AAvED,8BAuEC","sourcesContent":["import {\n  deepHexlify,\n  type BytesLike,\n  type PromiseOrValue,\n  type UserOperationStruct,\n  resolveProperties,\n} from \"@alchemy/aa-core\";\nimport axios from \"axios\";\nimport { ENTRYPOINT_ADDRESS, PAYMASTER_URL } from \"../constants.js\";\nimport type { ZeroDevProvider } from \"../provider.js\";\nimport { hexifyUserOp } from \"../utils/ERC4337-utils.js\";\nimport type { PaymasterAndBundlerProviders } from \"./types.js\";\nimport { getChainId } from \"../api/index.js\";\n\nexport abstract class Paymaster {\n  constructor(protected provider: ZeroDevProvider) {}\n  abstract getPaymasterResponse(\n    struct: UserOperationStruct,\n    paymasterProvider?: PaymasterAndBundlerProviders,\n    shouldOverrideFee?: boolean\n  ): Promise<UserOperationStruct | undefined>;\n  protected async signUserOp({\n    userOp,\n    callData,\n    gasTokenAddress,\n    erc20UserOp,\n    erc20CallData,\n    paymasterProvider,\n    shouldOverrideFee = false,\n  }: {\n    userOp: UserOperationStruct;\n    callData?: PromiseOrValue<BytesLike>;\n    gasTokenAddress?: string;\n    erc20UserOp?: Partial<UserOperationStruct>;\n    erc20CallData?: PromiseOrValue<BytesLike>;\n    paymasterProvider?: PaymasterAndBundlerProviders;\n    shouldOverrideFee?: boolean;\n  }): Promise<any> {\n    const hexifiedUserOp = deepHexlify(await resolveProperties(userOp));\n    let resolvedERC20UserOp;\n    let hexifiedERC20UserOp: any;\n    if (erc20UserOp) {\n      resolvedERC20UserOp = await resolveProperties(erc20UserOp);\n\n      hexifiedERC20UserOp = hexifyUserOp(resolvedERC20UserOp);\n    }\n    const chainId = await getChainId(this.provider.getProjectId());\n    if (!chainId) throw new Error(\"ChainId not found\");\n    let requestBodyParams = Object.fromEntries(\n      Object.entries({\n        projectId: this.provider.getProjectId(),\n        chainId,\n        userOp: hexifiedUserOp,\n        entryPointAddress: ENTRYPOINT_ADDRESS,\n        callData: callData instanceof Promise ? await callData : callData,\n        gasTokenData:\n          gasTokenAddress && hexifiedERC20UserOp && erc20CallData\n            ? {\n                tokenAddress: gasTokenAddress,\n                erc20UserOp: hexifiedERC20UserOp,\n                erc20CallData:\n                  erc20CallData instanceof Promise\n                    ? await erc20CallData\n                    : erc20CallData,\n              }\n            : undefined,\n        tokenAddress: gasTokenAddress,\n        erc20UserOp: hexifiedERC20UserOp,\n        erc20CallData:\n          erc20CallData instanceof Promise\n            ? await erc20CallData\n            : erc20CallData,\n        paymasterProvider,\n        shouldOverrideFee,\n      }).filter(([_, value]) => value !== undefined)\n    );\n    const { data: paymasterResp } = await axios.post(\n      `${PAYMASTER_URL}/getPaymasterAndData`,\n      {\n        ...requestBodyParams,\n      },\n      { headers: { \"Content-Type\": \"application/json\" } }\n    );\n    return paymasterResp;\n  }\n}\n"]}

package/dist/cjs/kernel-zerodev/paymaster/token-paymaster.d.ts

@@ -1,14 +1,15 @@
-import { type PromiseOrValue, type BytesLike, type UserOperationStruct } from "@alchemy/aa-core";
+import { type PromiseOrValue, type BytesLike, type UserOperationCallData, type UserOperationStruct, type BatchUserOperationCallData } from "@alchemy/aa-core";
 import { type Hex } from "viem";
 import type { ZeroDevProvider } from "../provider.js";
 import { type UserOperationCallDataWithDelegate } from "../utils.js";
 import { Paymaster } from "./base.js";
 import { type PaymasterAndBundlerProviders, type PaymasterConfig } from "./types.js";
+export declare function isBatchUserOperationCallData(data: any): data is BatchUserOperationCallData;
 export declare class TokenPaymaster extends Paymaster {
     protected paymasterConfig: PaymasterConfig<"TOKEN_PAYMASTER">;
     constructor(provider: ZeroDevProvider, paymasterConfig: PaymasterConfig<"TOKEN_PAYMASTER">);
     getPaymasterAddress(paymasterProvider?: PaymasterAndBundlerProviders): Promise<Hex | undefined>;
-    decodeMainCallFromCallData(kernelAddress: PromiseOrValue<string>, callData: PromiseOrValue<BytesLike>): Promise<UserOperationCallDataWithDelegate | undefined>;
-    getERC20UserOp(struct: UserOperationStruct, mainCall: UserOperationCallDataWithDelegate, gasTokenAddress: Hex, paymasterAddress: Hex): Promise<UserOperationStruct | undefined>;
+    decodeMainCallFromCallData(kernelAddress: PromiseOrValue<string>, callData: PromiseOrValue<BytesLike>): Promise<UserOperationCallData | BatchUserOperationCallData | UserOperationCallDataWithDelegate | undefined>;
+    getERC20UserOp<T extends UserOperationCallData | BatchUserOperationCallData>(struct: UserOperationStruct, mainCall: T, gasTokenAddress: Hex, paymasterAddress: Hex): Promise<UserOperationStruct | undefined>;
     getPaymasterResponse(struct: UserOperationStruct, paymasterProvider?: PaymasterAndBundlerProviders, shouldOverrideFee?: boolean): Promise<UserOperationStruct | undefined>;
 }

package/dist/cjs/kernel-zerodev/paymaster/token-paymaster.js

@@ -3,17 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TokenPaymaster = void 0;
+exports.TokenPaymaster = exports.isBatchUserOperationCallData = void 0;
 const axios_1 = __importDefault(require("axios"));
 const viem_1 = require("viem");
 const ERC20Abi_js_1 = require("../abis/ERC20Abi.js");
 const KernelAccountAbi_js_1 = require("../abis/KernelAccountAbi.js");
-const MultiSendAbi_js_1 = require("../abis/MultiSendAbi.js");
 const constants_js_1 = require("../constants.js");
 const errors_js_1 = require("../errors.js");
 const utils_js_1 = require("../utils.js");
 const base_js_1 = require("./base.js");
 const index_js_1 = require("../api/index.js");
+const MultiSendAbi_js_1 = require("../abis/MultiSendAbi.js");
+function isBatchUserOperationCallData(data) {
+    return data && Array.isArray(data);
+}
+exports.isBatchUserOperationCallData = isBatchUserOperationCallData;
 class TokenPaymaster extends base_js_1.Paymaster {
     constructor(provider, paymasterConfig) {
         super(provider);
@@ -86,6 +90,14 @@ class TokenPaymaster extends base_js_1.Paymaster {
                 }
                 return mainCall;
             }
+            else if (functionName === "executeBatch") {
+                const [txs] = args;
+                return txs.map((tx) => ({
+                    target: tx.to,
+                    value: tx.value ?? 0n,
+                    data: tx.data,
+                }));
+            }
         }
         catch (error) {
             return {
@@ -113,10 +125,14 @@ class TokenPaymaster extends base_js_1.Paymaster {
             if (!this.provider.account) {
                 throw errors_js_1.AccountNotConnected;
             }
-            const erc20CallData = await this.provider.account.encodeBatchExecute([
-                approveData,
-                mainCall,
-            ]);
+            let calls;
+            if (isBatchUserOperationCallData(mainCall)) {
+                calls = [approveData, ...mainCall];
+            }
+            else {
+                calls = [approveData, mainCall];
+            }
+            const erc20CallData = await this.provider.account.encodeBatchExecute(calls);
             return {
                 ...struct,
                 callData: erc20CallData,
@@ -136,40 +152,33 @@ class TokenPaymaster extends base_js_1.Paymaster {
         }
     }
     async getPaymasterResponse(struct, paymasterProvider, shouldOverrideFee) {
-        try {
-            const mainCall = await this.decodeMainCallFromCallData(struct.sender, struct.callData);
-            if (!mainCall) {
-                throw errors_js_1.IncorrectCallDataForTokenPaymaster;
-            }
-            const chainId = await (0, index_js_1.getChainId)(this.provider.getProjectId());
-            if (!chainId) {
-                throw new Error("ChainId not found");
-            }
-            const gasTokenAddress = (0, utils_js_1.getGasTokenAddress)(this.paymasterConfig.gasToken, chainId);
-            let paymasterAddress = await this.getPaymasterAddress(paymasterProvider);
-            if (gasTokenAddress !== undefined &&
-                paymasterAddress !== undefined &&
-                (0, viem_1.isAddress)(paymasterAddress)) {
-                const erc20UserOp = await this.getERC20UserOp(struct, mainCall, gasTokenAddress, paymasterAddress);
-                if (!erc20UserOp) {
-                    return;
-                }
-                const paymasterResp = await this.signUserOp({
-                    userOp: struct,
-                    callData: struct.callData,
-                    gasTokenAddress,
-                    erc20UserOp,
-                    erc20CallData: erc20UserOp.callData,
-                    paymasterProvider,
-                    shouldOverrideFee,
-                });
-                if (paymasterResp) {
-                    return paymasterResp;
-                }
-            }
+        const mainCall = await this.decodeMainCallFromCallData(struct.sender, struct.callData);
+        if (!mainCall) {
+            throw errors_js_1.IncorrectCallDataForTokenPaymaster;
         }
-        catch (error) {
-            console.log(error);
+        const chainId = await (0, index_js_1.getChainId)(this.provider.getProjectId());
+        if (!chainId) {
+            throw new Error("ChainId not found");
+        }
+        const gasTokenAddress = (0, utils_js_1.getGasTokenAddress)(this.paymasterConfig.gasToken, chainId);
+        let paymasterAddress = await this.getPaymasterAddress(paymasterProvider);
+        if (gasTokenAddress !== undefined &&
+            paymasterAddress !== undefined &&
+            (0, viem_1.isAddress)(paymasterAddress)) {
+            const erc20UserOp = await this.getERC20UserOp(struct, mainCall, gasTokenAddress, paymasterAddress);
+            if (!erc20UserOp) {
+                return;
+            }
+            const paymasterResp = await this.signUserOp({
+                userOp: struct,
+                callData: struct.callData,
+                gasTokenAddress,
+                erc20UserOp,
+                erc20CallData: erc20UserOp.callData,
+                paymasterProvider,
+                shouldOverrideFee,
+            });
+            return paymasterResp;
         }
         return;
     }

package/dist/cjs/kernel-zerodev/paymaster/token-paymaster.js.map

@@ -1 +1 @@
-{"version":3,"file":"token-paymaster.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/paymaster/token-paymaster.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type PromiseOrValue,\n  type BytesLike,\n  type UserOperationCallData,\n  type UserOperationStruct,\n} from \"@alchemy/aa-core\";\nimport axios from \"axios\";\nimport {\n  type Hex,\n  toHex,\n  decodeFunctionData,\n  encodeFunctionData,\n  isAddress,\n} from \"viem\";\nimport { ERC20Abi } from \"../abis/ERC20Abi.js\";\nimport { KernelAccountAbi } from \"../abis/KernelAccountAbi.js\";\nimport { MultiSendAbi } from \"../abis/MultiSendAbi.js\";\nimport {\n  PAYMASTER_URL,\n  ENTRYPOINT_ADDRESS,\n  MULTISEND_ADDR,\n  ERC20_APPROVAL_AMOUNT,\n} from \"../constants.js\";\nimport {\n  AccountNotConnected,\n  IncorrectCallDataForTokenPaymaster,\n} from \"../errors.js\";\nimport type { ZeroDevProvider } from \"../provider.js\";\nimport {\n  getGasTokenAddress,\n  type UserOperationCallDataWithDelegate,\n} from \"../utils.js\";\nimport { Paymaster } from \"./base.js\";\nimport {\n  type PaymasterAndBundlerProviders,\n  type PaymasterConfig,\n} from \"./types.js\";\nimport { getChainId } from \"../api/index.js\";\n\nexport class TokenPaymaster extends Paymaster {\n  constructor(\n    provider: ZeroDevProvider,\n    protected paymasterConfig: PaymasterConfig<\"TOKEN_PAYMASTER\">\n  ) {\n    super(provider);\n  }\n  async getPaymasterAddress(\n    paymasterProvider?: PaymasterAndBundlerProviders\n  ): Promise<Hex | undefined> {\n    const chainId = await getChainId(this.provider.getProjectId());\n\n    try {\n      const { data: paymasterResp } = await axios.post(\n        `${PAYMASTER_URL}/getPaymasterAddress`,\n        {\n          chainId,\n          entryPointAddress: ENTRYPOINT_ADDRESS,\n          paymasterProvider,\n        },\n        { headers: { \"Content-Type\": \"application/json\" } }\n      );\n      return paymasterResp as Hex;\n    } catch (e) {\n      console.log(e);\n      return undefined;\n    }\n  }\n  async decodeMainCallFromCallData(\n    kernelAddress: PromiseOrValue<string>,\n    callData: PromiseOrValue<BytesLike>\n  ): Promise<UserOperationCallDataWithDelegate | undefined> {\n    let data: Hex = \"0x\";\n    if (callData instanceof Promise) {\n      const _data = await callData;\n      if (_data instanceof Uint8Array) {\n        data = toHex(_data);\n      } else {\n        data = _data as Hex;\n      }\n    } else if (callData instanceof Uint8Array) {\n      data = toHex(callData);\n    } else {\n      data = callData as Hex;\n    }\n\n    try {\n      const { functionName, args } = decodeFunctionData({\n        abi: KernelAccountAbi,\n        data: data,\n      });\n      if (functionName === \"execute\") {\n        const [target, value, data] = args;\n        let msFuntionName;\n        try {\n          ({ functionName: msFuntionName } = decodeFunctionData({\n            abi: MultiSendAbi,\n            data,\n          }));\n        } catch (error) {}\n        let mainCall:\n          | UserOperationCallData\n          | UserOperationCallDataWithDelegate = {\n          target,\n          value: value ?? 0n,\n          data,\n        };\n        if (msFuntionName === \"multiSend\") {\n          mainCall = {\n            ...mainCall,\n            target: MULTISEND_ADDR,\n            delegateCall: true,\n            data,\n          };\n        }\n        return mainCall;\n      }\n    } catch (error) {\n      return {\n        target: (kernelAddress instanceof Promise\n          ? await kernelAddress\n          : kernelAddress) as Hex,\n        data,\n        value: 0n,\n        delegateCall: true,\n      };\n    }\n    return;\n  }\n\n  async getERC20UserOp(\n    struct: UserOperationStruct,\n    mainCall: UserOperationCallDataWithDelegate,\n    gasTokenAddress: Hex,\n    paymasterAddress: Hex\n  ): Promise<UserOperationStruct | undefined> {\n    try {\n      const approveData: UserOperationCallData = {\n        target: gasTokenAddress,\n        value: BigInt(0),\n        data: encodeFunctionData({\n          abi: ERC20Abi,\n          functionName: \"approve\",\n          args: [paymasterAddress, ERC20_APPROVAL_AMOUNT[gasTokenAddress]],\n        }),\n      };\n      if (!this.provider.account) {\n        throw AccountNotConnected;\n      }\n      const erc20CallData = await this.provider.account.encodeBatchExecute([\n        approveData,\n        mainCall,\n      ]);\n      return {\n        ...struct,\n        callData: erc20CallData,\n        callGasLimit: await this.provider.rpcClient.estimateGas({\n          account: ENTRYPOINT_ADDRESS,\n          to: await this.provider.getAddress(),\n          data: erc20CallData,\n        }),\n        signature: await this.provider\n          .getAccount()\n          .getValidator()\n          .getDynamicDummySignature(\n            (await struct.sender) as Hex,\n            erc20CallData\n          ),\n      };\n    } catch (error) {\n      return;\n    }\n  }\n\n  async getPaymasterResponse(\n    struct: UserOperationStruct,\n    paymasterProvider?: PaymasterAndBundlerProviders,\n    shouldOverrideFee?: boolean\n  ): Promise<UserOperationStruct | undefined> {\n    try {\n      const mainCall = await this.decodeMainCallFromCallData(\n        struct.sender,\n        struct.callData\n      );\n      if (!mainCall) {\n        throw IncorrectCallDataForTokenPaymaster;\n      }\n      const chainId = await getChainId(this.provider.getProjectId());\n      if (!chainId) {\n        throw new Error(\"ChainId not found\");\n      }\n      const gasTokenAddress = getGasTokenAddress(\n        this.paymasterConfig.gasToken,\n        chainId\n      );\n      let paymasterAddress = await this.getPaymasterAddress(paymasterProvider);\n      if (\n        gasTokenAddress !== undefined &&\n        paymasterAddress !== undefined &&\n        isAddress(paymasterAddress)\n      ) {\n        const erc20UserOp = await this.getERC20UserOp(\n          struct,\n          mainCall,\n          gasTokenAddress,\n          paymasterAddress\n        );\n        if (!erc20UserOp) {\n          return;\n        }\n        const paymasterResp = await this.signUserOp({\n          userOp: struct,\n          callData: struct.callData,\n          gasTokenAddress,\n          erc20UserOp,\n          erc20CallData: erc20UserOp.callData,\n          paymasterProvider,\n          shouldOverrideFee,\n        });\n        if (paymasterResp) {\n          return paymasterResp;\n        }\n      }\n    } catch (error) {\n      console.log(error);\n    }\n    return;\n  }\n}\n"]}
+{"version":3,"file":"token-paymaster.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/paymaster/token-paymaster.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type PromiseOrValue,\n  type BytesLike,\n  type UserOperationCallData,\n  type UserOperationStruct,\n  type BatchUserOperationCallData,\n} from \"@alchemy/aa-core\";\nimport axios from \"axios\";\nimport {\n  type Hex,\n  toHex,\n  decodeFunctionData,\n  encodeFunctionData,\n  isAddress,\n} from \"viem\";\nimport { ERC20Abi } from \"../abis/ERC20Abi.js\";\nimport { KernelAccountAbi } from \"../abis/KernelAccountAbi.js\";\nimport {\n  PAYMASTER_URL,\n  ENTRYPOINT_ADDRESS,\n  ERC20_APPROVAL_AMOUNT,\n  MULTISEND_ADDR,\n} from \"../constants.js\";\nimport {\n  AccountNotConnected,\n  IncorrectCallDataForTokenPaymaster,\n} from \"../errors.js\";\nimport type { ZeroDevProvider } from \"../provider.js\";\nimport {\n  getGasTokenAddress,\n  type UserOperationCallDataWithDelegate,\n} from \"../utils.js\";\nimport { Paymaster } from \"./base.js\";\nimport {\n  type PaymasterAndBundlerProviders,\n  type PaymasterConfig,\n} from \"./types.js\";\nimport { getChainId } from \"../api/index.js\";\nimport { MultiSendAbi } from \"../abis/MultiSendAbi.js\";\n\nexport function isBatchUserOperationCallData(\n  data: any\n): data is BatchUserOperationCallData {\n  return data && Array.isArray(data);\n}\nexport class TokenPaymaster extends Paymaster {\n  constructor(\n    provider: ZeroDevProvider,\n    protected paymasterConfig: PaymasterConfig<\"TOKEN_PAYMASTER\">\n  ) {\n    super(provider);\n  }\n  async getPaymasterAddress(\n    paymasterProvider?: PaymasterAndBundlerProviders\n  ): Promise<Hex | undefined> {\n    const chainId = await getChainId(this.provider.getProjectId());\n\n    try {\n      const { data: paymasterResp } = await axios.post(\n        `${PAYMASTER_URL}/getPaymasterAddress`,\n        {\n          chainId,\n          entryPointAddress: ENTRYPOINT_ADDRESS,\n          paymasterProvider,\n        },\n        { headers: { \"Content-Type\": \"application/json\" } }\n      );\n      return paymasterResp as Hex;\n    } catch (e) {\n      console.log(e);\n      return undefined;\n    }\n  }\n  async decodeMainCallFromCallData(\n    kernelAddress: PromiseOrValue<string>,\n    callData: PromiseOrValue<BytesLike>\n  ): Promise<\n    | UserOperationCallData\n    | BatchUserOperationCallData\n    | UserOperationCallDataWithDelegate\n    | undefined\n  > {\n    let data: Hex = \"0x\";\n    if (callData instanceof Promise) {\n      const _data = await callData;\n      if (_data instanceof Uint8Array) {\n        data = toHex(_data);\n      } else {\n        data = _data as Hex;\n      }\n    } else if (callData instanceof Uint8Array) {\n      data = toHex(callData);\n    } else {\n      data = callData as Hex;\n    }\n\n    try {\n      const { functionName, args } = decodeFunctionData({\n        abi: KernelAccountAbi,\n        data: data,\n      });\n      if (functionName === \"execute\") {\n        const [target, value, data] = args;\n        let msFuntionName;\n        try {\n          ({ functionName: msFuntionName } = decodeFunctionData({\n            abi: MultiSendAbi,\n            data,\n          }));\n        } catch (error) {}\n        let mainCall:\n          | UserOperationCallData\n          | UserOperationCallDataWithDelegate = {\n          target,\n          value: value ?? 0n,\n          data,\n        };\n        if (msFuntionName === \"multiSend\") {\n          mainCall = {\n            ...mainCall,\n            target: MULTISEND_ADDR,\n            delegateCall: true,\n            data,\n          };\n        }\n        return mainCall;\n      } else if (functionName === \"executeBatch\") {\n        const [txs] = args;\n        return txs.map((tx) => ({\n          target: tx.to,\n          value: tx.value ?? 0n,\n          data: tx.data,\n        }));\n      }\n    } catch (error) {\n      return {\n        target: (kernelAddress instanceof Promise\n          ? await kernelAddress\n          : kernelAddress) as Hex,\n        data,\n        value: 0n,\n        delegateCall: true,\n      };\n    }\n    return;\n  }\n\n  async getERC20UserOp<\n    T extends UserOperationCallData | BatchUserOperationCallData\n  >(\n    struct: UserOperationStruct,\n    mainCall: T,\n    gasTokenAddress: Hex,\n    paymasterAddress: Hex\n  ): Promise<UserOperationStruct | undefined> {\n    try {\n      const approveData: UserOperationCallData = {\n        target: gasTokenAddress,\n        value: BigInt(0),\n        data: encodeFunctionData({\n          abi: ERC20Abi,\n          functionName: \"approve\",\n          args: [paymasterAddress, ERC20_APPROVAL_AMOUNT[gasTokenAddress]],\n        }),\n      };\n      if (!this.provider.account) {\n        throw AccountNotConnected;\n      }\n\n      let calls: BatchUserOperationCallData;\n\n      if (isBatchUserOperationCallData(mainCall)) {\n        calls = [approveData, ...mainCall];\n      } else {\n        calls = [approveData, mainCall];\n      }\n      const erc20CallData = await this.provider.account.encodeBatchExecute(\n        calls\n      );\n      return {\n        ...struct,\n        callData: erc20CallData,\n        callGasLimit: await this.provider.rpcClient.estimateGas({\n          account: ENTRYPOINT_ADDRESS,\n          to: await this.provider.getAddress(),\n          data: erc20CallData,\n        }),\n        signature: await this.provider\n          .getAccount()\n          .getValidator()\n          .getDynamicDummySignature(\n            (await struct.sender) as Hex,\n            erc20CallData\n          ),\n      };\n    } catch (error) {\n      return;\n    }\n  }\n\n  async getPaymasterResponse(\n    struct: UserOperationStruct,\n    paymasterProvider?: PaymasterAndBundlerProviders,\n    shouldOverrideFee?: boolean\n  ): Promise<UserOperationStruct | undefined> {\n    const mainCall = await this.decodeMainCallFromCallData(\n      struct.sender,\n      struct.callData\n    );\n    if (!mainCall) {\n      throw IncorrectCallDataForTokenPaymaster;\n    }\n    const chainId = await getChainId(this.provider.getProjectId());\n    if (!chainId) {\n      throw new Error(\"ChainId not found\");\n    }\n    const gasTokenAddress = getGasTokenAddress(\n      this.paymasterConfig.gasToken,\n      chainId\n    );\n    let paymasterAddress = await this.getPaymasterAddress(paymasterProvider);\n    if (\n      gasTokenAddress !== undefined &&\n      paymasterAddress !== undefined &&\n      isAddress(paymasterAddress)\n    ) {\n      const erc20UserOp = await this.getERC20UserOp(\n        struct,\n        mainCall,\n        gasTokenAddress,\n        paymasterAddress\n      );\n      if (!erc20UserOp) {\n        return;\n      }\n      const paymasterResp = await this.signUserOp({\n        userOp: struct,\n        callData: struct.callData,\n        gasTokenAddress,\n        erc20UserOp,\n        erc20CallData: erc20UserOp.callData,\n        paymasterProvider,\n        shouldOverrideFee,\n      });\n      return paymasterResp;\n    }\n    return;\n  }\n}\n"]}

package/dist/cjs/kernel-zerodev/paymaster/verifying-paymaster.js

@@ -8,21 +8,13 @@ class VerifyingPaymaster extends base_js_1.Paymaster {
         super(provider);
     }
     async getPaymasterResponse(struct, paymasterProvider, shouldOverrideFee) {
-        try {
-            const hexifiedUserOp = (0, aa_core_1.deepHexlify)(await (0, aa_core_1.resolveProperties)(struct));
-            const paymasterResp = await this.signUserOp({
-                userOp: hexifiedUserOp,
-                paymasterProvider,
-                shouldOverrideFee,
-            });
-            if (paymasterResp) {
-                return paymasterResp;
-            }
-        }
-        catch (error) {
-            console.log(error);
-        }
-        return;
+        const hexifiedUserOp = (0, aa_core_1.deepHexlify)(await (0, aa_core_1.resolveProperties)(struct));
+        const paymasterResp = await this.signUserOp({
+            userOp: hexifiedUserOp,
+            paymasterProvider,
+            shouldOverrideFee,
+        });
+        return paymasterResp;
     }
 }
 exports.VerifyingPaymaster = VerifyingPaymaster;

package/dist/cjs/kernel-zerodev/paymaster/verifying-paymaster.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifying-paymaster.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/paymaster/verifying-paymaster.ts"],"names":[],"mappings":";;;AAAA,8CAI0B;AAC1B,uCAAsC;AAItC,MAAa,kBAAmB,SAAQ,mBAAS;IAC/C,YACE,QAAyB,EACzB,CAAyC;QAEzC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAClB,CAAC;IACD,KAAK,CAAC,oBAAoB,CACxB,MAA2B,EAC3B,iBAAgD,EAChD,iBAA2B;QAE3B,IAAI;YACF,MAAM,cAAc,GAAG,IAAA,qBAAW,EAAC,MAAM,IAAA,2BAAiB,EAAC,MAAM,CAAC,CAAC,CAAC;YACpE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC;gBAC1C,MAAM,EAAE,cAAc;gBACtB,iBAAiB;gBACjB,iBAAiB;aAClB,CAAC,CAAC;YACH,IAAI,aAAa,EAAE;gBACjB,OAAO,aAAa,CAAC;aACtB;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACpB;QACD,OAAO;IACT,CAAC;CACF;AA3BD,gDA2BC","sourcesContent":["import {\n  type UserOperationStruct,\n  deepHexlify,\n  resolveProperties,\n} from \"@alchemy/aa-core\";\nimport { Paymaster } from \"./base.js\";\nimport type { ZeroDevProvider } from \"../provider.js\";\nimport type { PaymasterAndBundlerProviders, PaymasterConfig } from \"./types.js\";\n\nexport class VerifyingPaymaster extends Paymaster {\n  constructor(\n    provider: ZeroDevProvider,\n    _: PaymasterConfig<\"VERIFYING_PAYMASTER\">\n  ) {\n    super(provider);\n  }\n  async getPaymasterResponse(\n    struct: UserOperationStruct,\n    paymasterProvider?: PaymasterAndBundlerProviders,\n    shouldOverrideFee?: boolean\n  ): Promise<UserOperationStruct | undefined> {\n    try {\n      const hexifiedUserOp = deepHexlify(await resolveProperties(struct));\n      const paymasterResp = await this.signUserOp({\n        userOp: hexifiedUserOp,\n        paymasterProvider,\n        shouldOverrideFee,\n      });\n      if (paymasterResp) {\n        return paymasterResp;\n      }\n    } catch (error) {\n      console.log(error);\n    }\n    return;\n  }\n}\n"]}
+{"version":3,"file":"verifying-paymaster.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/paymaster/verifying-paymaster.ts"],"names":[],"mappings":";;;AAAA,8CAI0B;AAC1B,uCAAsC;AAItC,MAAa,kBAAmB,SAAQ,mBAAS;IAC/C,YACE,QAAyB,EACzB,CAAyC;QAEzC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAClB,CAAC;IACD,KAAK,CAAC,oBAAoB,CACxB,MAA2B,EAC3B,iBAAgD,EAChD,iBAA2B;QAE3B,MAAM,cAAc,GAAG,IAAA,qBAAW,EAAC,MAAM,IAAA,2BAAiB,EAAC,MAAM,CAAC,CAAC,CAAC;QACpE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC;YAC1C,MAAM,EAAE,cAAc;YACtB,iBAAiB;YACjB,iBAAiB;SAClB,CAAC,CAAC;QACH,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AApBD,gDAoBC","sourcesContent":["import {\n  type UserOperationStruct,\n  deepHexlify,\n  resolveProperties,\n} from \"@alchemy/aa-core\";\nimport { Paymaster } from \"./base.js\";\nimport type { ZeroDevProvider } from \"../provider.js\";\nimport type { PaymasterAndBundlerProviders, PaymasterConfig } from \"./types.js\";\n\nexport class VerifyingPaymaster extends Paymaster {\n  constructor(\n    provider: ZeroDevProvider,\n    _: PaymasterConfig<\"VERIFYING_PAYMASTER\">\n  ) {\n    super(provider);\n  }\n  async getPaymasterResponse(\n    struct: UserOperationStruct,\n    paymasterProvider?: PaymasterAndBundlerProviders,\n    shouldOverrideFee?: boolean\n  ): Promise<UserOperationStruct | undefined> {\n    const hexifiedUserOp = deepHexlify(await resolveProperties(struct));\n    const paymasterResp = await this.signUserOp({\n      userOp: hexifiedUserOp,\n      paymasterProvider,\n      shouldOverrideFee,\n    });\n    return paymasterResp;\n  }\n}\n"]}

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

@@ -174,8 +174,7 @@ class ZeroDevProvider extends aa_core_1.SmartAccountProvider {
             configurable: true,
             writable: true,
             value: async (struct) => {
-                struct.paymasterAndData =
-                    "0xfe7dbcab8aaee4eb67943c1e6be95b1d065985c6000000000000000000000000000000000000000000000000000001869aa31cf400000000000000000000000000000000000000000000000000000000000000007dfe2190f34af27b265bae608717cdc9368b471fc0c097ab7b4088f255b4961e57b039e7e571b15221081c5dce7bcb93459b27a3ab65d2f8a889f4a40b4022801b";
+                struct.paymasterAndData = "0x";
                 return struct;
             }
         });