Merge pull request #338 from pimlicolabs/fix/prepareUserOperationForE…

…rc20Paymaster Fix/prepare user operation for erc20 paymaster
pimlicolabs · Dec 1, 2024 · b8f1f98 · b8f1f98
2 parents 2df14e9 + edb8baf
commit b8f1f98
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/.changeset/tasty-pugs-smell.md b/.changeset/tasty-pugs-smell.md
@@ -0,0 +1,5 @@
+---
+"permissionless": patch
+---
+
+Fixed use of getPaymasterData twice in prepareUserOperationForErc20Paymaster
diff --git a/packages/permissionless/experimental/pimlico/utils/prepareUserOperationForErc20Paymaster.ts b/packages/permissionless/experimental/pimlico/utils/prepareUserOperationForErc20Paymaster.ts
@@ -12,6 +12,8 @@ import {
 } from "viem"
 import {
     type BundlerClient,
+    type GetPaymasterDataParameters,
+    type GetPaymasterDataReturnType,
     type PrepareUserOperationParameters,
     type PrepareUserOperationRequest,
     type PrepareUserOperationReturnType,
@@ -196,6 +198,28 @@ export const prepareUserOperationForErc20Paymaster =
                 "prepareUserOperation"
             )({
                 ...parameters,
+                paymaster: {
+                    getPaymasterData: (
+                        args: GetPaymasterDataParameters
+                    ): Promise<GetPaymasterDataReturnType> => {
+                        const paymaster =
+                            parameters.paymaster ?? bundlerClient?.paymaster
+
+                        if (typeof paymaster === "object") {
+                            const { getPaymasterStubData } = paymaster
+
+                            if (getPaymasterStubData) {
+                                return getPaymasterStubData(args)
+                            }
+                        }
+
+                        return getAction(
+                            bundlerClient,
+                            getPaymasterData_,
+                            "getPaymasterData"
+                        )(args)
+                    }
+                },
                 calls: callsWithDummyApproval
             } as unknown as PrepareUserOperationParameters)