@zerodev/sdk 5.4.0-beta.0 → 5.4.0-beta.2

package/utils/toSigner.ts

@@ -0,0 +1,106 @@
+// Copied from: https://github.com/pimlicolabs/permissionless.js/blob/main/packages/permissionless/utils/toOwner.ts
+import {
+    type Account,
+    type Address,
+    type Chain,
+    type EIP1193Provider,
+    type EIP1193RequestFn,
+    type EIP1474Methods,
+    type LocalAccount,
+    type Transport,
+    type TypedData,
+    type TypedDataDefinition,
+    type WalletClient,
+    createWalletClient,
+    custom
+} from "viem"
+import { toAccount } from "viem/accounts"
+
+import { signMessage, signTypedData } from "viem/actions"
+import type { Signer } from "../types"
+
+export async function toSigner({
+    signer,
+    address
+}: {
+    signer: Signer
+    address?: Address
+}): Promise<LocalAccount> {
+    if ("type" in signer && signer.type === "local") {
+        return signer as LocalAccount
+    }
+
+    let walletClient:
+        | WalletClient<Transport, Chain | undefined, Account>
+        | undefined = undefined
+
+    if ("request" in signer) {
+        if (!address) {
+            try {
+                ;[address] = await (
+                    signer.request as EIP1193RequestFn<EIP1474Methods>
+                )({
+                    method: "eth_requestAccounts"
+                })
+            } catch {
+                ;[address] = await (
+                    signer.request as EIP1193RequestFn<EIP1474Methods>
+                )({
+                    method: "eth_accounts"
+                })
+            }
+        }
+        if (!address) {
+            // For TS to be happy
+            throw new Error("address is required")
+        }
+        walletClient = createWalletClient({
+            account: address,
+            transport: custom(signer as EIP1193Provider)
+        })
+    }
+
+    if (!walletClient) {
+        walletClient = signer as WalletClient<
+            Transport,
+            Chain | undefined,
+            Account
+        >
+    }
+
+    return toAccount({
+        address: walletClient.account.address,
+        async signMessage({ message }) {
+            return signMessage(
+                walletClient as WalletClient<
+                    Transport,
+                    Chain | undefined,
+                    Account
+                >,
+                { message }
+            )
+        },
+        async signTypedData(typedData) {
+            const { primaryType, domain, message, types } =
+                typedData as TypedDataDefinition<TypedData, string>
+            return signTypedData(
+                walletClient as WalletClient<
+                    Transport,
+                    Chain | undefined,
+                    Account
+                >,
+                {
+                    primaryType,
+                    domain,
+                    message,
+                    types
+                }
+            )
+        },
+        async signTransaction(_) {
+            throw new Error(
+                "Smart account signer doesn't need to sign transactions"
+            )
+        }
+    }) as LocalAccount
+}

package/utils.ts

@@ -14,7 +14,7 @@ import {
 import type { EntryPointVersion } from "viem/account-abstraction"
 import type { ZeroDevPaymasterClient } from "./clients/paymasterClient.js"
 import type { CALL_TYPE, EXEC_TYPE } from "./constants.js"
-import type { GetKernelVersion } from "./types/kernel.js"
+import type { EntryPointType, GetKernelVersion } from "./types/kernel.js"
 
 export enum KERNEL_FEATURES {
     ERC1271_SIG_WRAPPER = "ERC1271_SIG_WRAPPER",
@@ -50,7 +50,7 @@ export const getERC20PaymasterApproveCall = async <
     }: {
         gasToken: Address
         approveAmount: bigint
-        entryPoint: { address: Address; version: entryPointVersion }
+        entryPoint: EntryPointType<entryPointVersion>
     }
 ): Promise<{ to: Address; value: bigint; data: Hex }> => {
     const response = await client.request({