@zerodev/sdk 4.2.2 → 4.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (65) hide show
  1. package/dist/cjs/kernel-zerodev/abis/SessionKeyValidatorAbi.d.ts +58 -4
  2. package/dist/cjs/kernel-zerodev/abis/SessionKeyValidatorAbi.js +75 -4
  3. package/dist/cjs/kernel-zerodev/abis/SessionKeyValidatorAbi.js.map +1 -1
  4. package/dist/cjs/kernel-zerodev/client/create-client.js +1 -0
  5. package/dist/cjs/kernel-zerodev/client/create-client.js.map +1 -1
  6. package/dist/cjs/kernel-zerodev/constants.d.ts +1 -1
  7. package/dist/cjs/kernel-zerodev/constants.js +2 -2
  8. package/dist/cjs/kernel-zerodev/constants.js.map +1 -1
  9. package/dist/cjs/kernel-zerodev/middleware/gas-estimator.d.ts +4 -0
  10. package/dist/cjs/kernel-zerodev/middleware/gas-estimator.js +15 -7
  11. package/dist/cjs/kernel-zerodev/middleware/gas-estimator.js.map +1 -1
  12. package/dist/cjs/kernel-zerodev/validator/base.d.ts +1 -1
  13. package/dist/cjs/kernel-zerodev/validator/base.js +3 -3
  14. package/dist/cjs/kernel-zerodev/validator/base.js.map +1 -1
  15. package/dist/cjs/kernel-zerodev/validator/session-key-validator.d.ts +18 -7
  16. package/dist/cjs/kernel-zerodev/validator/session-key-validator.js +117 -63
  17. package/dist/cjs/kernel-zerodev/validator/session-key-validator.js.map +1 -1
  18. package/dist/cjs/kernel-zerodev/validator/types.d.ts +1 -1
  19. package/dist/cjs/kernel-zerodev/validator/types.js.map +1 -1
  20. package/dist/cjs/kernel-zerodev/validator-provider/base.js +9 -0
  21. package/dist/cjs/kernel-zerodev/validator-provider/base.js.map +1 -1
  22. package/dist/esm/kernel-zerodev/abis/SessionKeyValidatorAbi.d.ts +58 -4
  23. package/dist/esm/kernel-zerodev/abis/SessionKeyValidatorAbi.js +75 -4
  24. package/dist/esm/kernel-zerodev/abis/SessionKeyValidatorAbi.js.map +1 -1
  25. package/dist/esm/kernel-zerodev/client/create-client.js +1 -0
  26. package/dist/esm/kernel-zerodev/client/create-client.js.map +1 -1
  27. package/dist/esm/kernel-zerodev/constants.d.ts +1 -1
  28. package/dist/esm/kernel-zerodev/constants.js +2 -2
  29. package/dist/esm/kernel-zerodev/constants.js.map +1 -1
  30. package/dist/esm/kernel-zerodev/middleware/gas-estimator.d.ts +4 -0
  31. package/dist/esm/kernel-zerodev/middleware/gas-estimator.js +15 -6
  32. package/dist/esm/kernel-zerodev/middleware/gas-estimator.js.map +1 -1
  33. package/dist/esm/kernel-zerodev/validator/base.d.ts +1 -1
  34. package/dist/esm/kernel-zerodev/validator/base.js +3 -3
  35. package/dist/esm/kernel-zerodev/validator/base.js.map +1 -1
  36. package/dist/esm/kernel-zerodev/validator/session-key-validator.d.ts +18 -7
  37. package/dist/esm/kernel-zerodev/validator/session-key-validator.js +118 -64
  38. package/dist/esm/kernel-zerodev/validator/session-key-validator.js.map +1 -1
  39. package/dist/esm/kernel-zerodev/validator/types.d.ts +1 -1
  40. package/dist/esm/kernel-zerodev/validator/types.js.map +1 -1
  41. package/dist/esm/kernel-zerodev/validator-provider/base.js +9 -0
  42. package/dist/esm/kernel-zerodev/validator-provider/base.js.map +1 -1
  43. package/dist/types/kernel-zerodev/abis/SessionKeyValidatorAbi.d.ts +58 -4
  44. package/dist/types/kernel-zerodev/abis/SessionKeyValidatorAbi.d.ts.map +1 -1
  45. package/dist/types/kernel-zerodev/client/create-client.d.ts.map +1 -1
  46. package/dist/types/kernel-zerodev/constants.d.ts +1 -1
  47. package/dist/types/kernel-zerodev/middleware/gas-estimator.d.ts +4 -0
  48. package/dist/types/kernel-zerodev/middleware/gas-estimator.d.ts.map +1 -1
  49. package/dist/types/kernel-zerodev/validator/base.d.ts +1 -1
  50. package/dist/types/kernel-zerodev/validator/base.d.ts.map +1 -1
  51. package/dist/types/kernel-zerodev/validator/session-key-validator.d.ts +18 -7
  52. package/dist/types/kernel-zerodev/validator/session-key-validator.d.ts.map +1 -1
  53. package/dist/types/kernel-zerodev/validator/types.d.ts +1 -1
  54. package/dist/types/kernel-zerodev/validator/types.d.ts.map +1 -1
  55. package/dist/types/kernel-zerodev/validator-provider/base.d.ts.map +1 -1
  56. package/package.json +5 -4
  57. package/src/kernel-zerodev/__tests__/config/index.ts +18 -0
  58. package/src/kernel-zerodev/abis/SessionKeyValidatorAbi.ts +75 -4
  59. package/src/kernel-zerodev/client/create-client.ts +1 -0
  60. package/src/kernel-zerodev/constants.ts +2 -2
  61. package/src/kernel-zerodev/middleware/gas-estimator.ts +21 -7
  62. package/src/kernel-zerodev/validator/base.ts +4 -4
  63. package/src/kernel-zerodev/validator/session-key-validator.ts +159 -88
  64. package/src/kernel-zerodev/validator/types.ts +1 -1
  65. package/src/kernel-zerodev/validator-provider/base.ts +13 -0
@@ -1 +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 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"]}
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 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(kernelAccountAddress?: Address): 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(kernelAccountAddress);\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(kernel),\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(userOp.sender);\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"]}
@@ -2,7 +2,6 @@ import { type Address, type Hex, type SmartAccountSigner, type UserOperationRequ
2
2
  import { KernelBaseValidator, type KernelBaseValidatorParams, type ValidatorPluginData } from "./base.js";
3
3
  import { type GetAbiItemParameters } from "viem";
4
4
  import { MerkleTree } from "merkletreejs";
5
- import { Operation } from "../provider.js";
6
5
  import type { GetAbiItemReturnType } from "viem/dist/types/utils/abi/getAbiItem.js";
7
6
  import type { GeneratePermissionFromArgsParameters } from "./types.js";
8
7
  export interface SessionKeyValidatorParams extends KernelBaseValidatorParams {
@@ -22,6 +21,15 @@ export declare enum ParamOperator {
22
21
  LESS_THAN_OR_EQUAL = 4,
23
22
  NOT_EQUAL = 5
24
23
  }
24
+ export type SessionNonces = {
25
+ lastNonce: bigint;
26
+ invalidNonce: bigint;
27
+ };
28
+ export type ExecutionRule = {
29
+ validAfter: number;
30
+ interval: number;
31
+ runs: number;
32
+ };
25
33
  export interface ParamRules {
26
34
  offset: number;
27
35
  condition: ParamOperator;
@@ -29,10 +37,11 @@ export interface ParamRules {
29
37
  }
30
38
  export type Permission = {
31
39
  target: Address;
40
+ index?: number;
32
41
  rules?: ParamRules[];
33
42
  sig?: Hex;
34
43
  valueLimit?: bigint;
35
- operation?: Operation;
44
+ executionRule?: ExecutionRule;
36
45
  };
37
46
  export interface SessionKeyData {
38
47
  validUntil: number;
@@ -41,7 +50,7 @@ export interface SessionKeyData {
41
50
  permissions?: Permission[];
42
51
  }
43
52
  export declare function getAbiItem<TAbi extends Abi | readonly unknown[], TItemName extends string>({ abi, args, name, }: GetAbiItemParameters<TAbi, TItemName>): GetAbiItemReturnType<TAbi, TItemName>;
44
- export declare function getPermissionFromABI<TAbi extends Abi | readonly unknown[], TFunctionName extends string | undefined = string>({ abi, target, args, functionName, operation, valueLimit, }: GeneratePermissionFromArgsParameters<TAbi, TFunctionName>): Permission;
53
+ export declare function getPermissionFromABI<TAbi extends Abi | readonly unknown[], TFunctionName extends string | undefined = string>({ abi, target, args, functionName, valueLimit, }: GeneratePermissionFromArgsParameters<TAbi, TFunctionName>): Permission;
45
54
  export declare class SessionKeyValidator extends KernelBaseValidator {
46
55
  protected sessionKey: SmartAccountSigner;
47
56
  sessionKeyData: SessionKeyData;
@@ -49,19 +58,21 @@ export declare class SessionKeyValidator extends KernelBaseValidator {
49
58
  constructor(params: SessionKeyValidatorParams);
50
59
  static init(params: SessionKeyValidatorParams): Promise<SessionKeyValidator>;
51
60
  shouldDelegateViaFallback(): boolean;
52
- findMatchingPermission(callData: Hex): Permission | undefined;
53
- private filterByOperation;
61
+ findMatchingPermissions(callData: Hex): Permission | Permission[] | undefined;
62
+ private filterPermissions;
54
63
  private filterBySignature;
55
64
  private findPermissionByRule;
56
65
  private getFormattedHex;
57
66
  private evaluateRuleCondition;
58
67
  getMerkleTree(): MerkleTree;
59
- encodePermissionData(permission: Permission, merkleProof?: string[]): Hex;
68
+ encodePermissionData(permission: Permission | Permission[], merkleProof?: string[] | string[][]): Hex;
60
69
  getSessionData(): SessionKeyParams;
61
70
  signer(): Promise<SmartAccountSigner>;
62
- getEnableData(): Promise<Hex>;
71
+ getSessionNonces(kernelAccountAddress: Address): Promise<SessionNonces>;
72
+ getEnableData(kernelAccountAddress?: Address, enabledLastNonce?: bigint): Promise<Hex>;
63
73
  isPluginEnabled(kernelAccountAddress: Address, selector: Hex): Promise<boolean>;
64
74
  getDummyUserOpSignature(callData: Hex): Promise<Hex>;
75
+ private getEncodedPermissionProofData;
65
76
  encodeEnable(sessionKeyEnableData: Hex): Hex;
66
77
  encodeDisable(sessionKey: Hex): Hex;
67
78
  signMessage(message: string | Uint8Array): Promise<Hex>;
@@ -1,12 +1,11 @@
1
1
  import { getUserOperationHash, getChain, } from "@alchemy/aa-core";
2
2
  import { KernelBaseValidator, ValidatorMode, } from "./base.js";
3
- import { encodeFunctionData, toBytes, concat, pad, toHex, keccak256, encodeAbiParameters, concatHex, zeroAddress, decodeFunctionData, isHex, getFunctionSelector, } from "viem";
3
+ import { encodeFunctionData, toBytes, concat, pad, toHex, encodeAbiParameters, concatHex, zeroAddress, decodeFunctionData, isHex, getFunctionSelector, keccak256, } from "viem";
4
4
  import { formatAbiItem } from "viem/utils";
5
5
  import { SessionKeyValidatorAbi } from "../abis/SessionKeyValidatorAbi.js";
6
6
  import { DUMMY_ECDSA_SIG } from "../constants.js";
7
7
  import { KernelAccountAbi } from "../abis/KernelAccountAbi.js";
8
8
  import { MerkleTree } from "merkletreejs";
9
- import { Operation } from "../provider.js";
10
9
  import { getChainId } from "../api/index.js";
11
10
  import { fixSignedData } from "../utils.js";
12
11
  import {} from "abitype";
@@ -54,7 +53,7 @@ export function getAbiItem({ abi, args = [], name, }) {
54
53
  .map((item) => formatAbiItem(item))
55
54
  .reduce((a, c) => `${a}\n${c}`)}`);
56
55
  }
57
- export function getPermissionFromABI({ abi, target, args, functionName, operation, valueLimit, }) {
56
+ export function getPermissionFromABI({ abi, target, args, functionName, valueLimit, }) {
58
57
  const abiItem = getAbiItem({
59
58
  abi,
60
59
  args,
@@ -80,7 +79,6 @@ export function getPermissionFromABI({ abi, target, args, functionName, operatio
80
79
  sig: functionSelector,
81
80
  rules: paramRules,
82
81
  target,
83
- operation: operation ?? Operation.Call,
84
82
  valueLimit: valueLimit ?? 0n,
85
83
  };
86
84
  }
@@ -112,17 +110,19 @@ export class SessionKeyValidator extends KernelBaseValidator {
112
110
  validUntil: params.sessionKeyData.validUntil ?? 0,
113
111
  paymaster: params.sessionKeyData.paymaster ?? zeroAddress,
114
112
  };
115
- this.sessionKeyData.permissions = this.sessionKeyData.permissions?.map((perm) => ({
113
+ this.sessionKeyData.permissions = this.sessionKeyData.permissions?.map((perm, index) => ({
116
114
  ...perm,
117
- operation: perm.operation ?? Operation.Call,
118
115
  valueLimit: perm.valueLimit ?? 0n,
119
116
  sig: perm.sig ?? pad("0x", { size: 4 }),
120
117
  rules: perm.rules ?? [],
118
+ index,
119
+ executionRule: perm.executionRule ?? {
120
+ validAfter: 0,
121
+ interval: 0,
122
+ runs: 0,
123
+ },
121
124
  }));
122
125
  this.merkleTree = this.getMerkleTree();
123
- if (this.shouldDelegateViaFallback()) {
124
- throw Error("Session key permissions not set");
125
- }
126
126
  this.selector =
127
127
  params.selector ??
128
128
  getFunctionSelector("execute(address, uint256, bytes, uint8)");
@@ -141,29 +141,53 @@ export class SessionKeyValidator extends KernelBaseValidator {
141
141
  shouldDelegateViaFallback() {
142
142
  return this.merkleTree.getHexRoot() === pad("0x00", { size: 32 });
143
143
  }
144
- findMatchingPermission(callData) {
144
+ findMatchingPermissions(callData) {
145
145
  try {
146
146
  const { functionName, args } = decodeFunctionData({
147
147
  abi: KernelAccountAbi,
148
148
  data: callData,
149
149
  });
150
- if (functionName !== "execute")
150
+ if (functionName !== "execute" && functionName !== "executeBatch")
151
151
  return undefined;
152
+ if (functionName === "execute") {
153
+ const [to, value, data] = args;
154
+ return this.filterPermissions([to], [data], [value])?.[0];
155
+ }
156
+ else if (functionName === "executeBatch") {
157
+ let targets = [], values = [], dataArray = [];
158
+ args[0].forEach((arg) => {
159
+ targets.push(arg.to);
160
+ values.push(arg.value);
161
+ dataArray.push(arg.data);
162
+ });
163
+ return this.filterPermissions(targets, dataArray, values);
164
+ }
165
+ else {
166
+ throw Error("Invalid function");
167
+ }
168
+ }
169
+ catch (error) {
170
+ return undefined;
171
+ }
172
+ }
173
+ filterPermissions(targets, dataArray, values) {
174
+ if (targets.length !== dataArray.length ||
175
+ targets.length !== values.length) {
176
+ throw Error("Invalid arguments");
177
+ }
178
+ const filteredPermissions = targets.map((target, index) => {
152
179
  const permissionsList = this.sessionKeyData.permissions;
153
180
  if (!permissionsList || !permissionsList.length)
154
181
  return undefined;
155
- const targetToMatch = args[0].toLowerCase();
182
+ const targetToMatch = target.toLowerCase();
156
183
  let targetPermissions = permissionsList.filter((permission) => permission.target.toLowerCase() === targetToMatch);
157
184
  if (!targetPermissions.length) {
158
185
  targetPermissions = permissionsList.filter((permission) => permission.target.toLowerCase() === zeroAddress.toLowerCase());
159
186
  }
160
187
  if (!targetPermissions.length)
161
188
  return undefined;
162
- const operationPermissions = this.filterByOperation(targetPermissions, args[3]);
163
- if (!operationPermissions.length)
164
- return undefined;
165
- const signaturePermissions = this.filterBySignature(operationPermissions, args[2].slice(0, 10).toLowerCase());
166
- const valueLimitPermissions = signaturePermissions.filter((permission) => (permission.valueLimit ?? 0n) >= args[1]);
189
+ const signaturePermissions = this.filterBySignature(targetPermissions, dataArray[index].slice(0, 10).toLowerCase());
190
+ const valueLimitPermissions = signaturePermissions.filter((permission) => (permission.valueLimit ?? 0n) >= values[index]);
167
191
  if (!valueLimitPermissions.length)
168
192
  return undefined;
169
193
  const sortedPermissions = valueLimitPermissions.sort((a, b) => {
@@ -177,14 +201,11 @@ export class SessionKeyValidator extends KernelBaseValidator {
177
201
  return 0;
178
202
  }
179
203
  });
180
- return this.findPermissionByRule(sortedPermissions, args[2]);
181
- }
182
- catch (error) {
183
- return undefined;
184
- }
185
- }
186
- filterByOperation(permissions, operation) {
187
- return permissions.filter((permission) => permission.operation === operation || Operation.Call === operation);
204
+ return this.findPermissionByRule(sortedPermissions, dataArray[index]);
205
+ });
206
+ return filteredPermissions.every((permission) => permission !== undefined)
207
+ ? filteredPermissions
208
+ : undefined;
188
209
  }
189
210
  filterBySignature(permissions, signature) {
190
211
  return permissions.filter((permission) => (permission.sig ?? pad("0x", { size: 4 })).toLowerCase() === signature);
@@ -226,32 +247,38 @@ export class SessionKeyValidator extends KernelBaseValidator {
226
247
  }
227
248
  getMerkleTree() {
228
249
  const permissionPacked = this.sessionKeyData.permissions?.map((permission) => this.encodePermissionData(permission));
229
- if (permissionPacked?.length === 1)
250
+ if (permissionPacked && permissionPacked.length === 1)
230
251
  permissionPacked.push(permissionPacked[0]);
231
252
  return permissionPacked && permissionPacked.length !== 0
232
253
  ? new MerkleTree(permissionPacked, keccak256, {
233
- sortPairs: true,
234
254
  hashLeaves: true,
255
+ complete: true,
256
+ sort: true,
235
257
  })
236
258
  : new MerkleTree([pad("0x00", { size: 32 })], keccak256, {
237
259
  hashLeaves: false,
260
+ complete: true,
238
261
  });
239
262
  }
240
263
  encodePermissionData(permission, merkleProof) {
241
264
  let permissionParam = {
242
265
  components: [
243
266
  {
244
- name: "target",
245
- type: "address",
267
+ name: "index",
268
+ type: "uint32",
246
269
  },
247
270
  {
248
- name: "valueLimit",
249
- type: "uint256",
271
+ name: "target",
272
+ type: "address",
250
273
  },
251
274
  {
252
275
  name: "sig",
253
276
  type: "bytes4",
254
277
  },
278
+ {
279
+ name: "valueLimit",
280
+ type: "uint256",
281
+ },
255
282
  {
256
283
  components: [
257
284
  {
@@ -272,13 +299,27 @@ export class SessionKeyValidator extends KernelBaseValidator {
272
299
  type: "tuple[]",
273
300
  },
274
301
  {
275
- internalType: "enum Operation",
276
- name: "operation",
277
- type: "uint8",
302
+ components: [
303
+ {
304
+ name: "interval",
305
+ type: "uint48",
306
+ },
307
+ {
308
+ name: "runs",
309
+ type: "uint48",
310
+ },
311
+ {
312
+ internalType: "ValidAfter",
313
+ name: "validAfter",
314
+ type: "uint48",
315
+ },
316
+ ],
317
+ name: "executionRule",
318
+ type: "tuple",
278
319
  },
279
320
  ],
280
321
  name: "permission",
281
- type: "tuple",
322
+ type: Array.isArray(permission) ? "tuple[]" : "tuple",
282
323
  };
283
324
  let params;
284
325
  let values;
@@ -287,7 +328,7 @@ export class SessionKeyValidator extends KernelBaseValidator {
287
328
  permissionParam,
288
329
  {
289
330
  name: "merkleProof",
290
- type: "bytes32[]",
331
+ type: Array.isArray(merkleProof[0]) ? "bytes32[][]" : "bytes32[]",
291
332
  },
292
333
  ];
293
334
  values = [permission, merkleProof];
@@ -314,16 +355,34 @@ export class SessionKeyValidator extends KernelBaseValidator {
314
355
  async signer() {
315
356
  return await Promise.resolve(this.sessionKey);
316
357
  }
317
- async getEnableData() {
358
+ async getSessionNonces(kernelAccountAddress) {
359
+ if (!this.publicClient) {
360
+ throw new Error("Validator uninitialized: PublicClient missing");
361
+ }
362
+ const nonce = await this.publicClient.readContract({
363
+ abi: SessionKeyValidatorAbi,
364
+ address: this.validatorAddress,
365
+ functionName: "nonces",
366
+ args: [kernelAccountAddress],
367
+ });
368
+ return { lastNonce: nonce[0], invalidNonce: nonce[1] };
369
+ }
370
+ async getEnableData(kernelAccountAddress, enabledLastNonce) {
318
371
  if (!this.merkleTree) {
319
372
  throw Error("SessionKeyValidator: MerkleTree not generated");
320
373
  }
374
+ if (!kernelAccountAddress) {
375
+ throw Error("SessionKeyValidator: Kernel account address not provided");
376
+ }
377
+ const lastNonce = enabledLastNonce ??
378
+ (await this.getSessionNonces(kernelAccountAddress)).lastNonce + 1n;
321
379
  return concat([
322
380
  await this.sessionKey.getAddress(),
323
381
  pad(this.merkleTree.getHexRoot(), { size: 32 }),
324
382
  pad(toHex(this.sessionKeyData.validAfter), { size: 6 }),
325
383
  pad(toHex(this.sessionKeyData.validUntil), { size: 6 }),
326
384
  this.sessionKeyData.paymaster,
385
+ pad(toHex(lastNonce), { size: 32 }),
327
386
  ]);
328
387
  }
329
388
  async isPluginEnabled(kernelAccountAddress, selector) {
@@ -344,18 +403,26 @@ export class SessionKeyValidator extends KernelBaseValidator {
344
403
  });
345
404
  const enableDataHex = concatHex([
346
405
  await this.sessionKey.getAddress(),
347
- pad(enableData[0], { size: 4 }),
406
+ pad(enableData[0], { size: 32 }),
348
407
  pad(toHex(enableData[1]), { size: 6 }),
349
408
  pad(toHex(enableData[2]), { size: 6 }),
350
409
  enableData[3],
410
+ pad(toHex(enableData[4]), { size: 32 }),
351
411
  ]);
352
412
  return (execDetail.validator.toLowerCase() ===
353
413
  this.validatorAddress.toLowerCase() &&
354
- enableData[4] &&
355
- enableDataHex.toLowerCase() === (await this.getEnableData()).toLowerCase());
414
+ enableDataHex.toLowerCase() ===
415
+ (await this.getEnableData(kernelAccountAddress, enableData[4])).toLowerCase());
356
416
  }
357
417
  async getDummyUserOpSignature(callData) {
358
- const matchingPermission = this.findMatchingPermission(callData);
418
+ return concatHex([
419
+ await this.sessionKey.getAddress(),
420
+ DUMMY_ECDSA_SIG,
421
+ this.getEncodedPermissionProofData(callData),
422
+ ]);
423
+ }
424
+ getEncodedPermissionProofData(callData) {
425
+ const matchingPermission = this.findMatchingPermissions(callData);
359
426
  if (!matchingPermission && !this.shouldDelegateViaFallback()) {
360
427
  throw Error("SessionKeyValidator: No matching permission found for the userOp");
361
428
  }
@@ -364,17 +431,19 @@ export class SessionKeyValidator extends KernelBaseValidator {
364
431
  matchingPermission
365
432
  ? this.encodePermissionData(matchingPermission)
366
433
  : "0x";
367
- const merkleProof = this.merkleTree.getHexProof(keccak256(encodedPermissionData));
368
- const encodedData = this.sessionKeyData.permissions &&
434
+ let merkleProof = [];
435
+ if (Array.isArray(matchingPermission)) {
436
+ let encodedPerms = matchingPermission.map((permission) => keccak256(this.encodePermissionData(permission)));
437
+ merkleProof = encodedPerms.map((perm) => this.merkleTree.getHexProof(perm));
438
+ }
439
+ else if (matchingPermission) {
440
+ merkleProof = this.merkleTree.getHexProof(keccak256(encodedPermissionData));
441
+ }
442
+ return this.sessionKeyData.permissions &&
369
443
  this.sessionKeyData.permissions.length !== 0 &&
370
444
  matchingPermission
371
445
  ? this.encodePermissionData(matchingPermission, merkleProof)
372
446
  : "0x";
373
- return concatHex([
374
- await this.sessionKey.getAddress(),
375
- DUMMY_ECDSA_SIG,
376
- encodedData,
377
- ]);
378
447
  }
379
448
  encodeEnable(sessionKeyEnableData) {
380
449
  return encodeFunctionData({
@@ -405,25 +474,10 @@ export class SessionKeyValidator extends KernelBaseValidator {
405
474
  signature: "0x",
406
475
  }, this.entryPointAddress, BigInt(this.chain.id));
407
476
  const formattedMessage = typeof hash === "string" ? toBytes(hash) : hash;
408
- const matchingPermission = this.findMatchingPermission(userOp.callData);
409
- if (!matchingPermission && !this.shouldDelegateViaFallback()) {
410
- throw Error("SessionKeyValidator: No matching permission found for the userOp");
411
- }
412
- const encodedPermissionData = this.sessionKeyData.permissions &&
413
- this.sessionKeyData.permissions.length !== 0 &&
414
- matchingPermission
415
- ? this.encodePermissionData(matchingPermission)
416
- : "0x";
417
- const merkleProof = this.merkleTree.getHexProof(keccak256(encodedPermissionData));
418
- const encodedData = this.sessionKeyData.permissions &&
419
- this.sessionKeyData.permissions.length !== 0 &&
420
- matchingPermission
421
- ? this.encodePermissionData(matchingPermission, merkleProof)
422
- : "0x";
423
477
  const signature = concat([
424
478
  await this.sessionKey.getAddress(),
425
479
  await this.sessionKey.signMessage(formattedMessage),
426
- encodedData,
480
+ this.getEncodedPermissionProofData(userOp.callData),
427
481
  ]);
428
482
  return signature;
429
483
  }