fix: [S4] use Ownable2Step in AccountFactory

alchemyplatform · Nov 21, 2024 · 25602b9 · 25602b9
1 parent 4027ce4
commit 25602b9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/gas-snapshots/ModularAccount.json b/gas-snapshots/ModularAccount.json
@@ -1,5 +1,5 @@
 {
-  "Runtime_AccountCreation": "176125",
+  "Runtime_AccountCreation": "176147",
   "Runtime_BatchTransfers": "93045",
   "Runtime_Erc20Transfer": "78454",
   "Runtime_InstallSessionKey_Case1": "423148",

diff --git a/gas-snapshots/SemiModularAccount.json b/gas-snapshots/SemiModularAccount.json
@@ -1,5 +1,5 @@
 {
-  "Runtime_AccountCreation": "97745",
+  "Runtime_AccountCreation": "97767",
   "Runtime_BatchTransfers": "89031",
   "Runtime_Erc20Transfer": "74488",
   "Runtime_InstallSessionKey_Case1": "421700",

diff --git a/src/factory/AccountFactory.sol b/src/factory/AccountFactory.sol
@@ -4,6 +4,7 @@ pragma solidity ^0.8.26;
 import {ValidationConfigLib} from "@erc6900/reference-implementation/libraries/ValidationConfigLib.sol";
 import {IEntryPoint} from "@eth-infinitism/account-abstraction/interfaces/IEntryPoint.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
+import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import {LibClone} from "solady/utils/LibClone.sol";
@@ -15,7 +16,7 @@ import {SemiModularAccountBytecode} from "../account/SemiModularAccountBytecode.
 /// @author Alchemy
 /// @notice Factory contract to deploy modular accounts. Allows creation of both modular and semi-modular accounts
 /// (the bytecode variant).
-contract AccountFactory is Ownable {
+contract AccountFactory is Ownable2Step {
     ModularAccount public immutable ACCOUNT_IMPL;
     SemiModularAccountBytecode public immutable SEMI_MODULAR_ACCOUNT_IMPL;
     IEntryPoint public immutable ENTRY_POINT;