@zerodev/sdk 5.2.1-alpha-5 → 5.2.1-alpha-7

package/accounts/kernel/createKernelAccount.ts

@@ -26,6 +26,7 @@ import {
     getTypesForEIP712Domain,
     hashMessage,
     hashTypedData,
+    toHex,
     validateTypedData,
     zeroAddress
 } from "viem"
@@ -42,6 +43,7 @@ import {
 } from "../utils/toKernelPluginManager.js"
 import { KernelInitAbi } from "./abi/KernelAccountAbi.js"
 import { KernelV3InitAbi } from "./abi/kernel_v_3_0_0/KernelAccountAbi.js"
+import { KernelFactoryStakerAbi } from "./abi/kernel_v_3_0_0/KernelFactoryStakerAbi.js"
 import { encodeCallData as encodeCallDataEpV06 } from "./utils/account/ep0_6/encodeCallData.js"
 import { encodeDeployCallData as encodeDeployCallDataV06 } from "./utils/account/ep0_6/encodeDeployCallData.js"
 import { encodeCallData as encodeCallDataEpV07 } from "./utils/account/ep0_7/encodeCallData.js"
@@ -68,6 +70,7 @@ export type CreateKernelAccountParameters<entryPoint extends EntryPoint> = {
     index?: bigint
     factoryAddress?: Address
     accountLogicAddress?: Address
+    factoryStakerAddress?: Address
     deployedAccountAddress?: Address
 }
 
@@ -112,13 +115,15 @@ const createAccountAbi = [
 export const KERNEL_ADDRESSES: {
     ACCOUNT_LOGIC_V0_6: Address
     ACCOUNT_LOGIC_V0_7: Address
-    FACTORY_ADDRESS: Address
-    ENTRYPOINT_V0_6: Address
+    FACTORY_ADDRESS_V0_6: Address
+    FACTORY_ADDRESS_V0_7: Address
+    FACTORY_STAKER: Address
 } = {
     ACCOUNT_LOGIC_V0_6: "0xd3082872F8B06073A021b4602e022d5A070d7cfC",
-    ACCOUNT_LOGIC_V0_7: "0x541E811D24A54745619a5B9f0c1d4B08D5740144",
-    FACTORY_ADDRESS: "0x5de4839a76cf55d0c90e2061ef4386d962E15ae3",
-    ENTRYPOINT_V0_6: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
+    ACCOUNT_LOGIC_V0_7: "0xe59cffb45AFFB215e3823F7D1a207a71C1aa09c3",
+    FACTORY_ADDRESS_V0_6: "0x5de4839a76cf55d0c90e2061ef4386d962E15ae3",
+    FACTORY_ADDRESS_V0_7: "0x17B6697d81844518365484323e810Be08EaA3A6a",
+    FACTORY_STAKER: "0xd703aaE79538628d27099B8c4f621bE4CCd142d5"
 }
 
 const getKernelInitData = async <entryPoint extends EntryPoint>({
@@ -158,12 +163,14 @@ const getAccountInitCode = async <entryPoint extends EntryPoint>({
     index,
     factoryAddress,
     accountLogicAddress,
+    factoryStakerAddress,
     entryPoint: entryPointAddress,
     kernelPluginManager
 }: {
     index: bigint
     factoryAddress: Address
     accountLogicAddress: Address
+    factoryStakerAddress: Address
     entryPoint: entryPoint
     kernelPluginManager: KernelPluginManager<entryPoint>
 }): Promise<Hex> => {
@@ -172,15 +179,31 @@ const getAccountInitCode = async <entryPoint extends EntryPoint>({
         entryPoint: entryPointAddress,
         kernelPluginManager
     })
+    const entryPointVersion = getEntryPointVersion(entryPointAddress)
 
     // Build the account init code
+    if (entryPointVersion === "v0.6") {
+        return concatHex([
+            factoryAddress,
+            encodeFunctionData({
+                abi: createAccountAbi,
+                functionName: "createAccount",
+                args: [accountLogicAddress, initialisationData, index]
+            }) as Hex
+        ])
+    }
+
     return concatHex([
-        factoryAddress,
+        factoryStakerAddress,
         encodeFunctionData({
-            abi: createAccountAbi,
-            functionName: "createAccount",
-            args: [accountLogicAddress, initialisationData, index]
-        }) as Hex
+            abi: KernelFactoryStakerAbi,
+            functionName: "deployWithFactory",
+            args: [
+                factoryAddress,
+                initialisationData,
+                toHex(index, { size: 32 })
+            ]
+        })
     ])
 }
 
@@ -244,8 +267,9 @@ export async function createKernelAccount<
         plugins,
         entryPoint: entryPointAddress,
         index = 0n,
-        factoryAddress = KERNEL_ADDRESSES.FACTORY_ADDRESS,
+        factoryAddress = KERNEL_ADDRESSES.FACTORY_ADDRESS_V0_6,
         accountLogicAddress = KERNEL_ADDRESSES.ACCOUNT_LOGIC_V0_6,
+        factoryStakerAddress = KERNEL_ADDRESSES.FACTORY_STAKER,
         deployedAccountAddress
     }: CreateKernelAccountParameters<entryPoint>
 ): Promise<KernelSmartAccount<entryPoint, TTransport, TChain>> {
@@ -254,6 +278,10 @@ export async function createKernelAccount<
         entryPointVersion === "v0.6"
             ? KERNEL_ADDRESSES.ACCOUNT_LOGIC_V0_6
             : KERNEL_ADDRESSES.ACCOUNT_LOGIC_V0_7
+    factoryAddress =
+        entryPointVersion === "v0.6"
+            ? KERNEL_ADDRESSES.FACTORY_ADDRESS_V0_6
+            : KERNEL_ADDRESSES.FACTORY_ADDRESS_V0_7
 
     const kernelPluginManager = isKernelPluginManager<entryPoint>(plugins)
         ? plugins
@@ -270,6 +298,7 @@ export async function createKernelAccount<
             index,
             factoryAddress,
             accountLogicAddress,
+            factoryStakerAddress,
             entryPoint: entryPointAddress,
             kernelPluginManager
         })
@@ -331,7 +360,11 @@ export async function createKernelAccount<
 
                 if (smartAccountDeployed) return undefined
 
-                return factoryAddress
+                const entryPointVersion =
+                    getEntryPointVersion(entryPointAddress)
+                return entryPointVersion === "v0.6"
+                    ? factoryAddress
+                    : factoryStakerAddress
             },
 
             async getFactoryData() {

package/accounts/utils/toKernelPluginManager.ts

@@ -159,7 +159,7 @@ export async function toKernelPluginManager<
             const typeData = await getPluginsEnableTypedDataV1({
                 accountAddress,
                 chainId,
-                kernelVersion: version ?? kernelVersion,
+                kernelVersion: kernelVersion ?? version,
                 action,
                 validator: regular,
                 validUntil,

package/actions/paymaster/estimateGasInERC20.ts

@@ -1,3 +1,4 @@
+import { ENTRYPOINT_ADDRESS_V06 } from "permissionless"
 import type { EntryPoint } from "permissionless/types"
 import type {
     UserOperation,
@@ -5,7 +6,6 @@ import type {
 } from "permissionless/types/userOperation.js"
 import { deepHexlify } from "permissionless/utils"
 import type { Address, Hex } from "viem"
-import { KERNEL_ADDRESSES } from "../../accounts/index.js"
 import type { ZeroDevPaymasterClient } from "../../clients/paymasterClient.js"
 
 export type EstimateGasInERC20Parameters = {
@@ -40,8 +40,7 @@ export const estimateGasInERC20 = async <entryPoint extends EntryPoint>(
                     args.userOperation
                 ) as UserOperationWithBigIntAsHex<"v0.6">,
                 tokenAddress: args.gasTokenAddress,
-                entryPointAddress:
-                    args.entryPoint ?? KERNEL_ADDRESSES.ENTRYPOINT_V0_6
+                entryPointAddress: args.entryPoint ?? ENTRYPOINT_ADDRESS_V06
             }
         ]
     })

package/clients/decorators/kernel.ts

@@ -42,10 +42,13 @@ export const zerodevPaymasterActions =
         sponsorUserOperation: async (
             args: Omit<SponsorUserOperationParameters<entryPoint>, "entryPoint">
         ) =>
-            sponsorUserOperation(client as ZeroDevPaymasterClient<entryPoint>, {
-                ...args,
-                entryPoint: entryPointAddress
-            }),
+            sponsorUserOperation<entryPoint>(
+                client as ZeroDevPaymasterClient<entryPoint>,
+                {
+                    ...args,
+                    entryPoint: entryPointAddress
+                }
+            ),
         estimateGasInERC20: async (args: EstimateGasInERC20Parameters) =>
             estimateGasInERC20(
                 client as ZeroDevPaymasterClient<entryPoint>,

package/clients/kernelAccountClient.ts

@@ -84,10 +84,9 @@ export const createKernelAccountClient = <
     let middleware = parameters.middleware
 
     if (
-        !middleware ||
-        (typeof middleware !== "function" &&
-            !middleware.gasPrice &&
-            parameters.entryPoint === ENTRYPOINT_ADDRESS_V07)
+        (!middleware ||
+            (typeof middleware !== "function" && !middleware.gasPrice)) &&
+        parameters.entryPoint === ENTRYPOINT_ADDRESS_V07
     ) {
         const gasPrice = () => getUserOperationGasPrice(client)
         middleware = {

package/constants.ts

@@ -10,7 +10,7 @@ export const KernelImplToVersionMap: { [key: Address]: string } = {
     "0xD3F582F6B4814E989Ee8E96bc3175320B5A540ab": "0.2.3",
     "0x5FC0236D6c88a65beD32EECDC5D60a5CAb377717": "0.2.3",
     "0xd3082872F8B06073A021b4602e022d5A070d7cfC": "0.2.4",
-    "0x541E811D24A54745619a5B9f0c1d4B08D5740144": "0.3.0-beta"
+    "0xe59cffb45AFFB215e3823F7D1a207a71C1aa09c3": "0.3.0-beta"
 }
 export const TOKEN_ACTION = "0x2087C7FfD0d0DAE80a00EE74325aBF3449e0eaf1"
 export const KERNEL_NAME = "Kernel"

package/index.ts

@@ -38,6 +38,8 @@ export {
     KernelV3ExecuteAbi,
     KernelV3InitAbi
 } from "./accounts/kernel/abi/kernel_v_3_0_0/KernelAccountAbi.js"
+export { KernelV3FactoryAbi } from "./accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryAbi.js"
+export { KernelFactoryStakerAbi } from "./accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryStakerAbi.js"
 export { TokenActionsAbi } from "./accounts/kernel/abi/TokenActionsAbi.js"
 export * as constants from "./constants.js"
 export * from "./utils.js"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zerodev/sdk",
-    "version": "5.2.1-alpha-5",
+    "version": "5.2.1-alpha-7",
     "author": "ZeroDev",
     "main": "./_cjs/index.js",
     "module": "./_esm/index.js",

package/utils.ts

@@ -1,4 +1,4 @@
-import { getEntryPointVersion } from "permissionless"
+import { ENTRYPOINT_ADDRESS_V06, getEntryPointVersion } from "permissionless"
 import type { EntryPoint } from "permissionless/types/entrypoint"
 import { satisfies } from "semver"
 import {
@@ -13,7 +13,6 @@ import {
     signatureToHex,
     zeroAddress
 } from "viem"
-import { KERNEL_ADDRESSES } from "./accounts/index.js"
 import type { ZeroDevPaymasterClient } from "./clients/paymasterClient.js"
 import {
     CALL_TYPE,
@@ -73,7 +72,7 @@ export const getERC20PaymasterApproveCall = async (
         params: [
             {
                 chainId: client.chain?.id as number,
-                entryPointAddress: KERNEL_ADDRESSES.ENTRYPOINT_V0_6
+                entryPointAddress: ENTRYPOINT_ADDRESS_V06
             }
         ]
     })