status-im/dagger-contracts
2
0
Fork 0
mirror of https://github.com/status-im/dagger-contracts.git synced 2025-02-16 08:37:13 +00:00
Code Issues Projects Releases Wiki Activity

[Storage] Move submitProof() to Proofs

Browse Source
This commit is contained in:
Mark Spanbroek 2023-01-09 15:19:00 +01:00 committed by markspanbroek
parent 31d109f0d3
commit 39da450c2a
4 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/Marketplace.sol
View File

@ -89,7 +89,7 @@ contract Marketplace is Collateral, Proofs {
require(balanceOf(msg.sender) >= collateral, "Insufficient collateral"); require(balanceOf(msg.sender) >= collateral, "Insufficient collateral");
_expectProofs(slotId, requestId, request.ask.proofProbability); _expectProofs(slotId, requestId, request.ask.proofProbability);
_submitProof(slotId, proof); submitProof(slotId, proof);
slot.host = msg.sender; slot.host = msg.sender;
slot.requestId = requestId; slot.requestId = requestId;

2
contracts/Proofs.sol
View File

@ -161,7 +161,7 @@ contract Proofs {
return isRequired && pointer < downtime; return isRequired && pointer < downtime;
} }
function _submitProof(SlotId id, bytes calldata proof) internal { function submitProof(SlotId id, bytes calldata proof) public {
require(proof.length > 0, "Invalid proof"); // TODO: replace by actual check require(proof.length > 0, "Invalid proof"); // TODO: replace by actual check
require(!received[id][currentPeriod()], "Proof already submitted"); require(!received[id][currentPeriod()], "Proof already submitted");
received[id][currentPeriod()] = true; received[id][currentPeriod()] = true;

4
contracts/Storage.sol
View File

@ -35,10 +35,6 @@ contract Storage is Marketplace {
minCollateralThreshold = _minCollateralThreshold; minCollateralThreshold = _minCollateralThreshold;
} }
function submitProof(SlotId slotId, bytes calldata proof) public {
_submitProof(slotId, proof);
}
function markProofAsMissing(SlotId slotId, uint256 period) function markProofAsMissing(SlotId slotId, uint256 period)
public public
slotMustAcceptProofs(slotId) slotMustAcceptProofs(slotId)

4
contracts/TestProofs.sol
View File

@ -56,10 +56,6 @@ contract TestProofs is Proofs {
return _getPointer(id); return _getPointer(id);
} }
function submitProof(SlotId id, bytes calldata proof) public {
_submitProof(id, proof);
}
function markProofAsMissing(SlotId id, uint256 _period) public { function markProofAsMissing(SlotId id, uint256 _period) public {
_markProofAsMissing(id, _period); _markProofAsMissing(id, _period);
} }