mirror of
https://github.com/status-im/nim-codex.git
synced 2025-02-16 12:46:48 +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>
79 lines
2.1 KiB
Nim
79 lines
2.1 KiB
Nim
import pkg/ethers
|
|
import pkg/chronicles
|
|
import ../purchasing
|
|
import ../sales
|
|
import ../proving
|
|
import ./deployment
|
|
import ./storage
|
|
import ./market
|
|
import ./proofs
|
|
import ./clock
|
|
|
|
export purchasing
|
|
export sales
|
|
export proving
|
|
export chronicles
|
|
|
|
type
|
|
ContractInteractions* = ref object
|
|
purchasing*: Purchasing
|
|
sales*: Sales
|
|
proving*: Proving
|
|
clock: OnChainClock
|
|
|
|
proc new*(_: type ContractInteractions,
|
|
signer: Signer,
|
|
deployment: Deployment): ?ContractInteractions =
|
|
|
|
without address =? deployment.address(Storage):
|
|
error "Unable to determine address of the Storage smart contract"
|
|
return none ContractInteractions
|
|
|
|
let contract = Storage.new(address, signer)
|
|
let market = OnChainMarket.new(contract)
|
|
let proofs = OnChainProofs.new(contract)
|
|
let clock = OnChainClock.new(signer.provider)
|
|
let proving = Proving.new(proofs, clock)
|
|
some ContractInteractions(
|
|
purchasing: Purchasing.new(market, clock),
|
|
sales: Sales.new(market, clock, proving),
|
|
proving: proving,
|
|
clock: clock
|
|
)
|
|
|
|
proc new*(_: type ContractInteractions,
|
|
providerUrl: string,
|
|
account: Address,
|
|
deploymentFile: string = string.default): ?ContractInteractions =
|
|
|
|
let provider = JsonRpcProvider.new(providerUrl)
|
|
let signer = provider.getSigner(account)
|
|
|
|
var deploy: Deployment
|
|
try:
|
|
if deploymentFile == string.default:
|
|
deploy = deployment()
|
|
else:
|
|
deploy = deployment(deploymentFile)
|
|
except IOError as e:
|
|
error "Unable to read deployment json", msg = e.msg
|
|
return none ContractInteractions
|
|
|
|
ContractInteractions.new(signer, deploy)
|
|
|
|
proc new*(_: type ContractInteractions,
|
|
account: Address): ?ContractInteractions =
|
|
ContractInteractions.new("ws://localhost:8545", account)
|
|
|
|
proc start*(interactions: ContractInteractions) {.async.} =
|
|
await interactions.clock.start()
|
|
await interactions.sales.start()
|
|
await interactions.proving.start()
|
|
await interactions.purchasing.start()
|
|
|
|
proc stop*(interactions: ContractInteractions) {.async.} =
|
|
await interactions.purchasing.stop()
|
|
await interactions.sales.stop()
|
|
await interactions.proving.stop()
|
|
await interactions.clock.stop()
|