Merge pull request #350 from pimlicolabs/feat/kernel-metafactory-flag

Feat/kernel metafactory flag
pimlicolabs · Jan 15, 2025 · ff38975 · ff38975
2 parents 809a64a + 6ea966d
commit ff38975
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 5 deletions.
diff --git a/.changeset/polite-cups-shout.md b/.changeset/polite-cups-shout.md
@@ -0,0 +1,5 @@
+---
+"permissionless": patch
+---
+
+Added useMetaFactory flag for toEcdsaKernelSmartAccount
diff --git a/packages/permissionless-test/src/utils.ts b/packages/permissionless-test/src/utils.ts
@@ -314,9 +314,11 @@ export const getKernelEcdsaClient = async <
     entryPoint,
     anvilRpc,
     version,
-    privateKey
+    privateKey,
+    useMetaFactory
 }: AAParamType<entryPointVersion> & {
     version?: KernelVersion<entryPointVersion>
+    useMetaFactory?: boolean
 }) => {
     const publicClient = getPublicClient(anvilRpc)
 
@@ -336,6 +338,7 @@ export const getKernelEcdsaClient = async <
                     : entryPoint07Address,
             version: entryPoint.version === "0.6" ? "0.6" : "0.7"
         },
+        useMetaFactory,
         owners: [privateKeyToAccount(privateKey ?? generatePrivateKey())],
         version
     })
@@ -549,6 +552,36 @@ export const getCoreSmartAccounts = () => [
         supportsEntryPointV07: false,
         isEip1271Compliant: true
     },
+    {
+        name: "Kernel 7579 0.3.0-beta (non meta factory deployment)",
+        getSmartAccountClient: async <entryPointVersion extends "0.6" | "0.7">(
+            conf: AAParamType<entryPointVersion>
+        ) =>
+            getBundlerClient({
+                account: await getKernelEcdsaClient({
+                    ...conf,
+                    version: "0.3.0-beta" as KernelVersion<entryPointVersion>,
+                    useMetaFactory: false
+                }),
+                ...conf
+            }),
+        getErc7579SmartAccountClient: async <
+            entryPointVersion extends "0.6" | "0.7"
+        >(
+            conf: AAParamType<entryPointVersion>
+        ) =>
+            getSmartAccountClient({
+                account: await getKernelEcdsaClient({
+                    ...conf,
+                    version: "0.3.0-beta" as KernelVersion<entryPointVersion>,
+                    useMetaFactory: false
+                }),
+                ...conf
+            }),
+        supportsEntryPointV06: false,
+        supportsEntryPointV07: true,
+        isEip1271Compliant: true
+    },
     {
         name: "Kernel 7579 0.3.0-beta",
         getSmartAccountClient: async <entryPointVersion extends "0.6" | "0.7">(
@@ -577,6 +610,36 @@ export const getCoreSmartAccounts = () => [
         supportsEntryPointV07: true,
         isEip1271Compliant: true
     },
+    {
+        name: "Kernel 7579 0.3.1 (non meta factory deployment)",
+        getSmartAccountClient: async <entryPointVersion extends "0.6" | "0.7">(
+            conf: AAParamType<entryPointVersion>
+        ) =>
+            getBundlerClient({
+                account: await getKernelEcdsaClient({
+                    ...conf,
+                    version: "0.3.1" as KernelVersion<entryPointVersion>,
+                    useMetaFactory: false
+                }),
+                ...conf
+            }),
+        getErc7579SmartAccountClient: async <
+            entryPointVersion extends "0.6" | "0.7"
+        >(
+            conf: AAParamType<entryPointVersion>
+        ) =>
+            getSmartAccountClient({
+                account: await getKernelEcdsaClient({
+                    ...conf,
+                    version: "0.3.1" as KernelVersion<entryPointVersion>,
+                    useMetaFactory: false
+                }),
+                ...conf
+            }),
+        supportsEntryPointV06: false,
+        supportsEntryPointV07: true,
+        isEip1271Compliant: true
+    },
     {
         name: "Kernel 7579 0.3.1",
         getSmartAccountClient: async <entryPointVersion extends "0.6" | "0.7">(

diff --git a/packages/permissionless/accounts/kernel/abi/KernelV3FactoryAbi.ts b/packages/permissionless/accounts/kernel/abi/KernelV3FactoryAbi.ts
@@ -0,0 +1,12 @@
+export const KernelV3FactoryAbi = [
+    {
+        type: "function",
+        name: "createAccount",
+        inputs: [
+            { name: "data", type: "bytes", internalType: "bytes" },
+            { name: "salt", type: "bytes32", internalType: "bytes32" }
+        ],
+        outputs: [{ name: "", type: "address", internalType: "address" }],
+        stateMutability: "payable"
+    }
+] as const
diff --git a/packages/permissionless/accounts/kernel/toKernelSmartAccount.ts b/packages/permissionless/accounts/kernel/toKernelSmartAccount.ts
@@ -41,6 +41,7 @@ import {
     KernelV3InitAbi,
     KernelV3_1AccountAbi
 } from "./abi/KernelV3AccountAbi.js"
+import { KernelV3FactoryAbi } from "./abi/KernelV3FactoryAbi.js"
 import { KernelV3MetaFactoryDeployWithFactoryAbi } from "./abi/KernelV3MetaFactoryAbi.js"
 import {
     DUMMY_ECDSA_SIGNATURE,
@@ -315,7 +316,8 @@ const getAccountInitCode = async <entryPointVersion extends "0.6" | "0.7">({
     index,
     factoryAddress,
     accountLogicAddress,
-    validatorAddress
+    validatorAddress,
+    useMetaFactory
 }: {
     kernelVersion: KernelVersion<entryPointVersion>
     entryPointVersion: entryPointVersion
@@ -324,6 +326,7 @@ const getAccountInitCode = async <entryPointVersion extends "0.6" | "0.7">({
     factoryAddress: Address
     accountLogicAddress: Address
     validatorAddress: Address
+    useMetaFactory: boolean
 }): Promise<Hex> => {
     // Build the account initialization data
     const initializationData = getInitializationData({
@@ -343,6 +346,14 @@ const getAccountInitCode = async <entryPointVersion extends "0.6" | "0.7">({
         })
     }
 
+    if (!useMetaFactory) {
+        return encodeFunctionData({
+            abi: KernelV3FactoryAbi,
+            functionName: "createAccount",
+            args: [initializationData, toHex(index, { size: 32 })]
+        })
+    }
+
     return encodeFunctionData({
         abi: KernelV3MetaFactoryDeployWithFactoryAbi,
         functionName: "deployWithFactory",
@@ -374,6 +385,7 @@ export type ToKernelSmartAccountParameters<
     accountLogicAddress?: Address
     validatorAddress?: Address
     nonceKey?: bigint
+    useMetaFactory?: boolean
 }
 
 export type KernelSmartAccountImplementation<
@@ -431,7 +443,8 @@ export async function toKernelSmartAccount<
         validatorAddress: _validatorAddress,
         factoryAddress: _factoryAddress,
         metaFactoryAddress: _metaFactoryAddress,
-        accountLogicAddress: _accountLogicAddress
+        accountLogicAddress: _accountLogicAddress,
+        useMetaFactory = true
     } = parameters
 
     const isWebAuthn = owners[0].type === "webAuthn"
@@ -484,7 +497,8 @@ export async function toKernelSmartAccount<
             index,
             factoryAddress,
             accountLogicAddress,
-            validatorAddress
+            validatorAddress,
+            useMetaFactory
         })
 
     let accountAddress: Address | undefined = address
@@ -502,7 +516,7 @@ export async function toKernelSmartAccount<
     const getFactoryArgs = async () => {
         return {
             factory:
-                entryPoint.version === "0.6"
+                entryPoint.version === "0.6" || useMetaFactory === false
                     ? factoryAddress
                     : metaFactoryAddress,
             factoryData: await generateInitCode()