status-im
/
dagger-contracts
mirror of https://github.com/status-im/dagger-contracts.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[marketplace] Add cancelled check for marking missing proofs 

Add check for cancelled requests when marking proofs as missing.

Add NatSpec documentation for `withdrawFunds` and `isCancelled`.
This commit is contained in:
Eric Mastro 2022-08-17 15:26:04 +10:00 committed by Eric Mastro
parent 949a359626
commit 20938ab448
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contracts/Marketplace.sol
View File

@ -97,6 +97,9 @@ contract Marketplace is Collateral, Proofs {
require(token.transfer(slot.host, amount), "Payment failed"); require(token.transfer(slot.host, amount), "Payment failed");
} }
/// @notice Withdraws storage request funds back to the client that deposited them.
/// @dev Request must be expired, must be in RequestState.New, and the transaction must originate from the depositer address.
/// @param requestId the id of the request
function withdrawFunds(bytes32 requestId) public marketplaceInvariant { function withdrawFunds(bytes32 requestId) public marketplaceInvariant {
Request memory request = requests[requestId]; Request memory request = requests[requestId];
require(block.timestamp > request.expiry, "Request not yet timed out"); require(block.timestamp > request.expiry, "Request not yet timed out");
@ -116,6 +119,10 @@ contract Marketplace is Collateral, Proofs {
emit RequestCancelled(requestId); emit RequestCancelled(requestId);
} }
/// @notice Rseturn true if the request state is RequestState.Cancelled or if the request expiry time has elapsed and the request was never started.
/// @dev Handles the case when a request may have been cancelled, but the client has not withdrawn its funds yet, and therefore the state has not yet been updated.
/// @param requestId the id of the request
/// @return true if request is cancelled
function isCancelled(bytes32 requestId) public view returns (bool) { function isCancelled(bytes32 requestId) public view returns (bool) {
RequestContext storage context = requestContexts[requestId]; RequestContext storage context = requestContexts[requestId];
return return

1
contracts/Storage.sol
View File

@ -65,6 +65,7 @@ contract Storage is Collateral, Marketplace {
} }
function markProofAsMissing(bytes32 slotId, uint256 period) public { function markProofAsMissing(bytes32 slotId, uint256 period) public {
require(!isCancelled(slotId), "Request was cancelled");
_markProofAsMissing(slotId, period); _markProofAsMissing(slotId, period);
if (_missed(slotId) % slashMisses == 0) { if (_missed(slotId) % slashMisses == 0) {
_slash(_host(slotId), slashPercentage); _slash(_host(slotId), slashPercentage);