2023-09-01 05:44:41 +00:00
|
|
|
import std/options
|
2023-10-24 10:12:54 +00:00
|
|
|
import std/sequtils
|
2023-11-22 11:35:26 +00:00
|
|
|
import std/httpclient
|
2023-09-01 05:44:41 +00:00
|
|
|
from pkg/libp2p import `==`
|
2023-03-09 11:23:45 +00:00
|
|
|
import pkg/chronos
|
[marketplace] Add Reservations Module (#340)
* [marketplace] reservations module
- add de/serialization for Availability
- add markUsed/markUnused in persisted availability
- add query for unused
- add reserve/release
- reservation module tests
- split ContractInteractions into client contracts and host contracts
- remove reservations start/stop as the repo start/stop is being managed by the node
- remove dedicated reservations metadata store and use the metadata store from the repo instead
- Split ContractInteractions into:
- ClientInteractions (with purchasing)
- HostInteractions (with sales and proving)
- compilation fix for nim 1.2
[repostore] fix started flag, add tests
[marketplace] persist slot index
For loading the sales state from chain, the slot index was not previously persisted in the contract. Will retrieve the slot index from the contract when the sales state is loaded.
* Revert repostore changes
In favour of separate PR https://github.com/status-im/nim-codex/pull/374.
* remove warnings
* clean up
* tests: stop repostore during teardown
* change constructor type identifier
Change Contracts constructor to accept Contracts type instead of ContractInteractions.
* change constructor return type to Result instead of Option
* fix and split interactions tests
* clean up, fix tests
* find availability by slot id
* remove duplication in host/client interactions
* add test for finding availability by slotId
* log instead of raiseAssert when failed to mark availability as unused
* move to SaleErrored state instead of raiseAssert
* remove unneeded reverse
It appears that order is not preserved in the repostore, so reversing does not have the intended effect here.
* update open api spec for potential rest endpoint errors
* move functions about available bytes to repostore
* WIP: reserve and release availabilities as needed
WIP: not tested yet
Availabilities are marked as used when matched (just before downloading starts) so that future matching logic does not match an availability currently in use.
As the download progresses, batches of blocks are written to disk, and the equivalent bytes are released from the reservation module. The size of the availability is reduced as well.
During a reserve or release operation, availability updates occur after the repo is manipulated. If the availability update operation fails, the reserve or release is rolled back to maintain correct accounting of bytes.
Finally, once download completes, or if an error occurs, the availability is marked as unused so future matching can occur.
* delete availability when all bytes released
* fix tests + cleanup
* remove availability from SalesContext callbacks
Availability is no longer used past the SaleDownloading state in the state machine. Cleanup of Availability (marking unused) is handled directly in the SaleDownloading state, and no longer in SaleErrored or SaleFinished. Likewise, Availabilities shouldn’t need to be handled on node restart.
Additionally, Availability was being passed in SalesContext callbacks, and now that Availability is only used temporarily in the SaleDownloading state, Availability is contextually irrelevant to the callbacks, except in OnStore possibly, though it was not being consumed.
* test clean up
* - remove availability from callbacks and constructors from previous commit that needed to be removed (oopsie)
- fix integration test that checks availabilities
- there was a bug fixed that crashed the node due to a missing `return success` in onStore
- the test was fixed by ensuring that availabilities are remaining on the node, and the size has been reduced
- change Availability back to non-ref object and constructor back to init
- add trace logging of all state transitions in state machine
- add generally useful trace logging
* fixes after rebase
1. Fix onProve callbacks
2. Use Slot type instead of tuple for retrieving active slot.
3. Bump codex-contracts-eth that exposes getActivceSlot call.
* swap contracts branch to not support slot collateral
Slot collateral changes in the contracts require further changes in the client code, so we’ll skip those changes for now and add in a separate commit.
* modify Interactions and Deployment constructors
- `HostInteractions` and `ClientInteractions` constructors were simplified to take a contract address and no overloads
- `Interactions` prepared simplified so there are no overloads
- `Deployment` constructor updated so that it takes an optional string parameter, instead `Option[string]`
* Move `batchProc` declaration
`batchProc` needs to be consumed by both `node` and `salescontext`, and they can’t reference each other as it creates a circular dependency.
* [reservations] rename `available` to `hasAvailable`
* [reservations] default error message to inner error msg
* add SaleIngored state
When a storage request is handled but the request does match availabilities, the sales agent machine is sent to the SaleIgnored state. In addition, the agent is constructed in a way that if the request is ignored, the sales agent is removed from the list of active agents being tracked in the sales module.
2023-04-04 07:05:16 +00:00
|
|
|
import pkg/stint
|
2023-09-25 14:31:10 +00:00
|
|
|
import pkg/codex/rng
|
|
|
|
import pkg/stew/byteutils
|
2023-05-15 07:02:57 +00:00
|
|
|
import pkg/ethers/erc20
|
2023-06-21 05:46:18 +00:00
|
|
|
import pkg/codex/contracts
|
|
|
|
import pkg/codex/utils/stintutils
|
2023-03-09 11:23:45 +00:00
|
|
|
import ../contracts/time
|
2023-05-15 07:02:57 +00:00
|
|
|
import ../contracts/deployment
|
2023-09-25 14:31:10 +00:00
|
|
|
import ../codex/helpers
|
2023-10-24 10:12:54 +00:00
|
|
|
import ../examples
|
2023-03-27 13:47:25 +00:00
|
|
|
import ./twonodes
|
2023-03-09 11:23:45 +00:00
|
|
|
|
2023-09-01 05:44:41 +00:00
|
|
|
|
2023-05-15 07:02:57 +00:00
|
|
|
# For debugging you can enable logging output with debugX = true
|
|
|
|
# You can also pass a string in same format like for the `--log-level` parameter
|
|
|
|
# to enable custom logging levels for specific topics like: debug2 = "INFO; TRACE: marketplace"
|
|
|
|
|
2023-03-27 13:47:25 +00:00
|
|
|
twonodessuite "Integration tests", debug1 = false, debug2 = false:
|
2023-09-01 05:44:41 +00:00
|
|
|
|
|
|
|
proc purchaseStateIs(client: CodexClient, id: PurchaseId, state: string): bool =
|
2023-11-17 12:49:45 +00:00
|
|
|
without purchase =? client.getPurchase(id):
|
|
|
|
return false
|
|
|
|
return purchase.state == state
|
2023-09-01 05:44:41 +00:00
|
|
|
|
2023-03-09 11:23:45 +00:00
|
|
|
setup:
|
2023-04-14 09:04:17 +00:00
|
|
|
# Our Hardhat configuration does use automine, which means that time tracked by `provider.currentTime()` is not
|
|
|
|
# advanced until blocks are mined and that happens only when transaction is submitted.
|
|
|
|
# As we use in tests provider.currentTime() which uses block timestamp this can lead to synchronization issues.
|
|
|
|
await provider.advanceTime(1.u256)
|
2023-03-09 11:23:45 +00:00
|
|
|
|
|
|
|
test "nodes can print their peer information":
|
2023-03-27 13:47:25 +00:00
|
|
|
check client1.info() != client2.info()
|
2023-03-09 11:23:45 +00:00
|
|
|
|
2023-03-27 13:47:25 +00:00
|
|
|
test "nodes can set chronicles log level":
|
|
|
|
client1.setLogLevel("DEBUG;TRACE:codex")
|
2023-03-09 11:23:45 +00:00
|
|
|
|
|
|
|
test "node accepts file uploads":
|
2023-09-01 05:44:41 +00:00
|
|
|
let cid1 = client1.upload("some file contents").get
|
|
|
|
let cid2 = client1.upload("some other contents").get
|
2023-03-27 13:47:25 +00:00
|
|
|
check cid1 != cid2
|
2023-03-09 11:23:45 +00:00
|
|
|
|
2023-12-14 10:57:16 +00:00
|
|
|
test "node shows used and available space":
|
|
|
|
discard client1.upload("some file contents").get
|
|
|
|
discard client1.postAvailability(size=12.u256, duration=2.u256, minPrice=3.u256, maxCollateral=4.u256).get
|
|
|
|
let space = client1.space().tryGet()
|
|
|
|
check:
|
|
|
|
space.totalBlocks == 2.uint
|
|
|
|
space.quotaMaxBytes == 8589934592.uint
|
|
|
|
space.quotaUsedBytes == 65518.uint
|
|
|
|
space.quotaReservedBytes == 12.uint
|
|
|
|
|
2023-11-21 00:14:06 +00:00
|
|
|
test "node allows local file downloads":
|
|
|
|
let content1 = "some file contents"
|
|
|
|
let content2 = "some other contents"
|
|
|
|
|
|
|
|
let cid1 = client1.upload(content1).get
|
|
|
|
let cid2 = client2.upload(content2).get
|
|
|
|
|
|
|
|
let resp1 = client1.download(cid1, local = true).get
|
|
|
|
let resp2 = client2.download(cid2, local = true).get
|
|
|
|
|
|
|
|
check:
|
|
|
|
content1 == resp1
|
|
|
|
content2 == resp2
|
|
|
|
|
|
|
|
test "node allows remote file downloads":
|
|
|
|
let content1 = "some file contents"
|
|
|
|
let content2 = "some other contents"
|
|
|
|
|
|
|
|
let cid1 = client1.upload(content1).get
|
|
|
|
let cid2 = client2.upload(content2).get
|
|
|
|
|
|
|
|
let resp2 = client1.download(cid2, local = false).get
|
|
|
|
let resp1 = client2.download(cid1, local = false).get
|
|
|
|
|
|
|
|
check:
|
|
|
|
content1 == resp1
|
|
|
|
content2 == resp2
|
|
|
|
|
|
|
|
test "node fails retrieving non-existing local file":
|
|
|
|
let content1 = "some file contents"
|
|
|
|
let cid1 = client1.upload(content1).get # upload to first node
|
|
|
|
let resp2 = client2.download(cid1, local = true) # try retrieving from second node
|
|
|
|
|
|
|
|
check:
|
|
|
|
resp2.error.msg == "404 Not Found"
|
|
|
|
|
|
|
|
test "node lists local files":
|
|
|
|
let content1 = "some file contents"
|
|
|
|
let content2 = "some other contents"
|
|
|
|
|
|
|
|
let cid1 = client1.upload(content1).get
|
|
|
|
let cid2 = client1.upload(content2).get
|
|
|
|
let list = client1.list().get
|
|
|
|
|
|
|
|
check:
|
|
|
|
[cid1, cid2].allIt(it in list.mapIt(it.cid))
|
|
|
|
|
2023-03-09 11:23:45 +00:00
|
|
|
test "node handles new storage availability":
|
2023-09-01 05:44:41 +00:00
|
|
|
let availability1 = client1.postAvailability(size=1.u256, duration=2.u256, minPrice=3.u256, maxCollateral=4.u256).get
|
|
|
|
let availability2 = client1.postAvailability(size=4.u256, duration=5.u256, minPrice=6.u256, maxCollateral=7.u256).get
|
2023-03-27 13:47:25 +00:00
|
|
|
check availability1 != availability2
|
2023-03-09 11:23:45 +00:00
|
|
|
|
|
|
|
test "node lists storage that is for sale":
|
2023-09-01 05:44:41 +00:00
|
|
|
let availability = client1.postAvailability(size=1.u256, duration=2.u256, minPrice=3.u256, maxCollateral=4.u256).get
|
|
|
|
check availability in client1.getAvailabilities().get
|
2023-03-09 11:23:45 +00:00
|
|
|
|
|
|
|
test "node handles storage request":
|
2023-12-05 13:25:28 +00:00
|
|
|
let expiry = (await provider.currentTime()) + 10
|
2023-09-01 05:44:41 +00:00
|
|
|
let cid = client1.upload("some file contents").get
|
2023-12-05 13:25:28 +00:00
|
|
|
let id1 = client1.requestStorage(cid, duration=100.u256, reward=2.u256, proofProbability=3.u256, expiry=expiry, collateral=200.u256).get
|
|
|
|
let id2 = client1.requestStorage(cid, duration=400.u256, reward=5.u256, proofProbability=6.u256, expiry=expiry, collateral=201.u256).get
|
2023-03-27 13:47:25 +00:00
|
|
|
check id1 != id2
|
2023-03-09 11:23:45 +00:00
|
|
|
|
|
|
|
test "node retrieves purchase status":
|
2023-09-25 14:31:10 +00:00
|
|
|
# get one contiguous chunk
|
|
|
|
let rng = rng.Rng.instance()
|
|
|
|
let chunker = RandomChunker.new(rng, size = DefaultBlockSize * 2, chunkSize = DefaultBlockSize * 2)
|
|
|
|
let data = await chunker.getBytes()
|
|
|
|
let cid = client1.upload(byteutils.toHex(data)).get
|
2023-03-27 13:47:25 +00:00
|
|
|
let expiry = (await provider.currentTime()) + 30
|
2023-09-25 14:31:10 +00:00
|
|
|
let id = client1.requestStorage(
|
|
|
|
cid,
|
2023-12-05 13:25:28 +00:00
|
|
|
duration=100.u256,
|
2023-09-25 14:31:10 +00:00
|
|
|
reward=2.u256,
|
|
|
|
proofProbability=3.u256,
|
|
|
|
expiry=expiry,
|
|
|
|
collateral=200.u256,
|
|
|
|
nodes=2,
|
|
|
|
tolerance=1).get
|
|
|
|
|
2023-09-01 05:44:41 +00:00
|
|
|
let request = client1.getPurchase(id).get.request.get
|
2023-12-05 13:25:28 +00:00
|
|
|
check request.ask.duration == 100.u256
|
2023-09-01 05:44:41 +00:00
|
|
|
check request.ask.reward == 2.u256
|
|
|
|
check request.ask.proofProbability == 3.u256
|
|
|
|
check request.expiry == expiry
|
|
|
|
check request.ask.collateral == 200.u256
|
|
|
|
check request.ask.slots == 3'u64
|
|
|
|
check request.ask.maxSlotLoss == 1'u64
|
2023-03-09 11:23:45 +00:00
|
|
|
|
2023-09-25 14:31:10 +00:00
|
|
|
# TODO: We currently do not support encoding single chunks
|
|
|
|
# test "node retrieves purchase status with 1 chunk":
|
|
|
|
# let expiry = (await provider.currentTime()) + 30
|
|
|
|
# let cid = client1.upload("some file contents").get
|
|
|
|
# let id = client1.requestStorage(cid, duration=1.u256, reward=2.u256, proofProbability=3.u256, expiry=expiry, collateral=200.u256, nodes=2, tolerance=1).get
|
|
|
|
# let request = client1.getPurchase(id).get.request.get
|
|
|
|
# check request.ask.duration == 1.u256
|
|
|
|
# check request.ask.reward == 2.u256
|
|
|
|
# check request.ask.proofProbability == 3.u256
|
|
|
|
# check request.expiry == expiry
|
|
|
|
# check request.ask.collateral == 200.u256
|
|
|
|
# check request.ask.slots == 3'u64
|
|
|
|
# check request.ask.maxSlotLoss == 1'u64
|
|
|
|
|
2023-03-09 11:23:45 +00:00
|
|
|
test "node remembers purchase status after restart":
|
2023-03-27 13:47:25 +00:00
|
|
|
let expiry = (await provider.currentTime()) + 30
|
2023-09-01 05:44:41 +00:00
|
|
|
let cid = client1.upload("some file contents").get
|
|
|
|
let id = client1.requestStorage(cid,
|
2023-12-05 13:25:28 +00:00
|
|
|
duration=100.u256,
|
2023-09-01 05:44:41 +00:00
|
|
|
reward=2.u256,
|
|
|
|
proofProbability=3.u256,
|
|
|
|
expiry=expiry,
|
|
|
|
collateral=200.u256).get
|
|
|
|
check eventually client1.purchaseStateIs(id, "submitted")
|
2023-03-09 11:23:45 +00:00
|
|
|
|
|
|
|
node1.restart()
|
2023-03-27 13:47:25 +00:00
|
|
|
client1.restart()
|
2023-03-09 11:23:45 +00:00
|
|
|
|
2023-09-01 05:44:41 +00:00
|
|
|
check eventually client1.purchaseStateIs(id, "submitted")
|
|
|
|
let request = client1.getPurchase(id).get.request.get
|
2023-12-05 13:25:28 +00:00
|
|
|
check request.ask.duration == 100.u256
|
2023-09-01 05:44:41 +00:00
|
|
|
check request.ask.reward == 2.u256
|
|
|
|
check request.ask.proofProbability == 3.u256
|
|
|
|
check request.expiry == expiry
|
|
|
|
check request.ask.collateral == 200.u256
|
|
|
|
check request.ask.slots == 1'u64
|
|
|
|
check request.ask.maxSlotLoss == 0'u64
|
|
|
|
|
2023-03-09 11:23:45 +00:00
|
|
|
|
|
|
|
test "nodes negotiate contracts on the marketplace":
|
2023-09-01 05:44:41 +00:00
|
|
|
let size = 0xFFFFF.u256
|
2023-03-27 13:47:25 +00:00
|
|
|
# client 2 makes storage available
|
2023-09-01 05:44:41 +00:00
|
|
|
discard client2.postAvailability(size=size, duration=200.u256, minPrice=300.u256, maxCollateral=300.u256)
|
2023-03-09 11:23:45 +00:00
|
|
|
|
2023-03-27 13:47:25 +00:00
|
|
|
# client 1 requests storage
|
|
|
|
let expiry = (await provider.currentTime()) + 30
|
2023-09-01 05:44:41 +00:00
|
|
|
let cid = client1.upload("some file contents").get
|
|
|
|
let id = client1.requestStorage(cid, duration=100.u256, reward=400.u256, proofProbability=3.u256, expiry=expiry, collateral=200.u256).get
|
2023-03-09 11:23:45 +00:00
|
|
|
|
2023-09-01 05:44:41 +00:00
|
|
|
check eventually client1.purchaseStateIs(id, "started")
|
|
|
|
let purchase = client1.getPurchase(id).get
|
|
|
|
check purchase.error == none string
|
|
|
|
let availabilities = client2.getAvailabilities().get
|
[marketplace] Add Reservations Module (#340)
* [marketplace] reservations module
- add de/serialization for Availability
- add markUsed/markUnused in persisted availability
- add query for unused
- add reserve/release
- reservation module tests
- split ContractInteractions into client contracts and host contracts
- remove reservations start/stop as the repo start/stop is being managed by the node
- remove dedicated reservations metadata store and use the metadata store from the repo instead
- Split ContractInteractions into:
- ClientInteractions (with purchasing)
- HostInteractions (with sales and proving)
- compilation fix for nim 1.2
[repostore] fix started flag, add tests
[marketplace] persist slot index
For loading the sales state from chain, the slot index was not previously persisted in the contract. Will retrieve the slot index from the contract when the sales state is loaded.
* Revert repostore changes
In favour of separate PR https://github.com/status-im/nim-codex/pull/374.
* remove warnings
* clean up
* tests: stop repostore during teardown
* change constructor type identifier
Change Contracts constructor to accept Contracts type instead of ContractInteractions.
* change constructor return type to Result instead of Option
* fix and split interactions tests
* clean up, fix tests
* find availability by slot id
* remove duplication in host/client interactions
* add test for finding availability by slotId
* log instead of raiseAssert when failed to mark availability as unused
* move to SaleErrored state instead of raiseAssert
* remove unneeded reverse
It appears that order is not preserved in the repostore, so reversing does not have the intended effect here.
* update open api spec for potential rest endpoint errors
* move functions about available bytes to repostore
* WIP: reserve and release availabilities as needed
WIP: not tested yet
Availabilities are marked as used when matched (just before downloading starts) so that future matching logic does not match an availability currently in use.
As the download progresses, batches of blocks are written to disk, and the equivalent bytes are released from the reservation module. The size of the availability is reduced as well.
During a reserve or release operation, availability updates occur after the repo is manipulated. If the availability update operation fails, the reserve or release is rolled back to maintain correct accounting of bytes.
Finally, once download completes, or if an error occurs, the availability is marked as unused so future matching can occur.
* delete availability when all bytes released
* fix tests + cleanup
* remove availability from SalesContext callbacks
Availability is no longer used past the SaleDownloading state in the state machine. Cleanup of Availability (marking unused) is handled directly in the SaleDownloading state, and no longer in SaleErrored or SaleFinished. Likewise, Availabilities shouldn’t need to be handled on node restart.
Additionally, Availability was being passed in SalesContext callbacks, and now that Availability is only used temporarily in the SaleDownloading state, Availability is contextually irrelevant to the callbacks, except in OnStore possibly, though it was not being consumed.
* test clean up
* - remove availability from callbacks and constructors from previous commit that needed to be removed (oopsie)
- fix integration test that checks availabilities
- there was a bug fixed that crashed the node due to a missing `return success` in onStore
- the test was fixed by ensuring that availabilities are remaining on the node, and the size has been reduced
- change Availability back to non-ref object and constructor back to init
- add trace logging of all state transitions in state machine
- add generally useful trace logging
* fixes after rebase
1. Fix onProve callbacks
2. Use Slot type instead of tuple for retrieving active slot.
3. Bump codex-contracts-eth that exposes getActivceSlot call.
* swap contracts branch to not support slot collateral
Slot collateral changes in the contracts require further changes in the client code, so we’ll skip those changes for now and add in a separate commit.
* modify Interactions and Deployment constructors
- `HostInteractions` and `ClientInteractions` constructors were simplified to take a contract address and no overloads
- `Interactions` prepared simplified so there are no overloads
- `Deployment` constructor updated so that it takes an optional string parameter, instead `Option[string]`
* Move `batchProc` declaration
`batchProc` needs to be consumed by both `node` and `salescontext`, and they can’t reference each other as it creates a circular dependency.
* [reservations] rename `available` to `hasAvailable`
* [reservations] default error message to inner error msg
* add SaleIngored state
When a storage request is handled but the request does match availabilities, the sales agent machine is sent to the SaleIgnored state. In addition, the agent is constructed in a way that if the request is ignored, the sales agent is removed from the list of active agents being tracked in the sales module.
2023-04-04 07:05:16 +00:00
|
|
|
check availabilities.len == 1
|
2023-09-01 05:44:41 +00:00
|
|
|
let newSize = availabilities[0].size
|
|
|
|
check newSize > 0 and newSize < size
|
2023-05-15 07:02:57 +00:00
|
|
|
|
|
|
|
test "node slots gets paid out":
|
|
|
|
let marketplace = Marketplace.new(Marketplace.address, provider.getSigner())
|
|
|
|
let tokenAddress = await marketplace.token()
|
|
|
|
let token = Erc20Token.new(tokenAddress, provider.getSigner())
|
2023-09-01 05:44:41 +00:00
|
|
|
let reward = 400.u256
|
|
|
|
let duration = 100.u256
|
2023-05-15 07:02:57 +00:00
|
|
|
|
|
|
|
# client 2 makes storage available
|
|
|
|
let startBalance = await token.balanceOf(account2)
|
2023-09-01 05:44:41 +00:00
|
|
|
discard client2.postAvailability(size=0xFFFFF.u256, duration=200.u256, minPrice=300.u256, maxCollateral=300.u256).get
|
2023-05-15 07:02:57 +00:00
|
|
|
|
|
|
|
# client 1 requests storage
|
|
|
|
let expiry = (await provider.currentTime()) + 30
|
2023-09-01 05:44:41 +00:00
|
|
|
let cid = client1.upload("some file contents").get
|
|
|
|
let id = client1.requestStorage(cid, duration=duration, reward=reward, proofProbability=3.u256, expiry=expiry, collateral=200.u256).get
|
2023-05-15 07:02:57 +00:00
|
|
|
|
2023-09-01 05:44:41 +00:00
|
|
|
check eventually client1.purchaseStateIs(id, "started")
|
|
|
|
let purchase = client1.getPurchase(id).get
|
|
|
|
check purchase.error == none string
|
2023-05-15 07:02:57 +00:00
|
|
|
|
|
|
|
# Proving mechanism uses blockchain clock to do proving/collect/cleanup round
|
|
|
|
# hence we must use `advanceTime` over `sleepAsync` as Hardhat does mine new blocks
|
|
|
|
# only with new transaction
|
2023-09-01 05:44:41 +00:00
|
|
|
await provider.advanceTime(duration)
|
2023-05-15 07:02:57 +00:00
|
|
|
|
2023-09-01 05:44:41 +00:00
|
|
|
check eventually (await token.balanceOf(account2)) - startBalance == duration*reward
|
2023-10-24 10:12:54 +00:00
|
|
|
|
2023-11-22 11:35:26 +00:00
|
|
|
test "node requires expiry and its value to be in future":
|
|
|
|
let currentTime = await provider.currentTime()
|
|
|
|
let cid = client1.upload("some file contents").get
|
|
|
|
|
|
|
|
let responseMissing = client1.requestStorageRaw(cid, duration=1.u256, reward=2.u256, proofProbability=3.u256, collateral=200.u256)
|
|
|
|
check responseMissing.status == "400 Bad Request"
|
|
|
|
check responseMissing.body == "Expiry required"
|
|
|
|
|
|
|
|
let responsePast = client1.requestStorageRaw(cid, duration=1.u256, reward=2.u256, proofProbability=3.u256, collateral=200.u256, expiry=currentTime-10)
|
|
|
|
check responsePast.status == "400 Bad Request"
|
|
|
|
check responsePast.body == "Expiry needs to be in future"
|
|
|
|
|
2023-12-05 13:25:28 +00:00
|
|
|
let responseBefore = client1.requestStorageRaw(cid, duration=1.u256, reward=2.u256, proofProbability=3.u256, collateral=200.u256, expiry=currentTime+10)
|
|
|
|
check responseBefore.status == "400 Bad Request"
|
|
|
|
check responseBefore.body == "Expiry has to be before the request's end (now + duration)"
|
|
|
|
|
2023-10-24 10:12:54 +00:00
|
|
|
test "expired request partially pays out for stored time":
|
|
|
|
let marketplace = Marketplace.new(Marketplace.address, provider.getSigner())
|
|
|
|
let tokenAddress = await marketplace.token()
|
|
|
|
let token = Erc20Token.new(tokenAddress, provider.getSigner())
|
|
|
|
let reward = 400.u256
|
|
|
|
let duration = 100.u256
|
|
|
|
|
|
|
|
# client 2 makes storage available
|
|
|
|
let startBalanceClient2 = await token.balanceOf(account2)
|
|
|
|
discard client2.postAvailability(size=140000.u256, duration=200.u256, minPrice=300.u256, maxCollateral=300.u256).get
|
|
|
|
|
|
|
|
# client 1 requests storage but requires two nodes to host the content
|
|
|
|
let startBalanceClient1 = await token.balanceOf(account1)
|
|
|
|
let expiry = (await provider.currentTime()) + 10
|
|
|
|
let cid = client1.upload(exampleString(100000)).get
|
|
|
|
let id = client1.requestStorage(cid, duration=duration, reward=reward, proofProbability=3.u256, expiry=expiry, collateral=200.u256, nodes=2).get
|
|
|
|
|
|
|
|
# We have to wait for Client 2 fills the slot, before advancing time.
|
|
|
|
# Until https://github.com/codex-storage/nim-codex/issues/594 is implemented nothing better then
|
|
|
|
# sleeping some seconds is available.
|
|
|
|
await sleepAsync(2.seconds)
|
|
|
|
await provider.advanceTimeTo(expiry+1)
|
|
|
|
check eventually(client1.purchaseStateIs(id, "cancelled"), 20000)
|
|
|
|
|
|
|
|
check eventually ((await token.balanceOf(account2)) - startBalanceClient2) > 0 and ((await token.balanceOf(account2)) - startBalanceClient2) < 10*reward
|
|
|
|
check eventually (startBalanceClient1 - (await token.balanceOf(account1))) == ((await token.balanceOf(account2)) - startBalanceClient2)
|