marketplace: re-instate currentCollateral()

So that a storage provider can know how much collateral is
returned when it calls freeSlot()

Author: markspanbroek

contracts/Marketplace.sol

@@ -66,9 +66,10 @@ contract Marketplace is SlotReservations, Proofs, StateRetrieval, Endian {
   }
 
   struct Slot {
-    SlotState state;
     RequestId requestId;
     uint64 slotIndex;
+    uint128 currentCollateral;
+    SlotState state;
     address host;
   }
 
@@ -99,6 +100,10 @@ contract Marketplace is SlotReservations, Proofs, StateRetrieval, Endian {
     return _vault;
   }
 
+  function currentCollateral(SlotId slotId) public view returns (uint128) {
+    return _slots[slotId].currentCollateral;
+  }
+
   function requestStorage(Request calldata request) public {
     RequestId id = request.id();
 
@@ -215,6 +220,8 @@ contract Marketplace is SlotReservations, Proofs, StateRetrieval, Endian {
     _vault.designate(fund, hostAccount, designated);
     _vault.flow(fund, clientAccount, hostAccount, rate);
 
+    slot.currentCollateral = collateral;
+
     _addToMySlots(slot.host, slotId);
 
     slot.state = SlotState.Filled;
@@ -317,6 +324,7 @@ contract Marketplace is SlotReservations, Proofs, StateRetrieval, Endian {
     _vault.designate(fund, validatorAccount, validatorReward);
     _vault.burnDesignated(fund, hostAccount, slashedAmount - validatorReward);
 
+    slot.currentCollateral -= slashedAmount;
     if (missingProofs(slotId) >= _config.collateral.maxNumberOfSlashes) {
       // When the number of slashings is at or above the allowed amount,
       // free the slot.
@@ -346,6 +354,7 @@ contract Marketplace is SlotReservations, Proofs, StateRetrieval, Endian {
     _removeFromMySlots(slot.host, slotId);
     delete _reservations[slotId]; // We purge all the reservations for the slot
     slot.state = SlotState.Repair;
+    slot.currentCollateral = 0;
     slot.host = address(0);
     context.slotsFilled -= 1;
     emit SlotFreed(requestId, slot.slotIndex);
@@ -371,6 +380,7 @@ contract Marketplace is SlotReservations, Proofs, StateRetrieval, Endian {
     Request storage request = _requests[requestId];
     context.state = RequestState.Finished;
     Slot storage slot = _slots[slotId];
+    slot.currentCollateral = 0;
 
     _removeFromMyRequests(request.client, requestId);
     _removeFromMySlots(slot.host, slotId);
@@ -392,6 +402,7 @@ contract Marketplace is SlotReservations, Proofs, StateRetrieval, Endian {
     SlotId slotId
   ) private requestIsKnown(requestId) {
     Slot storage slot = _slots[slotId];
+    slot.currentCollateral = 0;
     _removeFromMySlots(slot.host, slotId);
     FundId fund = requestId.asFundId();
     AccountId account = _vault.hostAccount(slot.host, slot.slotIndex);

test/Marketplace.test.js

@@ -326,6 +326,13 @@ describe("Marketplace", function () {
       })
     })
 
+    it("updates the slot's current collateral", async function() {
+      await marketplace.reserveSlot(slot.request, slot.index)
+      await marketplace.fillSlot(slot.request, slot.index, proof)
+      const collateral = await marketplace.currentCollateral(slotId(slot))
+      expect(collateral).to.equal(collateralPerSlot(request))
+    })
+
     it("fails to retrieve a request of an empty slot", async function () {
       expect(marketplace.getActiveSlot(slotId(slot))).to.be.revertedWith(
         "Marketplace_SlotIsFree"
@@ -549,6 +556,12 @@ describe("Marketplace", function () {
         .to.emit(marketplace, "SlotFreed")
         .withArgs(slot.request, slot.index)
     })
+
+    it("updates the slot's current collateral", async function() {
+      await waitUntilStarted(marketplace, request, proof, token)
+      await marketplace.freeSlot(id)
+      expect(await marketplace.currentCollateral(id)).to.equal(0)
+    })
   })
 
   describe("paying out a slot", function () {
@@ -603,6 +616,21 @@ describe("Marketplace", function () {
       expect(endBalance - startBalance).to.be.equal(expectedPartialPayout)
     })
 
+    it("updates the collateral when freeing a finished slot", async function() {
+      await waitUntilStarted(marketplace, request, proof, token)
+      await waitUntilFinished(marketplace, requestId(request))
+      await marketplace.freeSlot(slotId(slot))
+      expect(await marketplace.currentCollateral(slotId(slot))).to.equal(0)
+    })
+
+    it("updates the collateral when freeing a cancelled slot", async function() {
+      await marketplace.reserveSlot(slot.request, slot.index)
+      await marketplace.fillSlot(slot.request, slot.index, proof)
+      await waitUntilCancelled(marketplace, request)
+      await marketplace.freeSlot(slotId(slot))
+      expect(await marketplace.currentCollateral(slotId(slot))).to.equal(0)
+    })
+
     it("does not pay when the contract hasn't ended", async function () {
       await marketplace.reserveSlot(slot.request, slot.index)
       await marketplace.fillSlot(slot.request, slot.index, proof)
@@ -1157,7 +1185,13 @@ describe("Marketplace", function () {
         await marketplace.markProofAsMissing(id, missedPeriod)
         const endBalance = await marketplace.getSlotBalance(id)
         expect(endBalance).to.equal(startBalance - slashAmount)
+      })
 
+      it("updates the slot's current collateral", async function() {
+        await setNextBlockTimestamp(await currentTime())
+        await marketplace.markProofAsMissing(id, missedPeriod)
+        const currentCollateral = await marketplace.currentCollateral(id)
+        expect(currentCollateral).to.equal(collateral - slashAmount)
       })
 
       it("rewards validator when marking proof as missing", async function () {
@@ -1200,6 +1234,11 @@ describe("Marketplace", function () {
         expect(await marketplace.getSlotBalance(slotId(slot))).to.equal(0)
       })
 
+      it("updates the slot's current collateral", async function() {
+        const collateral = await marketplace.currentCollateral(slotId(slot))
+        expect(collateral).to.equal(0)
+      })
+
       it("resets missed proof counter", async function () {
         expect(await marketplace.missingProofs(slotId(slot))).to.equal(0)
       })