@zerodev/sdk 4.1.0 → 4.1.2

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/validator/base.js

@@ -164,12 +164,29 @@ class KernelBaseValidator {
         if (!this.chain) {
             throw new Error("Validator uninitialized");
         }
+        let kernelImplAddr;
+        try {
+            const strgAddr = await this.getPublicClient().getStorageAt({
+                address: kernel,
+                slot: "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+            });
+            kernelImplAddr = strgAddr
+                ? ("0x" + strgAddr.slice(26))
+                : strgAddr;
+        }
+        catch (error) { }
         const sender = kernel;
         const signer = await this.signer();
         const ownerSig = await signer.signTypedData({
             domain: {
                 name: "Kernel",
-                version: "0.2.1",
+                version: kernelImplAddr?.toLowerCase() === constants_js_1.KERNEL_IMPL_ADDRESS.toLowerCase() ||
+                    kernelImplAddr?.toLowerCase() ===
+                        "0x8dD4DBB54d8A8Cf0DE6F9CCC4609470A30EfF18C".toLowerCase() ||
+                    kernelImplAddr === undefined ||
+                    kernelImplAddr === viem_1.zeroAddress
+                    ? "0.2.2"
+                    : "0.2.1",
                 chainId: this.chain.id,
                 verifyingContract: sender,
             },

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

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/validator/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type SignTypedDataParams,\n  type SmartAccountSigner,\n  type UserOperationRequest,\n} from \"@alchemy/aa-core\";\nimport {\n  concat,\n  type Chain,\n  type Hex,\n  pad,\n  toHex,\n  type Address,\n  concatHex,\n  hexToBigInt,\n  type PublicClient,\n  type Transport,\n  createPublicClient,\n  http,\n} from \"viem\";\nimport { KernelAccountAbi } from \"../abis/KernelAccountAbi.js\";\nimport {\n  BUNDLER_URL,\n  CHAIN_ID_TO_NODE,\n  ECDSA_VALIDATOR_ADDRESS,\n  ENTRYPOINT_ADDRESS,\n} from \"../constants.js\";\nimport { polygonMumbai } from \"viem/chains\";\n\nexport enum ValidatorMode {\n  sudo = \"0x00000000\",\n  plugin = \"0x00000001\",\n  enable = \"0x00000002\",\n}\n\nexport interface KernelBaseValidatorParams {\n  projectId: string;\n  validatorAddress?: Hex;\n  mode?: ValidatorMode;\n  chain?: Chain;\n  entryPointAddress?: Address;\n  enableSignature?: Hex;\n  validUntil?: number;\n  validAfter?: number;\n  executor?: Address;\n  selector?: Hex;\n  rpcUrl?: string;\n}\n\nexport type ValidatorPluginData = Required<\n  Pick<\n    KernelBaseValidatorParams,\n    \"executor\" | \"selector\" | \"validAfter\" | \"validUntil\"\n  >\n>;\n\n//Kernel wallet implementation separates out validation and execution phase. It allows you to have\n// custom wrapper logic for the validation phase in addition to signature of choice.\nexport abstract class KernelBaseValidator {\n  readonly validatorAddress: Hex;\n  mode: ValidatorMode;\n  protected projectId: string;\n  protected chain?: Chain;\n  protected entryPointAddress: Address;\n  protected enableSignature?: Hex;\n  protected validUntil: number;\n  protected validAfter: number;\n  protected executor?: Address;\n  protected selector?: Hex;\n  protected rpcUrl?: string;\n  publicClient?: PublicClient<Transport, Chain>;\n\n  constructor(params: KernelBaseValidatorParams) {\n    this.projectId = params.projectId;\n    this.validatorAddress = params.validatorAddress ?? ECDSA_VALIDATOR_ADDRESS;\n    this.mode = params.mode ?? ValidatorMode.sudo;\n    this.entryPointAddress = params.entryPointAddress ?? ENTRYPOINT_ADDRESS;\n    this.enableSignature = params.enableSignature;\n    this.validUntil = params.validUntil ?? 0;\n    this.validAfter = params.validAfter ?? 0;\n    this.executor = params.executor;\n    this.selector = params.selector;\n    this.chain = params.chain;\n    this.rpcUrl = params.rpcUrl ?? BUNDLER_URL;\n    this.publicClient = createPublicClient({\n      transport: http(CHAIN_ID_TO_NODE[this.chain?.id ?? polygonMumbai.id]),\n      chain: this.chain ?? polygonMumbai,\n    });\n  }\n\n  abstract encodeEnable(enableData: Hex): Hex;\n\n  abstract encodeDisable(enableData: Hex): Hex;\n\n  abstract getEnableData(): Promise<Hex>;\n\n  abstract signMessage(message: Uint8Array | string | Hex): Promise<Hex>;\n\n  abstract signTypedData(params: SignTypedDataParams): Promise<Hex>;\n\n  abstract signUserOp(userOp: UserOperationRequest): Promise<Hex>;\n\n  abstract signer(): Promise<SmartAccountSigner>;\n\n  abstract getDummyUserOpSignature(callData?: Hex): Promise<Hex>;\n\n  abstract isPluginEnabled(\n    kernelAccountAddress: Address,\n    selector: Hex\n  ): Promise<boolean>;\n\n  shouldDelegateViaFallback(): boolean {\n    return true;\n  }\n\n  getPluginValidatorData(): ValidatorPluginData {\n    if (!this.selector || !this.executor) {\n      throw Error(\"Plugin Validator data params uninitialised\");\n    }\n    return {\n      selector: this.selector,\n      executor: this.executor,\n      validAfter: this.validAfter,\n      validUntil: this.validUntil,\n    };\n  }\n\n  getNonceKey(): bigint {\n    return 0n;\n  }\n\n  async getDynamicDummySignature(\n    kernelAccountAddress: Address,\n    calldata: Hex\n  ): Promise<Hex> {\n    const dummyECDSASig =\n      \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n    const validatorMode = await this.resolveValidatorMode(\n      kernelAccountAddress,\n      calldata\n    );\n    if (validatorMode === ValidatorMode.enable) {\n      const enableData = await this.getEnableData();\n      const enableDataLength = enableData.length / 2 - 1;\n      const enableSigLength = 65;\n      const staticDummySig = concatHex([\n        \"0x000000000000000000000000\",\n        this.getAddress(),\n        this.executor!,\n      ]);\n\n      return concatHex([\n        ValidatorMode.enable,\n        staticDummySig,\n        pad(toHex(enableDataLength), { size: 32 }),\n        enableData,\n        pad(toHex(enableSigLength), { size: 32 }),\n        dummyECDSASig,\n        await this.getDummyUserOpSignature(calldata),\n      ]);\n    }\n    return concatHex([\n      validatorMode,\n      await this.getDummyUserOpSignature(calldata),\n    ]);\n  }\n\n  setEnableSignature(enableSignature: Hex) {\n    this.enableSignature = enableSignature;\n  }\n\n  getEnableSignature(): Hex | undefined {\n    return this.enableSignature;\n  }\n\n  getAddress(): Hex {\n    return this.validatorAddress;\n  }\n\n  getPublicClient(): PublicClient<Transport, Chain> {\n    if (!this.publicClient) {\n      throw new Error(\"Validator uninitialized: PublicClient missing\");\n    }\n    return this.publicClient;\n  }\n\n  async approveExecutor(\n    kernel: Address,\n    selector: Hex,\n    executor: Address,\n    validUntil: number,\n    validAfter: number,\n    validator: KernelBaseValidator\n  ): Promise<Hex> {\n    if (!this.chain) {\n      throw new Error(\"Validator uninitialized\");\n    }\n    const sender = kernel;\n    const signer = await this.signer();\n    const ownerSig = await signer.signTypedData({\n      domain: {\n        name: \"Kernel\",\n        version: \"0.2.1\",\n        chainId: this.chain.id,\n        verifyingContract: sender,\n      },\n      types: {\n        ValidatorApproved: [\n          { name: \"sig\", type: \"bytes4\" },\n          { name: \"validatorData\", type: \"uint256\" },\n          { name: \"executor\", type: \"address\" },\n          { name: \"enableData\", type: \"bytes\" },\n        ],\n      },\n      message: {\n        sig: selector as Hex,\n        validatorData: hexToBigInt(\n          concatHex([\n            pad(toHex(validUntil), { size: 6 }),\n            pad(toHex(validAfter), { size: 6 }),\n            validator.getAddress(),\n          ]),\n          { size: 32 }\n        ),\n        executor: executor as Address,\n        enableData: await validator.getEnableData(),\n      },\n      primaryType: \"ValidatorApproved\",\n    });\n    return ownerSig;\n  }\n\n  async resolveValidatorMode(\n    kernelAccountAddress: Address,\n    callData: Hex\n  ): Promise<ValidatorMode> {\n    if (!this.chain || !this.publicClient) {\n      throw new Error(\"Validator uninitialized\");\n    }\n\n    let mode: ValidatorMode;\n    try {\n      const defaultValidatorAddress = await this.publicClient.readContract({\n        abi: KernelAccountAbi,\n        address: kernelAccountAddress,\n        functionName: \"getDefaultValidator\",\n      });\n      if (\n        defaultValidatorAddress?.toLowerCase() ===\n          this.validatorAddress.toLowerCase() ||\n        this.mode === ValidatorMode.sudo\n      ) {\n        mode = ValidatorMode.sudo;\n      } else if (\n        await this.isPluginEnabled(\n          kernelAccountAddress,\n          callData.toString().slice(0, 10) as Hex\n        )\n      ) {\n        mode = ValidatorMode.plugin;\n      } else {\n        mode = ValidatorMode.enable;\n      }\n    } catch (error) {\n      if (this.mode === ValidatorMode.plugin) {\n        mode = ValidatorMode.enable;\n      } else {\n        mode = this.mode;\n      }\n    }\n    return mode;\n  }\n\n  async getSignature(userOp: UserOperationRequest): Promise<Hex> {\n    const mode = await this.resolveValidatorMode(\n      userOp.sender,\n      userOp.callData\n    );\n    if (mode === ValidatorMode.sudo || mode === ValidatorMode.plugin) {\n      return concatHex([this.mode, await this.signUserOp(userOp)]);\n    } else {\n      const enableData = await this.getEnableData();\n      const enableDataLength = enableData.length / 2 - 1;\n      const enableSignature = this.getEnableSignature();\n      if (!enableSignature) {\n        throw new Error(\"Enable signature not set\");\n      }\n      return concat([\n        mode, // 4 bytes 0 - 4\n        pad(toHex(this.validUntil), { size: 6 }), // 6 bytes 4 - 10\n        pad(toHex(this.validAfter), { size: 6 }), // 6 bytes 10 - 16\n        pad(this.validatorAddress, { size: 20 }), // 20 bytes 16 - 36\n        pad(this.executor!, { size: 20 }), // 20 bytes 36 - 56\n        pad(toHex(enableDataLength), { size: 32 }), // 32 bytes 56 - 88\n        enableData, // 88 - 88 + enableData.length\n        pad(toHex(enableSignature.length / 2 - 1), { size: 32 }), // 32 bytes 88 + enableData.length - 120 + enableData.length\n        enableSignature, // 120 + enableData.length - 120 + enableData.length + enableSignature.length\n        await this.signUserOp(userOp), // 120 + enableData.length + enableSignature.length - 120 + enableData.length + enableSignature.length + userOperation.length\n      ]);\n    }\n  }\n}\n"]}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/validator/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type SignTypedDataParams,\n  type SmartAccountSigner,\n  type UserOperationRequest,\n} from \"@alchemy/aa-core\";\nimport {\n  concat,\n  type Chain,\n  type Hex,\n  pad,\n  toHex,\n  type Address,\n  concatHex,\n  hexToBigInt,\n  type PublicClient,\n  type Transport,\n  createPublicClient,\n  http,\n  zeroAddress,\n} from \"viem\";\nimport { KernelAccountAbi } from \"../abis/KernelAccountAbi.js\";\nimport {\n  BUNDLER_URL,\n  CHAIN_ID_TO_NODE,\n  ECDSA_VALIDATOR_ADDRESS,\n  ENTRYPOINT_ADDRESS,\n  KERNEL_IMPL_ADDRESS,\n} from \"../constants.js\";\nimport { polygonMumbai } from \"viem/chains\";\n\nexport enum ValidatorMode {\n  sudo = \"0x00000000\",\n  plugin = \"0x00000001\",\n  enable = \"0x00000002\",\n}\n\nexport interface KernelBaseValidatorParams {\n  projectId: string;\n  validatorAddress?: Hex;\n  mode?: ValidatorMode;\n  chain?: Chain;\n  entryPointAddress?: Address;\n  enableSignature?: Hex;\n  validUntil?: number;\n  validAfter?: number;\n  executor?: Address;\n  selector?: Hex;\n  rpcUrl?: string;\n}\n\nexport type ValidatorPluginData = Required<\n  Pick<\n    KernelBaseValidatorParams,\n    \"executor\" | \"selector\" | \"validAfter\" | \"validUntil\"\n  >\n>;\n\n//Kernel wallet implementation separates out validation and execution phase. It allows you to have\n// custom wrapper logic for the validation phase in addition to signature of choice.\nexport abstract class KernelBaseValidator {\n  readonly validatorAddress: Hex;\n  mode: ValidatorMode;\n  protected projectId: string;\n  protected chain?: Chain;\n  protected entryPointAddress: Address;\n  protected enableSignature?: Hex;\n  protected validUntil: number;\n  protected validAfter: number;\n  protected executor?: Address;\n  protected selector?: Hex;\n  protected rpcUrl?: string;\n  publicClient?: PublicClient<Transport, Chain>;\n\n  constructor(params: KernelBaseValidatorParams) {\n    this.projectId = params.projectId;\n    this.validatorAddress = params.validatorAddress ?? ECDSA_VALIDATOR_ADDRESS;\n    this.mode = params.mode ?? ValidatorMode.sudo;\n    this.entryPointAddress = params.entryPointAddress ?? ENTRYPOINT_ADDRESS;\n    this.enableSignature = params.enableSignature;\n    this.validUntil = params.validUntil ?? 0;\n    this.validAfter = params.validAfter ?? 0;\n    this.executor = params.executor;\n    this.selector = params.selector;\n    this.chain = params.chain;\n    this.rpcUrl = params.rpcUrl ?? BUNDLER_URL;\n    this.publicClient = createPublicClient({\n      transport: http(CHAIN_ID_TO_NODE[this.chain?.id ?? polygonMumbai.id]),\n      chain: this.chain ?? polygonMumbai,\n    });\n  }\n\n  abstract encodeEnable(enableData: Hex): Hex;\n\n  abstract encodeDisable(enableData: Hex): Hex;\n\n  abstract getEnableData(): Promise<Hex>;\n\n  abstract signMessage(message: Uint8Array | string | Hex): Promise<Hex>;\n\n  abstract signTypedData(params: SignTypedDataParams): Promise<Hex>;\n\n  abstract signUserOp(userOp: UserOperationRequest): Promise<Hex>;\n\n  abstract signer(): Promise<SmartAccountSigner>;\n\n  abstract getDummyUserOpSignature(callData?: Hex): Promise<Hex>;\n\n  abstract isPluginEnabled(\n    kernelAccountAddress: Address,\n    selector: Hex\n  ): Promise<boolean>;\n\n  shouldDelegateViaFallback(): boolean {\n    return true;\n  }\n\n  getPluginValidatorData(): ValidatorPluginData {\n    if (!this.selector || !this.executor) {\n      throw Error(\"Plugin Validator data params uninitialised\");\n    }\n    return {\n      selector: this.selector,\n      executor: this.executor,\n      validAfter: this.validAfter,\n      validUntil: this.validUntil,\n    };\n  }\n\n  getNonceKey(): bigint {\n    return 0n;\n  }\n\n  async getDynamicDummySignature(\n    kernelAccountAddress: Address,\n    calldata: Hex\n  ): Promise<Hex> {\n    const dummyECDSASig =\n      \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n    const validatorMode = await this.resolveValidatorMode(\n      kernelAccountAddress,\n      calldata\n    );\n    if (validatorMode === ValidatorMode.enable) {\n      const enableData = await this.getEnableData();\n      const enableDataLength = enableData.length / 2 - 1;\n      const enableSigLength = 65;\n      const staticDummySig = concatHex([\n        \"0x000000000000000000000000\",\n        this.getAddress(),\n        this.executor!,\n      ]);\n\n      return concatHex([\n        ValidatorMode.enable,\n        staticDummySig,\n        pad(toHex(enableDataLength), { size: 32 }),\n        enableData,\n        pad(toHex(enableSigLength), { size: 32 }),\n        dummyECDSASig,\n        await this.getDummyUserOpSignature(calldata),\n      ]);\n    }\n    return concatHex([\n      validatorMode,\n      await this.getDummyUserOpSignature(calldata),\n    ]);\n  }\n\n  setEnableSignature(enableSignature: Hex) {\n    this.enableSignature = enableSignature;\n  }\n\n  getEnableSignature(): Hex | undefined {\n    return this.enableSignature;\n  }\n\n  getAddress(): Hex {\n    return this.validatorAddress;\n  }\n\n  getPublicClient(): PublicClient<Transport, Chain> {\n    if (!this.publicClient) {\n      throw new Error(\"Validator uninitialized: PublicClient missing\");\n    }\n    return this.publicClient;\n  }\n\n  async approveExecutor(\n    kernel: Address,\n    selector: Hex,\n    executor: Address,\n    validUntil: number,\n    validAfter: number,\n    validator: KernelBaseValidator\n  ): Promise<Hex> {\n    if (!this.chain) {\n      throw new Error(\"Validator uninitialized\");\n    }\n    let kernelImplAddr;\n    try {\n      const strgAddr = await this.getPublicClient().getStorageAt({\n        address: kernel,\n        slot: \"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc\",\n      });\n      kernelImplAddr = strgAddr\n        ? ((\"0x\" + strgAddr.slice(26)) as Hex)\n        : strgAddr;\n    } catch (error) {}\n    const sender = kernel;\n    const signer = await this.signer();\n    const ownerSig = await signer.signTypedData({\n      domain: {\n        name: \"Kernel\",\n        version:\n          kernelImplAddr?.toLowerCase() === KERNEL_IMPL_ADDRESS.toLowerCase() ||\n          kernelImplAddr?.toLowerCase() ===\n            \"0x8dD4DBB54d8A8Cf0DE6F9CCC4609470A30EfF18C\".toLowerCase() ||\n          kernelImplAddr === undefined ||\n          kernelImplAddr === zeroAddress\n            ? \"0.2.2\"\n            : \"0.2.1\",\n        chainId: this.chain.id,\n        verifyingContract: sender,\n      },\n      types: {\n        ValidatorApproved: [\n          { name: \"sig\", type: \"bytes4\" },\n          { name: \"validatorData\", type: \"uint256\" },\n          { name: \"executor\", type: \"address\" },\n          { name: \"enableData\", type: \"bytes\" },\n        ],\n      },\n      message: {\n        sig: selector as Hex,\n        validatorData: hexToBigInt(\n          concatHex([\n            pad(toHex(validUntil), { size: 6 }),\n            pad(toHex(validAfter), { size: 6 }),\n            validator.getAddress(),\n          ]),\n          { size: 32 }\n        ),\n        executor: executor as Address,\n        enableData: await validator.getEnableData(),\n      },\n      primaryType: \"ValidatorApproved\",\n    });\n    return ownerSig;\n  }\n\n  async resolveValidatorMode(\n    kernelAccountAddress: Address,\n    callData: Hex\n  ): Promise<ValidatorMode> {\n    if (!this.chain || !this.publicClient) {\n      throw new Error(\"Validator uninitialized\");\n    }\n\n    let mode: ValidatorMode;\n    try {\n      const defaultValidatorAddress = await this.publicClient.readContract({\n        abi: KernelAccountAbi,\n        address: kernelAccountAddress,\n        functionName: \"getDefaultValidator\",\n      });\n      if (\n        defaultValidatorAddress?.toLowerCase() ===\n          this.validatorAddress.toLowerCase() ||\n        this.mode === ValidatorMode.sudo\n      ) {\n        mode = ValidatorMode.sudo;\n      } else if (\n        await this.isPluginEnabled(\n          kernelAccountAddress,\n          callData.toString().slice(0, 10) as Hex\n        )\n      ) {\n        mode = ValidatorMode.plugin;\n      } else {\n        mode = ValidatorMode.enable;\n      }\n    } catch (error) {\n      if (this.mode === ValidatorMode.plugin) {\n        mode = ValidatorMode.enable;\n      } else {\n        mode = this.mode;\n      }\n    }\n    return mode;\n  }\n\n  async getSignature(userOp: UserOperationRequest): Promise<Hex> {\n    const mode = await this.resolveValidatorMode(\n      userOp.sender,\n      userOp.callData\n    );\n    if (mode === ValidatorMode.sudo || mode === ValidatorMode.plugin) {\n      return concatHex([this.mode, await this.signUserOp(userOp)]);\n    } else {\n      const enableData = await this.getEnableData();\n      const enableDataLength = enableData.length / 2 - 1;\n      const enableSignature = this.getEnableSignature();\n      if (!enableSignature) {\n        throw new Error(\"Enable signature not set\");\n      }\n      return concat([\n        mode, // 4 bytes 0 - 4\n        pad(toHex(this.validUntil), { size: 6 }), // 6 bytes 4 - 10\n        pad(toHex(this.validAfter), { size: 6 }), // 6 bytes 10 - 16\n        pad(this.validatorAddress, { size: 20 }), // 20 bytes 16 - 36\n        pad(this.executor!, { size: 20 }), // 20 bytes 36 - 56\n        pad(toHex(enableDataLength), { size: 32 }), // 32 bytes 56 - 88\n        enableData, // 88 - 88 + enableData.length\n        pad(toHex(enableSignature.length / 2 - 1), { size: 32 }), // 32 bytes 88 + enableData.length - 120 + enableData.length\n        enableSignature, // 120 + enableData.length - 120 + enableData.length + enableSignature.length\n        await this.signUserOp(userOp), // 120 + enableData.length + enableSignature.length - 120 + enableData.length + enableSignature.length + userOperation.length\n      ]);\n    }\n  }\n}\n"]}

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

