AA-541: Make BasePaymaster use "Ownable2Step" instead of "Ownable" (#548

)
eth-infinitism · Feb 26, 2025 · 781641e · 781641e
1 parent 4b386fb
commit 781641e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/contracts/core/BasePaymaster.sol b/contracts/core/BasePaymaster.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.23;
 
 /* solhint-disable reason-string */
 
-import "@openzeppelin/contracts/access/Ownable.sol";
+import "@openzeppelin/contracts/access/Ownable2Step.sol";
 import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import "../interfaces/IPaymaster.sol";
 import "../interfaces/IEntryPoint.sol";
@@ -13,7 +13,7 @@ import "./UserOperationLib.sol";
  * provides helper methods for staking.
  * Validates that the postOp is called only by the entryPoint.
  */
-abstract contract BasePaymaster is IPaymaster, Ownable {
+abstract contract BasePaymaster is IPaymaster, Ownable2Step {
     IEntryPoint public immutable entryPoint;
 
     uint256 internal constant PAYMASTER_VALIDATION_GAS_OFFSET = UserOperationLib.PAYMASTER_VALIDATION_GAS_OFFSET;

diff --git a/reports/gas-checker.txt b/reports/gas-checker.txt
@@ -26,7 +26,7 @@
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
 ║ simple paymaster               │    10 │        445146 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple paymaster with diff     │    11 │               │          40187 │               11188 ║
+║ simple paymaster with diff     │    11 │               │          40175 │               11176 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
 ║ big tx 5k                      │     1 │        167224 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
@@ -36,12 +36,12 @@
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
 ║ big tx - diff from previous    │    11 │               │         130742 │               16302 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ paymaster+postOp               │     1 │         84737 │                │                     ║
+║ paymaster+postOp               │     1 │         84759 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ paymaster+postOp with diff     │     2 │               │          41531 │               12532 ║
+║ paymaster+postOp with diff     │     2 │               │          41529 │               12530 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ paymaster+postOp               │    10 │        458456 │                │                     ║
+║ paymaster+postOp               │    10 │        458688 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ paymaster+postOp with diff     │    11 │               │          41579 │               12580 ║
+║ paymaster+postOp with diff     │    11 │               │          41577 │               12578 ║
 ╚════════════════════════════════╧═══════╧═══════════════╧════════════════╧═════════════════════╝