mirror of
https://github.com/codex-storage/nim-codex.git
synced 2025-01-21 18:29:12 +00:00
4175689745
* [purchasing] Simplify test * [utils] Move StorageRequest.example up one level * [purchasing] Load purchases from market * [purchasing] load purchase states * Implement myRequest() and getState() methods for OnChainMarket * [proofs] Fix intermittently failing tests Ensures that examples of proofs in tests are never of length 0; these are considered invalid proofs by the smart contract logic. * [contracts] Fix failing test With the new solidity contracts update, a contract can only be paid out after it started. * [market] Add method to get request end time * [purchasing] wait until purchase is finished Purchase.wait() would previously wait until purchase was started, now we wait until it is finished. * [purchasing] Handle 'finished' and 'failed' states * [marketplace] move to failed state once request fails - Add support for subscribing to request failure events. - Add supporting contract tests for subscribing to request failure events. - Allow the PurchaseStarted state to move to PurchaseFailure once a request failure event is emitted - Add supporting tests for moving from PurchaseStarted to PurchaseFailure - Add state transition tests for PurchaseUnknown. * [marketplace] Fix test with longer sleepAsync * [integration] Add function to restart a codex node * [purchasing] Set client address before requesting storage To prevent the purchase id (which equals the request id) from changing once it's been submitted. * [contracts] Fix: OnChainMarket.getState() Had the wrong method signature before * [purchasing] Load purchases on node start * [purchasing] Rename state 'PurchaseError' to 'PurchaseErrored' Allows for an exception type called 'PurchaseError' * [purchasing] Load purchases in background No longer calls market.getRequest() for every purchase on node start. * [contracts] Add `$` for RequestId, SlotId and Nonce To aid with debugging * [purchasing] Add Purchasing.stop() To ensure that all contract interactions have both a start() and a stop() for * [tests] Remove sleepAsync where possible Use `eventually` loop instead, to make sure that we're not waiting unnecessarily. * [integration] Fix: handle non-json response in test * [purchasing] Add purchase state to json * [integration] Ensure that purchase is submitted before restart Fixes test failure on slower CI * [purchasing] re-implement `description` as method Allows description to be set in the same module where the state type is defined. Co-authored-by: Eric Mastro <eric.mastro@gmail.com> * [contracts] fix typo Co-authored-by: Eric Mastro <eric.mastro@gmail.com> * [market] Use more generic error type Should we decide to change the provider type later Co-authored-by: Eric Mastro <eric.mastro@gmail.com> Co-authored-by: Eric Mastro <eric.mastro@gmail.com>
63 lines
2.6 KiB
Nim
63 lines
2.6 KiB
Nim
import pkg/ethers
|
|
import pkg/json_rpc/rpcclient
|
|
import pkg/stint
|
|
import pkg/chronos
|
|
import ../clock
|
|
import ./requests
|
|
|
|
export stint
|
|
export ethers
|
|
|
|
type
|
|
Storage* = ref object of Contract
|
|
StorageRequested* = object of Event
|
|
requestId*: RequestId
|
|
ask*: StorageAsk
|
|
SlotFilled* = object of Event
|
|
requestId* {.indexed.}: RequestId
|
|
slotIndex* {.indexed.}: UInt256
|
|
slotId*: SlotId
|
|
RequestFulfilled* = object of Event
|
|
requestId* {.indexed.}: RequestId
|
|
RequestCancelled* = object of Event
|
|
requestId* {.indexed.}: RequestId
|
|
RequestFailed* = object of Event
|
|
requestId* {.indexed.}: RequestId
|
|
ProofSubmitted* = object of Event
|
|
id*: SlotId
|
|
proof*: seq[byte]
|
|
|
|
|
|
proc collateralAmount*(storage: Storage): UInt256 {.contract, view.}
|
|
proc slashMisses*(storage: Storage): UInt256 {.contract, view.}
|
|
proc slashPercentage*(storage: Storage): UInt256 {.contract, view.}
|
|
proc minCollateralThreshold*(storage: Storage): UInt256 {.contract, view.}
|
|
|
|
proc deposit*(storage: Storage, amount: UInt256) {.contract.}
|
|
proc withdraw*(storage: Storage) {.contract.}
|
|
proc balanceOf*(storage: Storage, account: Address): UInt256 {.contract, view.}
|
|
|
|
proc requestStorage*(storage: Storage, request: StorageRequest) {.contract.}
|
|
proc fillSlot*(storage: Storage, requestId: RequestId, slotIndex: UInt256, proof: seq[byte]) {.contract.}
|
|
proc withdrawFunds*(storage: Storage, requestId: RequestId) {.contract.}
|
|
proc payoutSlot*(storage: Storage, requestId: RequestId, slotIndex: UInt256) {.contract.}
|
|
proc getRequest*(storage: Storage, id: RequestId): StorageRequest {.contract, view.}
|
|
proc getHost*(storage: Storage, id: SlotId): Address {.contract, view.}
|
|
|
|
proc myRequests*(storage: Storage): seq[RequestId] {.contract, view.}
|
|
proc state*(storage: Storage, requestId: RequestId): RequestState {.contract, view.}
|
|
proc requestEnd*(storage: Storage, requestId: RequestId): SecondsSince1970 {.contract, view.}
|
|
|
|
proc proofPeriod*(storage: Storage): UInt256 {.contract, view.}
|
|
proc proofTimeout*(storage: Storage): UInt256 {.contract, view.}
|
|
|
|
proc proofEnd*(storage: Storage, id: SlotId): UInt256 {.contract, view.}
|
|
proc missingProofs*(storage: Storage, id: SlotId): UInt256 {.contract, view.}
|
|
proc isProofRequired*(storage: Storage, id: SlotId): bool {.contract, view.}
|
|
proc willProofBeRequired*(storage: Storage, id: SlotId): bool {.contract, view.}
|
|
proc getChallenge*(storage: Storage, id: SlotId): array[32, byte] {.contract, view.}
|
|
proc getPointer*(storage: Storage, id: SlotId): uint8 {.contract, view.}
|
|
|
|
proc submitProof*(storage: Storage, id: SlotId, proof: seq[byte]) {.contract.}
|
|
proc markProofAsMissing*(storage: Storage, id: SlotId, period: UInt256) {.contract.}
|