@@ -51,8 +51,7 @@ export 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/esm/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/esm/kernel-zerodev/validator/base.js

@@ -1,7 +1,7 @@
 import {} from "@alchemy/aa-core";
-import { concat, pad, toHex, concatHex, hexToBigInt, createPublicClient, http, } from "viem";
+import { concat, pad, toHex, concatHex, hexToBigInt, createPublicClient, http, zeroAddress, } from "viem";
 import { KernelAccountAbi } from "../abis/KernelAccountAbi.js";
-import { BUNDLER_URL, CHAIN_ID_TO_NODE, ECDSA_VALIDATOR_ADDRESS, ENTRYPOINT_ADDRESS, } from "../constants.js";
+import { BUNDLER_URL, CHAIN_ID_TO_NODE, ECDSA_VALIDATOR_ADDRESS, ENTRYPOINT_ADDRESS, KERNEL_IMPL_ADDRESS, } from "../constants.js";
 import { polygonMumbai } from "viem/chains";
 export var ValidatorMode;
 (function (ValidatorMode) {
@@ -162,12 +162,29 @@ export class KernelBaseValidator {
         if (!this.chain) {
             throw new Error("Validator uninitialized");
         }
+        let kernelImplAddr;
+        try {
+            const strgAddr = await this.getPublicClient().getStorageAt({
+                address: kernel,
+                slot: "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+            });
+            kernelImplAddr = strgAddr
+                ? ("0x" + strgAddr.slice(26))
+                : strgAddr;
+        }
+        catch (error) { }
         const sender = kernel;
         const signer = await this.signer();
         const ownerSig = await signer.signTypedData({
             domain: {
                 name: "Kernel",
-                version: "0.2.1",
+                version: kernelImplAddr?.toLowerCase() === KERNEL_IMPL_ADDRESS.toLowerCase() ||
+                    kernelImplAddr?.toLowerCase() ===
+                        "0x8dD4DBB54d8A8Cf0DE6F9CCC4609470A30EfF18C".toLowerCase() ||
+                    kernelImplAddr === undefined ||
+                    kernelImplAddr === zeroAddress
+                    ? "0.2.2"
+                    : "0.2.1",
                 chainId: this.chain.id,
                 verifyingContract: sender,
             },

package/dist/esm/kernel-zerodev/validator/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/validator/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type SignTypedDataParams,\n  type SmartAccountSigner,\n  type UserOperationRequest,\n} from \"@alchemy/aa-core\";\nimport {\n  concat,\n  type Chain,\n  type Hex,\n  pad,\n  toHex,\n  type Address,\n  concatHex,\n  hexToBigInt,\n  type PublicClient,\n  type Transport,\n  createPublicClient,\n  http,\n} from \"viem\";\nimport { KernelAccountAbi } from \"../abis/KernelAccountAbi.js\";\nimport {\n  BUNDLER_URL,\n  CHAIN_ID_TO_NODE,\n  ECDSA_VALIDATOR_ADDRESS,\n  ENTRYPOINT_ADDRESS,\n} from \"../constants.js\";\nimport { polygonMumbai } from \"viem/chains\";\n\nexport enum ValidatorMode {\n  sudo = \"0x00000000\",\n  plugin = \"0x00000001\",\n  enable = \"0x00000002\",\n}\n\nexport interface KernelBaseValidatorParams {\n  projectId: string;\n  validatorAddress?: Hex;\n  mode?: ValidatorMode;\n  chain?: Chain;\n  entryPointAddress?: Address;\n  enableSignature?: Hex;\n  validUntil?: number;\n  validAfter?: number;\n  executor?: Address;\n  selector?: Hex;\n  rpcUrl?: string;\n}\n\nexport type ValidatorPluginData = Required<\n  Pick<\n    KernelBaseValidatorParams,\n    \"executor\" | \"selector\" | \"validAfter\" | \"validUntil\"\n  >\n>;\n\n//Kernel wallet implementation separates out validation and execution phase. It allows you to have\n// custom wrapper logic for the validation phase in addition to signature of choice.\nexport abstract class KernelBaseValidator {\n  readonly validatorAddress: Hex;\n  mode: ValidatorMode;\n  protected projectId: string;\n  protected chain?: Chain;\n  protected entryPointAddress: Address;\n  protected enableSignature?: Hex;\n  protected validUntil: number;\n  protected validAfter: number;\n  protected executor?: Address;\n  protected selector?: Hex;\n  protected rpcUrl?: string;\n  publicClient?: PublicClient<Transport, Chain>;\n\n  constructor(params: KernelBaseValidatorParams) {\n    this.projectId = params.projectId;\n    this.validatorAddress = params.validatorAddress ?? ECDSA_VALIDATOR_ADDRESS;\n    this.mode = params.mode ?? ValidatorMode.sudo;\n    this.entryPointAddress = params.entryPointAddress ?? ENTRYPOINT_ADDRESS;\n    this.enableSignature = params.enableSignature;\n    this.validUntil = params.validUntil ?? 0;\n    this.validAfter = params.validAfter ?? 0;\n    this.executor = params.executor;\n    this.selector = params.selector;\n    this.chain = params.chain;\n    this.rpcUrl = params.rpcUrl ?? BUNDLER_URL;\n    this.publicClient = createPublicClient({\n      transport: http(CHAIN_ID_TO_NODE[this.chain?.id ?? polygonMumbai.id]),\n      chain: this.chain ?? polygonMumbai,\n    });\n  }\n\n  abstract encodeEnable(enableData: Hex): Hex;\n\n  abstract encodeDisable(enableData: Hex): Hex;\n\n  abstract getEnableData(): Promise<Hex>;\n\n  abstract signMessage(message: Uint8Array | string | Hex): Promise<Hex>;\n\n  abstract signTypedData(params: SignTypedDataParams): Promise<Hex>;\n\n  abstract signUserOp(userOp: UserOperationRequest): Promise<Hex>;\n\n  abstract signer(): Promise<SmartAccountSigner>;\n\n  abstract getDummyUserOpSignature(callData?: Hex): Promise<Hex>;\n\n  abstract isPluginEnabled(\n    kernelAccountAddress: Address,\n    selector: Hex\n  ): Promise<boolean>;\n\n  shouldDelegateViaFallback(): boolean {\n    return true;\n  }\n\n  getPluginValidatorData(): ValidatorPluginData {\n    if (!this.selector || !this.executor) {\n      throw Error(\"Plugin Validator data params uninitialised\");\n    }\n    return {\n      selector: this.selector,\n      executor: this.executor,\n      validAfter: this.validAfter,\n      validUntil: this.validUntil,\n    };\n  }\n\n  getNonceKey(): bigint {\n    return 0n;\n  }\n\n  async getDynamicDummySignature(\n    kernelAccountAddress: Address,\n    calldata: Hex\n  ): Promise<Hex> {\n    const dummyECDSASig =\n      \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n    const validatorMode = await this.resolveValidatorMode(\n      kernelAccountAddress,\n      calldata\n    );\n    if (validatorMode === ValidatorMode.enable) {\n      const enableData = await this.getEnableData();\n      const enableDataLength = enableData.length / 2 - 1;\n      const enableSigLength = 65;\n      const staticDummySig = concatHex([\n        \"0x000000000000000000000000\",\n        this.getAddress(),\n        this.executor!,\n      ]);\n\n      return concatHex([\n        ValidatorMode.enable,\n        staticDummySig,\n        pad(toHex(enableDataLength), { size: 32 }),\n        enableData,\n        pad(toHex(enableSigLength), { size: 32 }),\n        dummyECDSASig,\n        await this.getDummyUserOpSignature(calldata),\n      ]);\n    }\n    return concatHex([\n      validatorMode,\n      await this.getDummyUserOpSignature(calldata),\n    ]);\n  }\n\n  setEnableSignature(enableSignature: Hex) {\n    this.enableSignature = enableSignature;\n  }\n\n  getEnableSignature(): Hex | undefined {\n    return this.enableSignature;\n  }\n\n  getAddress(): Hex {\n    return this.validatorAddress;\n  }\n\n  getPublicClient(): PublicClient<Transport, Chain> {\n    if (!this.publicClient) {\n      throw new Error(\"Validator uninitialized: PublicClient missing\");\n    }\n    return this.publicClient;\n  }\n\n  async approveExecutor(\n    kernel: Address,\n    selector: Hex,\n    executor: Address,\n    validUntil: number,\n    validAfter: number,\n    validator: KernelBaseValidator\n  ): Promise<Hex> {\n    if (!this.chain) {\n      throw new Error(\"Validator uninitialized\");\n    }\n    const sender = kernel;\n    const signer = await this.signer();\n    const ownerSig = await signer.signTypedData({\n      domain: {\n        name: \"Kernel\",\n        version: \"0.2.1\",\n        chainId: this.chain.id,\n        verifyingContract: sender,\n      },\n      types: {\n        ValidatorApproved: [\n          { name: \"sig\", type: \"bytes4\" },\n          { name: \"validatorData\", type: \"uint256\" },\n          { name: \"executor\", type: \"address\" },\n          { name: \"enableData\", type: \"bytes\" },\n        ],\n      },\n      message: {\n        sig: selector as Hex,\n        validatorData: hexToBigInt(\n          concatHex([\n            pad(toHex(validUntil), { size: 6 }),\n            pad(toHex(validAfter), { size: 6 }),\n            validator.getAddress(),\n          ]),\n          { size: 32 }\n        ),\n        executor: executor as Address,\n        enableData: await validator.getEnableData(),\n      },\n      primaryType: \"ValidatorApproved\",\n    });\n    return ownerSig;\n  }\n\n  async resolveValidatorMode(\n    kernelAccountAddress: Address,\n    callData: Hex\n  ): Promise<ValidatorMode> {\n    if (!this.chain || !this.publicClient) {\n      throw new Error(\"Validator uninitialized\");\n    }\n\n    let mode: ValidatorMode;\n    try {\n      const defaultValidatorAddress = await this.publicClient.readContract({\n        abi: KernelAccountAbi,\n        address: kernelAccountAddress,\n        functionName: \"getDefaultValidator\",\n      });\n      if (\n        defaultValidatorAddress?.toLowerCase() ===\n          this.validatorAddress.toLowerCase() ||\n        this.mode === ValidatorMode.sudo\n      ) {\n        mode = ValidatorMode.sudo;\n      } else if (\n        await this.isPluginEnabled(\n          kernelAccountAddress,\n          callData.toString().slice(0, 10) as Hex\n        )\n      ) {\n        mode = ValidatorMode.plugin;\n      } else {\n        mode = ValidatorMode.enable;\n      }\n    } catch (error) {\n      if (this.mode === ValidatorMode.plugin) {\n        mode = ValidatorMode.enable;\n      } else {\n        mode = this.mode;\n      }\n    }\n    return mode;\n  }\n\n  async getSignature(userOp: UserOperationRequest): Promise<Hex> {\n    const mode = await this.resolveValidatorMode(\n      userOp.sender,\n      userOp.callData\n    );\n    if (mode === ValidatorMode.sudo || mode === ValidatorMode.plugin) {\n      return concatHex([this.mode, await this.signUserOp(userOp)]);\n    } else {\n      const enableData = await this.getEnableData();\n      const enableDataLength = enableData.length / 2 - 1;\n      const enableSignature = this.getEnableSignature();\n      if (!enableSignature) {\n        throw new Error(\"Enable signature not set\");\n      }\n      return concat([\n        mode, // 4 bytes 0 - 4\n        pad(toHex(this.validUntil), { size: 6 }), // 6 bytes 4 - 10\n        pad(toHex(this.validAfter), { size: 6 }), // 6 bytes 10 - 16\n        pad(this.validatorAddress, { size: 20 }), // 20 bytes 16 - 36\n        pad(this.executor!, { size: 20 }), // 20 bytes 36 - 56\n        pad(toHex(enableDataLength), { size: 32 }), // 32 bytes 56 - 88\n        enableData, // 88 - 88 + enableData.length\n        pad(toHex(enableSignature.length / 2 - 1), { size: 32 }), // 32 bytes 88 + enableData.length - 120 + enableData.length\n        enableSignature, // 120 + enableData.length - 120 + enableData.length + enableSignature.length\n        await this.signUserOp(userOp), // 120 + enableData.length + enableSignature.length - 120 + enableData.length + enableSignature.length + userOperation.length\n      ]);\n    }\n  }\n}\n"]}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/validator/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type SignTypedDataParams,\n  type SmartAccountSigner,\n  type UserOperationRequest,\n} from \"@alchemy/aa-core\";\nimport {\n  concat,\n  type Chain,\n  type Hex,\n  pad,\n  toHex,\n  type Address,\n  concatHex,\n  hexToBigInt,\n  type PublicClient,\n  type Transport,\n  createPublicClient,\n  http,\n  zeroAddress,\n} from \"viem\";\nimport { KernelAccountAbi } from \"../abis/KernelAccountAbi.js\";\nimport {\n  BUNDLER_URL,\n  CHAIN_ID_TO_NODE,\n  ECDSA_VALIDATOR_ADDRESS,\n  ENTRYPOINT_ADDRESS,\n  KERNEL_IMPL_ADDRESS,\n} from \"../constants.js\";\nimport { polygonMumbai } from \"viem/chains\";\n\nexport enum ValidatorMode {\n  sudo = \"0x00000000\",\n  plugin = \"0x00000001\",\n  enable = \"0x00000002\",\n}\n\nexport interface KernelBaseValidatorParams {\n  projectId: string;\n  validatorAddress?: Hex;\n  mode?: ValidatorMode;\n  chain?: Chain;\n  entryPointAddress?: Address;\n  enableSignature?: Hex;\n  validUntil?: number;\n  validAfter?: number;\n  executor?: Address;\n  selector?: Hex;\n  rpcUrl?: string;\n}\n\nexport type ValidatorPluginData = Required<\n  Pick<\n    KernelBaseValidatorParams,\n    \"executor\" | \"selector\" | \"validAfter\" | \"validUntil\"\n  >\n>;\n\n//Kernel wallet implementation separates out validation and execution phase. It allows you to have\n// custom wrapper logic for the validation phase in addition to signature of choice.\nexport abstract class KernelBaseValidator {\n  readonly validatorAddress: Hex;\n  mode: ValidatorMode;\n  protected projectId: string;\n  protected chain?: Chain;\n  protected entryPointAddress: Address;\n  protected enableSignature?: Hex;\n  protected validUntil: number;\n  protected validAfter: number;\n  protected executor?: Address;\n  protected selector?: Hex;\n  protected rpcUrl?: string;\n  publicClient?: PublicClient<Transport, Chain>;\n\n  constructor(params: KernelBaseValidatorParams) {\n    this.projectId = params.projectId;\n    this.validatorAddress = params.validatorAddress ?? ECDSA_VALIDATOR_ADDRESS;\n    this.mode = params.mode ?? ValidatorMode.sudo;\n    this.entryPointAddress = params.entryPointAddress ?? ENTRYPOINT_ADDRESS;\n    this.enableSignature = params.enableSignature;\n    this.validUntil = params.validUntil ?? 0;\n    this.validAfter = params.validAfter ?? 0;\n    this.executor = params.executor;\n    this.selector = params.selector;\n    this.chain = params.chain;\n    this.rpcUrl = params.rpcUrl ?? BUNDLER_URL;\n    this.publicClient = createPublicClient({\n      transport: http(CHAIN_ID_TO_NODE[this.chain?.id ?? polygonMumbai.id]),\n      chain: this.chain ?? polygonMumbai,\n    });\n  }\n\n  abstract encodeEnable(enableData: Hex): Hex;\n\n  abstract encodeDisable(enableData: Hex): Hex;\n\n  abstract getEnableData(): Promise<Hex>;\n\n  abstract signMessage(message: Uint8Array | string | Hex): Promise<Hex>;\n\n  abstract signTypedData(params: SignTypedDataParams): Promise<Hex>;\n\n  abstract signUserOp(userOp: UserOperationRequest): Promise<Hex>;\n\n  abstract signer(): Promise<SmartAccountSigner>;\n\n  abstract getDummyUserOpSignature(callData?: Hex): Promise<Hex>;\n\n  abstract isPluginEnabled(\n    kernelAccountAddress: Address,\n    selector: Hex\n  ): Promise<boolean>;\n\n  shouldDelegateViaFallback(): boolean {\n    return true;\n  }\n\n  getPluginValidatorData(): ValidatorPluginData {\n    if (!this.selector || !this.executor) {\n      throw Error(\"Plugin Validator data params uninitialised\");\n    }\n    return {\n      selector: this.selector,\n      executor: this.executor,\n      validAfter: this.validAfter,\n      validUntil: this.validUntil,\n    };\n  }\n\n  getNonceKey(): bigint {\n    return 0n;\n  }\n\n  async getDynamicDummySignature(\n    kernelAccountAddress: Address,\n    calldata: Hex\n  ): Promise<Hex> {\n    const dummyECDSASig =\n      \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n    const validatorMode = await this.resolveValidatorMode(\n      kernelAccountAddress,\n      calldata\n    );\n    if (validatorMode === ValidatorMode.enable) {\n      const enableData = await this.getEnableData();\n      const enableDataLength = enableData.length / 2 - 1;\n      const enableSigLength = 65;\n      const staticDummySig = concatHex([\n        \"0x000000000000000000000000\",\n        this.getAddress(),\n        this.executor!,\n      ]);\n\n      return concatHex([\n        ValidatorMode.enable,\n        staticDummySig,\n        pad(toHex(enableDataLength), { size: 32 }),\n        enableData,\n        pad(toHex(enableSigLength), { size: 32 }),\n        dummyECDSASig,\n        await this.getDummyUserOpSignature(calldata),\n      ]);\n    }\n    return concatHex([\n      validatorMode,\n      await this.getDummyUserOpSignature(calldata),\n    ]);\n  }\n\n  setEnableSignature(enableSignature: Hex) {\n    this.enableSignature = enableSignature;\n  }\n\n  getEnableSignature(): Hex | undefined {\n    return this.enableSignature;\n  }\n\n  getAddress(): Hex {\n    return this.validatorAddress;\n  }\n\n  getPublicClient(): PublicClient<Transport, Chain> {\n    if (!this.publicClient) {\n      throw new Error(\"Validator uninitialized: PublicClient missing\");\n    }\n    return this.publicClient;\n  }\n\n  async approveExecutor(\n    kernel: Address,\n    selector: Hex,\n    executor: Address,\n    validUntil: number,\n    validAfter: number,\n    validator: KernelBaseValidator\n  ): Promise<Hex> {\n    if (!this.chain) {\n      throw new Error(\"Validator uninitialized\");\n    }\n    let kernelImplAddr;\n    try {\n      const strgAddr = await this.getPublicClient().getStorageAt({\n        address: kernel,\n        slot: \"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc\",\n      });\n      kernelImplAddr = strgAddr\n        ? ((\"0x\" + strgAddr.slice(26)) as Hex)\n        : strgAddr;\n    } catch (error) {}\n    const sender = kernel;\n    const signer = await this.signer();\n    const ownerSig = await signer.signTypedData({\n      domain: {\n        name: \"Kernel\",\n        version:\n          kernelImplAddr?.toLowerCase() === KERNEL_IMPL_ADDRESS.toLowerCase() ||\n          kernelImplAddr?.toLowerCase() ===\n            \"0x8dD4DBB54d8A8Cf0DE6F9CCC4609470A30EfF18C\".toLowerCase() ||\n          kernelImplAddr === undefined ||\n          kernelImplAddr === zeroAddress\n            ? \"0.2.2\"\n            : \"0.2.1\",\n        chainId: this.chain.id,\n        verifyingContract: sender,\n      },\n      types: {\n        ValidatorApproved: [\n          { name: \"sig\", type: \"bytes4\" },\n          { name: \"validatorData\", type: \"uint256\" },\n          { name: \"executor\", type: \"address\" },\n          { name: \"enableData\", type: \"bytes\" },\n        ],\n      },\n      message: {\n        sig: selector as Hex,\n        validatorData: hexToBigInt(\n          concatHex([\n            pad(toHex(validUntil), { size: 6 }),\n            pad(toHex(validAfter), { size: 6 }),\n            validator.getAddress(),\n          ]),\n          { size: 32 }\n        ),\n        executor: executor as Address,\n        enableData: await validator.getEnableData(),\n      },\n      primaryType: \"ValidatorApproved\",\n    });\n    return ownerSig;\n  }\n\n  async resolveValidatorMode(\n    kernelAccountAddress: Address,\n    callData: Hex\n  ): Promise<ValidatorMode> {\n    if (!this.chain || !this.publicClient) {\n      throw new Error(\"Validator uninitialized\");\n    }\n\n    let mode: ValidatorMode;\n    try {\n      const defaultValidatorAddress = await this.publicClient.readContract({\n        abi: KernelAccountAbi,\n        address: kernelAccountAddress,\n        functionName: \"getDefaultValidator\",\n      });\n      if (\n        defaultValidatorAddress?.toLowerCase() ===\n          this.validatorAddress.toLowerCase() ||\n        this.mode === ValidatorMode.sudo\n      ) {\n        mode = ValidatorMode.sudo;\n      } else if (\n        await this.isPluginEnabled(\n          kernelAccountAddress,\n          callData.toString().slice(0, 10) as Hex\n        )\n      ) {\n        mode = ValidatorMode.plugin;\n      } else {\n        mode = ValidatorMode.enable;\n      }\n    } catch (error) {\n      if (this.mode === ValidatorMode.plugin) {\n        mode = ValidatorMode.enable;\n      } else {\n        mode = this.mode;\n      }\n    }\n    return mode;\n  }\n\n  async getSignature(userOp: UserOperationRequest): Promise<Hex> {\n    const mode = await this.resolveValidatorMode(\n      userOp.sender,\n      userOp.callData\n    );\n    if (mode === ValidatorMode.sudo || mode === ValidatorMode.plugin) {\n      return concatHex([this.mode, await this.signUserOp(userOp)]);\n    } else {\n      const enableData = await this.getEnableData();\n      const enableDataLength = enableData.length / 2 - 1;\n      const enableSignature = this.getEnableSignature();\n      if (!enableSignature) {\n        throw new Error(\"Enable signature not set\");\n      }\n      return concat([\n        mode, // 4 bytes 0 - 4\n        pad(toHex(this.validUntil), { size: 6 }), // 6 bytes 4 - 10\n        pad(toHex(this.validAfter), { size: 6 }), // 6 bytes 10 - 16\n        pad(this.validatorAddress, { size: 20 }), // 20 bytes 16 - 36\n        pad(this.executor!, { size: 20 }), // 20 bytes 36 - 56\n        pad(toHex(enableDataLength), { size: 32 }), // 32 bytes 56 - 88\n        enableData, // 88 - 88 + enableData.length\n        pad(toHex(enableSignature.length / 2 - 1), { size: 32 }), // 32 bytes 88 + enableData.length - 120 + enableData.length\n        enableSignature, // 120 + enableData.length - 120 + enableData.length + enableSignature.length\n        await this.signUserOp(userOp), // 120 + enableData.length + enableSignature.length - 120 + enableData.length + enableSignature.length + userOperation.length\n      ]);\n    }\n  }\n}\n"]}

package/dist/types/kernel-zerodev/middleware/gas-estimator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gas-estimator.d.ts","sourceRoot":"","sources":["../../../../src/kernel-zerodev/middleware/gas-estimator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAGL,KAAK,mBAAmB,EAExB,KAAK,YAAY,EAElB,MAAM,kBAAkB,CAAC;AAI1B,eAAO,MAAM,uBAAuB,aACxB,eAAe,KACxB,eAmFF,CAAC;AAEF,eAAO,MAAM,mBAAmB,aACpB,eAAe,aACd,MAAM,KAChB,QAAQ,MAAM,CAShB,CAAC;AAMF,eAAO,MAAM,qBAAqB,WACxB,QAAQ,mBAAmB,CAAC,KACnC,QAAQ,MAAM,CAGhB,CAAC;AAEF,eAAO,MAAM,eAAe,aAAoB,eAAe;;;EAkB9D,CAAC;AACF,UAAU,OAAO;IACf,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,oBAAoB,EAAE,YAAY,GAAG,IAAI,CAAC;CAC3C;AAED,eAAO,MAAM,UAAU,aACX,eAAe,KACxB,QAAQ,OAAO,CAgCjB,CAAC"}
+{"version":3,"file":"gas-estimator.d.ts","sourceRoot":"","sources":["../../../../src/kernel-zerodev/middleware/gas-estimator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAGL,KAAK,mBAAmB,EAExB,KAAK,YAAY,EAElB,MAAM,kBAAkB,CAAC;AAI1B,eAAO,MAAM,uBAAuB,aACxB,eAAe,KACxB,eAkFF,CAAC;AAEF,eAAO,MAAM,mBAAmB,aACpB,eAAe,aACd,MAAM,KAChB,QAAQ,MAAM,CAShB,CAAC;AAMF,eAAO,MAAM,qBAAqB,WACxB,QAAQ,mBAAmB,CAAC,KACnC,QAAQ,MAAM,CAGhB,CAAC;AAEF,eAAO,MAAM,eAAe,aAAoB,eAAe;;;EAkB9D,CAAC;AACF,UAAU,OAAO;IACf,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,oBAAoB,EAAE,YAAY,GAAG,IAAI,CAAC;CAC3C;AAED,eAAO,MAAM,UAAU,aACX,eAAe,KACxB,QAAQ,OAAO,CAgCjB,CAAC"}

package/dist/types/kernel-zerodev/validator/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/kernel-zerodev/validator/base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/kernel-zerodev/validator/base.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/kernel-zerodev/middleware/gas-estimator.ts

@@ -83,8 +83,7 @@ export const withZeroDevGasEstimator = (
     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;
 

package/src/kernel-zerodev/validator/base.ts

@@ -16,6 +16,7 @@ import {
   type Transport,
   createPublicClient,
   http,
+  zeroAddress,
 } from "viem";
 import { KernelAccountAbi } from "../abis/KernelAccountAbi.js";
 import {
@@ -23,6 +24,7 @@ import {
   CHAIN_ID_TO_NODE,
   ECDSA_VALIDATOR_ADDRESS,
   ENTRYPOINT_ADDRESS,
+  KERNEL_IMPL_ADDRESS,
 } from "../constants.js";
 import { polygonMumbai } from "viem/chains";
 
@@ -194,12 +196,29 @@ export abstract class KernelBaseValidator {
     if (!this.chain) {
       throw new Error("Validator uninitialized");
     }
+    let kernelImplAddr;
+    try {
+      const strgAddr = await this.getPublicClient().getStorageAt({
+        address: kernel,
+        slot: "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+      });
+      kernelImplAddr = strgAddr
+        ? (("0x" + strgAddr.slice(26)) as Hex)
+        : strgAddr;
+    } catch (error) {}
     const sender = kernel;
     const signer = await this.signer();
     const ownerSig = await signer.signTypedData({
       domain: {
         name: "Kernel",
-        version: "0.2.1",
+        version:
+          kernelImplAddr?.toLowerCase() === KERNEL_IMPL_ADDRESS.toLowerCase() ||
+          kernelImplAddr?.toLowerCase() ===
+            "0x8dD4DBB54d8A8Cf0DE6F9CCC4609470A30EfF18C".toLowerCase() ||
+          kernelImplAddr === undefined ||
+          kernelImplAddr === zeroAddress
+            ? "0.2.2"
+            : "0.2.1",
         chainId: this.chain.id,
         verifyingContract: sender,
       },