@zerodev/sdk 5.3.26 → 5.4.0-beta.0

package/accounts/utils/toKernelPluginManager.ts

@@ -1,12 +1,8 @@
-import { getEntryPointVersion } from "permissionless"
-import type { EntryPoint } from "permissionless/types/entrypoint"
 import { satisfies } from "semver"
 import {
     type Address,
-    type Chain,
     type Client,
     type Hex,
-    type Transport,
     concat,
     concatHex,
     maxUint16,
@@ -15,6 +11,7 @@ import {
     toHex,
     zeroAddress
 } from "viem"
+import type { EntryPointVersion } from "viem/account-abstraction"
 import { getChainId } from "viem/actions"
 import { encodeModuleInstallCallData as encodeModuleInstallCallDataEpV06 } from "../../accounts/kernel/utils/account/ep0_6/encodeModuleInstallCallData.js"
 import {
@@ -36,19 +33,19 @@ import { getEncodedPluginsData as getEncodedPluginsDataV2 } from "../kernel/util
 import { getPluginsEnableTypedData as getPluginsEnableTypedDataV2 } from "../kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.js"
 import { isPluginInitialized } from "../kernel/utils/plugins/ep0_7/isPluginInitialized.js"
 
-export function isKernelPluginManager<entryPoint extends EntryPoint>(
+export function isKernelPluginManager<
+    entryPointVersion extends EntryPointVersion
+>(
     // biome-ignore lint/suspicious/noExplicitAny: <explanation>
     plugin: any
-): plugin is KernelPluginManager<entryPoint> {
+): plugin is KernelPluginManager<entryPointVersion> {
     return plugin.getPluginEnableSignature !== undefined
 }
 
 export async function toKernelPluginManager<
-    entryPoint extends EntryPoint,
-    TTransport extends Transport = Transport,
-    TChain extends Chain | undefined = Chain | undefined
+    entryPointVersion extends EntryPointVersion
 >(
-    client: Client<TTransport, TChain, undefined>,
+    client: Client,
     {
         sudo,
         regular,
@@ -58,11 +55,11 @@ export async function toKernelPluginManager<
         action,
         validAfter = 0,
         validUntil = 0,
-        entryPoint: entryPointAddress,
+        entryPoint,
         kernelVersion,
         chainId
-    }: KernelPluginManagerParams<entryPoint>
-): Promise<KernelPluginManager<entryPoint>> {
+    }: KernelPluginManagerParams<entryPointVersion>
+): Promise<KernelPluginManager<entryPointVersion>> {
     if (
         (sudo && !satisfies(kernelVersion, sudo?.supportedKernelVersions)) ||
         (regular && !satisfies(kernelVersion, regular?.supportedKernelVersions))
@@ -72,20 +69,19 @@ export async function toKernelPluginManager<
         )
     }
     let pluginEnabled: boolean
-    const entryPointVersion = getEntryPointVersion(entryPointAddress)
     const activeValidator = regular || sudo
     if (!activeValidator) {
         throw new Error("One of `sudo` or `regular` validator must be set")
     }
     action = {
-        selector: action?.selector ?? getActionSelector(entryPointVersion),
+        selector: action?.selector ?? getActionSelector(entryPoint.version),
         address: action?.address ?? zeroAddress
     }
     if (
-        entryPointVersion === "v0.7" &&
+        entryPoint.version === "0.7" &&
         (action.address.toLowerCase() !== zeroAddress.toLowerCase() ||
             action.selector.toLowerCase() !==
-                getActionSelector(entryPointVersion).toLowerCase()) &&
+                getActionSelector(entryPoint.version).toLowerCase()) &&
         kernelVersion === "0.3.0"
     ) {
         action.hook = {
@@ -105,7 +101,7 @@ export async function toKernelPluginManager<
         if (!action) {
             throw new Error("Action data must be set")
         }
-        if (entryPointVersion === "v0.6") {
+        if (entryPoint.version === "0.6") {
             if (regular) {
                 if (pluginEnabled) {
                     return ValidatorMode.plugin
@@ -163,7 +159,7 @@ export async function toKernelPluginManager<
             throw new Error("Action data must be set")
         }
         if (!regular) throw new Error("regular validator not set")
-        if (entryPointVersion === "v0.6") {
+        if (entryPoint.version === "0.6") {
             return regular.isEnabled(accountAddress, selector)
         }
         const isEnabled =
@@ -195,7 +191,7 @@ export async function toKernelPluginManager<
             chainId = client.chain?.id ?? (await getChainId(client))
         }
         let ownerSig: Hex
-        if (entryPointVersion === "v0.6") {
+        if (entryPoint.version === "0.6") {
             const typeData = await getPluginsEnableTypedDataV1({
                 accountAddress,
                 chainId,
@@ -276,7 +272,7 @@ export async function toKernelPluginManager<
                 throw new Error("Action data must be set")
             }
             if (!regular) throw new Error("regular validator not set")
-            if (entryPointVersion === "v0.6") {
+            if (entryPoint.version === "0.6") {
                 return await encodeModuleInstallCallDataEpV06({
                     accountAddress,
                     selector: action.selector,
@@ -292,7 +288,7 @@ export async function toKernelPluginManager<
         signUserOperation: async (userOperation) => {
             const userOpSig =
                 await activeValidator.signUserOperation(userOperation)
-            if (entryPointVersion === "v0.6") {
+            if (entryPoint.version === "0.6") {
                 return concatHex([
                     await getSignatureData(
                         userOperation.sender,
@@ -317,10 +313,10 @@ export async function toKernelPluginManager<
             validAfter,
             validUntil
         }),
-        getDummySignature: async (userOperation) => {
+        getStubSignature: async (userOperation) => {
             const userOpSig =
-                await activeValidator.getDummySignature(userOperation)
-            if (entryPointVersion === "v0.6") {
+                await activeValidator.getStubSignature(userOperation)
+            if (entryPoint.version === "0.6") {
                 return concatHex([
                     await getSignatureData(
                         userOperation.sender,
@@ -342,10 +338,10 @@ export async function toKernelPluginManager<
             if (!action) {
                 throw new Error("Action data must be set")
             }
-            if (entryPointVersion === "v0.6") {
+            if (entryPoint.version === "0.6") {
                 if (customNonceKey > maxUint192) {
                     throw new Error(
-                        "Custom nonce key must be equal or less than maxUint192 for v0.6"
+                        "Custom nonce key must be equal or less than maxUint192 for 0.6"
                     )
                 }
 

package/actions/account-client/changeSudoValidator.ts

@@ -1,22 +1,25 @@
-import {
-    type SendUserOperationParameters,
-    sendUserOperation
-} from "permissionless/actions/smartAccount"
-import type { EntryPoint, Prettify } from "permissionless/types"
-import {
-    AccountOrClientNotFoundError,
-    parseAccount
-} from "permissionless/utils"
 import {
     type Chain,
     type Client,
     type Hash,
     type Hex,
+    type Prettify,
     type Transport,
     zeroAddress
 } from "viem"
-import { concatHex, encodeFunctionData, getAction, pad } from "viem/utils"
-import type { KernelSmartAccount } from "../../accounts/index.js"
+import {
+    type SendUserOperationParameters,
+    type SmartAccount,
+    sendUserOperation
+} from "viem/account-abstraction"
+import {
+    concatHex,
+    encodeFunctionData,
+    getAction,
+    pad,
+    parseAccount
+} from "viem/utils"
+import type { KernelSmartAccountImplementation } from "../../accounts/index.js"
 import { KernelV3_1AccountAbi } from "../../accounts/kernel/abi/kernel_v_3_1/KernelAccountAbi.js"
 import {
     KERNEL_V3_0,
@@ -28,68 +31,39 @@ import type {
     KernelValidator,
     KernelValidatorHook
 } from "../../types/kernel.js"
-
-type OptionalUserOperationParameters<
-    entryPoint extends EntryPoint,
-    TTransport extends Transport = Transport,
-    TChain extends Chain | undefined = Chain | undefined,
-    TAccount extends
-        | KernelSmartAccount<entryPoint, TTransport, TChain>
-        | undefined =
-        | KernelSmartAccount<entryPoint, TTransport, TChain>
-        | undefined
-> = Omit<
-    SendUserOperationParameters<entryPoint, TTransport, TChain, TAccount>,
-    "userOperation"
-> & {
-    userOperation?: SendUserOperationParameters<
-        entryPoint,
-        TTransport,
-        TChain,
-        TAccount
-    >["userOperation"]
-}
+import { AccountNotFoundError } from "../../errors/index.js";
 
 export type ChangeSudoValidatorParameters<
-    entryPoint extends EntryPoint,
-    TTransport extends Transport = Transport,
-    TChain extends Chain | undefined = Chain | undefined,
-    TAccount extends
-        | KernelSmartAccount<entryPoint, TTransport, TChain>
-        | undefined =
-        | KernelSmartAccount<entryPoint, TTransport, TChain>
-        | undefined
+    account extends SmartAccount | undefined,
+    accountOverride extends SmartAccount | undefined = undefined,
+    calls extends readonly unknown[] = readonly unknown[]
 > = Prettify<
-    OptionalUserOperationParameters<
-        entryPoint,
-        TTransport,
-        TChain,
-        TAccount
-    > & {
-        sudoValidator: KernelValidator<entryPoint, string>
+    Partial<SendUserOperationParameters<account, accountOverride, calls>> & {
+        sudoValidator: KernelValidator<string>
         hook?: KernelValidatorHook
     }
 >
 
 export async function changeSudoValidator<
-    entryPoint extends EntryPoint,
-    TTransport extends Transport = Transport,
-    TChain extends Chain | undefined = Chain | undefined,
-    TAccount extends
-        | KernelSmartAccount<entryPoint, TTransport, TChain>
-        | undefined =
-        | KernelSmartAccount<entryPoint, TTransport, TChain>
-        | undefined
+    account extends SmartAccount | undefined,
+    chain extends Chain | undefined,
+    accountOverride extends SmartAccount | undefined = undefined,
+    calls extends readonly unknown[] = readonly unknown[]
 >(
-    client: Client<TTransport, TChain, TAccount>,
+    client: Client<Transport, chain, account>,
     args: Prettify<
-        ChangeSudoValidatorParameters<entryPoint, TTransport, TChain, TAccount>
+        ChangeSudoValidatorParameters<account, accountOverride, calls>
     >
 ): Promise<Hash> {
     const { account: account_ = client.account, sudoValidator, hook } = args
-    if (!account_) throw new AccountOrClientNotFoundError()
+    if (!account_)
+        throw new AccountNotFoundError({
+            docsPath: "/docs/actions/wallet/sendTransaction"
+        })
 
-    const account = parseAccount(account_) as KernelSmartAccount<entryPoint>
+    const account = parseAccount(
+        account_
+    ) as SmartAccount<KernelSmartAccountImplementation>
 
     let rootValidatorId: Hex
     if (
@@ -122,29 +96,31 @@ export async function changeSudoValidator<
     if (account.kernelVersion === KERNEL_V3_0) {
         return await getAction(
             client,
-            sendUserOperation<entryPoint, TTransport, TChain, TAccount>,
+            sendUserOperation,
             "sendUserOperation"
         )({
             ...args,
-            userOperation: {
-                callData: await account.encodeCallData({
-                    to: KernelVersionToAddressesMap[KERNEL_V3_1]
-                        .accountImplementationAddress,
-                    value: 0n,
-                    data: encodeFunctionData({
-                        abi: KernelV3_1AccountAbi,
-                        functionName: "changeRootValidator",
-                        args: [rootValidatorId, hookId, validatorData, hookData]
-                    }),
-                    callType: "delegatecall"
-                })
-            }
-        } as SendUserOperationParameters<
-            entryPoint,
-            TTransport,
-            TChain,
-            TAccount
-        >)
+            callData: await account.encodeCalls(
+                [
+                    {
+                        to: KernelVersionToAddressesMap[KERNEL_V3_1]
+                            .accountImplementationAddress,
+                        value: 0n,
+                        data: encodeFunctionData({
+                            abi: KernelV3_1AccountAbi,
+                            functionName: "changeRootValidator",
+                            args: [
+                                rootValidatorId,
+                                hookId,
+                                validatorData,
+                                hookData
+                            ]
+                        })
+                    }
+                ],
+                "delegatecall"
+            )
+        } as SendUserOperationParameters)
     }
 
     /**
@@ -152,12 +128,12 @@ export async function changeSudoValidator<
      */
     return await getAction(
         client,
-        sendUserOperation<entryPoint, TTransport, TChain, TAccount>,
+        sendUserOperation,
         "sendUserOperation"
     )({
         ...args,
-        userOperation: {
-            callData: await account.encodeCallData({
+        callData: await account.encodeCalls([
+            {
                 to: account.address,
                 value: 0n,
                 data: encodeFunctionData({
@@ -165,7 +141,7 @@ export async function changeSudoValidator<
                     functionName: "changeRootValidator",
                     args: [rootValidatorId, hookId, validatorData, hookData]
                 })
-            })
-        }
-    } as SendUserOperationParameters<entryPoint, TTransport, TChain, TAccount>)
+            }
+        ])
+    } as SendUserOperationParameters)
 }

package/actions/account-client/getKernelV3ModuleCurrentNonce.ts

@@ -1,67 +1,28 @@
-import type { SendTransactionWithPaymasterParameters } from "permissionless/actions/smartAccount"
-import type { EntryPoint, Prettify } from "permissionless/types"
-import {
-    AccountOrClientNotFoundError,
-    parseAccount
-} from "permissionless/utils"
 import type { Chain, Client, Transport } from "viem"
+import type { SmartAccount } from "viem/account-abstraction"
 import { readContract } from "viem/actions"
-import { getAction } from "viem/utils"
-import type { KernelSmartAccount } from "../../accounts/index.js"
+import { getAction, parseAccount } from "viem/utils"
 import { KernelV3AccountAbi } from "../../accounts/kernel/abi/kernel_v_3_0_0/KernelAccountAbi.js"
-
-export type GetKernelV3ModuleCurrentNonceParameters<
-    entryPoint extends EntryPoint,
-    TTransport extends Transport = Transport,
-    TChain extends Chain | undefined = Chain | undefined,
-    TAccount extends
-        | KernelSmartAccount<entryPoint, TTransport, TChain>
-        | undefined =
-        | KernelSmartAccount<entryPoint, TTransport, TChain>
-        | undefined,
-    TChainOverride extends Chain | undefined = Chain | undefined
-> = Prettify<
-    SendTransactionWithPaymasterParameters<
-        entryPoint,
-        TTransport,
-        TChain,
-        TAccount,
-        TChainOverride
-    >
->
+import { AccountNotFoundError } from "../../errors/index.js"
 
 export async function getKernelV3ModuleCurrentNonce<
-    entryPoint extends EntryPoint,
     TTransport extends Transport = Transport,
     TChain extends Chain | undefined = Chain | undefined,
-    TAccount extends
-        | KernelSmartAccount<entryPoint, TTransport, TChain>
-        | undefined =
-        | KernelSmartAccount<entryPoint, TTransport, TChain>
-        | undefined,
-    TChainOverride extends Chain | undefined = Chain | undefined
->(
-    client: Client<TTransport, TChain, TAccount>,
-    args: Prettify<
-        GetKernelV3ModuleCurrentNonceParameters<
-            entryPoint,
-            TTransport,
-            TChain,
-            TAccount,
-            TChainOverride
-        >
-    >
-): Promise<number> {
-    const { account: account_ = client.account } = args
-    if (!account_) throw new AccountOrClientNotFoundError()
+    TAccount extends SmartAccount | undefined = SmartAccount | undefined
+>(client: Client<TTransport, TChain, TAccount>): Promise<number> {
+    const account_ = client.account
+    if (!account_)
+        throw new AccountNotFoundError({
+            docsPath: "/docs/actions/wallet/sendTransaction"
+        })
 
-    const account = parseAccount(account_) as KernelSmartAccount<entryPoint>
+    const account = parseAccount(account_) as SmartAccount
 
     try {
         const nonce = await getAction(
             client,
             readContract,
-            "sendTransaction"
+            "readContract"
         )({
             abi: KernelV3AccountAbi,
             address: account.address,

package/actions/account-client/invalidateNonce.ts

@@ -1,86 +1,57 @@
+import type { Chain, Client, Hash, Prettify, Transport } from "viem"
 import {
-    type SendTransactionWithPaymasterParameters,
-    sendTransaction
-} from "permissionless/actions/smartAccount"
-import type { EntryPoint, Prettify } from "permissionless/types"
-import {
-    AccountOrClientNotFoundError,
-    parseAccount
-} from "permissionless/utils"
-import type { Chain, Client, Hash, Transport } from "viem"
-import { encodeFunctionData, getAction } from "viem/utils"
-import type { KernelSmartAccount } from "../../accounts/index.js"
+    type SendUserOperationParameters,
+    type SmartAccount,
+    sendUserOperation
+} from "viem/account-abstraction"
+import { encodeFunctionData, getAction, parseAccount } from "viem/utils"
 import { KernelV3AccountAbi } from "../../accounts/kernel/abi/kernel_v_3_0_0/KernelAccountAbi.js"
+import { AccountNotFoundError } from "../../errors/index.js"
 
 export type InvalidateNonceParameters<
-    entryPoint extends EntryPoint,
-    TTransport extends Transport = Transport,
-    TChain extends Chain | undefined = Chain | undefined,
-    TAccount extends
-        | KernelSmartAccount<entryPoint, TTransport, TChain>
-        | undefined =
-        | KernelSmartAccount<entryPoint, TTransport, TChain>
-        | undefined,
-    TChainOverride extends Chain | undefined = Chain | undefined
+    account extends SmartAccount | undefined,
+    accountOverride extends SmartAccount | undefined = undefined,
+    calls extends readonly unknown[] = readonly unknown[]
 > = Prettify<
-    SendTransactionWithPaymasterParameters<
-        entryPoint,
-        TTransport,
-        TChain,
-        TAccount,
-        TChainOverride
-    > & {
+    Partial<SendUserOperationParameters<account, accountOverride, calls>> & {
         nonceToSet: number
     }
 >
 
 export async function invalidateNonce<
-    entryPoint extends EntryPoint,
-    TTransport extends Transport = Transport,
-    TChain extends Chain | undefined = Chain | undefined,
-    TAccount extends
-        | KernelSmartAccount<entryPoint, TTransport, TChain>
-        | undefined =
-        | KernelSmartAccount<entryPoint, TTransport, TChain>
-        | undefined,
-    TChainOverride extends Chain | undefined = Chain | undefined
+    account extends SmartAccount | undefined,
+    chain extends Chain | undefined,
+    accountOverride extends SmartAccount | undefined = undefined,
+    calls extends readonly unknown[] = readonly unknown[]
 >(
-    client: Client<TTransport, TChain, TAccount>,
-    args: Prettify<
-        InvalidateNonceParameters<
-            entryPoint,
-            TTransport,
-            TChain,
-            TAccount,
-            TChainOverride
-        >
-    >
+    client: Client<Transport, chain, account>,
+    args: Prettify<InvalidateNonceParameters<account, accountOverride, calls>>
 ): Promise<Hash> {
-    const { account: account_ = client.account, middleware, nonceToSet } = args
-    if (!account_) throw new AccountOrClientNotFoundError()
+    const { account: account_ = client.account, nonceToSet } = args
+    if (!account_)
+        throw new AccountNotFoundError({
+            docsPath: "/docs/actions/wallet/sendTransaction"
+        })
 
-    const account = parseAccount(account_) as KernelSmartAccount<entryPoint>
+    const account = parseAccount(account_) as SmartAccount
 
     return await getAction(
         client,
-        sendTransaction<
-            TTransport,
-            TChain,
-            TAccount,
-            entryPoint,
-            TChainOverride
-        >,
-        "sendTransaction"
+        sendUserOperation,
+        "sendUserOperation"
     )({
         ...args,
-        to: account.address,
-        data: encodeFunctionData({
-            abi: KernelV3AccountAbi,
-            functionName: "invalidateNonce",
-            args: [nonceToSet]
-        }),
-        value: 0n,
-        account,
-        middleware
-    })
+        calls: [
+            {
+                to: account.address,
+                data: encodeFunctionData({
+                    abi: KernelV3AccountAbi,
+                    functionName: "invalidateNonce",
+                    args: [nonceToSet]
+                }),
+                value: 0n
+            }
+        ],
+        account
+    } as SendUserOperationParameters)
 }