Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Deploy 014 - xOGN Governance #440

Merged
merged 1 commit into from
Jun 21, 2024
+5 −8
Merged

Deploy 014 - xOGN Governance #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build/deployments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -14,6 +15,7 @@
"OGN_REWARDS_SOURCE_IMPL": "0x16890bdd817Ed1c4654430d67329CB20b0B71bB0",
"VEOGV_IMPL": "0x5DA3E12893bB8673aC482d7177a1836c83d671F4",
"XOGN": "0x63898b3b6Ef3d39332082178656E9862bee45C57",
"XOGN_GOV": "0x1D3Fbd4d129Ddd2372EA85c5Fa00b2682081c9EC",
"XOGN_IMPL": "0x97711c7a5D64A064a95d10e37f786d2bD8b1F3c8"
}
}
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/mainnet/013_UpgradeMigratorScript.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {}

Expand Down
5 changes: 0 additions & 5 deletions script/deploy/mainnet/014_xOGNGovernanceScript.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
2 changes: 1 addition & 1 deletion script/deploy/mainnet/015_RevokeMultisigGovernance.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading