@zerodev/permissions 5.2.1-alpha.1 → 5.2.1-alpha.10

package/toPermissionValidator.ts

@@ -1,5 +1,9 @@
 import { KernelV3AccountAbi } from "@zerodev/sdk"
-import { getAction, getUserOperationHash } from "permissionless"
+import {
+    getAction,
+    getEntryPointVersion,
+    getUserOperationHash
+} from "permissionless"
 import type { EntryPoint } from "permissionless/types/entrypoint"
 import {
     type Address,
@@ -38,6 +42,11 @@ export async function toPermissionValidator<
     }: PermissionPluginParams
 ): Promise<PermissionPlugin<entryPoint>> {
     const chainId = await getChainId(client)
+    const entryPointVersion = getEntryPointVersion(entryPointAddress)
+
+    if (entryPointVersion !== "v0.7") {
+        throw new Error("Only EntryPoint 0.7 is supported")
+    }
 
     const getEnableData = async (
         _kernelAccountAddress?: Address
@@ -49,13 +58,13 @@ export async function toPermissionValidator<
                     ...policies.map((policy) =>
                         concat([
                             policy.getPolicyInfoInBytes(),
-                            policy.getPolicyData(getPermissionId())
+                            policy.getPolicyData()
                         ])
                     ),
                     concat([
                         flag,
                         signer.signerContractAddress,
-                        signer.getSignerData(getPermissionId())
+                        signer.getSignerData()
                     ])
                 ]
             ]
@@ -68,7 +77,7 @@ export async function toPermissionValidator<
             [{ name: "policyAndSignerData", type: "bytes[]" }],
             [[toPolicyId(policies), flag, toSignerId(signer)]]
         )
-        return slice(keccak256(pIdData), 0, 2)
+        return slice(keccak256(pIdData), 0, 4)
     }
 
     return {
@@ -77,11 +86,7 @@ export async function toPermissionValidator<
         address: zeroAddress,
         source: "PermissionValidator",
         getEnableData,
-        getIdentifier: () =>
-            pad(getPermissionId(), {
-                size: 20,
-                dir: "right"
-            }),
+        getIdentifier: getPermissionId,
 
         signMessage: async ({ message }) => {
             return concat([
@@ -100,7 +105,7 @@ export async function toPermissionValidator<
             const userOpHash = getUserOperationHash({
                 userOperation: { ...userOperation, signature: "0x" },
                 entryPoint: entryPointAddress,
-                chainId: chainId
+                chainId
             })
 
             const signature = await signer.account.signMessage({
@@ -109,7 +114,10 @@ export async function toPermissionValidator<
             return concat(["0xff", signature])
         },
 
-        getNonceKey: async () => {
+        async getNonceKey(_accountAddress?: Address, customNonceKey?: bigint) {
+            if (customNonceKey) {
+                return customNonceKey
+            }
             return 0n
         },
 

package/types.ts

@@ -29,12 +29,12 @@ export type PolicyParams = {
 export type ModularSigner = {
     account: LocalAccount
     signerContractAddress: Address
-    getSignerData: (permissionId?: Hex) => Hex
+    getSignerData: () => Hex
     getDummySignature: () => Hex
 }
 
 export type Policy = {
-    getPolicyData: (permissionId?: Hex) => Hex
+    getPolicyData: () => Hex
     getPolicyInfoInBytes: () => Hex
     // return params directly to serialize/deserialize Policy
     policyParams: