@zerodev/permissions 5.6.2 → 5.6.4

package/policies/types.ts

@@ -7,8 +7,10 @@ import type {
     AbiParameterToPrimitiveType,
     AbiStateMutability,
     Address,
+    ContractFunctionName,
     Hex,
-    Narrow
+    Narrow,
+    Prettify
 } from "viem"
 
 export enum CallType {
@@ -24,7 +26,8 @@ export enum ParamCondition {
     GREATER_THAN_OR_EQUAL = 3,
     LESS_THAN_OR_EQUAL = 4,
     NOT_EQUAL = 5,
-    ONE_OF = 6
+    ONE_OF = 6,
+    SLICE_EQUAL = 7
 }
 
 export interface ParamRule {
@@ -113,6 +116,12 @@ type ConditionValue<
           condition: ParamCondition.ONE_OF
           value: AbiParameterToPrimitiveType<TAbiParameter, TAbiParameterKind>[]
       }
+    | {
+          condition: ParamCondition.SLICE_EQUAL
+          value: AbiParameterToPrimitiveType<TAbiParameter, TAbiParameterKind>
+          start: number
+          length: number
+      }
     | {
           condition: Exclude<ParamCondition, ParamCondition.ONE_OF>
           value: AbiParameterToPrimitiveType<TAbiParameter, TAbiParameterKind>
@@ -149,3 +158,43 @@ export type GeneratePermissionFromArgsParameters<
     : _FunctionName extends string
       ? { abi: [Narrow<TAbi[number]>] } & GetFunctionArgs<TAbi, _FunctionName>
       : never)
+
+// infer permission parameters from `unknown` - similar to GetMulticallContractParameters
+export type GetPermissionParameters<permission> = permission extends {
+    abi: infer abi extends Abi
+} // 1. Check if `abi` is const-asserted or defined inline
+    ? // 1a. Check if `functionName` is valid for `abi`
+      permission extends {
+          functionName: infer functionName extends ContractFunctionName<abi>
+      }
+        ? // Use PermissionWithABI which supports CombinedArgs
+          PermissionWithABI<abi, functionName>
+        : // 1b. `functionName` is invalid, check if `abi` is declared as `Abi`
+          Abi extends abi
+          ? PermissionWithABI<abi, string> // `abi` declared as `Abi`, unable to infer types further
+          : // `abi` is const-asserted or defined inline, infer types for `functionName` and `args`
+            PermissionWithABI<abi, string>
+    : permission extends { target: Address } // manual permission
+      ? PermissionManual
+      : never // invalid permission
+
+// Process permissions array - similar to MulticallContracts
+export type InferPermissions<
+    permissions extends readonly unknown[],
+    result extends readonly unknown[] = []
+> = permissions extends readonly [] // no permissions, return empty
+    ? readonly []
+    : permissions extends readonly [infer permission] // one permission left before returning `result`
+      ? readonly [...result, Prettify<GetPermissionParameters<permission>>]
+      : permissions extends readonly [infer permission, ...infer rest] // grab first permission and recurse through `rest`
+        ? InferPermissions<
+              [...rest],
+              [...result, Prettify<GetPermissionParameters<permission>>]
+          >
+        : readonly unknown[] extends permissions
+          ? permissions
+          : // If `permissions` is *some* array but we couldn't assign `unknown[]` to it, then it must hold some known/homogenous type!
+            permissions extends readonly (infer permission)[]
+            ? readonly Prettify<GetPermissionParameters<permission>>[]
+            : // Fallback
+              readonly Permission<Abi, string>[]

package/serializeMultiChainPermissionAccounts.ts

@@ -19,6 +19,8 @@ import {
 export type MultiChainPermissionAccountsParams = {
     account: SmartAccount<KernelSmartAccountImplementation>
     privateKey?: Hex
+    permissionPlugin?: PermissionPlugin
+    isExternalPermissionPlugin?: boolean
 }
 
 export const serializeMultiChainPermissionAccounts = async (
@@ -26,13 +28,21 @@ export const serializeMultiChainPermissionAccounts = async (
 ): Promise<string[]> => {
     if (params.length === 0) return []
 
+    let isPreInstalled = false
     const permissionParamsPerAccounts = params.map((param) => {
-        if (!isPermissionValidatorPlugin(param.account.kernelPluginManager)) {
+        if (
+            isPermissionValidatorPlugin(param.account.kernelPluginManager) &&
+            !param.isExternalPermissionPlugin
+        ) {
+            return (
+                param.account.kernelPluginManager as PermissionPlugin
+            ).getPluginSerializationParams()
+        } else if (param.permissionPlugin) {
+            isPreInstalled = !param.isExternalPermissionPlugin
+            return param.permissionPlugin.getPluginSerializationParams()
+        } else {
             throw new Error("Account plugin is not a permission validator")
         }
-        return (
-            param.account.kernelPluginManager as PermissionPlugin
-        ).getPluginSerializationParams()
     })
 
     const actions = params.map((param) =>
@@ -43,23 +53,30 @@ export const serializeMultiChainPermissionAccounts = async (
         param.account.kernelPluginManager.getValidityData()
     )
 
-    const pluginEnableTypedDatas = await Promise.all(
-        params.map(async (param) => {
-            return param.account.kernelPluginManager.getPluginsEnableTypedData(
-                param.account.address
-            )
-        })
-    )
-
-    // build merkle tree for enable signatures
-    const leaves = pluginEnableTypedDatas.map((typedData) => {
-        return hashTypedData(typedData)
-    })
+    let leaves: Hex[] = []
+    let merkleTree: MerkleTree = new MerkleTree(leaves)
+
+    if (!isPreInstalled) {
+        const pluginEnableTypedDatas = await Promise.all(
+            params.map(async (param) => {
+                return param.account.kernelPluginManager.getPluginsEnableTypedData(
+                    param.account.address,
+                    param.isExternalPermissionPlugin
+                        ? param.permissionPlugin
+                        : undefined // override permission plugin if externalPlugin
+                )
+            })
+        )
 
-    const merkleTree = new MerkleTree(leaves, keccak256, {
-        sortPairs: true
-    })
+        // build merkle tree for enable signatures
+        leaves = pluginEnableTypedDatas.map((typedData) => {
+            return hashTypedData(typedData)
+        })
 
+        merkleTree = new MerkleTree(leaves, keccak256, {
+            sortPairs: true
+        })
+    }
     const merkleRoot = merkleTree.getHexRoot() as Hex
 
     const toEthSignedMessageHash = hashMessage({ raw: merkleRoot })
@@ -67,7 +84,8 @@ export const serializeMultiChainPermissionAccounts = async (
     let signature: Hex = "0x"
     if (
         params[0].account.kernelPluginManager.sudoValidator?.source ===
-        "MultiChainECDSAValidator"
+            "MultiChainECDSAValidator" &&
+        !isPreInstalled
     ) {
         signature =
             await params[0].account.kernelPluginManager.sudoValidator?.signMessage(
@@ -80,7 +98,8 @@ export const serializeMultiChainPermissionAccounts = async (
     }
     if (
         params[0].account.kernelPluginManager.sudoValidator?.source ===
-        "MultiChainWebAuthnValidator"
+            "MultiChainWebAuthnValidator" &&
+        !isPreInstalled
     ) {
         const encodedSignature =
             await params[0].account.kernelPluginManager.sudoValidator?.signMessage(
@@ -96,6 +115,8 @@ export const serializeMultiChainPermissionAccounts = async (
     // get enable signatures for multi-chain validator
     const enableSignatures = await Promise.all(
         params.map(async (param, index) => {
+            if (isPreInstalled) return undefined
+
             if (!param.account.kernelPluginManager.sudoValidator) {
                 throw new Error(
                     "No sudo validator found, check if sudo validator is multi-chain validator"

package/serializePermissionAccount.ts

@@ -13,7 +13,8 @@ export const serializePermissionAccount = async (
     privateKey?: Hex,
     enableSignature?: Hex,
     eip7702Auth?: SignAuthorizationReturnType,
-    permissionPlugin?: PermissionPlugin
+    permissionPlugin?: PermissionPlugin,
+    isExternalPermissionPlugin?: boolean
 ): Promise<string> => {
     let permissionParams: PermissionData
     let isPreInstalled = false
@@ -21,13 +22,16 @@ export const serializePermissionAccount = async (
     const validityData = account.kernelPluginManager.getValidityData()
 
     // Check if permission plugin is in kernelPluginManager
-    if (isPermissionValidatorPlugin(account.kernelPluginManager)) {
+    if (
+        isPermissionValidatorPlugin(account.kernelPluginManager) &&
+        !isExternalPermissionPlugin
+    ) {
         permissionParams =
             account.kernelPluginManager.getPluginSerializationParams()
     } else if (permissionPlugin) {
         // Permission plugin provided externally (initConfig case)
         permissionParams = permissionPlugin.getPluginSerializationParams()
-        isPreInstalled = true
+        isPreInstalled = !isExternalPermissionPlugin
     } else {
         throw new Error("No permission validator found in account or provided")
     }
@@ -36,7 +40,8 @@ export const serializePermissionAccount = async (
         ? undefined
         : (enableSignature ??
           (await account.kernelPluginManager.getPluginEnableSignature(
-              account.address
+              account.address,
+              isExternalPermissionPlugin ? permissionPlugin : undefined // override permission plugin if externalPlugin
           )))
     const _eip7702Auth = account.authorization
         ? (eip7702Auth ?? (await account?.eip7702Authorization?.()))

package/toInitConfig.ts

@@ -15,7 +15,9 @@ import {
 import type { PermissionPlugin } from "./types.js"
 
 export async function toInitConfig(
-    permissionPlugin: PermissionPlugin
+    permissionPlugin: PermissionPlugin,
+    hook: Hex = zeroAddress,
+    hookData: Hex = "0x"
 ): Promise<Hex[]> {
     const permissionInstallFunctionData = encodeFunctionData({
         abi: KernelV3_3AccountAbi,
@@ -30,9 +32,9 @@ export async function toInitConfig(
                     { size: 21, dir: "right" }
                 )
             ],
-            [{ nonce: 1, hook: zeroAddress }],
+            [{ nonce: 1, hook }],
             [await permissionPlugin.getEnableData()],
-            ["0x"]
+            [hookData]
         ]
     })
     const grantAccessFunctionData = encodeFunctionData({

package/types.ts

@@ -5,7 +5,7 @@ import type {
     GetKernelVersion,
     PluginValidityData
 } from "@zerodev/sdk/types"
-import type { Abi, Address, Hex, LocalAccount } from "viem"
+import type { Address, Hex, LocalAccount } from "viem"
 import type { EntryPointVersion } from "viem/account-abstraction"
 import type { SignAuthorizationReturnType } from "viem/accounts"
 import type { PolicyFlags } from "./constants.js"
@@ -42,7 +42,7 @@ export type Policy = {
     getPolicyInfoInBytes: () => Hex
     // return params directly to serialize/deserialize Policy
     policyParams:
-        | (CallPolicyParams<Abi | readonly unknown[], string> & {
+        | (CallPolicyParams & {
               type: "call"
           })
         | (GasPolicyParams & { type: "gas" })