more FailedOp instead of Error

eth-infinitism · Feb 2, 2025 · b61bccf · b61bccf
1 parent e5f9787
commit b61bccf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/contracts/core/EntryPoint.sol b/contracts/core/EntryPoint.sol
@@ -227,7 +227,7 @@ contract EntryPoint is IEntryPoint, StakeManager, NonceManager, ReentrancyGuardT
             //address(1) is special marker of "signature error"
             require(
                 address(aggregator) != address(1),
-                "AA96 invalid aggregator"
+                FailedOp(totalOps, "AA96 invalid aggregator")
             );
 
             if (address(aggregator) != address(0)) {
@@ -669,7 +669,7 @@ contract EntryPoint is IEntryPoint, StakeManager, NonceManager, ReentrancyGuardT
             mUserOp.paymasterPostOpGasLimit |
             mUserOp.maxFeePerGas |
             mUserOp.maxPriorityFeePerGas;
-        require(maxGasValues <= type(uint120).max, "AA94 gas values overflow");
+        require(maxGasValues <= type(uint120).max, FailedOp(opIndex, "AA94 gas values overflow"));
 
         uint256 requiredPreFund = _getRequiredPrefund(mUserOp);
         validationData = _validateAccountPrepayment(

diff --git a/reports/gas-checker.txt b/reports/gas-checker.txt
@@ -16,32 +16,32 @@
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
 ║ simple - diff from previous    │     2 │               │          41530 │               12271 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple                         │    10 │        451298 │                │                     ║
+║ simple                         │    10 │        451250 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple - diff from previous    │    11 │               │          41590 │               12331 ║
+║ simple - diff from previous    │    11 │               │          41614 │               12355 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple paymaster               │     1 │         83200 │                │                     ║
+║ simple paymaster               │     1 │         83224 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple paymaster with diff     │     2 │               │          40072 │               10813 ║
+║ simple paymaster with diff     │     2 │               │          40084 │               10825 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple paymaster               │    10 │        443927 │                │                     ║
+║ simple paymaster               │    10 │        444083 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple paymaster with diff     │    11 │               │          40067 │               10808 ║
+║ simple paymaster with diff     │    11 │               │          40103 │               10844 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
 ║ big tx 5k                      │     1 │        167141 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ big tx - diff from previous    │     2 │               │         130743 │               16041 ║
+║ big tx - diff from previous    │     2 │               │         130755 │               16053 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ big tx 5k                      │    10 │       1344014 │                │                     ║
+║ big tx 5k                      │    10 │       1343978 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ big tx - diff from previous    │    11 │               │         130754 │               16052 ║
+║ big tx - diff from previous    │    11 │               │         130766 │               16064 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
 ║ paymaster+postOp               │     1 │         84401 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
 ║ paymaster+postOp with diff     │     2 │               │          41261 │               12002 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ paymaster+postOp               │    10 │        455870 │                │                     ║
+║ paymaster+postOp               │    10 │        455822 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ paymaster+postOp with diff     │    11 │               │          41309 │               12050 ║
+║ paymaster+postOp with diff     │    11 │               │          41285 │               12026 ║
 ╚════════════════════════════════╧═══════╧═══════════════╧════════════════╧═════════════════════╝