Governance TODOs#674
Merged
thomas-waite merged 25 commits intofeat-governance-upgradefrom Apr 25, 2022
Merged
Conversation
fix flaky test
thomas-waite
commented
Apr 10, 2022
thomas-waite
commented
Apr 10, 2022
thomas-waite
commented
Apr 10, 2022
thomas-waite
commented
Apr 10, 2022
thomas-waite
commented
Apr 10, 2022
thomas-waite
changed the base branch from
feat-gov-upgrade-v2
to
feat-governance-upgrade
Joeysantoro
reviewed
Apr 11, 2022
Joeysantoro
reviewed
Apr 11, 2022
Joeysantoro
reviewed
Apr 11, 2022
Joeysantoro
reviewed
Apr 11, 2022
Joeysantoro
reviewed
Apr 11, 2022
Joeysantoro
reviewed
Apr 11, 2022
Joeysantoro
reviewed
Apr 11, 2022
Joeysantoro
reviewed
Apr 11, 2022
Joeysantoro
reviewed
Apr 11, 2022
| // TODODODODODO: Use TimelockController from OZ | ||
| OptimisticTimelock timelock = new TimelockController( | ||
| address(core()), | ||
| TimelockController timelock = new TimelockController( |
Contributor
There was a problem hiding this comment.
we should use v4.6 when it releases https://github.com/OpenZeppelin/openzeppelin-contracts/blob/release-v4.6/contracts/governance/TimelockController.sol and be more specific with the roles, specifically canceller
Contributor
Author
There was a problem hiding this comment.
Agreed. Didn't want to pull the contract direct from Github pre-release. Have reached out to find out more about release timelines
Contributor
There was a problem hiding this comment.
Still looks to be 4.5. Can we import the more recent commits via npm override?
Contributor
Author
There was a problem hiding this comment.
Going to update now in a seperate PR, merging this down
Joeysantoro
reviewed
Apr 11, 2022
Joeysantoro
requested changes
Apr 11, 2022
Contributor
Joeysantoro
left a comment
Joeysantoro
left a comment
There was a problem hiding this comment.
A lot better overall but still some important unresolved issues
thomas-waite
commented
Apr 11, 2022
needed to link podId and timelock
Joeysantoro
reviewed
Apr 11, 2022
Joeysantoro
reviewed
Apr 11, 2022
Joeysantoro
approved these changes
Apr 21, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Implements governance upgrade todos:
Main points
adminof a pod is set on a per pod basis via thePodConfigthat is passed tofactory.createOptimisticPod(). This is done for two reasons:PodFactoryto be be passed toPodAdminGateway, so that inveto()we can validate thatpodIdcorresponds to the passedtimelock(there won't be a cyclical dependency)adminandguardian. Map onto existing global role abilitiesOptimisticTimelock.solwithTimelockController.soldeployGenesisPod()function to deploy the first pod. It is used to deploy the TribalCouncil before the DAO vote FIP. This means we have the podId. It is not placed in the constructor of the factory as it relies on args passed to the constructor which I want to be immutable for future deploys