[marketplace] free slot after too many proofs missed

Needs tests
This commit is contained in:
Eric Mastro 2022-09-21 19:18:52 +10:00 committed by Eric Mastro
parent 087c13a7fc
commit 0ffe5d7697
5 changed files with 49 additions and 1 deletions

View File

@ -64,6 +64,25 @@ contract AccountLocks {
require(accountLocks.length == 0, "Account locked");
}
/// Removes an account lock
function _removeAccountLock(address account, bytes32 lockId) internal {
require(accounts[account].locks.length > 0, "Account lock doesn't exist");
bytes32[] storage accountLocks = accounts[account].locks;
uint256 index = 0;
while (true) {
if (index >= accountLocks.length) {
return;
}
if (accountLocks[index] == lockId) {
accountLocks[index] = accountLocks[accountLocks.length - 1];
accountLocks.pop();
} else {
index++;
}
}
}
function removeInactiveLocks(bytes32[] storage lockIds) private {
uint256 index = 0;
while (true) {

View File

@ -51,6 +51,12 @@ contract Collateral is AccountLocks {
internal
collateralInvariant
{
// TODO: perhaps we need to add a minCollateral parameter so that
// a host's collateral can't drop below a certain amount, possibly
// preventing malicious behaviour when collateral drops too low for it
// to matter that it will be lost. Also, we need collateral to be high
// enough to cover repair costs in case of repair as well as marked
// proofs as missing fees.
uint256 amount = (balanceOf(account) * percentage) / 100;
funds.slashed += amount;
subtract(account, amount);

View File

@ -47,6 +47,29 @@ contract Marketplace is Collateral, Proofs {
emit StorageRequested(id, request.ask);
}
function _freeSlot(
bytes32 slotId
) internal marketplaceInvariant {
bytes32 requestId = _getRequestIdForSlot(slotId);
RequestContext storage context = requestContexts[requestId];
require(context.state == RequestState.Started, "Invalid state");
require(!_isCancelled(requestId), "Request cancelled");
Slot storage slot = _slot(slotId);
require(slot.host != address(0), "Slot not filled");
_removeAccountLock(slot.host, requestId);
// TODO: burn host's collateral except for repair costs + mark proof
// missing reward
_unexpectProofs(slotId);
slot.host = address(0);
slot.requestId = 0;
context.slotsFilled -= 1;
emit SlotFreed(requestId, slotId);
}
function fillSlot(
bytes32 requestId,
uint256 slotIndex,

View File

@ -118,6 +118,7 @@ contract Proofs {
pointer = _getPointer(id, proofPeriod);
bytes32 challenge = _getChallenge(pointer);
uint256 probability = (probabilities[id] * (256 - downtime)) / 256;
// TODO: add test for below change
isRequired = ids[id] && uint256(challenge) % probability == 0;
}

View File

@ -32,7 +32,6 @@ contract Storage is Collateral, Marketplace {
collateralAmount = _collateralAmount;
slashMisses = _slashMisses;
slashPercentage = _slashPercentage;
minCollateralThreshold = _minCollateralThreshold;
}
function getRequest(bytes32 requestId) public view returns (Request memory) {