@zerodev/permissions 5.4.10 → 5.5.0-beta.1

package/signers/toECDSASigner.ts

@@ -1,41 +1,29 @@
-import { constants, fixSignedData } from "@zerodev/sdk"
+import { constants, fixSignedData, toSigner } from "@zerodev/sdk"
+import type { Signer } from "@zerodev/sdk/types"
 import type { TypedData } from "abitype"
-import {
-    SignTransactionNotSupportedBySmartAccount,
-    type SmartAccountSigner
-} from "permissionless/accounts"
-import type { Address, LocalAccount, TypedDataDefinition } from "viem"
+import type { TypedDataDefinition } from "viem"
 import { toAccount } from "viem/accounts"
 import { ECDSA_SIGNER_CONTRACT } from "../constants.js"
 import type { ModularSigner, ModularSignerParams } from "../types.js"
 
-export type ECDSAModularSignerParams<
-    TSource extends string = "custom",
-    TAddress extends Address = Address
-> = ModularSignerParams & {
-    signer: SmartAccountSigner<TSource, TAddress>
+export type ECDSAModularSignerParams = ModularSignerParams & {
+    signer: Signer
 }
 
-export function toECDSASigner<
-    TSource extends string = "custom",
-    TAddress extends Address = Address
->({
+export async function toECDSASigner({
     signer,
     signerContractAddress = ECDSA_SIGNER_CONTRACT
-}: ECDSAModularSignerParams<TSource, TAddress>): ModularSigner {
-    const viemSigner: LocalAccount = {
-        ...signer,
-        signTransaction: (_, __) => {
-            throw new SignTransactionNotSupportedBySmartAccount()
-        }
-    } as LocalAccount
+}: ECDSAModularSignerParams): Promise<ModularSigner> {
+    const viemSigner = await toSigner({ signer })
     const account = toAccount({
         address: viemSigner.address,
         async signMessage({ message }) {
             return fixSignedData(await viemSigner.signMessage({ message }))
         },
         async signTransaction(_, __) {
-            throw new SignTransactionNotSupportedBySmartAccount()
+            throw new Error(
+                "Smart account signer doesn't need to sign transactions"
+            )
         },
         async signTypedData<
             const TTypedData extends TypedData | Record<string, unknown>,

package/signers/toWebAuthnSigner.ts

@@ -10,7 +10,6 @@ import {
     uint8ArrayToHexString
 } from "@zerodev/webauthn-key"
 import type { TypedData } from "abitype"
-import { SignTransactionNotSupportedBySmartAccount } from "permissionless/accounts"
 import {
     type Address,
     type Chain,
@@ -161,7 +160,9 @@ export const toWebAuthnSigner = async <
             ])
         },
         async signTransaction(_, __) {
-            throw new SignTransactionNotSupportedBySmartAccount()
+            throw new Error(
+                "Smart account signer doesn't need to sign transactions"
+            )
         },
         async signTypedData<
             const TTypedData extends TypedData | Record<string, unknown>,

package/toPermissionValidator.ts

@@ -1,18 +1,19 @@
 import { KernelV3AccountAbi } from "@zerodev/sdk"
-import { getEntryPointVersion, getUserOperationHash } from "permissionless"
-import type { EntryPoint } from "permissionless/types/entrypoint"
 import {
     type Address,
-    type Chain,
     type Client,
     type Hex,
-    type Transport,
     concat,
     encodeAbiParameters,
     keccak256,
     slice,
     zeroAddress
 } from "viem"
+import {
+    type EntryPointVersion,
+    type UserOperation,
+    getUserOperationHash
+} from "viem/account-abstraction"
 import { getChainId, readContract } from "viem/actions"
 import { getAction } from "viem/utils"
 import { PolicyFlags } from "./constants.js"
@@ -25,23 +26,20 @@ import type {
 } from "./types.js"
 
 export async function toPermissionValidator<
-    entryPoint extends EntryPoint,
-    TTransport extends Transport = Transport,
-    TChain extends Chain | undefined = Chain | undefined
+    entryPointVersion extends EntryPointVersion
 >(
-    client: Client<TTransport, TChain, undefined>,
+    client: Client,
     {
         signer,
         policies,
-        entryPoint: entryPointAddress,
+        entryPoint,
         kernelVersion: _,
         flag = PolicyFlags.FOR_ALL_VALIDATION
-    }: PermissionPluginParams<entryPoint>
-): Promise<PermissionPlugin<entryPoint>> {
+    }: PermissionPluginParams<entryPointVersion>
+): Promise<PermissionPlugin> {
     const chainId = await getChainId(client)
-    const entryPointVersion = getEntryPointVersion(entryPointAddress)
 
-    if (entryPointVersion !== "v0.7") {
+    if (entryPoint.version !== "0.7") {
         throw new Error("Only EntryPoint 0.7 is supported")
     }
 
@@ -101,8 +99,12 @@ export async function toPermissionValidator<
 
         signUserOperation: async (userOperation): Promise<Hex> => {
             const userOpHash = getUserOperationHash({
-                userOperation: { ...userOperation, signature: "0x" },
-                entryPoint: entryPointAddress,
+                userOperation: {
+                    ...userOperation,
+                    signature: "0x"
+                } as UserOperation<entryPointVersion>,
+                entryPointAddress: entryPoint.address,
+                entryPointVersion: entryPoint.version,
                 chainId
             })
 
@@ -119,7 +121,7 @@ export async function toPermissionValidator<
             return 0n
         },
 
-        async getDummySignature(_userOperation) {
+        async getStubSignature(_userOperation) {
             return concat(["0xff", signer.getDummySignature()])
         },
         getPluginSerializationParams: (): PermissionData => {

package/types.ts

@@ -1,11 +1,12 @@
 import type { KernelValidator } from "@zerodev/sdk"
 import type {
     Action,
+    EntryPointType,
     GetKernelVersion,
     PluginValidityData
 } from "@zerodev/sdk/types"
-import type { EntryPoint } from "permissionless/types/entrypoint"
 import type { Abi, Address, Hex, LocalAccount } from "viem"
+import type { EntryPointVersion } from "viem/account-abstraction"
 import type { PolicyFlags } from "./constants.js"
 import type {
     CallPolicyParams,
@@ -16,10 +17,7 @@ import type {
     TimestampPolicyParams
 } from "./policies/index.js"
 
-export type PermissionPlugin<entryPoint extends EntryPoint> = KernelValidator<
-    entryPoint,
-    "PermissionValidator"
-> & {
+export type PermissionPlugin = KernelValidator<"PermissionValidator"> & {
     getPluginSerializationParams: () => PermissionData
 }
 
@@ -53,11 +51,13 @@ export type Policy = {
         | (TimestampPolicyParams & { type: "timestamp" })
 }
 
-export type PermissionPluginParams<entryPoint extends EntryPoint> = {
+export type PermissionPluginParams<
+    entryPointVersion extends EntryPointVersion
+> = {
     signer: ModularSigner
     policies: Policy[]
-    entryPoint: entryPoint
-    kernelVersion: GetKernelVersion<entryPoint>
+    entryPoint: EntryPointType<entryPointVersion>
+    kernelVersion: GetKernelVersion<entryPointVersion>
     flag?: PolicyFlags
 }
 

package/utils.ts

@@ -1,4 +1,3 @@
-import type { EntryPoint } from "permissionless/types"
 import type { PermissionAccountParams, PermissionPlugin } from "./types.js"
 
 export function base64ToBytes(base64: string) {
@@ -11,10 +10,10 @@ export function bytesToBase64(bytes: Uint8Array) {
     return btoa(binString)
 }
 
-export function isPermissionValidatorPlugin<entryPoint extends EntryPoint>(
+export function isPermissionValidatorPlugin(
     // biome-ignore lint/suspicious/noExplicitAny: <explanation>
     plugin: any
-): plugin is PermissionPlugin<entryPoint> {
+): plugin is PermissionPlugin {
     return plugin?.getPluginSerializationParams !== undefined
 }