Skip to content

FIP-30#212

Merged
Joeysantoro merged 6 commits intomasterfrom
feat/FIP-30
Oct 4, 2021
Merged

FIP-30#212
Joeysantoro merged 6 commits intomasterfrom
feat/FIP-30

Conversation

@Joeysantoro
Copy link
Contributor

@Joeysantoro Joeysantoro commented Oct 3, 2021

This PR creates the DAO proposal steps for upgrading to the OZ governor. It also introduces a rollback mechanism which allows the guardian to revert back to a backup Governor Alpha in the event that the upgrade fails for one reason or another.

The rollback can be used at most once, and expires automatically on November 1 if not used beforehand.

TODO:

  • Add e2e test for rollback
  • Deploy FeiDAO
  • Fix unit tests and constants with new deploy address
  • Write json for proposal

uint256 private _proposalThreshold = 2_500_000e18;

constructor(ERC20VotesComp tribe, ICompoundTimelock timelock)
address private _admin;
Copy link
Contributor

Choose a reason for hiding this comment

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

Change to guardian

Copy link
Contributor

@xklob xklob left a comment

Choose a reason for hiding this comment

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

Looks good, but the address set in the FeiDAO smart contract for OLD_GOVERNOR doesn't match the address in the tests.

@Joeysantoro Joeysantoro merged commit 19187a0 into master Oct 4, 2021
@Joeysantoro Joeysantoro deleted the feat/FIP-30 branch October 4, 2021 02:25
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.

2 participants

Comments