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

Deployment with Governance proposal #425

Merged
merged 12 commits into from
May 26, 2024
Merged

Deployment with Governance proposal #425

merged 12 commits into from
May 26, 2024

Conversation

shahthepro
Copy link
Collaborator

If you made a contract change, make sure to complete the checklist below before merging it in master.

Contract change checklist:

  • Code reviewed by 2 reviewers.
  • Copy & paste code review security checklist below this checklist.
  • Unit tests pass
  • Slither tests pass with no warning
  • Echidna tests pass if PR includes changes to OUSD contract (not automated, run manually on local)

@shahthepro shahthepro marked this pull request as ready for review May 23, 2024 15:42
@shahthepro shahthepro requested a review from DanielVF May 23, 2024 15:49
DanielVF
DanielVF reviewed May 24, 2024
View reviewed changes
script/deploy/mainnet/012_xOGNGovernanceScript.sol
if (!isForked) {
govFive.printTxData();
}
// Revoke access from Multisig
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep an overlapping period and not revoke the multisig until after we've run a test TX through the final governance. This should break out into a new deploy file.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file has a skip method that doesn't run it on mainnet

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still need to separate the granting gov time permissions into a separate file from revoking multi-sig timelock permissions (even though both should not run now)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, gotcha, will do that

@naddison36
Copy link
Contributor

I've verified the OGV>OGN Migration Contracts proposal

  • OgvStakingProxy.collectRewards()
  • OgvStakingProxy.upgrade to new veOgvImpl 0x2d86e0342a0d263dff712cd0aa96d075f61974ed
  • Revoke proposer role from new Governance multisig on old Timelock
  • Revoke caller role from new Governance multisig on old Timelock
  • Revoke executer role from new Governance multisig on old Timelock
  • Upgrade OUSD Buyback to 0x386d8fEC5b6d5B5E36a48A376644e36239dB65d6
  • setRewardsSource to FixedRateRewardsSourceProxy 0x7609c88e5880e934dd3a75bcfef44e31b1badb8b
    • verified FixedRateRewardsSourceProxy against branch
  • Upgrade OETH Buyback to 0x4f11d31f781b57051764a3823b24d520626b4833
  • setRewardsSource to FixedRateRewardsSourceProxy 0x7609c88e5880e934dd3a75bcfef44e31b1badb8b
  • mint OGN to MigratorProxy
    • verified amount 409,664,846
  • transfer OGN to migrator
  • transfer OGN to rewards source FixedRateRewardsSourceProxy
  • setRewardsPerSecond 0.57
  • MigratorProxy.start()
  • MigratorProxy.transferExcessTokens

@shahthepro shahthepro merged commit b4b5aa4 into master May 26, 2024
3 of 4 checks passed
@shahthepro shahthepro deleted the shah/deploy-with-proposals branch May 26, 2024 16:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DanielVF DanielVF DanielVF left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@shahthepro @naddison36 @DanielVF