Merge pull request #123 from pimlicolabs/feat/introduce-middleware

fetch gas prices before paymaster signs the data
pimlicolabs · Feb 25, 2024 · fd3411f · fd3411f
2 parents 207c475 + 2b2c290
commit fd3411f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/.changeset/tall-knives-look.md b/.changeset/tall-knives-look.md
@@ -0,0 +1,5 @@
+---
+"permissionless": patch
+---
+
+fix prepareUserOperationRequest for entryPoint 0.7
diff --git a/packages/permissionless-test/ep-0.6/index.test.ts b/packages/permissionless-test/ep-0.6/index.test.ts
@@ -5,7 +5,6 @@ import {
     getSenderAddress,
     getUserOperationHash
 } from "permissionless"
-import { ENTRYPOINT_ADDRESS_V06_TYPE } from "permissionless/_types/types"
 import {
     getRequiredPrefund,
     signUserOperationHashWithECDSA

diff --git a/packages/permissionless/actions/smartAccount/prepareUserOperationRequest.ts b/packages/permissionless/actions/smartAccount/prepareUserOperationRequest.ts
@@ -304,6 +304,21 @@ async function prepareUserOperationRequestEntryPointV07<
         })) as PrepareUserOperationRequestReturnType<entryPoint>
     }
 
+    if (middleware && typeof middleware !== "function" && middleware.gasPrice) {
+        const gasPrice = await middleware.gasPrice()
+        userOperation.maxFeePerGas = gasPrice.maxFeePerGas
+        userOperation.maxPriorityFeePerGas = gasPrice.maxPriorityFeePerGas
+    }
+
+    if (!userOperation.maxFeePerGas || !userOperation.maxPriorityFeePerGas) {
+        const estimateGas = await estimateFeesPerGas(account.client)
+        userOperation.maxFeePerGas =
+            userOperation.maxFeePerGas || estimateGas.maxFeePerGas
+        userOperation.maxPriorityFeePerGas =
+            userOperation.maxPriorityFeePerGas ||
+            estimateGas.maxPriorityFeePerGas
+    }
+
     if (
         middleware &&
         typeof middleware !== "function" &&
@@ -340,21 +355,6 @@ async function prepareUserOperationRequestEntryPointV07<
         userOperation.paymasterData = sponsorUserOperationData.paymasterData
     }
 
-    if (middleware && typeof middleware !== "function" && middleware.gasPrice) {
-        const gasPrice = await middleware.gasPrice()
-        userOperation.maxFeePerGas = gasPrice.maxFeePerGas
-        userOperation.maxPriorityFeePerGas = gasPrice.maxPriorityFeePerGas
-    }
-
-    if (!userOperation.maxFeePerGas || !userOperation.maxPriorityFeePerGas) {
-        const estimateGas = await estimateFeesPerGas(account.client)
-        userOperation.maxFeePerGas =
-            userOperation.maxFeePerGas || estimateGas.maxFeePerGas
-        userOperation.maxPriorityFeePerGas =
-            userOperation.maxPriorityFeePerGas ||
-            estimateGas.maxPriorityFeePerGas
-    }
-
     if (
         !userOperation.callGasLimit ||
         !userOperation.verificationGasLimit ||