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

package/signers/toEmptyECDSASigner.ts

@@ -0,0 +1,34 @@
+import { constants } from "@zerodev/sdk"
+import type { TypedData } from "abitype"
+import { type Address, type TypedDataDefinition } from "viem"
+import { toAccount } from "viem/accounts"
+import { ECDSA_SIGNER_CONTRACT } from "../constants.js"
+import type { ModularSigner } from "../types.js"
+
+export function toEmptyECDSASigner(address: Address): ModularSigner {
+    const account = toAccount({
+        address,
+        async signMessage() {
+            throw new Error("Method not supported")
+        },
+        async signTransaction(_, __) {
+            throw new Error("Method not supported")
+        },
+        async signTypedData<
+            const TTypedData extends TypedData | Record<string, unknown>,
+            TPrimaryType extends
+                | keyof TTypedData
+                | "EIP712Domain" = keyof TTypedData
+        >(_typedData: TypedDataDefinition<TTypedData, TPrimaryType>) {
+            throw new Error("Method not supported")
+        }
+    })
+    return {
+        account,
+        signerContractAddress: ECDSA_SIGNER_CONTRACT,
+        getSignerData: () => {
+            return address
+        },
+        getDummySignature: () => constants.DUMMY_ECDSA_SIG
+    }
+}

package/signers/toWebAuthnPubKey.ts

@@ -1,5 +1,4 @@
 import { Buffer } from "buffer"
-import { startAuthentication, startRegistration } from "@simplewebauthn/browser"
 import { type Hex, keccak256 } from "viem"
 import { type WebAuthnKey } from "./toWebAuthnSigner.js"
 import { b64ToBytes, uint8ArrayToHexString } from "./webAuthnUtils.js"
@@ -33,6 +32,7 @@ export const toWebAuthnPubKey = async ({
         const loginOptions = await loginOptionsResponse.json()
 
         // Start authentication (login)
+        const { startAuthentication } = await import("@simplewebauthn/browser")
         const loginCred = await startAuthentication(loginOptions)
 
         // get authenticatorIdHash
@@ -88,6 +88,7 @@ export const toWebAuthnPubKey = async ({
         sessionStorage.setItem("userId", registerOptions.userId)
 
         // Start registration
+        const { startRegistration } = await import("@simplewebauthn/browser")
         const registerCred = await startRegistration(registerOptions.options)
 
         // get authenticatorIdHash

package/signers/toWebAuthnSigner.ts

@@ -1,4 +1,3 @@
-import { startAuthentication } from "@simplewebauthn/browser"
 import type { PublicKeyCredentialRequestOptionsJSON } from "@simplewebauthn/typescript-types"
 import type { TypedData } from "abitype"
 import { SignTransactionNotSupportedBySmartAccount } from "permissionless/accounts"
@@ -112,6 +111,8 @@ export const toWebAuthnSigner = async <
         }
 
         // start authentication (signing)
+
+        const { startAuthentication } = await import("@simplewebauthn/browser")
         const cred = await startAuthentication(assertionOptions)
 
         // verify signature from server

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: