fix estimations contract

pimlicolabs · Jan 10, 2025 · b3f7c53 · b3f7c53
1 parent 57617f0
commit b3f7c53
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/src/cli/config/bundler.ts b/src/cli/config/bundler.ts
@@ -211,7 +211,13 @@ export const gasEstimationArgsSchema = z.object({
         .string()
         .transform((val) => BigInt(val))
         .default("1000000"),
-    "call-gas-limit-multiplier": z.string().transform((val) => BigInt(val)),
+    "v6-call-gas-limit-multiplier": z.string().transform((val) => BigInt(val)),
+    "v7-verification-gas-limit-multiplier": z
+        .string()
+        .transform((val) => BigInt(val)),
+    "v7-paymaster-verification-gas-limit-multiplier": z
+        .string()
+        .transform((val) => BigInt(val)),
     "simulation-call-gas-limit": z.string().transform((val) => BigInt(val)),
     "simulation-verification-gas-limit": z
         .string()

diff --git a/src/cli/config/options.ts b/src/cli/config/options.ts
@@ -223,13 +223,27 @@ export const gasEstimationOptions: CliCommandOptions<IGasEstimationArgsInput> =
             require: false,
             default: "30000000"
         },
-        "call-gas-limit-multiplier": {
+        "v6-call-gas-limit-multiplier": {
             description:
-                "Amount to multiply the call gas limits fetched from simulations",
+                "Amount to multiply the call gas limits fetched from simulations for v6 userOperations",
             type: "string",
             require: true,
             default: "100"
         },
+        "v7-verification-gas-limit-multiplier": {
+            description:
+                "Amount to multiply the verification gas limits fetched from simulations for v7 userOperations",
+            type: "string",
+            require: true,
+            default: "130"
+        },
+        "v7-paymaster-verification-gas-limit-multiplier": {
+            description:
+                "Amount to multiply the paymaster verification gas limits fetched from simulations for v7 userOperations",
+            type: "string",
+            require: true,
+            default: "130"
+        },
         "paymaster-gas-limit-multiplier": {
             description:
                 "Amount to multiply the paymaster gas limits fetched from simulations",

diff --git a/src/rpc/rpcHandler.ts b/src/rpc/rpcHandler.ts
@@ -1225,7 +1225,18 @@ export class RpcHandler implements IRpcEndpoint {
         if (isVersion06(simulationUserOperation)) {
             callGasLimit = scaleBigIntByPercent(
                 callGasLimit,
-                Number(this.config.callGasLimitMultiplier)
+                Number(this.config.v6CallGasLimitMultiplier)
+            )
+        }
+
+        if (isVersion07(simulationUserOperation)) {
+            verificationGasLimit = scaleBigIntByPercent(
+                verificationGasLimit,
+                Number(this.config.v7VerificationGasLimitMultiplier)
+            )
+            paymasterVerificationGasLimit = scaleBigIntByPercent(
+                paymasterVerificationGasLimit,
+                Number(this.config.v7PaymasterVerificationGasLimitMultiplier)
             )
         }
 

diff --git a/src/types/contracts/PimlicoEntryPointSimulations.ts b/src/types/contracts/PimlicoEntryPointSimulations.ts