b3855c4ba3
[style] Use _ for private and internal functions
...
Co-authored-by: Eric Mastro <eric.mastro@gmail.com>
2023-01-23 15:10:23 +01:00
3bb077db7a
[marketplace] reordering
...
Co-authored-by: Eric Mastro <eric.mastro@gmail.com>
2023-01-23 15:10:23 +01:00
b62eeb564a
[marketplace] test & fix slotState()
2023-01-23 15:10:23 +01:00
ae70fd7c6f
[marketplace] introduce MarketplaceConfiguration struct
...
Container for all configuration values, replaces separate
constructor parameters and getters.
2023-01-23 15:10:23 +01:00
2dbdd0028d
[marketplace] move price calculations to Requests.sol
2023-01-23 15:10:23 +01:00
7aa162b526
[marketplace] move proofPeriod() getter to Proofs.sol
2023-01-23 15:10:23 +01:00
8c6891f1e2
[marketplace] slotIsNotFree() modifier
...
Replaces _slot getter
2023-01-23 15:10:23 +01:00
944e9c9da2
[marketplace] requestIsKnown() modifier
...
Replaces _request() getter
2023-01-23 15:10:23 +01:00
6eab9fee9a
[marketplace] remove wrappers around proof functions
...
No longer required; slot state is checked in Proofs.sol
2023-01-23 15:10:23 +01:00
97af6f7484
[marketplace] remove dead code
2023-01-23 15:10:23 +01:00
32b137a427
[marketplace] inline _context()
2023-01-23 15:10:23 +01:00
e828529e90
[marketplace] inline the requestAcceptsProofs() function
...
It was only used in one place
2023-01-23 15:10:23 +01:00
1316682a6f
[marketplace] remove slotMustAcceptProofs modifier
...
Replaced by checks on slot state
2023-01-23 15:10:23 +01:00
7d377a3739
[marketplace] remove requestMustAcceptProofs modifier
...
Is already covered by the slot state check later on
2023-01-23 15:10:23 +01:00
dd65133576
[marketplace] replace Slot.hostPaid with SlotState.Paid
2023-01-23 15:10:23 +01:00
c8dda37300
[marketplace] introduce SlotState
...
- replace proofEnd() by slotState()
- replace _slotAcceptsProofs() by slotState()
- remove _stopRequiringProofs()
2023-01-23 15:10:23 +01:00
de0595edb3
[marketplace] rename state(id) -> requestState(id)
2023-01-23 15:10:23 +01:00
10f88a62a7
[marketplace] Move RequestState enum to Requests.sol
2023-01-23 15:10:23 +01:00
bb0302afcb
[marketplace] inline function _notEqual
2023-01-23 15:10:23 +01:00
e496ac3550
[marketplace] remove _isCancelled and _isFinished
2023-01-23 15:10:23 +01:00
9aa4773392
[marketplace] remove unused _isSlotCancelled()
2023-01-23 15:10:23 +01:00
fffd0dcb86
[marketplace] remove dead code
2023-01-23 15:10:23 +01:00
de368708b2
[marketplace, proofs] simplify proofTimeout getter
2023-01-23 15:10:23 +01:00
6aa76257f8
[Marketplace] Move `slotId()` to `Requests` library
...
Co-authored-by: Eric Mastro <eric.mastro@gmail.com>
2023-01-12 13:57:44 +01:00
07e9043b30
[Marketplace] Remove dead code
...
Co-authored-by: Eric Mastro <eric.mastro@gmail.com>
2023-01-12 13:57:44 +01:00
2bfed21584
[Marketplace] Extract myRequests() and mySlots()
2023-01-12 13:57:44 +01:00
af08a72d7d
Fix: use slot start instead of request start
...
Proofs should be required from the moment a slot is filled,
not from the moment a request is submitted.
This reverts commit f224cb8eda
2023-01-12 13:49:08 +01:00
ad155be5a1
[Proofs] Extract period related types and function
2023-01-11 10:32:58 +01:00
c0690cd5d1
[Proofs] rename expectProofs -> startRequiringProofs
2023-01-11 10:27:08 +01:00
f224cb8eda
[Proofs] Remove double administration of request start
...
The timestamp when proofs start to be required was
stored in both the Marketplace and Proofs. It is now
only stored in the Marketplace.
2023-01-11 10:27:08 +01:00
f8e9f3c848
[Proofs] Remove double administration of request end
...
The timestamp when proofs no longer are required was
stored in both the Marketplace and Proofs. It is now
only stored in the Marketplace.
2023-01-11 10:27:08 +01:00
19f93500ea
[Marketplace] Combine host getters
...
Co-authored-by: Eric Mastro <eric.mastro@gmail.com>
2023-01-11 10:27:08 +01:00
afad73d588
[Markeplace] Linting
2023-01-10 12:15:22 +01:00
6ea2b77a8f
[Storage] Move markProofAsMissing() to Marketplace
2023-01-10 12:15:22 +01:00
39da450c2a
[Storage] Move submitProof() to Proofs
2023-01-10 12:15:22 +01:00
31d109f0d3
[Storage] Move isProofRequired() et al to Marketplace
2023-01-10 12:15:22 +01:00
d5d99515fc
[Proofs] Remove ProofId and EndId, use SlotId and RequestId
...
Rationale: in practice, a ProofId was always a slot id, and
an EndId was always a request id. Now that the definitons
of SlotId and RequestId are separated from the Marketplace,
we can import and use them.
2023-01-10 12:15:22 +01:00
27ccb1e2bc
[Marketplace] Extract Request struct into separate file
2023-01-10 12:15:22 +01:00
9b8bcc0bc7
[Storage] Move getRequest() and getHost() to Marketplace
2023-01-10 12:15:22 +01:00
71656f6a95
[collateral] Remove AccountLocks
...
AccountLocks is replaced by the isWithDrawAllowed()
implementation in Marketplace.
2022-12-22 10:29:06 +01:00
d5d4dba442
[marketplace] Add missing tests for freeSlot()
...
Removes unnecessary double removal from slotsPerHost.
2022-12-22 10:29:06 +01:00
0ecce3094a
[utils] Remove Utils
...
No longer required
2022-12-22 10:29:06 +01:00
4f75159e02
[marketplace] Slots of failed request remain in mySlots()
...
Until hosts calls freeSlot()
2022-12-22 10:29:06 +01:00
a7be363f04
[marketplace] Unlock collateral when list of slots is empty
2022-12-22 10:29:06 +01:00
c46c268880
[marketplace] freeSlot() can be called by host
...
Handles payout, slashing and removal from mySlots
2022-12-22 10:29:06 +01:00
6e0dfdf7db
[marketplace] Rename _freeSlot() -> _forciblyFreeSlot()
2022-12-22 10:29:06 +01:00
a96333ce5f
[marketplace] mySlots() returns slots of cancelled request
...
Reasoning: the node will want to call payoutSlot() for
cancelled requests, at which point it will be removed
from the list.
2022-12-22 10:29:06 +01:00
3fbc851a8d
[marketplace] Cleanup
2022-12-22 10:29:06 +01:00
a19e3f4198
[marketplace] Remove SetMap
...
No longer needed
2022-12-22 10:29:06 +01:00
c832dfbb7c
[marketplace] Simplify myRequests()
2022-12-22 10:29:06 +01:00
Mark Spanbroek