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.

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

Migrate without lockupIds #435

Merged
merged 6 commits into from
Jun 5, 2024
Merged

Migrate without lockupIds #435

merged 6 commits into from
Jun 5, 2024

Conversation

shahthepro
Copy link
Collaborator

  • Adds support for migrating just the rewards (without any lockup/balance)
  • Adds support for calling migrate() without lockupIds

This also removes the need for the MigrationZapper contract. The frontend can always call a single method for all purposes


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)

@@ -6,6 +6,7 @@ import {Vm} from "forge-std/Vm.sol";
import {Addresses} from "contracts/utils/Addresses.sol";
import "forge-std/console.sol";

import {TimelockController} from "OpenZeppelin/[email protected]/contracts/governance/TimelockController.sol";
import "OpenZeppelin/[email protected]/contracts/utils/Strings.sol";

library GovFive {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should spin timelock governance control out out into a seperate file from the governor bravo style governance submission. We'll be moving back to the governor bravo style in the future.

Copy link
Collaborator Author

@shahthepro shahthepro Jun 3, 2024

Choose a reason for hiding this comment

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

We already have a GovProposalHelper for Bravo style governance. This one only deals with multisig governance

Copy link
Contributor

Choose a reason for hiding this comment

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

(an idea is that the difference governance methods can be pluggable, this way we can use this code on different chains with difference governance systems.)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It should be possible to do that but I'll put that one up as a different PR

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe I'm just confused by the name GovFive which is the name of our OGV Governance contract. Maybe all that needs to change here is the name of this contract then.

contracts/Migrator.sol Outdated Show resolved Hide resolved
@shahthepro shahthepro merged commit db9d7ba into master Jun 5, 2024
4 checks passed
@shahthepro shahthepro deleted the shah/rewards-changes branch June 5, 2024 17:25
@DanielVF DanielVF changed the title Migrator changes Migrator without lockupIds Jun 8, 2024
@DanielVF DanielVF changed the title Migrator without lockupIds Migrate without lockupIds Jun 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants