@zerodev/sdk 5.3.25 → 5.4.0-beta.0

package/accounts/kernel/utils/account/ep0_6/encodeCallData.ts

@@ -1,30 +1,40 @@
-import type { EntryPoint } from "permissionless/types"
-import type { KernelSmartAccount } from "../../../createKernelAccount.js"
+import type { EntryPointVersion } from "viem/account-abstraction"
+import type { CallType } from "../../../../../types/kernel.js"
+import type { KernelSmartAccountImplementation } from "../../../createKernelAccount.js"
 import { encodeExecuteBatchCall } from "../../ep0_6/encodeExecuteBatchCall.js"
 import { encodeExecuteDelegateCall } from "../../ep0_6/encodeExecuteDelegateCall.js"
 import { encodeExecuteSingleCall } from "../../ep0_6/encodeExecuteSingleCall.js"
 
 export const encodeCallData = async <
-    entryPoint extends EntryPoint = EntryPoint
+    entryPointVersion extends EntryPointVersion = EntryPointVersion
 >(
-    tx: Parameters<KernelSmartAccount<entryPoint>["encodeCallData"]>[0]
+    calls: Parameters<
+        KernelSmartAccountImplementation<entryPointVersion>["encodeCalls"]
+    >[0],
+    callType?: CallType | undefined
 ) => {
-    if (Array.isArray(tx)) {
-        if (tx.some((t) => t.callType === "delegatecall")) {
+    if (calls.length > 1) {
+        if (callType === "delegatecall") {
             throw new Error("Cannot batch delegatecall")
         }
-        return encodeExecuteBatchCall(tx)
+        return encodeExecuteBatchCall(calls)
+    }
+
+    const call = calls.length === 0 ? undefined : calls[0]
+
+    if (!call) {
+        throw new Error("No calls to encode")
     }
 
     // Default to `call`
-    if (!tx.callType || tx.callType === "call") {
-        return encodeExecuteSingleCall(tx)
+    if (!callType || callType === "call") {
+        return encodeExecuteSingleCall(call)
     }
 
-    if (tx.callType === "delegatecall") {
+    if (callType === "delegatecall") {
         return encodeExecuteDelegateCall({
-            to: tx.to,
-            data: tx.data
+            to: call.to,
+            data: call.data
         })
     }
 

package/accounts/kernel/utils/account/ep0_6/encodeDeployCallData.ts

@@ -1,13 +1,16 @@
-import type { toSmartAccount } from "permissionless/accounts"
 import { encodeDeployData } from "viem"
+import type { EntryPointVersion } from "viem/account-abstraction"
 import { safeCreateCallAddress } from "../../../../../constants.js"
+import type { KernelSmartAccountImplementation } from "../../../createKernelAccount.js"
 import { encodeSafeCreateCall } from "../../common/encodeSafeCreateCall.js"
 import { encodeExecuteDelegateCall } from "../../ep0_6/encodeExecuteDelegateCall.js"
 import type { DelegateCallArgs } from "../../types.js"
 
-export const encodeDeployCallData = (
+export const encodeDeployCallData = <
+    entryPointVersion extends EntryPointVersion = EntryPointVersion
+>(
     tx: Parameters<
-        Parameters<typeof toSmartAccount>[0]["encodeDeployCallData"]
+        KernelSmartAccountImplementation<entryPointVersion>["encodeDeployCallData"]
     >[0]
 ) => {
     const deployCalldataArgs: DelegateCallArgs = {

package/accounts/kernel/utils/account/ep0_6/encodeModuleInstallCallData.ts

@@ -1,4 +1,3 @@
-import type { ENTRYPOINT_ADDRESS_V06_TYPE } from "permissionless/types/entrypoint"
 import { type Address, type Hex, encodeFunctionData } from "viem"
 import type { PluginInstallData } from "../../../../../types/kernel.js"
 import { KernelAccountAbi } from "../../../abi/KernelAccountAbi.js"
@@ -14,22 +13,26 @@ export const encodeModuleInstallCallData = async ({
     validator
 }: {
     accountAddress: Address
-} & PluginInstallData<ENTRYPOINT_ADDRESS_V06_TYPE>): Promise<Hex> => {
-    return encodeCallData({
-        to: accountAddress,
-        value: 0n,
-        data: encodeFunctionData({
-            abi: KernelAccountAbi,
-            functionName: "setExecution",
-            args: [
-                selector,
-                executor,
-                validator,
-                validUntil,
-                validAfter,
-                enableData
-            ]
-        }),
-        callType: "call"
-    })
+} & PluginInstallData<"0.6">): Promise<Hex> => {
+    return encodeCallData(
+        [
+            {
+                to: accountAddress,
+                value: 0n,
+                data: encodeFunctionData({
+                    abi: KernelAccountAbi,
+                    functionName: "setExecution",
+                    args: [
+                        selector,
+                        executor,
+                        validator,
+                        validUntil,
+                        validAfter,
+                        enableData
+                    ]
+                })
+            }
+        ],
+        "call"
+    )
 }

package/accounts/kernel/utils/account/ep0_7/encodeCallData.ts

@@ -1,23 +1,27 @@
-import type { EntryPoint } from "permissionless/types"
+import type { EntryPointVersion } from "viem/account-abstraction"
 import { EXEC_TYPE } from "../../../../../constants.js"
-import type { KernelSmartAccount } from "../../../createKernelAccount.js"
+import type { CallType } from "../../../../../types/kernel.js"
+import type { KernelSmartAccountImplementation } from "../../../createKernelAccount.js"
 import { encodeExecuteBatchCall } from "../../ep0_7/encodeExecuteBatchCall.js"
 import { encodeExecuteDelegateCall } from "../../ep0_7/encodeExecuteDelegateCall.js"
 import { encodeExecuteSingleCall } from "../../ep0_7/encodeExecuteSingleCall.js"
 
 export const encodeCallData = async <
-    entryPoint extends EntryPoint = EntryPoint
+    entryPointVersion extends EntryPointVersion = EntryPointVersion
 >(
-    tx: Parameters<KernelSmartAccount<entryPoint>["encodeCallData"]>[0],
+    calls: Parameters<
+        KernelSmartAccountImplementation<entryPointVersion>["encodeCalls"]
+    >[0],
+    callType?: CallType | undefined,
     includeHooks?: boolean
 ) => {
-    if (Array.isArray(tx)) {
-        if (tx.some((t) => t.callType === "delegatecall")) {
+    if (calls.length > 1) {
+        if (callType === "delegatecall") {
             throw new Error("Cannot batch delegatecall")
         }
         // Encode a batched call
         return encodeExecuteBatchCall(
-            tx,
+            calls,
             {
                 execType: EXEC_TYPE.DEFAULT
             },
@@ -25,10 +29,16 @@ export const encodeCallData = async <
         )
     }
 
+    const call = calls.length === 0 ? undefined : calls[0]
+
+    if (!call) {
+        throw new Error("No calls to encode")
+    }
+
     // Default to `call`
-    if (!tx.callType || tx.callType === "call") {
+    if (!callType || callType === "call") {
         return encodeExecuteSingleCall(
-            tx,
+            call,
             {
                 execType: EXEC_TYPE.DEFAULT
             },
@@ -36,9 +46,9 @@ export const encodeCallData = async <
         )
     }
 
-    if (tx.callType === "delegatecall") {
+    if (callType === "delegatecall") {
         return encodeExecuteDelegateCall(
-            { to: tx.to, data: tx.data },
+            { to: call.to, data: call.data },
             {
                 execType: EXEC_TYPE.DEFAULT
             },

package/accounts/kernel/utils/account/ep0_7/encodeDeployCallData.ts

@@ -1,13 +1,16 @@
-import type { toSmartAccount } from "permissionless/accounts"
 import { encodeDeployData } from "viem"
+import type { EntryPointVersion } from "viem/account-abstraction"
 import { EXEC_TYPE, safeCreateCallAddress } from "../../../../../constants.js"
+import type { KernelSmartAccountImplementation } from "../../../createKernelAccount.js"
 import { encodeSafeCreateCall } from "../../common/encodeSafeCreateCall.js"
 import { encodeExecuteDelegateCall } from "../../ep0_7/encodeExecuteDelegateCall.js"
 import type { DelegateCallArgs } from "../../types.js"
 
-export const encodeDeployCallData = (
+export const encodeDeployCallData = <
+    entryPointVersion extends EntryPointVersion = EntryPointVersion
+>(
     tx: Parameters<
-        Parameters<typeof toSmartAccount>[0]["encodeDeployCallData"]
+        KernelSmartAccountImplementation<entryPointVersion>["encodeDeployCallData"]
     >[0]
 ) => {
     const deployCalldataArgs: DelegateCallArgs = {

package/accounts/kernel/utils/common/accountMetadata.ts

@@ -1,8 +1,6 @@
 import {
     type Address,
-    type Chain,
     type Client,
-    type Transport,
     decodeFunctionResult,
     encodeFunctionData,
     publicActions
@@ -16,11 +14,8 @@ export type AccountMetadata = {
     version: string
     chainId: bigint
 }
-export const accountMetadata = async <
-    TTransport extends Transport = Transport,
-    TChain extends Chain | undefined = Chain | undefined
->(
-    client: Client<TTransport, TChain, undefined>,
+export const accountMetadata = async (
+    client: Client,
     accountAddress: Address,
     kernelVersion: KERNEL_VERSION_TYPE,
     chainId?: number

package/accounts/kernel/utils/common/getActionSelector.ts

@@ -1,16 +1,16 @@
-import type { EntryPointVersion } from "permissionless/types/entrypoint"
 import { type Hex, getAbiItem, toFunctionSelector } from "viem"
+import type { EntryPointVersion } from "viem/account-abstraction"
 import { KernelAccountAbi } from "../../abi/KernelAccountAbi.js"
 import { KernelV3AccountAbi } from "../../abi/kernel_v_3_0_0/KernelAccountAbi.js"
 
 export const getActionSelector = (
     entryPointVersion: EntryPointVersion
 ): Hex => {
-    if (entryPointVersion === "v0.6") {
+    if (entryPointVersion === "0.6") {
         return toFunctionSelector(
             getAbiItem({ abi: KernelAccountAbi, name: "execute" })
         )
-    } else if (entryPointVersion === "v0.7") {
+    } else if (entryPointVersion === "0.7") {
         return toFunctionSelector(
             getAbiItem({ abi: KernelV3AccountAbi, name: "execute" })
         )

package/accounts/kernel/utils/ep0_6/encodeExecuteBatchCall.ts

@@ -2,7 +2,7 @@ import { encodeFunctionData } from "viem"
 import { KernelExecuteAbi } from "../../abi/KernelAccountAbi.js"
 import type { CallArgs } from "../types.js"
 
-export const encodeExecuteBatchCall = (args: CallArgs[]) => {
+export const encodeExecuteBatchCall = (args: readonly CallArgs[]) => {
     return encodeFunctionData({
         abi: KernelExecuteAbi,
         functionName: "executeBatch",
@@ -10,8 +10,8 @@ export const encodeExecuteBatchCall = (args: CallArgs[]) => {
             args.map((arg) => {
                 return {
                     to: arg.to,
-                    value: arg.value,
-                    data: arg.data
+                    value: arg.value || 0n,
+                    data: arg.data || "0x"
                 }
             })
         ]

package/accounts/kernel/utils/ep0_6/encodeExecuteDelegateCall.ts

@@ -6,6 +6,6 @@ export const encodeExecuteDelegateCall = (args: DelegateCallArgs) => {
     return encodeFunctionData({
         abi: KernelExecuteAbi,
         functionName: "executeDelegateCall",
-        args: [args.to, args.data]
+        args: [args.to, args.data || "0x"]
     })
 }

package/accounts/kernel/utils/ep0_6/encodeExecuteSingleCall.ts

@@ -6,6 +6,6 @@ export const encodeExecuteSingleCall = (args: CallArgs) => {
     return encodeFunctionData({
         abi: KernelExecuteAbi,
         functionName: "execute",
-        args: [args.to, args.value, args.data, 0]
+        args: [args.to, args.value || 0n, args.data || "0x", 0]
     })
 }

package/accounts/kernel/utils/ep0_7/encodeExecuteBatchCall.ts

@@ -7,7 +7,7 @@ import {
 } from "./encodeExecuteCall.js"
 
 export const encodeExecuteBatchCall = (
-    args: CallArgs[],
+    args: readonly CallArgs[],
     options: Omit<EncodeExecuteOptions, "callType">,
     includeHooks?: boolean
 ) => {
@@ -36,8 +36,8 @@ export const encodeExecuteBatchCall = (
             args.map((arg) => {
                 return {
                     target: arg.to,
-                    value: arg.value,
-                    callData: arg.data
+                    value: arg.value || 0n,
+                    callData: arg.data || "0x"
                 }
             })
         ]

package/accounts/kernel/utils/ep0_7/encodeExecuteCall.ts

@@ -33,9 +33,9 @@ export const encodeExecuteCall = <TOptions extends EncodeExecuteOptions>(
         calldata = concatHex([
             args.to,
             options.callType !== CALL_TYPE.DELEGATE_CALL
-                ? toHex(args.value, { size: 32 })
+                ? toHex(args.value || 0n, { size: 32 })
                 : "0x", // No value if delegate call
-            args.data
+            args.data || "0x"
         ])
     }
 

package/accounts/kernel/utils/plugins/ep0_6/getEncodedPluginsData.ts

@@ -1,7 +1,3 @@
-import type {
-    ENTRYPOINT_ADDRESS_V06_TYPE,
-    EntryPoint
-} from "permissionless/types/entrypoint"
 import { type Address, type Hex, concat, pad, toHex } from "viem"
 import {
     type PluginValidityData,
@@ -9,9 +5,7 @@ import {
 } from "../../../../../types/index.js"
 import type { Kernel2_0_plugins } from "./getPluginsEnableTypedData.js"
 
-export const getEncodedPluginsData = async <
-    entryPoint extends EntryPoint = ENTRYPOINT_ADDRESS_V06_TYPE
->({
+export const getEncodedPluginsData = async ({
     accountAddress,
     enableSignature,
     action,
@@ -21,7 +15,7 @@ export const getEncodedPluginsData = async <
 }: {
     accountAddress: Address
     enableSignature: Hex
-} & Kernel2_0_plugins<entryPoint> &
+} & Kernel2_0_plugins &
     PluginValidityData) => {
     const enableData = await validator.getEnableData(accountAddress)
     const enableDataLength = enableData.length / 2 - 1

package/accounts/kernel/utils/plugins/ep0_6/getPluginsEnableTypedData.ts

@@ -1,7 +1,3 @@
-import type {
-    ENTRYPOINT_ADDRESS_V06_TYPE,
-    EntryPoint
-} from "permissionless/types/entrypoint"
 import {
     type Address,
     type CustomSource,
@@ -16,13 +12,11 @@ import type {
     PluginValidityData
 } from "../../../../../types/index.js"
 
-export type Kernel2_0_plugins<entryPoint extends EntryPoint> = {
-    validator: KernelValidator<entryPoint>
+export type Kernel2_0_plugins = {
+    validator: KernelValidator
     action: Action
 }
-export const getPluginsEnableTypedData = async <
-    entryPoint extends EntryPoint = ENTRYPOINT_ADDRESS_V06_TYPE
->({
+export const getPluginsEnableTypedData = async ({
     accountAddress,
     chainId,
     kernelVersion,
@@ -34,7 +28,7 @@ export const getPluginsEnableTypedData = async <
     accountAddress: Address
     chainId: number
     kernelVersion: string
-} & Kernel2_0_plugins<entryPoint> &
+} & Kernel2_0_plugins &
     PluginValidityData): Promise<
     Parameters<CustomSource["signTypedData"]>[0]
 > => {

package/accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.ts

@@ -1,7 +1,3 @@
-import type {
-    ENTRYPOINT_ADDRESS_V07_TYPE,
-    EntryPoint
-} from "permissionless/types/entrypoint"
 import {
     type Address,
     type CustomSource,
@@ -15,9 +11,7 @@ import { CALL_TYPE, VALIDATOR_TYPE } from "../../../../../constants.js"
 import type { KernelValidatorHook } from "../../../../../types/kernel.js"
 import type { Kernel2_0_plugins } from "../ep0_6/getPluginsEnableTypedData.js"
 
-export const getPluginsEnableTypedData = async <
-    entryPoint extends EntryPoint = ENTRYPOINT_ADDRESS_V07_TYPE
->({
+export const getPluginsEnableTypedData = async ({
     accountAddress,
     chainId,
     kernelVersion,
@@ -31,7 +25,7 @@ export const getPluginsEnableTypedData = async <
     kernelVersion: string
     validatorNonce: number
     hook?: KernelValidatorHook
-} & Kernel2_0_plugins<entryPoint>): Promise<
+} & Kernel2_0_plugins): Promise<
     Parameters<CustomSource["signTypedData"]>[0]
 > => {
     return {

package/accounts/kernel/utils/types.ts

@@ -2,7 +2,7 @@ import type { Address, Hex } from "viem"
 
 export type CallArgs = {
     to: Address
-    data: Hex
-    value: bigint
+    data?: Hex
+    value?: bigint
 }
 export type DelegateCallArgs = Omit<CallArgs, "value">