Eric Mastro 716b864f02 [marketplace] update state getter
Update `Marketplace.state` getter to to take `isCancelled` into account. This state can then be used internally and externally.

Add checks to `proofEnd`, `isProofRequired`, `willProofBeRequired`, and `getChallenge` that understands if the request is in a state to accept proofs. If not, return other values.

Add `slotMustAcceptProofs` modifier, originally introduced in a later PR, which requires the request to be in state of the request accepting proofs.

Add tests for all the above.
2022-09-20 15:59:03 +10:00

90 lines
2.1 KiB
Solidity

// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
import "./Marketplace.sol";
import "./Proofs.sol";
import "./Collateral.sol";
contract Storage is Collateral, Marketplace {
uint256 public collateralAmount;
uint256 public slashMisses;
uint256 public slashPercentage;
constructor(
IERC20 token,
uint256 _proofPeriod,
uint256 _proofTimeout,
uint8 _proofDowntime,
uint256 _collateralAmount,
uint256 _slashMisses,
uint256 _slashPercentage
)
Marketplace(
token,
_collateralAmount,
_proofPeriod,
_proofTimeout,
_proofDowntime
)
{
collateralAmount = _collateralAmount;
slashMisses = _slashMisses;
slashPercentage = _slashPercentage;
}
function getRequest(bytes32 requestId) public view returns (Request memory) {
return _request(requestId);
}
function getSlot(bytes32 slotId) public view returns (Slot memory) {
return _slot(slotId);
}
function getHost(bytes32 requestId) public view returns (address) {
return _host(requestId);
}
function missingProofs(bytes32 slotId) public view returns (uint256) {
return _missed(slotId);
}
function isProofRequired(bytes32 slotId) public view returns (bool) {
if(!_slotAcceptsProofs(slotId)) {
return false;
}
return _isProofRequired(slotId);
}
function willProofBeRequired(bytes32 slotId) public view returns (bool) {
if(!_slotAcceptsProofs(slotId)) {
return false;
}
return _willProofBeRequired(slotId);
}
function getChallenge(bytes32 slotId) public view returns (bytes32) {
if(!_slotAcceptsProofs(slotId)) {
return bytes32(0);
}
return _getChallenge(slotId);
}
function getPointer(bytes32 slotId) public view returns (uint8) {
return _getPointer(slotId);
}
function submitProof(bytes32 slotId, bytes calldata proof) public {
_submitProof(slotId, proof);
}
function markProofAsMissing(bytes32 slotId, uint256 period)
public
slotMustAcceptProofs(slotId)
{
_markProofAsMissing(slotId, period);
if (_missed(slotId) % slashMisses == 0) {
_slash(_host(slotId), slashPercentage);
}
}
}