permissionless 0.2.23 → 0.2.24

package/_types/accounts/safe/toSafeSmartAccount.d.ts

@@ -1,7 +1,35 @@
-import { type Account, type Address, type Assign, type Chain, type Client, type LocalAccount, type OneOf, type Transport, type WalletClient } from "viem";
-import { type SmartAccount, type SmartAccountImplementation, entryPoint06Abi, entryPoint07Abi } from "viem/account-abstraction";
-import { type EthereumProvider } from "../../utils/toOwner.js";
+import { type Account, type Address, type Assign, type Chain, type Client, type Transport, type WalletClient } from "viem";
+import { type SmartAccount, type SmartAccountImplementation, type UserOperation, entryPoint06Abi, entryPoint07Abi } from "viem/account-abstraction";
 export type SafeVersion = "1.4.1";
+export declare const EIP712_SAFE_OPERATION_TYPE_V06: {
+    SafeOp: {
+        type: string;
+        name: string;
+    }[];
+};
+export declare const EIP712_SAFE_OPERATION_TYPE_V07: {
+    SafeOp: {
+        type: string;
+        name: string;
+    }[];
+};
+export declare function getPaymasterAndData(unpackedUserOperation: UserOperation): `0x${string}`;
+export declare const getDefaultAddresses: (safeVersion: SafeVersion, entryPointVersion: "0.6" | "0.7", { addModuleLibAddress: _addModuleLibAddress, safeModuleSetupAddress: _safeModuleSetupAddress, safe4337ModuleAddress: _safe4337ModuleAddress, safeProxyFactoryAddress: _safeProxyFactoryAddress, safeSingletonAddress: _safeSingletonAddress, multiSendAddress: _multiSendAddress, multiSendCallOnlyAddress: _multiSendCallOnlyAddress }: {
+    addModuleLibAddress?: Address;
+    safeModuleSetupAddress?: Address;
+    safe4337ModuleAddress?: Address;
+    safeProxyFactoryAddress?: Address;
+    safeSingletonAddress?: Address;
+    multiSendAddress?: Address;
+    multiSendCallOnlyAddress?: Address;
+}) => {
+    safeModuleSetupAddress: `0x${string}`;
+    safe4337ModuleAddress: `0x${string}`;
+    safeProxyFactoryAddress: `0x${string}`;
+    safeSingletonAddress: `0x${string}`;
+    multiSendAddress: `0x${string}`;
+    multiSendCallOnlyAddress: `0x${string}`;
+};
 type GetErc7579Params<TErc7579 extends Address | undefined> = TErc7579 extends undefined ? {
     safeModuleSetupAddress?: Address;
     multiSendAddress?: Address;
@@ -34,9 +62,8 @@ type GetErc7579Params<TErc7579 extends Address | undefined> = TErc7579 extends u
 };
 export type ToSafeSmartAccountParameters<entryPointVersion extends "0.6" | "0.7", TErc7579 extends Address | undefined> = {
     client: Client;
-    owners: [
-        OneOf<EthereumProvider | WalletClient<Transport, Chain | undefined, Account> | LocalAccount>
-    ];
+    owners: (Account | WalletClient<Transport, Chain | undefined, Account>)[];
+    threshold?: bigint;
     version: SafeVersion;
     entryPoint?: {
         address: Address;

package/_types/accounts/safe/toSafeSmartAccount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toSafeSmartAccount.d.ts","sourceRoot":"","sources":["../../../accounts/safe/toSafeSmartAccount.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"toSafeSmartAccount.d.ts","sourceRoot":"","sources":["../../../accounts/safe/toSafeSmartAccount.ts"],"names":[],"mappings":"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"}

package/accounts/safe/index.ts

@@ -0,0 +1,22 @@
+import {
+    type SafeSmartAccountImplementation,
+    type SafeVersion,
+    type ToSafeSmartAccountParameters,
+    type ToSafeSmartAccountReturnType,
+    toSafeSmartAccount
+} from "./toSafeSmartAccount.js"
+
+import { signUserOperation } from "./signUserOperation.js"
+
+const SafeSmartAccount = {
+    toSafeSmartAccount,
+    signUserOperation
+}
+
+export {
+    type SafeSmartAccountImplementation,
+    type SafeVersion,
+    type ToSafeSmartAccountParameters,
+    type ToSafeSmartAccountReturnType,
+    SafeSmartAccount
+}

package/accounts/safe/signUserOperation.test.ts

@@ -0,0 +1,277 @@
+import {
+    entryPoint06Address,
+    entryPoint07Address
+} from "viem/account-abstraction"
+import {
+    generatePrivateKey,
+    privateKeyToAccount,
+    toAccount
+} from "viem/accounts"
+import { foundry } from "viem/chains"
+import { describe, expect } from "vitest"
+import { testWithRpc } from "../../../permissionless-test/src/testWithRpc"
+import {
+    getBundlerClient,
+    getSafeClient
+} from "../../../permissionless-test/src/utils"
+import { signUserOperation } from "./signUserOperation"
+
+describe("signUserOperation", () => {
+    testWithRpc("signUserOperation_V06", async ({ rpc }) => {
+        const owners = [
+            privateKeyToAccount(generatePrivateKey()),
+            privateKeyToAccount(generatePrivateKey()),
+            privateKeyToAccount(generatePrivateKey())
+        ]
+
+        const safeAccountClient = getBundlerClient({
+            account: await getSafeClient({
+                ...rpc,
+                entryPoint: {
+                    version: "0.6"
+                },
+                owners: owners.map((owner) => toAccount(owner.address))
+            }),
+            entryPoint: {
+                version: "0.6"
+            },
+            ...rpc
+        })
+
+        const unSignedUserOperation =
+            await safeAccountClient.prepareUserOperation({
+                calls: [
+                    {
+                        to: safeAccountClient.account.address,
+                        data: "0x"
+                    }
+                ]
+            })
+
+        let partialSignatures = await signUserOperation({
+            version: "1.4.1",
+            entryPoint: {
+                address: entryPoint06Address,
+                version: "0.6"
+            },
+            chainId: foundry.id,
+            owners: owners.map((owner) => toAccount(owner.address)),
+            account: owners[0],
+            ...unSignedUserOperation
+        })
+
+        partialSignatures = await signUserOperation({
+            version: "1.4.1",
+            entryPoint: {
+                address: entryPoint06Address,
+                version: "0.6"
+            },
+            chainId: foundry.id,
+            owners: owners.map((owner) => toAccount(owner.address)),
+            account: owners[1],
+            signatures: partialSignatures,
+            ...unSignedUserOperation
+        })
+
+        const finalSignature = await signUserOperation({
+            version: "1.4.1",
+            entryPoint: {
+                address: entryPoint06Address,
+                version: "0.6"
+            },
+            chainId: foundry.id,
+            owners: owners.map((owner) => toAccount(owner.address)),
+            account: owners[2],
+            signatures: partialSignatures,
+            ...unSignedUserOperation
+        })
+
+        const userOpHash = safeAccountClient.sendUserOperation({
+            ...unSignedUserOperation,
+            signature: finalSignature
+        })
+
+        expect(userOpHash).toBeTruthy()
+
+        const receipt = await safeAccountClient.waitForUserOperationReceipt({
+            hash: await userOpHash
+        })
+
+        expect(receipt).toBeTruthy()
+        expect(receipt.success).toBeTruthy()
+    })
+
+    testWithRpc("signUserOperation_V07", async ({ rpc }) => {
+        const owners = [
+            privateKeyToAccount(generatePrivateKey()),
+            privateKeyToAccount(generatePrivateKey()),
+            privateKeyToAccount(generatePrivateKey())
+        ]
+
+        const safeAccountClient = getBundlerClient({
+            account: await getSafeClient({
+                ...rpc,
+                entryPoint: {
+                    version: "0.7"
+                },
+                owners: owners.map((owner) => toAccount(owner.address))
+            }),
+            entryPoint: {
+                version: "0.7"
+            },
+            ...rpc
+        })
+
+        const unSignedUserOperation =
+            await safeAccountClient.prepareUserOperation({
+                calls: [
+                    {
+                        to: safeAccountClient.account.address,
+                        data: "0x"
+                    }
+                ]
+            })
+
+        let partialSignatures = await signUserOperation({
+            version: "1.4.1",
+            entryPoint: {
+                address: entryPoint07Address,
+                version: "0.7"
+            },
+            chainId: foundry.id,
+            owners: owners.map((owner) => toAccount(owner.address)),
+            account: owners[0],
+            ...unSignedUserOperation
+        })
+
+        partialSignatures = await signUserOperation({
+            version: "1.4.1",
+            entryPoint: {
+                address: entryPoint07Address,
+                version: "0.7"
+            },
+            chainId: foundry.id,
+            owners: owners.map((owner) => toAccount(owner.address)),
+            account: owners[1],
+            signatures: partialSignatures,
+            ...unSignedUserOperation
+        })
+
+        const finalSignature = await signUserOperation({
+            version: "1.4.1",
+            entryPoint: {
+                address: entryPoint07Address,
+                version: "0.7"
+            },
+            chainId: foundry.id,
+            owners: owners.map((owner) => toAccount(owner.address)),
+            account: owners[2],
+            signatures: partialSignatures,
+            ...unSignedUserOperation
+        })
+
+        const userOpHash = safeAccountClient.sendUserOperation({
+            ...unSignedUserOperation,
+            signature: finalSignature
+        })
+
+        expect(userOpHash).toBeTruthy()
+
+        const receipt = await safeAccountClient.waitForUserOperationReceipt({
+            hash: await userOpHash
+        })
+
+        expect(receipt).toBeTruthy()
+        expect(receipt.success).toBeTruthy()
+    })
+
+    testWithRpc("signUserOperation_V07 7579", async ({ rpc }) => {
+        const { anvilRpc } = rpc
+
+        const owners = [
+            privateKeyToAccount(generatePrivateKey()),
+            privateKeyToAccount(generatePrivateKey()),
+            privateKeyToAccount(generatePrivateKey())
+        ]
+
+        const safeAccountClient = getBundlerClient({
+            account: await getSafeClient({
+                ...rpc,
+                entryPoint: {
+                    version: "0.7"
+                },
+                owners: owners.map((owner) => toAccount(owner.address)),
+                erc7579: true
+            }),
+            entryPoint: {
+                version: "0.7"
+            },
+            ...rpc
+        })
+
+        const unSignedUserOperation =
+            await safeAccountClient.prepareUserOperation({
+                calls: [
+                    {
+                        to: safeAccountClient.account.address,
+                        data: "0x"
+                    }
+                ]
+            })
+
+        let partialSignatures = await signUserOperation({
+            version: "1.4.1",
+            entryPoint: {
+                address: entryPoint07Address,
+                version: "0.7"
+            },
+            chainId: foundry.id,
+            owners: owners.map((owner) => toAccount(owner.address)),
+            account: owners[0],
+            safe4337ModuleAddress: "0x7579EE8307284F293B1927136486880611F20002",
+            ...unSignedUserOperation
+        })
+
+        partialSignatures = await signUserOperation({
+            version: "1.4.1",
+            entryPoint: {
+                address: entryPoint07Address,
+                version: "0.7"
+            },
+            chainId: foundry.id,
+            owners: owners.map((owner) => toAccount(owner.address)),
+            account: owners[1],
+            signatures: partialSignatures,
+            safe4337ModuleAddress: "0x7579EE8307284F293B1927136486880611F20002",
+            ...unSignedUserOperation
+        })
+
+        const finalSignature = await signUserOperation({
+            version: "1.4.1",
+            entryPoint: {
+                address: entryPoint07Address,
+                version: "0.7"
+            },
+            chainId: foundry.id,
+            owners: owners.map((owner) => toAccount(owner.address)),
+            account: owners[2],
+            signatures: partialSignatures,
+            safe4337ModuleAddress: "0x7579EE8307284F293B1927136486880611F20002",
+            ...unSignedUserOperation
+        })
+
+        const userOpHash = safeAccountClient.sendUserOperation({
+            ...unSignedUserOperation,
+            signature: finalSignature
+        })
+
+        expect(userOpHash).toBeTruthy()
+
+        const receipt = await safeAccountClient.waitForUserOperationReceipt({
+            hash: await userOpHash
+        })
+
+        expect(receipt).toBeTruthy()
+        expect(receipt.success).toBeTruthy()
+    })
+})

package/accounts/safe/signUserOperation.ts

@@ -0,0 +1,177 @@
+import {
+    type Account,
+    type Address,
+    type Chain,
+    type Hex,
+    type LocalAccount,
+    type OneOf,
+    type Transport,
+    type UnionPartialBy,
+    type WalletClient,
+    concat,
+    concatHex,
+    decodeAbiParameters,
+    encodeAbiParameters,
+    encodePacked
+} from "viem"
+import type { UserOperation } from "viem/account-abstraction"
+import { toOwner } from "../../utils/index.js"
+import type { EthereumProvider } from "../../utils/toOwner.js"
+import {
+    EIP712_SAFE_OPERATION_TYPE_V06,
+    EIP712_SAFE_OPERATION_TYPE_V07,
+    type SafeVersion,
+    getDefaultAddresses,
+    getPaymasterAndData
+} from "./toSafeSmartAccount.js"
+
+export async function signUserOperation(
+    parameters: UnionPartialBy<UserOperation, "sender"> & {
+        version: SafeVersion
+        entryPoint: {
+            address: Address
+            version: "0.6" | "0.7"
+        }
+        owners: Account[]
+        account: OneOf<
+            | EthereumProvider
+            | WalletClient<Transport, Chain | undefined, Account>
+            | LocalAccount
+        >
+        chainId: number
+        signatures?: Hex
+        validAfter?: number
+        validUntil?: number
+        safe4337ModuleAddress?: Address
+    }
+) {
+    const {
+        chainId,
+        entryPoint,
+        validAfter = 0,
+        validUntil = 0,
+        safe4337ModuleAddress: _safe4337ModuleAddress,
+        version,
+        owners,
+        signatures: existingSignatures,
+        account,
+        ...userOperation
+    } = parameters
+
+    const { safe4337ModuleAddress } = getDefaultAddresses(
+        version,
+        entryPoint.version,
+        {
+            safe4337ModuleAddress: _safe4337ModuleAddress
+        }
+    )
+
+    const message = {
+        safe: userOperation.sender,
+        callData: userOperation.callData,
+        nonce: userOperation.nonce,
+        initCode: userOperation.initCode ?? "0x",
+        maxFeePerGas: userOperation.maxFeePerGas,
+        maxPriorityFeePerGas: userOperation.maxPriorityFeePerGas,
+        preVerificationGas: userOperation.preVerificationGas,
+        verificationGasLimit: userOperation.verificationGasLimit,
+        callGasLimit: userOperation.callGasLimit,
+        paymasterAndData: userOperation.paymasterAndData ?? "0x",
+        validAfter: validAfter,
+        validUntil: validUntil,
+        entryPoint: entryPoint.address
+    }
+
+    if ("initCode" in userOperation) {
+        message.paymasterAndData = userOperation.paymasterAndData ?? "0x"
+    }
+
+    if ("factory" in userOperation) {
+        if (userOperation.factory && userOperation.factoryData) {
+            message.initCode = concatHex([
+                userOperation.factory,
+                userOperation.factoryData
+            ])
+        }
+        if (!userOperation.sender) {
+            throw new Error("Sender is required")
+        }
+        message.paymasterAndData = getPaymasterAndData({
+            ...userOperation,
+            sender: userOperation.sender
+        })
+    }
+
+    const localOwners = [
+        await toOwner({
+            owner: account as OneOf<LocalAccount | EthereumProvider>
+        })
+    ]
+
+    let unPackedSignatures: readonly { signer: Address; data: Hex }[] = []
+
+    if (existingSignatures) {
+        const decoded = decodeAbiParameters(
+            [
+                {
+                    components: [
+                        { type: "address", name: "signer" },
+                        { type: "bytes", name: "data" }
+                    ],
+                    name: "signatures",
+                    type: "tuple[]"
+                }
+            ],
+            existingSignatures
+        )
+
+        unPackedSignatures = decoded[0]
+    }
+
+    const signatures: { signer: Address; data: Hex }[] = [
+        ...unPackedSignatures,
+        ...(await Promise.all(
+            localOwners.map(async (localOwner) => ({
+                signer: localOwner.address,
+                data: await localOwner.signTypedData({
+                    domain: {
+                        chainId,
+                        verifyingContract: safe4337ModuleAddress
+                    },
+                    types:
+                        entryPoint.version === "0.6"
+                            ? EIP712_SAFE_OPERATION_TYPE_V06
+                            : EIP712_SAFE_OPERATION_TYPE_V07,
+                    primaryType: "SafeOp",
+                    message: message
+                })
+            }))
+        ))
+    ]
+
+    if (signatures.length !== owners.length) {
+        return encodeAbiParameters(
+            [
+                {
+                    components: [
+                        { type: "address", name: "signer" },
+                        { type: "bytes", name: "data" }
+                    ],
+                    name: "signatures",
+                    type: "tuple[]"
+                }
+            ],
+            [signatures]
+        )
+    }
+
+    signatures.sort((left, right) =>
+        left.signer.toLowerCase().localeCompare(right.signer.toLowerCase())
+    )
+    const signatureBytes = concat(signatures.map((sig) => sig.data))
+
+    return encodePacked(
+        ["uint48", "uint48", "bytes"],
+        [validAfter, validUntil, signatureBytes]
+    )
+}