From 8b747fb7010f5476115676376288bf1201e288e4 Mon Sep 17 00:00:00 2001 From: wildmolasses Date: Thu, 22 Aug 2024 14:37:46 -0400 Subject: [PATCH] deployed governors --- script/SharedGovernorConstants.sol | 5 +++-- test/L2ArbitrumGovernorV2.t.sol | 2 +- test/helpers/SetupNewGovernors.sol | 10 ++++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/script/SharedGovernorConstants.sol b/script/SharedGovernorConstants.sol index 5cf1f43..add1783 100644 --- a/script/SharedGovernorConstants.sol +++ b/script/SharedGovernorConstants.sol @@ -6,6 +6,7 @@ pragma solidity 0.8.26; // Inheritable extension holding governor deployment constants that are shared between the Core Governor and the // Treasury Governor. These should be carefully checked and reviewed before final deployment. contract SharedGovernorConstants { + uint256 constant FORK_BLOCK = 245_608_716; // Arbitrary recent block address public constant L2_ARB_TOKEN_ADDRESS = 0x912CE59144191C1204E64559FE8253a0e49E6548; address public constant L2_CORE_GOVERNOR = 0xf07DeD9dC292157749B6Fd268E37DF6EA38395B9; @@ -23,8 +24,8 @@ contract SharedGovernorConstants { uint256 public constant L1_TIMELOCK_MIN_DELAY = 259_200; // TODO: Make sure this is up to date. address public constant L1_ARB_ONE_DELAYED_INBOX = 0x4Dbd4fc535Ac27206064B68FfCf827b0A60BAB3f; - address public constant L2_CORE_GOVERNOR_ONCHAIN = address(0); // TODO: Update with the deployed address. - address public constant L2_TREASURY_GOVERNOR_ONCHAIN = address(0); // TODO: Update with the deployed address. + address public constant L2_CORE_GOVERNOR_ONCHAIN = 0x7796F378B3c56ceD57350B938561D8c52256456b; + address public constant L2_TREASURY_GOVERNOR_ONCHAIN = 0x4fd1216c8b5E72b22785169Ae5C1e8f3b30C19E4; bool public constant UPGRADE_PROPOSAL_PASSED_ONCHAIN = false; // TODO: Update after the upgrade proposal is passed. address public constant L2_UPGRADE_EXECUTOR = 0xCF57572261c7c2BCF21ffD220ea7d1a27D40A827; diff --git a/test/L2ArbitrumGovernorV2.t.sol b/test/L2ArbitrumGovernorV2.t.sol index 46c25c6..5ff3ed5 100644 --- a/test/L2ArbitrumGovernorV2.t.sol +++ b/test/L2ArbitrumGovernorV2.t.sol @@ -1149,7 +1149,7 @@ contract CoreGovernorHasVoted is CoreGovernorBase, CastVoteWithReasonAndParams { } } -contract CoverGovernorQueue is CoreGovernorBase, Queue { +contract CoreGovernorQueue is CoreGovernorBase, Queue { function setUp() public override(L2ArbitrumGovernorV2Test, CoreGovernorBase) { super.setUp(); } diff --git a/test/helpers/SetupNewGovernors.sol b/test/helpers/SetupNewGovernors.sol index 22e11e7..b724c63 100644 --- a/test/helpers/SetupNewGovernors.sol +++ b/test/helpers/SetupNewGovernors.sol @@ -15,8 +15,6 @@ import {L2ArbitrumGovernorV2} from "src/L2ArbitrumGovernorV2.sol"; import {TimelockRolesUpgrader} from "src/gov-action-contracts/TimelockRolesUpgrader.sol"; abstract contract SetupNewGovernors is SharedGovernorConstants, Test { - uint256 constant FORK_BLOCK = 220_819_857; // Arbitrary recent block - // Deploy & setup scripts SubmitUpgradeProposalScript submitUpgradeProposalScript; TimelockRolesUpgrader timelockRolesUpgrader; @@ -49,8 +47,12 @@ abstract contract SetupNewGovernors is SharedGovernorConstants, Test { proxyTreasuryGovernorDeployer.setUp(); // Deploy Governor proxy contracts - newCoreGovernor = proxyCoreGovernorDeployer.run(_implementation); - newTreasuryGovernor = proxyTreasuryGovernorDeployer.run(_implementation); + newCoreGovernor = L2_CORE_GOVERNOR_ONCHAIN == address(0) + ? proxyCoreGovernorDeployer.run(_implementation) + : L2ArbitrumGovernorV2(payable(L2_CORE_GOVERNOR_ONCHAIN)); + newTreasuryGovernor = L2_TREASURY_GOVERNOR_ONCHAIN == address(0) + ? proxyTreasuryGovernorDeployer.run(_implementation) + : L2ArbitrumGovernorV2(payable(L2_TREASURY_GOVERNOR_ONCHAIN)); // Current governors and timelocks currentCoreGovernor = GovernorUpgradeable(payable(L2_CORE_GOVERNOR));