Towards 2step creation (allow multple guardians)

openfort-xyz · Nov 17, 2023 · 38f2e27 · 38f2e27
1 parent d0d1273
commit 38f2e27
Show file tree

Hide file tree

Showing 6 changed files with 642 additions and 40 deletions.
diff --git a/contracts/core/BaseOpenfortAccount.sol b/contracts/core/BaseOpenfortAccount.sol
@@ -59,7 +59,7 @@ abstract contract BaseOpenfortAccount is
 
     mapping(address sessionKey => SessionKeyStruct sessionKeyData) public sessionKeys;
 
-    event AccountCreated(address indexed creator);
+    event AccountImplementationDeployed(address indexed creator);
     event SessionKeyRegistered(address indexed key);
     event SessionKeyRevoked(address indexed key);
 
@@ -71,7 +71,7 @@ abstract contract BaseOpenfortAccount is
     receive() external payable virtual {}
 
     constructor() {
-        emit AccountCreated(msg.sender);
+        emit AccountImplementationDeployed(msg.sender);
         _disableInitializers();
     }
 

diff --git a/contracts/core/eip6551/EIP6551OpenfortAccount.sol b/contracts/core/eip6551/EIP6551OpenfortAccount.sol
@@ -35,11 +35,6 @@ contract EIP6551OpenfortAccount is BaseOpenfortAccount, IERC6551Account, IERC655
 
     receive() external payable override(BaseOpenfortAccount, IERC6551Account) {}
 
-    constructor() {
-        emit AccountCreated(msg.sender);
-        _disableInitializers();
-    }
-
     /*
      * @notice Initialize the smart contract wallet.
      */

diff --git a/contracts/core/recoverable/RecoverableOpenfortFactory.sol b/contracts/core/recoverable/RecoverableOpenfortFactory.sol
@@ -62,21 +62,9 @@ contract RecoverableOpenfortFactory is IBaseOpenfortFactory {
         }
 
         emit AccountCreated(account, _admin);
-        account = address(
-            new OpenfortRecoverableProxy{salt: salt}(
-                accountImplementation,
-                abi.encodeCall(
-                    RecoverableOpenfortAccount.initialize,
-                    (
-                        _admin,
-                        entrypointContract,
-                        recoveryPeriod,
-                        securityPeriod,
-                        securityWindow,
-                        lockPeriod,
-                        openfortGuardian)
-                    )
-                )
+        account = address(new OpenfortRecoverableProxy{salt: salt}(accountImplementation, ""));
+        RecoverableOpenfortAccount(payable(account)).initialize(
+            _admin, entrypointContract, recoveryPeriod, securityPeriod, securityWindow, lockPeriod, openfortGuardian
         );
     }
 
@@ -88,24 +76,7 @@ contract RecoverableOpenfortFactory is IBaseOpenfortFactory {
         return Create2.computeAddress(
             salt,
             keccak256(
-                abi.encodePacked(
-                    type(OpenfortRecoverableProxy).creationCode,
-                    abi.encode(
-                        accountImplementation,
-                        abi.encodeCall(
-                            RecoverableOpenfortAccount.initialize,
-                            (
-                                _admin,
-                                entrypointContract,
-                                recoveryPeriod,
-                                securityPeriod,
-                                securityWindow,
-                                lockPeriod,
-                                openfortGuardian
-                            )
-                        )
-                    )
-                )
+                abi.encodePacked(type(OpenfortRecoverableProxy).creationCode, abi.encode(accountImplementation, ""))
             )
         );
     }