Simplifying contracts

openfort-xyz · Jun 20, 2023 · f0c31b9 · f0c31b9
1 parent 4d294f1
commit f0c31b9
Show file tree

Hide file tree

Showing 20 changed files with 59 additions and 79 deletions.
diff --git a/contracts/core/managed/ManagedOpenfortAccount.sol b/contracts/core/managed/ManagedOpenfortAccount.sol
@@ -17,7 +17,7 @@ contract ManagedOpenfortAccount is BaseOpenfortAccount {
     /*
      * @notice Initialize the smart contract wallet.
      */
-    function initialize(address _defaultAdmin, bytes calldata) public initializer {
+    function initialize(address _defaultAdmin) public initializer {
         if (_defaultAdmin == address(0)) {
             revert ZeroAddressNotAllowed();
         }

diff --git a/contracts/core/managed/ManagedOpenfortFactory.sol b/contracts/core/managed/ManagedOpenfortFactory.sol
@@ -31,12 +31,9 @@ contract ManagedOpenfortFactory is IBaseOpenfortFactory {
     /*
      * @notice Deploy a new account for _admin with a nonce.
      */
-    function createAccountWithNonce(address _admin, bytes calldata _data, uint256 nonce)
-        external
-        returns (address account)
-    {
-        bytes32 salt = keccak256(abi.encode(msg.sender, nonce));
-        account = getAddressWithNonce(_admin, nonce);
+    function createAccountWithNonce(address _admin, bytes calldata _nonce) external returns (address account) {
+        bytes32 salt = keccak256(abi.encode(_admin, _nonce));
+        account = getAddressWithNonce(_admin, _nonce);
 
         if (account.code.length > 0) {
             return account;
@@ -46,22 +43,22 @@ contract ManagedOpenfortFactory is IBaseOpenfortFactory {
         account = address(
             new OpenfortBeaconProxy{salt: salt}(
                 openfortBeacon,
-                abi.encodeCall(ManagedOpenfortAccount.initialize, (_admin, _data))
+                abi.encodeCall(ManagedOpenfortAccount.initialize, (_admin))
             )
         );
     }
 
     /*
      * @notice Return the address of an account that would be deployed with the given admin signer and nonce.
      */
-    function getAddressWithNonce(address _admin, uint256 nonce) public view returns (address) {
-        bytes32 salt = keccak256(abi.encode(msg.sender, nonce));
+    function getAddressWithNonce(address _admin, bytes calldata _nonce) public view returns (address) {
+        bytes32 salt = keccak256(abi.encode(_admin, _nonce));
         return Create2.computeAddress(
             salt,
             keccak256(
                 abi.encodePacked(
                     type(OpenfortBeaconProxy).creationCode,
-                    abi.encode(openfortBeacon, abi.encodeCall(ManagedOpenfortAccount.initialize, (_admin, "")))
+                    abi.encode(openfortBeacon, abi.encodeCall(ManagedOpenfortAccount.initialize, (_admin)))
                 )
             )
         );

diff --git a/contracts/core/managed/OpenfortBeacon.sol b/contracts/core/managed/OpenfortBeacon.sol
@@ -11,5 +11,5 @@ import {UpgradeableBeacon} from "@openzeppelin/contracts/proxy/beacon/Upgradeabl
  *  - UpgradeableBeacon
  */
 contract OpenfortBeacon is UpgradeableBeacon {
-    constructor(address implementation_) UpgradeableBeacon(implementation_) {}
+    constructor(address _implementation) UpgradeableBeacon(_implementation) {}
 }
diff --git a/contracts/core/static/StaticOpenfortAccount.sol b/contracts/core/static/StaticOpenfortAccount.sol
@@ -20,7 +20,7 @@ contract StaticOpenfortAccount is BaseOpenfortAccount {
     /*
      * @notice Initialize the smart contract wallet.
      */
-    function initialize(address _defaultAdmin, address _entrypoint, bytes calldata) public initializer {
+    function initialize(address _defaultAdmin, address _entrypoint) public initializer {
         if (_defaultAdmin == address(0) || _entrypoint == address(0)) {
             revert ZeroAddressNotAllowed();
         }

diff --git a/contracts/core/static/StaticOpenfortFactory.sol b/contracts/core/static/StaticOpenfortFactory.sol
@@ -33,12 +33,9 @@ contract StaticOpenfortFactory is IBaseOpenfortFactory {
     /*
      * @notice Deploy a new account for _admin and a given nonce.
      */
-    function createAccountWithNonce(address _admin, bytes calldata _data, uint256 nonce)
-        external
-        returns (address account)
-    {
+    function createAccountWithNonce(address _admin, bytes calldata _nonce) external returns (address account) {
         address impl = accountImplementation;
-        bytes32 salt = keccak256(abi.encode(msg.sender, nonce));
+        bytes32 salt = keccak256(abi.encode(_admin, _nonce));
         account = Clones.predictDeterministicAddress(impl, salt);
 
         if (account.code.length > 0) {
@@ -47,23 +44,21 @@ contract StaticOpenfortFactory is IBaseOpenfortFactory {
 
         emit AccountCreated(account, _admin);
         account = Clones.cloneDeterministic(impl, salt);
-        _initializeAccount(account, _admin, entrypointContract, _data);
+        _initializeAccount(account, _admin, entrypointContract);
     }
 
     /*
      * @notice Return the address of an account that would be deployed with the given admin signer and nonce.
      */
-    function getAddressWithNonce(address _admin, uint256 nonce) public view returns (address) {
-        bytes32 salt = keccak256(abi.encode(msg.sender, nonce));
+    function getAddressWithNonce(address _admin, bytes calldata _nonce) public view returns (address) {
+        bytes32 salt = keccak256(abi.encode(_admin, _nonce));
         return Clones.predictDeterministicAddress(accountImplementation, salt);
     }
 
     /*
      * @dev Called in `createAccount`. Initializes the account contract created in `createAccount`.
      */
-    function _initializeAccount(address _account, address _admin, address _entrypointContract, bytes calldata _data)
-        internal
-    {
-        StaticOpenfortAccount(payable(_account)).initialize(_admin, _entrypointContract, _data);
+    function _initializeAccount(address _account, address _admin, address _entrypointContract) internal {
+        StaticOpenfortAccount(payable(_account)).initialize(_admin, _entrypointContract);
     }
 }
diff --git a/contracts/core/upgradeable/UpgradeableOpenfortAccount.sol b/contracts/core/upgradeable/UpgradeableOpenfortAccount.sol
@@ -21,7 +21,7 @@ contract UpgradeableOpenfortAccount is BaseOpenfortAccount, UUPSUpgradeable {
     /*
      * @notice Initialize the smart contract wallet.
      */
-    function initialize(address _defaultAdmin, address _entrypoint, bytes calldata) public initializer {
+    function initialize(address _defaultAdmin, address _entrypoint) public initializer {
         if (_defaultAdmin == address(0) || _entrypoint == address(0)) {
             revert ZeroAddressNotAllowed();
         }

diff --git a/contracts/core/upgradeable/UpgradeableOpenfortFactory.sol b/contracts/core/upgradeable/UpgradeableOpenfortFactory.sol
@@ -31,12 +31,9 @@ contract UpgradeableOpenfortFactory is IBaseOpenfortFactory {
     /*
      * @notice Deploy a new account for _admin with a nonce.
      */
-    function createAccountWithNonce(address _admin, bytes calldata _data, uint256 nonce)
-        external
-        returns (address account)
-    {
-        bytes32 salt = keccak256(abi.encode(msg.sender, nonce));
-        account = getAddressWithNonce(_admin, nonce);
+    function createAccountWithNonce(address _admin, bytes calldata _nonce) external returns (address account) {
+        bytes32 salt = keccak256(abi.encode(_admin, _nonce));
+        account = getAddressWithNonce(_admin, _nonce);
 
         if (account.code.length > 0) {
             return account;
@@ -46,24 +43,24 @@ contract UpgradeableOpenfortFactory is IBaseOpenfortFactory {
         account = address(
             new OpenfortUpgradeableProxy{salt: salt}(
                 accountImplementation,
-                abi.encodeCall(UpgradeableOpenfortAccount.initialize, (_admin, entrypointContract, _data))
+                abi.encodeCall(UpgradeableOpenfortAccount.initialize, (_admin, entrypointContract))
             )
         );
     }
 
     /*
      * @notice Return the address of an account that would be deployed with the given admin signer and nonce.
      */
-    function getAddressWithNonce(address _admin, uint256 nonce) public view returns (address) {
-        bytes32 salt = keccak256(abi.encode(msg.sender, nonce));
+    function getAddressWithNonce(address _admin, bytes calldata _nonce) public view returns (address) {
+        bytes32 salt = keccak256(abi.encode(_admin, _nonce));
         return Create2.computeAddress(
             salt,
             keccak256(
                 abi.encodePacked(
                     type(OpenfortUpgradeableProxy).creationCode,
                     abi.encode(
                         accountImplementation,
-                        abi.encodeCall(UpgradeableOpenfortAccount.initialize, (_admin, entrypointContract, ""))
+                        abi.encodeCall(UpgradeableOpenfortAccount.initialize, (_admin, entrypointContract))
                     )
                 )
             )

diff --git a/contracts/interfaces/IBaseOpenfortFactory.sol b/contracts/interfaces/IBaseOpenfortFactory.sol
@@ -9,19 +9,11 @@ interface IBaseOpenfortFactory {
     error ZeroAddressNotAllowed();
 
     /// @notice Deploys a new Account for admin.
-    //function createAccount(address _admin, bytes calldata _data) external returns (address account);
-
-    /// @notice Deploys a new Account for admin.
-    function createAccountWithNonce(address _admin, bytes calldata _data, uint256 nonce)
-        external
-        returns (address account);
+    function createAccountWithNonce(address _admin, bytes calldata _nonce) external returns (address account);
 
     /// @notice Returns the address of the Account implementation.
     function accountImplementation() external view returns (address);
 
-    /// @notice Returns the address of an Account that would be deployed with the given admin signer.
-    //function getAddress(address adminSigner) external view returns (address);
-
-    /// @notice Returns the address of an Account that would be deployed with the given admin signer and nonce.
-    function getAddressWithNonce(address adminSigner, uint256 nonce) external view returns (address);
+    /// @notice Returns the address of an Account that would be deployed with the given admin and nonce.
+    function getAddressWithNonce(address _admin, bytes calldata _nonce) external view returns (address);
 }
diff --git a/contracts/mock/MockedV2ManagedOpenfortAccount.sol b/contracts/mock/MockedV2ManagedOpenfortAccount.sol
@@ -17,7 +17,7 @@ contract MockedV2ManagedOpenfortAccount is BaseOpenfortAccount {
     /*
      * @notice Initialize the smart contract wallet.
      */
-    function initialize(address _defaultAdmin, bytes calldata) public initializer {
+    function initialize(address _defaultAdmin) public initializer {
         if (_defaultAdmin == address(0)) {
             revert ZeroAddressNotAllowed();
         }

diff --git a/contracts/mock/MockedV2UpgradeableOpenfortAccount.sol b/contracts/mock/MockedV2UpgradeableOpenfortAccount.sol
@@ -19,7 +19,7 @@ contract MockedV2UpgradeableOpenfortAccount is BaseOpenfortAccount, UUPSUpgradea
      * @notice Initialize the smart contract wallet.
      */
 
-    function initialize(address _defaultAdmin, address _entrypoint, bytes calldata) public initializer {
+    function initialize(address _defaultAdmin, address _entrypoint) public initializer {
         if (_defaultAdmin == address(0) || _entrypoint == address(0)) {
             revert ZeroAddressNotAllowed();
         }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfort/openfort-contracts",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Official Contracts of the Openfort Project",
   "scripts": {
     "build": "npm run clean-all && npm run compile",

diff --git a/script/UserOpTestCounter.sol b/script/UserOpTestCounter.sol
@@ -130,7 +130,7 @@ contract UserOpTestCounter is Script {
         testCounter.count();
         assert(testCounter.counters(deployAddress) == 1);
 
-        address account = staticOpenfortFactory.createAccountWithNonce(deployAddress, "", 1);
+        address account = staticOpenfortFactory.createAccountWithNonce(deployAddress, "1");
 
         // Count using userOp
         UserOperation[] memory userOp = _setupUserOpExecute(

diff --git a/script/deployBatching.s.sol b/script/deployBatching.s.sol
@@ -94,7 +94,7 @@ contract DeployBatching is Script {
 
         // Created with:
         // $forge create StaticOpenfortAccount --constructor-args $ENTRY_POINT_ADDRESS 0x6E767F52d49b0abD686003727b8bc0684011819B --mnemonic $MNEMONIC --rpc-url $POLYGON_MUMBAI_RPC --verify
-        address account = staticOpenfortFactory.createAccountWithNonce(deployAddress, "", 1);
+        address account = staticOpenfortFactory.createAccountWithNonce(deployAddress, "1");
 
         uint256 count = 3;
         address[] memory targets = new address[](count);

diff --git a/script/deployManagedAccounts.sol b/script/deployManagedAccounts.sol
@@ -28,7 +28,7 @@ contract ManagedOpenfortDeploy is Script {
         // address account1 = managedOpenfortFactory.accountImplementation();
 
         // The first call should create a new account, while the second will just return the corresponding account address
-        address account2 = managedOpenfortFactory.createAccountWithNonce(deployAddress, "", 1);
+        address account2 = managedOpenfortFactory.createAccountWithNonce(deployAddress, "1");
         console.log(
             "Factory at address %s has created an account at address %s", address(managedOpenfortFactory), account2
         );
@@ -37,12 +37,12 @@ contract ManagedOpenfortDeploy is Script {
         // (mockedOpenfortAccount);
 
         // assert(account1 != account2);
-        // address account3 = managedOpenfortFactory.createAccountWithNonce(deployAddress, "", 3);
+        // address account3 = managedOpenfortFactory.createAccountWithNonce(deployAddress, 3);
         // console.log(
         //     "Factory at address %s has created an account at address %s", address(managedOpenfortFactory), account3
         // );
         // assert(account2 != account3);
-        // address account4 = managedOpenfortFactory.createAccountWithNonce(deployAddress, "", 4);
+        // address account4 = managedOpenfortFactory.createAccountWithNonce(deployAddress, 4);
         // console.log(
         //     "Factory at address %s has created an account at address %s", address(managedOpenfortFactory), account4
         // );

diff --git a/script/deployStaticAccounts.sol b/script/deployStaticAccounts.sol
@@ -24,17 +24,17 @@ contract StaticOpenfortDeploy is Script {
         // address account1 = staticOpenfortFactory.accountImplementation();
 
         // The first call should create a new account, while the second will just return the corresponding account address
-        address account2 = staticOpenfortFactory.createAccountWithNonce(deployAddress, "", 1);
+        address account2 = staticOpenfortFactory.createAccountWithNonce(deployAddress, "1");
         console.log(
             "Factory at address %s has created an account at address %s", address(staticOpenfortFactory), account2
         );
         // assert(account1 != account2);
-        // address account3 = staticOpenfortFactory.createAccountWithNonce(deployAddress, "", 3);
+        // address account3 = staticOpenfortFactory.createAccountWithNonce(deployAddress, 3);
         // console.log(
         //     "Factory at address %s has created an account at address %s", address(staticOpenfortFactory), account3
         // );
         // assert(account2 != account3);
-        // address account4 = staticOpenfortFactory.createAccountWithNonce(deployAddress, "", 4);
+        // address account4 = staticOpenfortFactory.createAccountWithNonce(deployAddress, 4);
         // console.log(
         //     "Factory at address %s has created an account at address %s", address(staticOpenfortFactory), account4
         // );

diff --git a/script/deployUpgradeableAccounts.sol b/script/deployUpgradeableAccounts.sol
@@ -22,18 +22,18 @@ contract UpgradeableOpenfortDeploy is Script {
         address account1 = upgradeableOpenfortFactory.accountImplementation();
 
         // The first call should create a new account, while the second will just return the corresponding account address
-        address account2 = upgradeableOpenfortFactory.createAccountWithNonce(deployAddress, "", 1);
+        address account2 = upgradeableOpenfortFactory.createAccountWithNonce(deployAddress, "1");
         console.log(
             "Factory at address %s has created an account at address %s", address(upgradeableOpenfortFactory), account2
         );
 
         assert(account1 != account2);
-        // address account3 = upgradeableOpenfortFactory.createAccountWithNonce(deployAddress, "", 3);
+        // address account3 = upgradeableOpenfortFactory.createAccountWithNonce(deployAddress, 3);
         // console.log(
         //     "Factory at address %s has created an account at address %s", address(upgradeableOpenfortFactory), account3
         // );
         // assert(account2 != account3);
-        // address account4 = upgradeableOpenfortFactory.createAccountWithNonce(deployAddress, "", 4);
+        // address account4 = upgradeableOpenfortFactory.createAccountWithNonce(deployAddress, 4);
         // console.log(
         //     "Factory at address %s has created an account at address %s", address(upgradeableOpenfortFactory), account4
         // );

diff --git a/test/foundry/core/managed/ManagedOpenfortAccountTest.t.sol b/test/foundry/core/managed/ManagedOpenfortAccountTest.t.sol
@@ -148,7 +148,7 @@ contract ManagedOpenfortAccountTest is Test {
         // deploy account factory
         managedOpenfortFactory = new ManagedOpenfortFactory(address(openfortBeacon));
         // Create an static account wallet and get its address
-        account = managedOpenfortFactory.createAccountWithNonce(accountAdmin, "", 1);
+        account = managedOpenfortFactory.createAccountWithNonce(accountAdmin, "1");
         // deploy a new TestCounter
         testCounter = new TestCounter();
         // deploy a new TestToken (ERC20)
@@ -162,19 +162,19 @@ contract ManagedOpenfortAccountTest is Test {
     function testCreateAccountWithNonceViaFactory() public {
         // Get the counterfactual address
         vm.prank(factoryAdmin);
-        address account2 = managedOpenfortFactory.getAddressWithNonce(accountAdmin, 2);
+        address account2 = managedOpenfortFactory.getAddressWithNonce(accountAdmin, "2");
 
         // Expect that we will see an event containing the account and admin
         vm.expectEmit(true, true, false, true);
         emit AccountCreated(account2, accountAdmin);
 
         // Deploy a static account to the counterfactual address
         vm.prank(factoryAdmin);
-        managedOpenfortFactory.createAccountWithNonce(accountAdmin, "", 2);
+        managedOpenfortFactory.createAccountWithNonce(accountAdmin, "2");
 
         // Make sure the counterfactual address has not been altered
         vm.prank(factoryAdmin);
-        assertEq(account2, managedOpenfortFactory.getAddressWithNonce(accountAdmin, 2));
+        assertEq(account2, managedOpenfortFactory.getAddressWithNonce(accountAdmin, "2"));
     }
 
     /*
@@ -1032,7 +1032,7 @@ contract ManagedOpenfortAccountTest is Test {
     function testUpgradeTo() public {
         // Create a managed account wallet using the old implementation and get its address
         vm.prank(factoryAdmin);
-        address payable accountOld = payable(managedOpenfortFactory.createAccountWithNonce(accountAdmin, "", 2));
+        address payable accountOld = payable(managedOpenfortFactory.createAccountWithNonce(accountAdmin, "2"));
         ManagedOpenfortAccount managedAccount = ManagedOpenfortAccount(accountOld);
         assertEq(managedAccount.version(), 1);
 
@@ -1053,7 +1053,7 @@ contract ManagedOpenfortAccountTest is Test {
 
         // Same for new accounts. From now on, they have the new version.
         vm.prank(factoryAdmin);
-        address payable account3 = payable(managedOpenfortFactory.createAccountWithNonce(accountAdmin, "", 3));
+        address payable account3 = payable(managedOpenfortFactory.createAccountWithNonce(accountAdmin, "3"));
         ManagedOpenfortAccount managedAccount3 = ManagedOpenfortAccount(account3);
         managedAccount3.version();
     }