Using constants instead of magic numbers

Renaming _unstakeDelaySec to unstakeDelaySec
eth-infinitism · Feb 26, 2025 · f36d669 · f36d669
1 parent 3f66f14
commit f36d669
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/contracts/accounts/Simple7702Account.sol b/contracts/accounts/Simple7702Account.sol
@@ -17,7 +17,7 @@ contract Simple7702Account is BaseAccount, IERC165, IERC1271, ERC1155Holder, ERC
 
     // temporary address of entryPoint v0.8
     function entryPoint() public pure override returns (IEntryPoint) {
-        return IEntryPoint(0xd50BE0da15e04EF4fADbcbA27642179231E0A862);
+        return IEntryPoint(0x6282F42d4f559552b42aB22b04075c0525259d1F);
     }
 
     /**

diff --git a/contracts/core/Helpers.sol b/contracts/core/Helpers.sol
@@ -77,7 +77,7 @@ function _packValidationData(
     uint48 validAfter
 ) pure returns (uint256) {
     return
-        (sigFailed ? 1 : 0) |
+        (sigFailed ?  SIG_VALIDATION_FAILED : SIG_VALIDATION_SUCCESS) |
         (uint256(validUntil) << 160) |
         (uint256(validAfter) << (160 + 48));
 }

diff --git a/contracts/interfaces/IStakeManager.sol b/contracts/interfaces/IStakeManager.sol
@@ -82,9 +82,9 @@ interface IStakeManager {
     /**
      * Add to the account's stake - amount and delay
      * any pending unstake is first cancelled.
-     * @param _unstakeDelaySec - The new lock duration before the deposit can be withdrawn.
+     * @param unstakeDelaySec - The new lock duration before the deposit can be withdrawn.
      */
-    function addStake(uint32 _unstakeDelaySec) external payable;
+    function addStake(uint32 unstakeDelaySec) external payable;
 
     /**
      * Attempt to unlock the stake.

diff --git a/reports/gas-checker.txt b/reports/gas-checker.txt
@@ -12,36 +12,36 @@
 ║                                │       │               │     (delta for │        (compared to ║
 ║                                │       │               │    one UserOp) │     account.exec()) ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple                         │     1 │         77427 │                │                     ║
+║ simple                         │     1 │         77439 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple - diff from previous    │     2 │               │          41508 │               12509 ║
+║ simple - diff from previous    │     2 │               │          41496 │               12497 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple                         │    10 │        451046 │                │                     ║
+║ simple                         │    10 │        450974 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple - diff from previous    │    11 │               │          41604 │               12605 ║
+║ simple - diff from previous    │    11 │               │          41652 │               12653 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
 ║ simple paymaster               │     1 │         83409 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
 ║ simple paymaster with diff     │     2 │               │          40167 │               11168 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple paymaster               │    10 │        445122 │                │                     ║
+║ simple paymaster               │    10 │        445110 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple paymaster with diff     │    11 │               │          40211 │               11212 ║
+║ simple paymaster with diff     │    11 │               │          40175 │               11176 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ big tx 5k                      │     1 │        167212 │                │                     ║
+║ big tx 5k                      │     1 │        167224 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ big tx - diff from previous    │     2 │               │         130755 │               16315 ║
+║ big tx - diff from previous    │     2 │               │         130743 │               16303 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ big tx 5k                      │    10 │       1343939 │                │                     ║
+║ big tx 5k                      │    10 │       1343963 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ big tx - diff from previous    │    11 │               │         130778 │               16338 ║
+║ big tx - diff from previous    │    11 │               │         130754 │               16314 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
 ║ paymaster+postOp               │     1 │         84771 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ paymaster+postOp with diff     │     2 │               │          41541 │               12542 ║
+║ paymaster+postOp with diff     │     2 │               │          41529 │               12530 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ paymaster+postOp               │    10 │        458700 │                │                     ║
+║ paymaster+postOp               │    10 │        458772 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ paymaster+postOp with diff     │    11 │               │          41601 │               12602 ║
+║ paymaster+postOp with diff     │    11 │               │          41541 │               12542 ║
 ╚════════════════════════════════╧═══════╧═══════════════╧════════════════╧═════════════════════╝