Add changelog entry

OpenZeppelin · Nov 4, 2022 · 9e1cd84 · 9e1cd84
1 parent 1925687
commit 9e1cd84
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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))

diff --git a/contracts/governance/TimelockController.sol b/contracts/governance/TimelockController.sol
@@ -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);