Merge pull request #406 from pimlicolabs/fix/arb

revert is gas limit > maxGasPerBundle
pimlicolabs · Jan 17, 2025 · 20bcf51 · 20bcf51
2 parents 0e8118b + fbbb72b
commit 20bcf51
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 6 deletions.
diff --git a/src/cli/config/bundler.ts b/src/cli/config/bundler.ts
@@ -92,7 +92,7 @@ export const bundlerArgsSchema = z.object({
     "max-gas-per-bundle": z
         .string()
         .transform((val) => BigInt(val))
-        .default("5000000"),
+        .default("20000000"),
     "rpc-methods": z
         .string()
         .nullable()

diff --git a/src/cli/config/options.ts b/src/cli/config/options.ts
@@ -172,7 +172,7 @@ export const bundlerOptions: CliCommandOptions<IBundlerArgsInput> = {
         description: "Maximum amount of gas per bundle",
         type: "string",
         require: false,
-        default: "5000000"
+        default: "20000000"
     },
     "rpc-methods": {
         description: "Supported RPC methods split by commas",

diff --git a/src/mempool/mempool.ts b/src/mempool/mempool.ts
@@ -714,10 +714,14 @@ export class MemoryMempool {
 
         for (const opInfo of outstandingUserOperations) {
             const op = deriveUserOperation(opInfo.mempoolUserOperation)
-            gasUsed +=
-                op.callGasLimit +
-                op.verificationGasLimit * 3n +
-                op.preVerificationGas
+            gasUsed += op.callGasLimit + op.verificationGasLimit
+
+            if (isVersion07(op)) {
+                gasUsed +=
+                    (op.paymasterPostOpGasLimit ?? 0n) +
+                    (op.paymasterVerificationGasLimit ?? 0n)
+            }
+
             if (gasUsed > maxGasLimit && opsTaken >= (minOps || 0)) {
                 break
             }

diff --git a/src/rpc/rpcHandler.ts b/src/rpc/rpcHandler.ts
@@ -381,6 +381,33 @@ export class RpcHandler implements IRpcEndpoint {
             this.eventManager.emitFailedValidation(opHash, reason)
             throw new RpcError(reason)
         }
+
+        if (isVersion07(userOperation)) {
+            const gasLimits =
+                userOperation.callGasLimit +
+                userOperation.verificationGasLimit +
+                (userOperation.paymasterPostOpGasLimit ?? 0n) +
+                (userOperation.paymasterVerificationGasLimit ?? 0n)
+
+            if (gasLimits > this.config.maxGasPerBundle) {
+                throw new RpcError(
+                    `User operation gas limits exceed the max gas per bundle: ${gasLimits} > ${this.config.maxGasPerBundle}`
+                )
+            }
+        }
+
+        if (isVersion06(userOperation)) {
+            const gasLimits =
+                userOperation.callGasLimit + userOperation.verificationGasLimit
+
+            const maxGasPerBundle = (this.config.maxGasPerBundle * 130n) / 100n
+
+            if (gasLimits > maxGasPerBundle) {
+                throw new RpcError(
+                    `User operation gas limits exceed the max gas per bundle: ${gasLimits} > ${this.config.maxGasPerBundle}`
+                )
+            }
+        }
     }
 
     eth_chainId(): ChainIdResponseResult {