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

Add TimelockController #2354

Merged
merged 74 commits into from
Sep 17, 2020
Merged
Changes from 1 commit
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
f3e90fb
timelock
Amxx Aug 28, 2020
8f41c6d
new commit/reveal version of timelock
Amxx Aug 28, 2020
8eb329c
reverting on failled operation + minDelay
Amxx Aug 29, 2020
be3a111
timelock: testing double commitment
Amxx Aug 29, 2020
3c34cb7
timelock using access control
Amxx Aug 30, 2020
760c23c
minor simplification
Amxx Aug 30, 2020
818a2fe
Timelock access control refactor
Amxx Aug 30, 2020
0e3c228
lint
Amxx Aug 30, 2020
dbcadac
timelock documentation
Amxx Aug 30, 2020
639cde8
doc
Amxx Aug 31, 2020
5c438d3
timelock: open role to everyone with address(0)
Amxx Sep 1, 2020
05bc209
split timelock logic
Amxx Sep 1, 2020
032cc7b
timelock doc
Amxx Sep 1, 2020
8d01d66
timelock: naming
Amxx Sep 1, 2020
9f39d26
timelock controller docs
Amxx Sep 1, 2020
7da0098
timelock with public schedule
Amxx Sep 1, 2020
7176a2e
timelock testing
Amxx Sep 1, 2020
3cfad30
Merge branch 'master' into timelock-public
Amxx Sep 2, 2020
e4f11de
timelock doc
Amxx Sep 2, 2020
1c05edc
adding predecessor
Amxx Sep 2, 2020
948e510
timelock testing
Amxx Sep 3, 2020
6320cd7
timelock testing lint
Amxx Sep 3, 2020
f631e80
timelock gas optimisation
Amxx Sep 3, 2020
fe9a85f
timelock gas tweek
Amxx Sep 3, 2020
a352260
moving timelock testing to test/utils
Amxx Sep 3, 2020
c42c05b
all-in-one timelock
Amxx Sep 4, 2020
14ceb84
minor testing update
Amxx Sep 4, 2020
bd3d36c
minor testing update
Amxx Sep 4, 2020
610bd29
linting
Amxx Sep 4, 2020
32cdcf7
linting
Amxx Sep 4, 2020
f8b5aa0
linting
Amxx Sep 4, 2020
6d86153
minor dependency fix
Amxx Sep 4, 2020
1fdeba8
TimelockController refactor & cleanup
Amxx Sep 4, 2020
79eaa94
hardcoded values in tests
Amxx Sep 5, 2020
74ddc18
timelock docs and minor refactor
Amxx Sep 5, 2020
94fe13f
adding constructor event + remove payable from schedule
Amxx Sep 7, 2020
900ed50
doc
Amxx Sep 7, 2020
ae4bcde
tests fix
Amxx Sep 7, 2020
f01745b
typo + guide start
Amxx Sep 7, 2020
ff458da
timelock guide
Amxx Sep 7, 2020
3d88c92
timelock doc
Amxx Sep 9, 2020
3b4f074
Merge branch 'master' into timelock-public
Amxx Sep 9, 2020
bb62b65
TimelockController doc typo
Amxx Sep 9, 2020
8bc0ae3
documentation refactor
Amxx Sep 10, 2020
2c28b82
documentation refactor
Amxx Sep 10, 2020
bfa2fa2
timelock: addressing review comments
Amxx Sep 11, 2020
06eeb19
addressing more review comments
Amxx Sep 12, 2020
fae6d5a
doc update
Amxx Sep 12, 2020
79dfd00
Solving reentrancy issue introduced in 06eeb1
Amxx Sep 13, 2020
0815268
compile fix
Amxx Sep 13, 2020
96d700a
Merge branch 'master' into timelock-public
Amxx Sep 13, 2020
8da3b96
execution checks refactor
Amxx Sep 13, 2020
4adc4e4
cleanup
Amxx Sep 13, 2020
eb1599f
doc typos
Amxx Sep 13, 2020
9954a52
Update test/access/TimelockController.test.js
Amxx Sep 15, 2020
b962f01
Update test/access/TimelockController.test.js
Amxx Sep 15, 2020
287310b
Update test/access/TimelockController.test.js
Amxx Sep 15, 2020
be14be9
Update contracts/access/README.adoc
Amxx Sep 15, 2020
b1de782
Update contracts/access/README.adoc
Amxx Sep 15, 2020
84285d8
Update contracts/access/README.adoc
Amxx Sep 15, 2020
106152c
Update contracts/access/README.adoc
Amxx Sep 15, 2020
96e0122
removing redundant events checks
Amxx Sep 15, 2020
cd23b05
fix lint
Amxx Sep 15, 2020
38e8a1d
Merge branch 'master' into timelock-public
Amxx Sep 15, 2020
79b07f9
Update test/access/TimelockController.test.js
Amxx Sep 15, 2020
52042e0
Apply suggestions from code review
Amxx Sep 16, 2020
cd0b97c
addressing review
Amxx Sep 16, 2020
fed7a3a
fix tests
Amxx Sep 16, 2020
20a6299
Merge branch 'master' into timelock-public
Amxx Sep 16, 2020
a798e76
lint fix
Amxx Sep 16, 2020
45476a1
skip OutOfGas test when running coverage
Amxx Sep 16, 2020
13ee9cb
re-fixing lint (don't use vim in the future)
Amxx Sep 16, 2020
60fc3bf
Addressing comments about TimelockController.test.js structure
Amxx Sep 17, 2020
64500e4
fix typo and increase test timeout
frangio Sep 17, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
timelock doc
  • Loading branch information
Amxx committed Sep 2, 2020
commit e4f11dea798f12fd2eb55acda73f217491ff5150
12 changes: 8 additions & 4 deletions contracts/access/TimelockController.sol
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ contract TimelockController is Timelock, AccessControl {
/**
* @dev Schedule an operation containing a single transaction.
*
* Emits a {CallScheduled} event.
* Emits a {Timelock-Scheduled} and a {CallScheduled} event.
*
* Requirements:
*
Expand All @@ -79,7 +79,8 @@ contract TimelockController is Timelock, AccessControl {
/**
* @dev Schedule an operation containing a batch of transactions.
*
* Emits one {CallScheduled} event per entry in the batch.
* Emits a {Timelock-Scheduled} event and one {CallScheduled} event per
* entry in the batch.
*
* Requirements:
*
Expand Down Expand Up @@ -110,7 +111,7 @@ contract TimelockController is Timelock, AccessControl {
/**
* @dev Execute an (ready) operation containing a single transaction.
*
* Emits a {CallExecuted} event.
* Emits a {Timelock-Executed} and a {CallExecuted} event.
*
* Requirements:
*
Expand All @@ -125,7 +126,8 @@ contract TimelockController is Timelock, AccessControl {
/**
* @dev Execute an (ready) operation containing a batch of transactions.
*
* Emits one {CallExecuted} event per entry in the batch.
* Emits a {Timelock-Executed} event and one {CallExecuted} event per
* entry in the batch.
*
* Requirements:
*
Expand Down Expand Up @@ -158,6 +160,8 @@ contract TimelockController is Timelock, AccessControl {

/**
* @dev Changes the timelock duration for future operations.
*
* Emits a {Timelock-MinDelayChange} event.
*/
function updateDelay(uint256 newDelay) external onlyRole(DEFAULT_ADMIN_ROLE) {
_updateDelay(newDelay);
Expand Down