Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Add changelog entry
  • Loading branch information
JulissaDantes committed Nov 7, 2022
commit 1c52fe2fdc933d6940e139b9df8db80459ea5a8b
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Changelog

## Unreleased
* `TimelockController`: During deployment, the TimelockController used to grant the `TIMELOCK_ADMIN_ROLE` to the `admin` parameter, it will now assign the `DEFAULT_ADMIN_ROLE` to the `admin` parameter to be consistent with the rest of the repository.([#](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/))

* `ReentrancyGuard`: Add a `_reentrancyGuardEntered` function to expose the guard status. ([#3714](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3714))
* `ERC20Votes`: optimize by using unchecked arithmetic. ([#3748](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3748))
Expand Down
1 change: 0 additions & 1 deletion contracts/governance/TimelockController.sol
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ contract TimelockController is AccessControl, IERC721Receiver, IERC1155Receiver
address[] memory executors,
address admin
) {
_setupRole(DEFAULT_ADMIN_ROLE, _msgSender());
_setRoleAdmin(PROPOSER_ROLE, DEFAULT_ADMIN_ROLE);
_setRoleAdmin(EXECUTOR_ROLE, DEFAULT_ADMIN_ROLE);
_setRoleAdmin(CANCELLER_ROLE, DEFAULT_ADMIN_ROLE);
Expand Down