fix(protocol): remove L1/gov/ in favor of Aragon's (#16933)

taikoxyz · Apr 30, 2024 · 1573735 · 1573735
1 parent 9cf307d
commit 1573735
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 583 deletions.
diff --git a/packages/protocol/contracts/L1/gov/TaikoGovernor.sol b/packages/protocol/contracts/L1/gov/TaikoGovernor.sol
diff --git a/packages/protocol/contracts/L1/gov/TaikoTimelockController.sol b/packages/protocol/contracts/L1/gov/TaikoTimelockController.sol
diff --git a/packages/protocol/script/AddSGXVerifierInstances.s.sol b/packages/protocol/script/AddSGXVerifierInstances.s.sol
@@ -2,12 +2,10 @@
 pragma solidity 0.8.24;
 
 import "../test/DeployCapability.sol";
-import "../contracts/L1/gov/TaikoTimelockController.sol";
 import "../contracts/verifiers/SgxVerifier.sol";
 
 contract AddSGXVerifierInstances is DeployCapability {
     uint256 public privateKey = vm.envUint("PRIVATE_KEY");
-    address public timelockAddress = vm.envAddress("TIMELOCK_ADDRESS");
     address public sgxVerifier = vm.envAddress("SGX_VERIFIER");
     address[] public instances = vm.envAddress("INSTANCES", ",");
 
@@ -16,27 +14,14 @@ contract AddSGXVerifierInstances is DeployCapability {
 
         vm.startBroadcast(privateKey);
 
-        updateInstancesByTimelock(timelockAddress);
-
-        vm.stopBroadcast();
-    }
-
-    function updateInstancesByTimelock(address timelock) internal {
-        bytes32 salt = bytes32(block.timestamp);
-
-        bytes memory payload =
-            abi.encodeWithSelector(bytes4(keccak256("addInstances(address[])")), instances);
-
-        TaikoTimelockController timelockController = TaikoTimelockController(payable(timelock));
-
-        timelockController.schedule(sgxVerifier, 0, payload, bytes32(0), salt, 0);
-
-        timelockController.execute(sgxVerifier, 0, payload, bytes32(0), salt);
+        SgxVerifier(sgxVerifier).addInstances(instances);
 
         for (uint256 i; i < instances.length; ++i) {
             console2.log("New instance added:");
             console2.log("index: ", i);
             console2.log("instance: ", instances[0]);
         }
+
+        vm.stopBroadcast();
     }
 }
diff --git a/packages/protocol/script/AuthorizeTaikoForMultihop.s.sol b/packages/protocol/script/AuthorizeTaikoForMultihop.s.sol
@@ -2,32 +2,20 @@
 pragma solidity 0.8.24;
 
 import "../test/DeployCapability.sol";
