Merge pull request #430 from pimlicolabs/fix/pm_sponsorUserOperation

mouseless0x · web-flow · commit b55d46b955ea · 2025-07-17T20:45:27.000+02:00
Fix/pm sponsor user operation
diff --git a/.changeset/twelve-experts-heal.md b/.changeset/twelve-experts-heal.md
@@ -0,0 +1,5 @@
+---
+"@pimlico/mock-paymaster": patch
+---
+
+Fixed AA34 error in pm_sponsorUserOperation due to signing wrong userOp fields
diff --git a/packages/mock-paymaster/helpers/erc20-utils.ts b/packages/mock-paymaster/helpers/erc20-utils.ts
@@ -36,7 +36,7 @@ export const deployErc20Token = async (
 }
 
 export const tokenBalanceOf = async (holder: Address, anvilRpc: string) => {
-    const publicClient = getPublicClient(anvilRpc)
+    const publicClient = await getPublicClient(anvilRpc)
 
     const balance = await publicClient.call({
         to: erc20Address,
@@ -59,7 +59,10 @@ export const sudoMintTokens = async ({
     to: Address
     anvilRpc: string
 }) => {
-    const walletClient = getAnvilWalletClient({ addressIndex: 0, anvilRpc })
+    const walletClient = await getAnvilWalletClient({
+        addressIndex: 0,
+        anvilRpc
+    })
 
     await walletClient.sendTransaction({
         to: erc20Address,
diff --git a/packages/mock-paymaster/helpers/utils.ts b/packages/mock-paymaster/helpers/utils.ts
@@ -7,10 +7,10 @@ import {
     type Transport,
     type WalletClient,
     createPublicClient,
-    createWalletClient
+    createWalletClient,
+    defineChain
 } from "viem"
 import { mnemonicToAccount } from "viem/accounts"
-import { foundry } from "viem/chains"
 import { erc20Address } from "./erc20-utils.js"
 import { RpcError, ValidationErrors } from "./schema.js"
 
@@ -19,9 +19,32 @@ export const maxBigInt = (a: bigint, b: bigint) => {
     return a > b ? a : b
 }
 
-export const getPublicClient = (
+export const getChain = async (rpcUrl: string): Promise<Chain> => {
+    const tempClient = createPublicClient({
+        transport: http(rpcUrl)
+    })
+
+    const chainId = await tempClient.getChainId()
+
+    return defineChain({
+        id: chainId,
+        name: `Chain ${chainId}`,
+        nativeCurrency: {
+            name: "ETH",
+            symbol: "ETH",
+            decimals: 18
+        },
+        rpcUrls: {
+            default: {
+                http: [rpcUrl]
+            }
+        }
+    })
+}
+
+export const getPublicClient = async (
     anvilRpc: string
-): PublicClient<Transport, Chain> => {
+): Promise<PublicClient<Transport, Chain>> => {
     const transport = http(anvilRpc, {
         // onFetchRequest: async (req) => {
         //     console.log(await req.json(), "request")
@@ -31,29 +54,31 @@ export const getPublicClient = (
         //}
     })
 
+    const chain = await getChain(anvilRpc)
+
     return createPublicClient({
-        chain: foundry,
+        chain,
         transport: transport,
         pollingInterval: 100
     })
 }
 
-export const getAnvilWalletClient = ({
+export const getAnvilWalletClient = async ({
     addressIndex,
     anvilRpc
-}: { addressIndex: number; anvilRpc: string }): WalletClient<
-    Transport,
-    Chain,
-    Account
+}: { addressIndex: number; anvilRpc: string }): Promise<
+    WalletClient<Transport, Chain, Account>
 > => {
+    const chain = await getChain(anvilRpc)
+
     return createWalletClient({
         account: mnemonicToAccount(
             "test test test test test test test test test test test junk",
             {
                 addressIndex
             }
         ),
-        chain: foundry,
+        chain,
         transport: http(anvilRpc)
     })
 }
diff --git a/packages/mock-paymaster/index.ts b/packages/mock-paymaster/index.ts
@@ -3,9 +3,8 @@ import Fastify from "fastify"
 import { defineInstance } from "prool"
 import { http, createPublicClient } from "viem"
 import { createBundlerClient } from "viem/account-abstraction"
-import { foundry } from "viem/chains"
 import { deployErc20Token } from "./helpers/erc20-utils.js"
-import { getAnvilWalletClient } from "./helpers/utils.js"
+import { getAnvilWalletClient, getChain } from "./helpers/utils.js"
 import { createRpcHandler } from "./relay.js"
 import { deployPaymasters } from "./singletonPaymasters.js"
 
@@ -23,16 +22,17 @@ export const paymaster = defineInstance(
             port: _port,
             name: "mock-paymaster",
             start: async ({ port = _port }) => {
-                const walletClient = getAnvilWalletClient({
+                const chain = await getChain(anvilRpc)
+                const walletClient = await getAnvilWalletClient({
                     anvilRpc,
                     addressIndex: 1
                 })
                 const publicClient = createPublicClient({
                     transport: http(anvilRpc),
-                    chain: foundry
+                    chain
                 })
                 const bundler = createBundlerClient({
-                    chain: foundry,
+                    chain,
                     transport: http(altoRpc)
                 })
 
diff --git a/packages/mock-paymaster/relay.ts b/packages/mock-paymaster/relay.ts
@@ -69,34 +69,38 @@ const handlePmSponsor = async ({
 }) => {
     const is06 = entryPoint === entryPoint06Address
 
-    let op = {
+    let sponsoredUserOp = {
         ...userOperation,
         ...getDummyPaymasterData({ is06, paymaster, paymasterMode })
     } as UserOperation
 
+    // User provided gasLimits
     const callGasLimit = userOperation.callGasLimit
     const verificationGasLimit = userOperation.verificationGasLimit
     const preVerificationGas = userOperation.preVerificationGas
 
     if (estimateGas) {
         try {
             const gasEstimates = await bundler.estimateUserOperationGas({
-                ...op,
+                ...sponsoredUserOp,
                 entryPointAddress: entryPoint
             })
 
-            op = {
-                ...op,
+            sponsoredUserOp = {
+                ...sponsoredUserOp,
                 ...gasEstimates
             } as UserOperation
 
-            op.callGasLimit = maxBigInt(op.callGasLimit, callGasLimit)
-            op.preVerificationGas = maxBigInt(
-                op.preVerificationGas,
+            sponsoredUserOp.callGasLimit = maxBigInt(
+                gasEstimates.callGasLimit,
+                callGasLimit
+            )
+            sponsoredUserOp.preVerificationGas = maxBigInt(
+                gasEstimates.preVerificationGas,
                 preVerificationGas
             )
-            op.verificationGasLimit = maxBigInt(
-                op.verificationGasLimit,
+            sponsoredUserOp.verificationGasLimit = maxBigInt(
+                gasEstimates.verificationGasLimit,
                 verificationGasLimit
             )
         } catch (e: unknown) {
@@ -116,17 +120,19 @@ const handlePmSponsor = async ({
     }
 
     const result = {
-        preVerificationGas: toHex(op.preVerificationGas),
-        callGasLimit: toHex(op.callGasLimit),
+        preVerificationGas: toHex(sponsoredUserOp.preVerificationGas),
+        callGasLimit: toHex(sponsoredUserOp.callGasLimit),
         paymasterVerificationGasLimit: toHex(
-            op.paymasterVerificationGasLimit || 0
+            sponsoredUserOp.paymasterVerificationGasLimit || 0
+        ),
+        paymasterPostOpGasLimit: toHex(
+            sponsoredUserOp.paymasterPostOpGasLimit || 0
         ),
-        paymasterPostOpGasLimit: toHex(op.paymasterPostOpGasLimit || 0),
-        verificationGasLimit: toHex(op.verificationGasLimit || 0),
+        verificationGasLimit: toHex(sponsoredUserOp.verificationGasLimit || 0),
         ...(await getSignedPaymasterData({
             publicClient,
             signer: paymasterSigner,
-            userOp: userOperation,
+            userOp: sponsoredUserOp,
             paymaster,
             paymasterMode
         }))
@@ -277,6 +283,15 @@ const handleMethod = async ({
         ]
     }
 
+    if (parsedBody.method === "pimlico_getUserOperationGasPrice") {
+        return await bundler.request({
+            // @ts-ignore
+            method: "pimlico_getUserOperationGasPrice",
+            // @ts-ignore
+            params: []
+        })
+    }
+
     if (parsedBody.method === "pimlico_getTokenQuotes") {
         const params = pimlicoGetTokenQuotesSchema.safeParse(parsedBody.params)
 
diff --git a/packages/permissionless/actions/pimlico/sponsorUserOperation.test.ts b/packages/permissionless/actions/pimlico/sponsorUserOperation.test.ts
@@ -1,16 +1,22 @@
 import { isHash, zeroAddress } from "viem"
-import { entryPoint06Address } from "viem/account-abstraction"
+import {
+    type UserOperation,
+    entryPoint06Address,
+    entryPoint07Address,
+    entryPoint08Address
+} from "viem/account-abstraction"
 import { describe, expect } from "vitest"
 import { testWithRpc } from "../../../permissionless-test/src/testWithRpc"
 import {
     getBundlerClient,
     getPimlicoClient,
     getSimpleAccountClient
 } from "../../../permissionless-test/src/utils"
+import { sponsorUserOperation } from "./sponsorUserOperation"
 
 describe("sponsorUserOperation", () => {
     testWithRpc("sponsorUserOperation_V06", async ({ rpc }) => {
-        const { altoRpc } = rpc
+        const { altoRpc, paymasterRpc } = rpc
 
         const bundlerClient = getPimlicoClient({
             entryPointVersion: "0.6",
@@ -30,7 +36,7 @@ describe("sponsorUserOperation", () => {
             ...rpc
         })
 
-        const opHash = await simpleAccountClient.sendUserOperation({
+        const preparedUserOp = await simpleAccountClient.prepareUserOperation({
             calls: [
                 {
                     to: zeroAddress,
@@ -40,6 +46,28 @@ describe("sponsorUserOperation", () => {
             ]
         })
 
+        const paymasterClient = getPimlicoClient({
+            entryPointVersion: "0.6",
+            altoRpc: paymasterRpc
+        })
+
+        const sponsorResult = await sponsorUserOperation(paymasterClient, {
+            userOperation: preparedUserOp,
+            entryPoint: {
+                address: entryPoint06Address,
+                version: "0.6"
+            }
+        })
+
+        const finalUserOp = {
+            ...preparedUserOp,
+            ...sponsorResult
+        }
+        const account = simpleAccountClient.account
+        finalUserOp.signature = await account.signUserOperation(finalUserOp)
+
+        const opHash = await simpleAccountClient.sendUserOperation(finalUserOp)
+
         expect(isHash(opHash)).toBe(true)
 
         const userOperationReceipt =
@@ -61,7 +89,7 @@ describe("sponsorUserOperation", () => {
     })
 
     testWithRpc("sponsorUserOperation_V07", async ({ rpc }) => {
-        const { altoRpc } = rpc
+        const { altoRpc, paymasterRpc } = rpc
 
         const bundlerClient = getPimlicoClient({
             entryPointVersion: "0.7",
@@ -81,7 +109,7 @@ describe("sponsorUserOperation", () => {
             ...rpc
         })
 
-        const opHash = await simpleAccountClient.sendUserOperation({
+        const preparedUserOp = await simpleAccountClient.prepareUserOperation({
             calls: [
                 {
                     to: zeroAddress,
@@ -91,6 +119,28 @@ describe("sponsorUserOperation", () => {
             ]
         })
 
+        const paymasterClient = getPimlicoClient({
+            entryPointVersion: "0.7",
+            altoRpc: paymasterRpc
+        })
+
+        const sponsorResult = await sponsorUserOperation(paymasterClient, {
+            userOperation: preparedUserOp,
+            entryPoint: {
+                address: entryPoint07Address,
+                version: "0.7"
+            }
+        })
+
+        const finalUserOp = {
+            ...preparedUserOp,
+            ...sponsorResult
+        }
+        const account = simpleAccountClient.account
+        finalUserOp.signature = await account.signUserOperation(finalUserOp)
+
+        const opHash = await simpleAccountClient.sendUserOperation(finalUserOp)
+
         expect(isHash(opHash)).toBe(true)
 
         const userOperationReceipt =
@@ -112,7 +162,7 @@ describe("sponsorUserOperation", () => {
     })
 
     testWithRpc("sponsorUserOperation_V08", async ({ rpc }) => {
-        const { altoRpc } = rpc
+        const { altoRpc, paymasterRpc } = rpc
 
         const bundlerClient = getPimlicoClient({
             entryPointVersion: "0.8",
@@ -132,16 +182,38 @@ describe("sponsorUserOperation", () => {
             ...rpc
         })
 
-        const opHash = await simpleAccountClient.sendUserOperation({
+        const preparedUserOp = (await simpleAccountClient.prepareUserOperation({
             calls: [
                 {
                     to: zeroAddress,
                     data: "0x",
                     value: 0n
                 }
             ]
+        })) as UserOperation<"0.8">
+
+        const paymasterClient = getPimlicoClient({
+            entryPointVersion: "0.8",
+            altoRpc: paymasterRpc
         })
 
+        const sponsorResult = await sponsorUserOperation(paymasterClient, {
+            userOperation: preparedUserOp,
+            entryPoint: {
+                address: entryPoint08Address,
+                version: "0.8"
+            }
+        })
+
+        const finalUserOp = {
+            ...preparedUserOp,
+            ...sponsorResult
+        }
+        const account = simpleAccountClient.account
+        finalUserOp.signature = await account.signUserOperation(finalUserOp)
+
+        const opHash = await simpleAccountClient.sendUserOperation(finalUserOp)
+
         expect(isHash(opHash)).toBe(true)
 
         const userOperationReceipt =

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@pimlico/mock-paymaster": patch
 +---
++
 +Fixed AA34 error in pm_sponsorUserOperation due to signing wrong userOp fields