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

Add a canceller role to the TimelockController #3165

Merged
merged 12 commits into from Mar 8, 2022
Merged

Add a canceller role to the TimelockController #3165

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
91b1f1f
Add a cancellor role to the TimelockController
Amxx Feb 3, 2022
758e915
Update contracts/governance/TimelockController.sol
Amxx Feb 4, 2022
856f486
CANCELLOR → CANCELLER
Amxx Feb 4, 2022
bc2be74
Merge remote-tracking branch 'Amxx/fix/TimelockController/CancellorRo…
Amxx Feb 4, 2022
a66a531
update testing
Amxx Feb 4, 2022
5ca9903
Update TimelockController.sol
frangio Feb 4, 2022
218dfd1
improve timelock controller testing
Amxx Feb 21, 2022
210fc8b
Merge branch 'master' into fix/TimelockController/CancellorRole
Amxx Feb 21, 2022
51bb826
rename cancellor -> canceller
frangio Feb 21, 2022
136e901
lint
frangio Feb 21, 2022
6b13cc7
Merge remote-tracking branch 'upstream/master' into fix/TimelockContr…
frangio Mar 8, 2022
63d99d5
add changelog entry
frangio Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions contracts/governance/TimelockController.sol
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@ contract TimelockController is AccessControl {
bytes32 public constant TIMELOCK_ADMIN_ROLE = keccak256("TIMELOCK_ADMIN_ROLE");
bytes32 public constant PROPOSER_ROLE = keccak256("PROPOSER_ROLE");
bytes32 public constant EXECUTOR_ROLE = keccak256("EXECUTOR_ROLE");
bytes32 public constant CANCELLOR_ROLE = keccak256("CANCELLOR_ROLE");
uint256 internal constant _DONE_TIMESTAMP = uint256(1);

mapping(bytes32 => uint256) private _timestamps;
Expand Down Expand Up @@ -68,14 +69,16 @@ contract TimelockController is AccessControl {
_setRoleAdmin(TIMELOCK_ADMIN_ROLE, TIMELOCK_ADMIN_ROLE);
_setRoleAdmin(PROPOSER_ROLE, TIMELOCK_ADMIN_ROLE);
_setRoleAdmin(EXECUTOR_ROLE, TIMELOCK_ADMIN_ROLE);
_setRoleAdmin(CANCELLOR_ROLE, TIMELOCK_ADMIN_ROLE);

// deployer + self administration
_setupRole(TIMELOCK_ADMIN_ROLE, _msgSender());
_setupRole(TIMELOCK_ADMIN_ROLE, address(this));

// register proposers
// register proposers (and give them cancellor role)
Amxx marked this conversation as resolved.
Show resolved Hide resolved
for (uint256 i = 0; i < proposers.length; ++i) {
_setupRole(PROPOSER_ROLE, proposers[i]);
_setupRole(CANCELLOR_ROLE, proposers[i]);
}

// register executors
Expand Down Expand Up @@ -243,9 +246,9 @@ contract TimelockController is AccessControl {
*
* Requirements:
*
* - the caller must have the 'proposer' role.
* - the caller must have the 'cancellor' role.
*/
function cancel(bytes32 id) public virtual onlyRole(PROPOSER_ROLE) {
function cancel(bytes32 id) public virtual onlyRole(CANCELLOR_ROLE) {
require(isOperationPending(id), "TimelockController: operation cannot be cancelled");
delete _timestamps[id];

Expand Down