-import "../contracts/L1/gov/TaikoTimelockController.sol";
 import "../contracts/signal/SignalService.sol";
 
 contract AuthorizeTaikoForMultihop is DeployCapability {
     uint256 public privateKey = vm.envUint("PRIVATE_KEY");
     address public sharedSignalService = vm.envAddress("SHARED_SIGNAL_SERVICE");
-    address public timelockAddress = vm.envAddress("TIMELOCK_ADDRESS");
     // TaikoL1 and TaikoL2 contracts
     address[] public taikoContracts = vm.envAddress("TAIKO_CONTRACTS", ",");
 
     function run() external {
         require(taikoContracts.length != 0, "invalid taiko contracts");
 
         vm.startBroadcast(privateKey);
-
         for (uint256 i; i < taikoContracts.length; ++i) {
-            bytes32 salt = bytes32(block.timestamp);
-
-            bytes memory payload =
-                abi.encodeCall(SignalService.authorize, (taikoContracts[i], true));
-
-            TaikoTimelockController timelock = TaikoTimelockController(payable(timelockAddress));
-
-            timelock.schedule(sharedSignalService, 0, payload, bytes32(0), salt, 0);
-
-            timelock.execute(sharedSignalService, 0, payload, bytes32(0), salt);
+            SignalService(sharedSignalService).authorize(taikoContracts[i], true);
         }
 
         vm.stopBroadcast();

diff --git a/packages/protocol/script/SetRemoteBridgeSuites.s.sol b/packages/protocol/script/SetRemoteBridgeSuites.s.sol
@@ -2,7 +2,6 @@
 pragma solidity 0.8.24;
 
 import "../test/DeployCapability.sol";
-import "../contracts/L1/gov/TaikoTimelockController.sol";
 
 contract SetRemoteBridgeSuites is DeployCapability {
     uint256 public privateKey = vm.envUint("PRIVATE_KEY");
@@ -75,17 +74,7 @@ contract SetRemoteBridgeSuites is DeployCapability {
     )
         internal
     {
-        bytes32 salt = bytes32(block.timestamp);
-
-        bytes memory payload =
-            abi.encodeCall(AddressManager.setAddress, (chainId, bytes32(bytes(name)), addr));
-
-        TaikoTimelockController timelock = TaikoTimelockController(payable(timelockAddress));
-
-        timelock.schedule(registerTo, 0, payload, bytes32(0), salt, 0);
-
-        timelock.execute(registerTo, 0, payload, bytes32(0), salt);
-
+        AddressManager(registerTo).setAddress(chainId, bytes32(bytes(name)), addr);
         console2.log("> ", name, "@", registerTo);
         console2.log("\t addr : ", addr);
     }

diff --git a/packages/protocol/script/upgrade/UpgradeAddressManager.s.sol b/packages/protocol/script/upgrade/UpgradeAddressManager.s.sol
@@ -8,10 +8,6 @@ import "./UpgradeScript.s.sol";
 
 contract UpgradeAddressManager is UpgradeScript {
     function run() external setUp {
-        console2.log("upgrading AddressManager");
-        AddressManager newAddressManager = new AddressManager();
-        upgrade(address(newAddressManager));
-
-        console2.log("upgraded AddressManager to", address(newAddressManager));
+        upgrade("AddressManager", address(new AddressManager()));
     }
 }
diff --git a/packages/protocol/script/upgrade/UpgradeAssignmentHook.s.sol b/packages/protocol/script/upgrade/UpgradeAssignmentHook.s.sol
@@ -8,10 +8,6 @@ import "./UpgradeScript.s.sol";
 
 contract UpgradeAssignmentHook is UpgradeScript {
     function run() external setUp {
-        console2.log("upgrading AssignmentHook");
-        AssignmentHook newAssignmentHook = new AssignmentHook();
-        upgrade(address(newAssignmentHook));
-
-        console2.log("upgraded AssignmentHook to", address(newAssignmentHook));
+        upgrade("AssignmentHook", address(new AssignmentHook()));
     }
 }
diff --git a/packages/protocol/script/upgrade/UpgradeBridge.s.sol b/packages/protocol/script/upgrade/UpgradeBridge.s.sol
@@ -8,10 +8,6 @@ import "./UpgradeScript.s.sol";
 
 contract UpgradeBridge is UpgradeScript {
     function run() external setUp {
-        console2.log("upgrading bridge");
-        Bridge newBridge = new Bridge();
-        upgrade(address(newBridge));
-
-        console2.log("upgraded bridge to", address(newBridge));
+        upgrade("Bridge", address(new Bridge()));
     }
 }
diff --git a/packages/protocol/script/upgrade/UpgradeERC1155Vault.s.sol b/packages/protocol/script/upgrade/UpgradeERC1155Vault.s.sol
@@ -8,10 +8,6 @@ import "./UpgradeScript.s.sol";
 
 contract UpgradeERC1155Vault is UpgradeScript {
     function run() external setUp {
-        console2.log("upgrading ERC1155Vault");
-        ERC1155Vault newERC1155Vault = new ERC1155Vault();
-        upgrade(address(newERC1155Vault));
-
-        console2.log("upgraded ERC1155Vault to", address(newERC1155Vault));
+        upgrade("ERC1155Vault", address(new ERC1155Vault()));
     }
 }
diff --git a/packages/protocol/script/upgrade/UpgradeERC20Vault.s.sol b/packages/protocol/script/upgrade/UpgradeERC20Vault.s.sol
@@ -8,10 +8,6 @@ import "./UpgradeScript.s.sol";
 
 contract UpgradeERC20Vault is UpgradeScript {
     function run() external setUp {
-        console2.log("upgrading ERC20Vault");
-        ERC20Vault newERC20Vault = new ERC20Vault();
-        upgrade(address(newERC20Vault));
-
-        console2.log("upgraded ERC20Vault to", address(newERC20Vault));
+        upgrade("ERC20Vault", address(new ERC20Vault()));
     }
 }
diff --git a/packages/protocol/script/upgrade/UpgradeERC721Vault.s.sol b/packages/protocol/script/upgrade/UpgradeERC721Vault.s.sol
@@ -8,10 +8,6 @@ import "./UpgradeScript.s.sol";
 
 contract UpgradeERC721Vault is UpgradeScript {
     function run() external setUp {
-        console2.log("upgrading ERC721Vault");
-        ERC721Vault newERC721Vault = new ERC721Vault();
-        upgrade(address(newERC721Vault));
-
-        console2.log("upgraded ERC721Vault to", address(newERC721Vault));
+        upgrade("ERC721Vault", address(new ERC721Vault()));
     }
 }
diff --git a/packages/protocol/script/upgrade/UpgradeGuardianProver.s.sol b/packages/protocol/script/upgrade/UpgradeGuardianProver.s.sol
@@ -8,10 +8,6 @@ import "./UpgradeScript.s.sol";
 
 contract UpgradeGuardianProver is UpgradeScript {
     function run() external setUp {
-        console2.log("upgrading GuardianProver");
-        GuardianProver newGuardianProver = new GuardianProver();
-        upgrade(address(newGuardianProver));
-
-        console2.log("upgraded GuardianProver to", address(newGuardianProver));
+        upgrade("GuardianProver", address(new GuardianProver()));
     }
 }