From eca70b78b8259778d71a032546acb3d84bc7d4c5 Mon Sep 17 00:00:00 2001 From: Shahul Hameed <10547529+shahthepro@users.noreply.github.com> Date: Fri, 21 Jun 2024 15:23:20 +0530 Subject: [PATCH] Deploy 014 - xOGN Governance (#440) --- build/deployments.json | 4 +++- script/deploy/mainnet/013_UpgradeMigratorScript.sol | 2 +- script/deploy/mainnet/014_xOGNGovernanceScript.sol | 5 ----- script/deploy/mainnet/015_RevokeMultisigGovernance.sol | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/build/deployments.json b/build/deployments.json index 52f20a54..69b6c958 100644 --- a/build/deployments.json +++ b/build/deployments.json @@ -4,7 +4,8 @@ "010_xOGNSetup": 1716312107, "011_OgnOgvMigration": 1716485925, "012_MigrationZapper": 1716910212, - "013_UpgradeMigrator": 1717736099 + "013_UpgradeMigrator": 1717736099, + "014_xOGNGovernance": 1718704847 }, "contracts": { "MIGRATION_ZAPPER": "0xC202CDa20A8C34C7a282890eAE2Bb9CC0B115877", @@ -14,6 +15,7 @@ "OGN_REWARDS_SOURCE_IMPL": "0x16890bdd817Ed1c4654430d67329CB20b0B71bB0", "VEOGV_IMPL": "0x5DA3E12893bB8673aC482d7177a1836c83d671F4", "XOGN": "0x63898b3b6Ef3d39332082178656E9862bee45C57", + "XOGN_GOV": "0x1D3Fbd4d129Ddd2372EA85c5Fa00b2682081c9EC", "XOGN_IMPL": "0x97711c7a5D64A064a95d10e37f786d2bD8b1F3c8" } } diff --git a/script/deploy/mainnet/013_UpgradeMigratorScript.sol b/script/deploy/mainnet/013_UpgradeMigratorScript.sol index 83e24bb4..e9a64c92 100644 --- a/script/deploy/mainnet/013_UpgradeMigratorScript.sol +++ b/script/deploy/mainnet/013_UpgradeMigratorScript.sol @@ -17,7 +17,7 @@ contract UpgradeMigratorScript is BaseMainnetScript { GovFive.GovFiveProposal public govProposal; string public constant override DEPLOY_NAME = "013_UpgradeMigrator"; - bool public constant override proposalExecuted = false; + bool public constant override proposalExecuted = true; constructor() {} diff --git a/script/deploy/mainnet/014_xOGNGovernanceScript.sol b/script/deploy/mainnet/014_xOGNGovernanceScript.sol index 0ab0a603..f4967b04 100644 --- a/script/deploy/mainnet/014_xOGNGovernanceScript.sol +++ b/script/deploy/mainnet/014_xOGNGovernanceScript.sol @@ -62,9 +62,4 @@ contract XOGNGovernanceScript is BaseMainnetScript { // Simulate execute on fork by impersonating Timelock govProposal.execute(); } - - function skip() external view override returns (bool) { - // Don't deploy on Mainnet for now - return !this.isForked(); - } } diff --git a/script/deploy/mainnet/015_RevokeMultisigGovernance.sol b/script/deploy/mainnet/015_RevokeMultisigGovernance.sol index 28377706..10371aa8 100644 --- a/script/deploy/mainnet/015_RevokeMultisigGovernance.sol +++ b/script/deploy/mainnet/015_RevokeMultisigGovernance.sol @@ -11,7 +11,7 @@ import {Governance} from "contracts/Governance.sol"; import {GovFive} from "contracts/utils/GovFive.sol"; -contract XOGNGovernanceScript is BaseMainnetScript { +contract RevokeMultisigGovernanceScript is BaseMainnetScript { using GovFive for GovFive.GovFiveProposal; GovFive.GovFiveProposal public govProposal;