Upgrade OZ contracts, make use of CANCELLER role#739
Merged
thomas-waite merged 6 commits intofeat-governance-upgradefrom Apr 26, 2022
Merged
Upgrade OZ contracts, make use of CANCELLER role#739thomas-waite merged 6 commits intofeat-governance-upgradefrom
thomas-waite merged 6 commits intofeat-governance-upgradefrom
Conversation
take into account getVotes has become an internal method _getVotes on GovernorVotesComp
thomas-waite
force-pushed
the
deps-upgrade-oz
branch
from
005064d to
da3c1bb
Compare
Merged
Joeysantoro
reviewed
Apr 26, 2022
| /// @dev Roles that individual addresses are granted on the relevant timelock: | ||
| // safeAddress - PROPOSER_ROLE, CANCELLER_ROLE, EXECUTOR_ROLE | ||
| // podAdmin - CANCELLER_ROLE | ||
| // publicExecutor - EXECUTOR_ROLE |
Contributor
There was a problem hiding this comment.
just want to double check, is the publicExecutor pausable/revokable?
Contributor
Author
There was a problem hiding this comment.
Have made pausable
Joeysantoro
approved these changes
Apr 26, 2022
thomas-waite
force-pushed
the
deps-upgrade-oz
branch
from
7a378fa to
04a3ceb
Compare
thomas-waite
force-pushed
the
deps-upgrade-oz
branch
from
6e0b236 to
f9384e5
Compare
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
2 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
Upgrades the OZ contracts to the next release. The next release contains a version of the
TimelockController.solthat has a more granularCANCELLOR_ROLEwe can make use of.We are technically using the 'pre-release' here - the pre-release period ended on the 22nd April and it is now going to main release. Have confirmed with the OZ team that there are no planned differences between this pre-release and the main release - it is being released as is in a few days.
Code changes
Previously, all
proposerspassed to thenew TimelockController()created for a pod inpodFactorywere given thePROPOSER_ROLEwhich entitled the proposers to both proposal creation and cancellation abilities.This upgrade restricts the proposer to just the pod safeAddress and not the pod admin contract. Both the pod safe and podAdmin have cancellation rights.