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

Add modifier & internal function with standard revert message in AccessControl #2609

Merged
merged 18 commits into from
Apr 16, 2021
Merged

Add modifier & internal function with standard revert message in AccessControl #2609

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
76a5c2a
add onlyRole modifiers to AccessControl
Amxx Mar 22, 2021
094e69f
test _checkRole revert message
Amxx Mar 22, 2021
401b419
rename modifiers in AccessControl an TimelockController
Amxx Mar 22, 2021
30e1626
save large amount of gas using if({ revert(s); } instead of require(c,s)
Amxx Mar 31, 2021
a070a2b
Update test/access/AccessControl.behavior.js
Amxx Apr 12, 2021
ef91bb7
add onlyRoleAdmin modifier with extended error message
Amxx Apr 12, 2021
1aa13cc
Merge branch 'feature/AccessControlRevertMessage' of github.com:Amxx/…
Amxx Apr 12, 2021
8bd68fa
consistency in revert reason generation for test
Amxx Apr 12, 2021
aeb7091
remove onlyRoleAdmin modifier, use onlyRole
frangio Apr 12, 2021
dfc6e18
document format of revert reason
frangio Apr 12, 2021
7ac9a91
add changelog entry
Amxx Apr 13, 2021
90ead88
add documentation on the onlyRole modifier
Amxx Apr 13, 2021
85b9d29
Merge branch 'master' into feature/AccessControlRevertMessage
frangio Apr 13, 2021
e0480a4
use _checkRole in onlyRoleorOpenRole
frangio Apr 13, 2021
27eeffe
fix TimelockController tests to match AccessControl revert messages
Amxx Apr 14, 2021
cdcb3c2
Remove the openRole mechanism on the TimelockController.
Amxx Apr 16, 2021
4909a82
Re-enable openRole for timelock execution
Amxx Apr 16, 2021
f01b805
add changelog notes about breaking changes
frangio Apr 16, 2021
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
use _checkRole in onlyRoleorOpenRole
  • Loading branch information
@frangio
frangio authored Apr 13, 2021
commit e0480a4556dab04a38c875a6142bf28f91251a5c
4 changes: 3 additions & 1 deletion contracts/governance/TimelockController.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ contract TimelockController is AccessControl {
* this role for everyone.
*/
modifier onlyRoleOrOpenRole(bytes32 role) {
Amxx marked this conversation as resolved.
Show resolved Hide resolved
require(hasRole(role, _msgSender()) || hasRole(role, address(0)), "TimelockController: sender requires permission");
if (!hasRole(role, address(0))) {
_checkRole(role, _msgSender());
}
_;
}

Expand Down