ChronosXYZ/dione
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix checking request deadline when submitting result in DioneOracle

Browse Source
This commit is contained in:
ChronosX88 2021-04-27 21:23:53 +03:00
parent 6a3349a9ee
commit 8dbd84e00b
Signed by: ChronosXYZ
GPG Key ID: 085A69A82C8C511A
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eth-contracts/contracts/DioneOracle.sol
View File

@ -15,8 +15,6 @@ contract DioneOracle {
uint256 constant public MAXIMUM_DELAY = 5 minutes; uint256 constant public MAXIMUM_DELAY = 5 minutes;
// Dione staking contract // Dione staking contract
IDioneStaking public dioneStaking; IDioneStaking public dioneStaking;
// Minimum amount of DIONE tokens required to vote against miner result
uint256 public minimumDisputeFee = 100**18;
struct OracleRequest { struct OracleRequest {
address requestSender; address requestSender;
@ -26,7 +24,7 @@ contract DioneOracle {
address callbackAddress; // callback address for users request contract address callbackAddress; // callback address for users request contract
bytes4 callbackMethodID; // method for users request contract bytes4 callbackMethodID; // method for users request contract
uint256 reqID; // request counter uint256 reqID; // request counter
uint256 deadline; int256 deadline;
bytes data; bytes data;
} }
@ -70,7 +68,7 @@ contract DioneOracle {
callbackAddress: _callbackAddress, callbackAddress: _callbackAddress,
callbackMethodID: _callbackMethodID, callbackMethodID: _callbackMethodID,
reqID: requestCounter, reqID: requestCounter,
deadline: requestDeadline, deadline: int256(requestDeadline),
data: new bytes(0) data: new bytes(0)
}); });
@ -86,7 +84,7 @@ contract DioneOracle {
} }
function submitOracleRequest(uint256 _reqID, bytes memory _data) public onlyPendingRequest(_reqID) returns (bool) { function submitOracleRequest(uint256 _reqID, bytes memory _data) public onlyPendingRequest(_reqID) returns (bool) {
require((pendingRequests[_reqID].deadline - block.timestamp) <= MAXIMUM_DELAY, "submission has exceeded the deadline"); require(pendingRequests[_reqID].deadline - int256(block.timestamp) >= 0, "submission has exceeded the deadline");
delete pendingRequests[_reqID]; delete pendingRequests[_reqID];
dioneStaking.mine(msg.sender); dioneStaking.mine(msg.sender);
(bool success, ) = pendingRequests[_reqID].callbackAddress.call(abi.encodeWithSelector(pendingRequests[_reqID].callbackMethodID, _reqID, _data)); (bool success, ) = pendingRequests[_reqID].callbackAddress.call(abi.encodeWithSelector(pendingRequests[_reqID].callbackMethodID, _reqID, _data));