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

Jump to bottom

Add in-queue check for cancelTransaction() in Timelock.sol #213

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add in-queue check for cancelTransaction() in Timelock.sol #213

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fab0b1
Update Timelock.sol
AmazingAng Aug 12, 2022
ebbd9e5
Update Timelock.sol
AmazingAng Aug 12, 2022
57ebf3d
Update Timelock.sol
AmazingAng Aug 12, 2022
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
11 changes: 5 additions & 6 deletions contracts/Timelock.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
// SPDX-License-Identifier: BSD-3-Clause
pragma solidity ^0.8.10;

import "./SafeMath.sol";

contract Timelock {
using SafeMath for uint;

event NewAdmin(address indexed newAdmin);
event NewPendingAdmin(address indexed newPendingAdmin);
Expand All @@ -24,7 +21,7 @@ contract Timelock {
mapping (bytes32 => bool) public queuedTransactions;


constructor(address admin_, uint delay_) public {
constructor(address admin_, uint delay_) {
require(delay_ >= MINIMUM_DELAY, "Timelock::constructor: Delay must exceed minimum delay.");
require(delay_ <= MAXIMUM_DELAY, "Timelock::setDelay: Delay must not exceed maximum delay.");

Expand Down Expand Up @@ -60,7 +57,7 @@ contract Timelock {

function queueTransaction(address target, uint value, string memory signature, bytes memory data, uint eta) public returns (bytes32) {
require(msg.sender == admin, "Timelock::queueTransaction: Call must come from admin.");
require(eta >= getBlockTimestamp().add(delay), "Timelock::queueTransaction: Estimated execution block must satisfy delay.");
require(eta >= getBlockTimestamp() + delay, "Timelock::queueTransaction: Estimated execution block must satisfy delay.");

bytes32 txHash = keccak256(abi.encode(target, value, signature, data, eta));
queuedTransactions[txHash] = true;
Expand All @@ -73,6 +70,8 @@ contract Timelock {
require(msg.sender == admin, "Timelock::cancelTransaction: Call must come from admin.");

bytes32 txHash = keccak256(abi.encode(target, value, signature, data, eta));
require(queuedTransactions[txHash], "Timelock::cancelTransaction: Transaction hasn't been queued.");

queuedTransactions[txHash] = false;

emit CancelTransaction(txHash, target, value, signature, data, eta);
Expand All @@ -84,7 +83,7 @@ contract Timelock {
bytes32 txHash = keccak256(abi.encode(target, value, signature, data, eta));
require(queuedTransactions[txHash], "Timelock::executeTransaction: Transaction hasn't been queued.");
require(getBlockTimestamp() >= eta, "Timelock::executeTransaction: Transaction hasn't surpassed time lock.");
require(getBlockTimestamp() <= eta.add(GRACE_PERIOD), "Timelock::executeTransaction: Transaction is stale.");
require(getBlockTimestamp() <= eta + GRACE_PERIOD, "Timelock::executeTransaction: Transaction is stale.");

queuedTransactions[txHash] = false;

Expand Down