Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
82e34fd
first proposal
RenanSouza2 Jun 16, 2023
536628e
Add changeset
RenanSouza2 Jun 16, 2023
a2a6a0c
Merge branch 'master' into timelockControler-getter
RenanSouza2 Jun 16, 2023
b2b6844
Improove getOperationState decision tree
RenanSouza2 Jun 16, 2023
813360d
Merge branch 'master' into timelockControler-getter
RenanSouza2 Jun 17, 2023
c3f0ac1
Merge branch 'master' into timelockControler-getter
RenanSouza2 Jun 28, 2023
832c2d5
Reinstate functions
RenanSouza2 Jun 28, 2023
e0bbaad
Change Pending to Blocked
RenanSouza2 Jun 29, 2023
8e671f9
Change TimelockController error from state to bitmap
RenanSouza2 Jul 1, 2023
de0fb95
Fix tests
RenanSouza2 Jul 1, 2023
ef63f37
Fix linter
RenanSouza2 Jul 1, 2023
7587ab4
Merge branch 'master' into timelockControler-getter
RenanSouza2 Jul 1, 2023
9e8c8ca
Update loud-shrimps-play.md
frangio Jul 4, 2023
cf4a2df
rename error param
frangio Jul 4, 2023
ab10a19
remove isOperationBlocked
frangio Jul 4, 2023
643b549
remove virtual
frangio Jul 4, 2023
86f1724
revert afterCall change
frangio Jul 4, 2023
f9498a9
rename Blocked to Waiting
frangio Jul 4, 2023
84099df
Merge branch 'master' into timelockControler-getter
frangio Jul 4, 2023
220cfc3
Change enum in documentation
RenanSouza2 Jul 4, 2023
bd74728
Remove interfaces from docs
RenanSouza2 Jul 4, 2023
a608384
Update contracts/governance/TimelockController.sol
frangio Jul 4, 2023
bd2f0fa
Update contracts/governance/TimelockController.sol
frangio Jul 4, 2023
8d43f44
Update contracts/governance/TimelockController.sol
frangio Jul 4, 2023
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
remove isOperationBlocked
  • Loading branch information
frangio committed Jul 4, 2023
commit ab10a19a9a80cb148526d308b386a93fdf1a221e
15 changes: 4 additions & 11 deletions contracts/governance/TimelockController.sol
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,11 @@ contract TimelockController is AccessControl, ERC721Holder, ERC1155Holder {
}

/**
* @dev Returns whether an operation is waitinf for expiration. Note that a "blocked" operation is also "pending".
* @dev Returns whether an operation is pending or not. Note that a "pending" operation may also be "ready".
*/
function isOperationBlocked(bytes32 id) public view virtual returns (bool) {
return getOperationState(id) == OperationState.Blocked;
function isOperationPending(bytes32 id) public view virtual returns (bool) {
OperationState state = getOperationState(id);
return state == OperationState.Blocked || state == OperationState.Ready;
}

/**
Expand All @@ -184,14 +185,6 @@ contract TimelockController is AccessControl, ERC721Holder, ERC1155Holder {
return getOperationState(id) == OperationState.Ready;
}

/**
* @dev Returns whether an operation is pending or not. Note that a "pending" operation may also be "ready".
*/
function isOperationPending(bytes32 id) public view virtual returns (bool) {
OperationState state = getOperationState(id);
return state == OperationState.Blocked || state == OperationState.Ready;
}

/**
* @dev Returns whether an operation is done or not.
*/
Expand Down