NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add additional isOperationReady check in TimelockController

Browse Source 
(cherry picked from commit cec4f2ef57)
This commit is contained in:
Francisco Giordano
2021-08-24 16:09:39 -03:00
parent 1d2e15fbd7
commit 0ec7f4c25d
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
# Changelog # Changelog
## 4.3.1
* `TimelockController`: Add additional isOperationReady check.
## 4.3.0 (2021-08-17) ## 4.3.0 (2021-08-17)
* `ERC2771Context`: use private variable from storage to store the forwarder address. Fixes issues where `_msgSender()` was not callable from constructors. ([#2754](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2754)) * `ERC2771Context`: use private variable from storage to store the forwarder address. Fixes issues where `_msgSender()` was not callable from constructors. ([#2754](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2754))

7
contracts/governance/TimelockController.sol
View File

@ -268,7 +268,7 @@ contract TimelockController is AccessControl {
bytes32 salt bytes32 salt
) public payable virtual onlyRoleOrOpenRole(EXECUTOR_ROLE) { ) public payable virtual onlyRoleOrOpenRole(EXECUTOR_ROLE) {
bytes32 id = hashOperation(target, value, data, predecessor, salt); bytes32 id = hashOperation(target, value, data, predecessor, salt);
_beforeCall(predecessor); _beforeCall(id, predecessor);
_call(id, 0, target, value, data); _call(id, 0, target, value, data);
_afterCall(id); _afterCall(id);
} }
@ -293,7 +293,7 @@ contract TimelockController is AccessControl {
require(targets.length == datas.length, "TimelockController: length mismatch"); require(targets.length == datas.length, "TimelockController: length mismatch");
bytes32 id = hashOperationBatch(targets, values, datas, predecessor, salt); bytes32 id = hashOperationBatch(targets, values, datas, predecessor, salt);
_beforeCall(predecessor); _beforeCall(id, predecessor);
for (uint256 i = 0; i < targets.length; ++i) { for (uint256 i = 0; i < targets.length; ++i) {
_call(id, i, targets[i], values[i], datas[i]); _call(id, i, targets[i], values[i], datas[i]);
} }
@ -303,7 +303,8 @@ contract TimelockController is AccessControl {
/** /**
* @dev Checks before execution of an operation's calls. * @dev Checks before execution of an operation's calls.
*/ */
function _beforeCall(bytes32 predecessor) private view { function _beforeCall(bytes32 id, bytes32 predecessor) private view {
require(isOperationReady(id), "TimelockController: operation is not ready");
require(predecessor == bytes32(0) || isOperationDone(predecessor), "TimelockController: missing dependency"); require(predecessor == bytes32(0) || isOperationDone(predecessor), "TimelockController: missing dependency");
} }