feat(proxy): pre-deterministic address

FraxFinance · Mar 11, 2024 · 06bf126 · 06bf126
1 parent f515af3
commit 06bf126
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/proxies/Proxy.sol b/src/proxies/Proxy.sol
@@ -46,8 +46,12 @@ contract Proxy is Ownable2StepUpgradeable {
         }
     }
 
-    constructor(address _owner) {
-        _transferOwnership(_owner);
+    constructor() {
+        __Ownable_init(msg.sender);
+    }
+
+    function initialize(address _owner) external initializer onlyOwner {
+        _transferOwnership(_owner):
     }
 
     // slither-disable-next-line locked-ether

diff --git a/src/proxies/ProxyHelper.sol b/src/proxies/ProxyHelper.sol
@@ -14,8 +14,7 @@ contract ProxyHelper {
         Proxy proxy = new Proxy{ salt: _salt }({ _owner: msg.sender });
         bytes memory data = abi.encode(_functionSignature, _encodedArguments);
         proxy.upgradeToAndCall({ _implementation: _implementation, _data: data });
-        /// @dev: _owner is required to accept before ownership is fully transfered
-        proxy.transferOwnership(_owner);
+        proxy.initialize(_owner);
 
         return address(proxy);
     }