Improved deployment scripts

openfort-xyz · Dec 11, 2023 · b8312e0 · b8312e0
1 parent 2d43250
commit b8312e0
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 50 deletions.
diff --git a/script/deployManagedAccounts.s.sol b/script/deployManagedAccounts.s.sol
@@ -34,15 +34,15 @@ contract ManagedOpenfortDeploy is Script {
             LOCK_PERIOD,
             OPENFORT_GUARDIAN
         );
-
+
+        vm.stopBroadcast();
+
         address accountImpl = openfortFactory.implementation();
         console.log("Account implementation: ", accountImpl);
 
         // Create an managed account wallet and get its address
         address firstAccountAddress = openfortFactory.createAccountWithNonce(deployAddress, "1", true);
         console.log(firstAccountAddress);
         console.log("First Account Address: ", firstAccountAddress);
-
-        vm.stopBroadcast();
     }
 }
diff --git a/script/deployUpgradeableAccounts.s.sol b/script/deployUpgradeableAccounts.s.sol
@@ -6,50 +6,43 @@ import {IEntryPoint} from "lib/account-abstraction/contracts/interfaces/IEntryPo
 import {UpgradeableOpenfortAccount} from "../contracts/core/upgradeable/UpgradeableOpenfortAccount.sol";
 import {UpgradeableOpenfortFactory} from "../contracts/core/upgradeable/UpgradeableOpenfortFactory.sol";
 
-// contract UpgradeableOpenfortDeploy is Script {
-//     uint256 internal deployPrivKey = vm.deriveKey(vm.envString("MNEMONIC_MC"), 0);
-//     // uint256 internal deployPrivKey = vm.envUint("PK");
-//     address internal deployAddress = vm.addr(deployPrivKey);
-//     IEntryPoint internal entryPoint = IEntryPoint((payable(vm.envAddress("ENTRY_POINT_ADDRESS"))));
-
-//     function run() public {
-//         bytes32 versionSalt = vm.envBytes32("VERSION_SALT");
-//         vm.startBroadcast(deployPrivKey);
-
-//         UpgradeableOpenfortAccount upgradeableOpenfortAccount = new UpgradeableOpenfortAccount{salt: versionSalt}();
-
-//         UpgradeableOpenfortFactory upgradeableOpenfortFactory =
-//             new UpgradeableOpenfortFactory{salt: versionSalt}(address(entryPoint), address(upgradeableOpenfortAccount));
-//         (upgradeableOpenfortFactory);
-//         // 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");
-//         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);
-//         // 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);
-//         // console.log(
-//         //     "Factory at address %s has created an account at address %s", address(upgradeableOpenfortFactory), account4
-//         // );
-//         // assert(account3 != account4);
-
-//         //address account3 = upgradeableOpenfortFactory.createAccount(deployAddress, bytes(""));
-
-//         //assert(account1 != account2);
-//         //assert(account2 == account3);
-
-//         //UpgradeableOpenfortAccount newAccount = new UpgradeableOpenfortAccount();
-
-//         //UpgradeableOpenfortAccount(payable(account2)).upgradeTo(address(newAccount));
-
-//         vm.stopBroadcast();
-//     }
-// }
+contract UpgradeableOpenfortDeploy is Script {
+    uint256 internal deployPrivKey = vm.envUint("PK_PAYMASTER_OWNER_TESTNET");
+    address internal deployAddress = vm.addr(deployPrivKey);
+    IEntryPoint internal entryPoint = IEntryPoint((payable(vm.envAddress("ENTRY_POINT_ADDRESS"))));
+
+    uint256 private constant RECOVERY_PERIOD = 2 days;
+    uint256 private constant SECURITY_PERIOD = 1.5 days;
+    uint256 private constant SECURITY_WINDOW = 0.5 days;
+    uint256 private constant LOCK_PERIOD = 5 days;
+    address private OPENFORT_GUARDIAN = vm.envAddress("PAYMASTER_OWNER_TESTNET");
+
+    function run() public {
+        bytes32 versionSalt = vm.envBytes32("VERSION_SALT");
+        vm.startBroadcast(deployPrivKey);
+
+        // Create an acccount to serve as implementation
+        UpgradeableOpenfortAccount upgradeableOpenfortAccountImpl = new UpgradeableOpenfortAccount{salt: versionSalt}();
+        // deploy account factory (beacon)
+        UpgradeableOpenfortFactory openfortFactory = new UpgradeableOpenfortFactory{salt: versionSalt}(
+            deployAddress,
+            address(entryPoint),
+            address(upgradeableOpenfortAccountImpl),
+            RECOVERY_PERIOD,
+            SECURITY_PERIOD,
+            SECURITY_WINDOW,
+            LOCK_PERIOD,
+            OPENFORT_GUARDIAN
+        );
+
+        vm.stopBroadcast();
+
+        address accountImpl = openfortFactory.implementation();
+        console.log("Account implementation: ", accountImpl);
+
+        // Create an upgradeable account wallet and get its address
+        address firstAccountAddress = openfortFactory.createAccountWithNonce(deployAddress, "1", true);
+        console.log(firstAccountAddress);
+        console.log("First Account Address: ", firstAccountAddress);
+    }
+}