Merge branch 'main' of github.com:zerodevapp/sdk

zerodevapp · Dec 4, 2024 · e43060e · e43060e
2 parents 7931d94 + f92058b
commit e43060e
Show file tree

Hide file tree

Showing 10 changed files with 802 additions and 74 deletions.
diff --git a/packages/test/v0.7/multiChainECDSAValidator.test.ts b/packages/test/v0.7/multiChainECDSAValidator.test.ts
@@ -6,6 +6,10 @@ import {
     signUserOperations
 } from "@zerodev/multi-chain-ecdsa-validator"
 import { toMultiChainECDSAValidator } from "@zerodev/multi-chain-ecdsa-validator"
+import {
+    type PrepareAndSignUserOperationsParameters,
+    prepareAndSignUserOperations
+} from "@zerodev/multi-chain-ecdsa-validator/actions/prepareAndSignUserOperations.js"
 import {
     EIP1271Abi,
     type KernelAccountClient,
@@ -24,6 +28,7 @@ import {
     http,
     type Address,
     type Chain,
+    type Client,
     type GetContractReturnType,
     type Hex,
     type PrivateKeyAccount,
@@ -94,7 +99,6 @@ const SEPOLIA_ZERODEV_RPC_URL = getBundlerRpc(
 const SEPOLIA_ZERODEV_PAYMASTER_RPC_URL = getPaymasterRpc(
     config["0.7"][sepolia.id].projectId
 )
-
 const OPTIMISM_SEPOLIA_ZERODEV_RPC_URL = getBundlerRpc(
     config["0.7"][optimismSepolia.id].projectId
 )
@@ -812,59 +816,62 @@ describe("MultiChainECDSAValidator", () => {
                     paymaster: opSepoliaZeroDevPaymasterClient
                 })
 
-            const sepoliaUserOp =
-                await sepoliaZerodevKernelClient.prepareUserOperation({
-                    callData:
-                        await sepoliaZerodevKernelClient.account.encodeCalls([
+            const clients: Client<Transport, Chain, SmartAccount>[] = [
+                {
+                    ...sepoliaZerodevKernelClient
+                },
+                {
+                    ...optimismSepoliaZerodevKernelClient
+                }
+            ]
+
+            const userOps = await Promise.all(
+                clients.map(async (client) => {
+                    return {
+                        callData: await client.account.encodeCalls([
                             {
                                 to: zeroAddress,
                                 value: BigInt(0),
                                 data: "0x"
                             }
                         ])
+                    }
                 })
+            )
 
-            const optimismSepoliaUserOp =
-                await optimismSepoliaZerodevKernelClient.prepareUserOperation({
-                    callData:
-                        await optimismSepoliaZerodevKernelClient.account.encodeCalls(
-                            [
-                                {
-                                    to: zeroAddress,
-                                    value: BigInt(0),
-                                    data: "0x"
-                                }
-                            ]
-                        )
-                })
-
-            const signedUserOps = await signUserOperations(
-                sepoliaZerodevKernelClient,
+            const userOpParams: PrepareAndSignUserOperationsParameters[] = [
                 {
-                    userOperations: [
-                        { ...sepoliaUserOp, chainId: sepolia.id },
-                        {
-                            ...optimismSepoliaUserOp,
-                            chainId: optimismSepolia.id
-                        }
-                    ]
+                    ...userOps[0],
+                    chainId: sepolia.id
+                },
+                {
+                    ...userOps[1],
+                    chainId: optimismSepolia.id
                 }
+            ]
+
+            const signedUserOps = await prepareAndSignUserOperations(
+                clients,
+                userOpParams
             )
 
+            const sepoliaUserOp = signedUserOps[0]
+            const optimismSepoliaUserOp = signedUserOps[1]
+
             const sepoliaUserOpHash =
-                await sepoliaZerodevKernelClient.sendUserOperation({
-                    ...signedUserOps[0]
-                })
+                await sepoliaZerodevKernelClient.sendUserOperation(
+                    sepoliaUserOp
+                )
 
             console.log("sepoliaUserOpHash", sepoliaUserOpHash)
             await sepoliaZerodevKernelClient.waitForUserOperationReceipt({
                 hash: sepoliaUserOpHash
             })
 
             const optimismSepoliaUserOpHash =
-                await optimismSepoliaZerodevKernelClient.sendUserOperation({
-                    ...signedUserOps[1]
-                })
+                await optimismSepoliaZerodevKernelClient.sendUserOperation(
+                    optimismSepoliaUserOp
+                )
 
             console.log("optimismSepoliaUserOpHash", optimismSepoliaUserOpHash)
             await optimismSepoliaZerodevKernelClient.waitForUserOperationReceipt(
@@ -963,55 +970,62 @@ describe("MultiChainECDSAValidator", () => {
                     paymaster: opSepoliaZeroDevPaymasterClient
                 })
 
-            const sepoliaUserOp =
-                await sepoliaZerodevKernelClient.prepareUserOperation({
-                    callData: await sepoliaKernelAccount.encodeCalls([
-                        {
-                            to: zeroAddress,
-                            value: BigInt(0),
-                            data: "0x"
-                        }
-                    ])
-                })
+            const clients: Client<Transport, Chain, SmartAccount>[] = [
+                {
+                    ...sepoliaZerodevKernelClient
+                },
+                {
+                    ...optimismSepoliaZerodevKernelClient
+                }
+            ]
 
-            const optimismSepoliaUserOp =
-                await optimismSepoliaZerodevKernelClient.prepareUserOperation({
-                    callData: await optimismSepoliaKernelAccount.encodeCalls([
-                        {
-                            to: zeroAddress,
-                            value: BigInt(0),
-                            data: "0x"
-                        }
-                    ])
+            const userOps = await Promise.all(
+                clients.map(async (client) => {
+                    return {
+                        callData: await client.account.encodeCalls([
+                            {
+                                to: zeroAddress,
+                                value: BigInt(0),
+                                data: "0x"
+                            }
+                        ])
+                    }
                 })
+            )
 
-            const signedEnableUserOps = await ecdsaSignUserOpsWithEnable({
-                multiChainUserOpConfigsForEnable: [
-                    {
-                        account: sepoliaKernelAccount,
-                        userOp: sepoliaUserOp
-                    },
-                    {
-                        account: optimismSepoliaKernelAccount,
-                        userOp: optimismSepoliaUserOp
-                    }
-                ]
-            })
+            const userOpParams: PrepareAndSignUserOperationsParameters[] = [
+                {
+                    ...userOps[0],
+                    chainId: sepolia.id
+                },
+                {
+                    ...userOps[1],
+                    chainId: optimismSepolia.id
+                }
+            ]
+
+            const signedUserOps = await prepareAndSignUserOperations(
+                clients,
+                userOpParams
+            )
+
+            const sepoliaUserOp = signedUserOps[0]
+            const optimismSepoliaUserOp = signedUserOps[1]
 
             const sepoliaUserOpHash =
-                await sepoliaZerodevKernelClient.sendUserOperation({
-                    ...signedEnableUserOps[0]
-                })
+                await sepoliaZerodevKernelClient.sendUserOperation(
+                    sepoliaUserOp
+                )
 
             console.log("sepoliaUserOpHash", sepoliaUserOpHash)
             await sepoliaZerodevKernelClient.waitForUserOperationReceipt({
                 hash: sepoliaUserOpHash
             })
 
             const optimismSepoliaUserOpHash =
-                await optimismSepoliaZerodevKernelClient.sendUserOperation({
-                    ...signedEnableUserOps[1]
-                })
+                await optimismSepoliaZerodevKernelClient.sendUserOperation(
+                    optimismSepoliaUserOp
+                )
 
             console.log("optimismSepoliaUserOpHash", optimismSepoliaUserOpHash)
             await optimismSepoliaZerodevKernelClient.waitForUserOperationReceipt(

diff --git a/packages/test/v0.7/utils/common.ts b/packages/test/v0.7/utils/common.ts
@@ -27,7 +27,7 @@ export const Test_ERC20Address = "0x3870419Ba2BBf0127060bCB37f69A1b1C090992B"
 const testingChain = allChains.sepolia.id
 export const kernelVersion = "0.3.1"
 export const index = 11111111111111111n // 432334375434333332434365532464445487823332432423423n
-const DEFAULT_PROVIDER = "ALCHEMY"
+const DEFAULT_PROVIDER = "PIMLICO"
 const projectId = config["0.7"][testingChain].projectId
 
 export const getEntryPoint = (): {

diff --git a/plugins/multi-chain-ecdsa/CHANGELOG.md b/plugins/multi-chain-ecdsa/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @zerodev/multi-chain-ecdsa
 
+## 5.4.2
+
+### Minor Changes
+
+- Change `sendUserOpeations` to `prepareAndSignUserOperations`
+
+## 5.4.1
+
+### Minor Changes
+
+- - Add `sendUserOpeations` method
+
 ## 5.4.0
 
 ### Minor Changes