status-im
/
nim-dagger
mirror of https://github.com/status-im/nim-dagger.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: check expiration is before request end (#641)

This commit is contained in:
Adam Uhlíř 2023-12-05 14:25:28 +01:00 committed by GitHub
parent 0e4387d1b3
commit b38146d3f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
codex/rest/api.nim
View File

@ -293,6 +293,9 @@ proc initPurchasingApi(node: CodexNodeRef, router: var RestRouter) =
if expiry <= node.clock.now.u256: if expiry <= node.clock.now.u256:
return RestApiResponse.error(Http400, "Expiry needs to be in future") return RestApiResponse.error(Http400, "Expiry needs to be in future")
if expiry > node.clock.now.u256 + params.duration:
return RestApiResponse.error(Http400, "Expiry has to be before the request's end (now + duration)")
without purchaseId =? await node.requestStorage( without purchaseId =? await node.requestStorage(
cid, cid,
params.duration, params.duration,

18
tests/integration/testIntegration.nim
View File

@ -101,10 +101,10 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
check availability in client1.getAvailabilities().get check availability in client1.getAvailabilities().get
test "node handles storage request": test "node handles storage request":
let expiry = (await provider.currentTime()) + 30 let expiry = (await provider.currentTime()) + 10
let cid = client1.upload("some file contents").get let cid = client1.upload("some file contents").get
let id1 = client1.requestStorage(cid, duration=1.u256, reward=2.u256, proofProbability=3.u256, expiry=expiry, collateral=200.u256).get 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=4.u256, reward=5.u256, proofProbability=6.u256, expiry=expiry, collateral=201.u256).get let id2 = client1.requestStorage(cid, duration=400.u256, reward=5.u256, proofProbability=6.u256, expiry=expiry, collateral=201.u256).get
check id1 != id2 check id1 != id2
test "node retrieves purchase status": test "node retrieves purchase status":
@ -116,7 +116,7 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
let expiry = (await provider.currentTime()) + 30 let expiry = (await provider.currentTime()) + 30
let id = client1.requestStorage( let id = client1.requestStorage(
cid, cid,
duration=1.u256, duration=100.u256,
reward=2.u256, reward=2.u256,
proofProbability=3.u256, proofProbability=3.u256,
expiry=expiry, expiry=expiry,
@ -125,7 +125,7 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
tolerance=1).get tolerance=1).get
let request = client1.getPurchase(id).get.request.get let request = client1.getPurchase(id).get.request.get
check request.ask.duration == 1.u256 check request.ask.duration == 100.u256
check request.ask.reward == 2.u256 check request.ask.reward == 2.u256
check request.ask.proofProbability == 3.u256 check request.ask.proofProbability == 3.u256
check request.expiry == expiry check request.expiry == expiry
@ -151,7 +151,7 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
let expiry = (await provider.currentTime()) + 30 let expiry = (await provider.currentTime()) + 30
let cid = client1.upload("some file contents").get let cid = client1.upload("some file contents").get
let id = client1.requestStorage(cid, let id = client1.requestStorage(cid,
duration=1.u256, duration=100.u256,
reward=2.u256, reward=2.u256,
proofProbability=3.u256, proofProbability=3.u256,
expiry=expiry, expiry=expiry,
@ -163,7 +163,7 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
check eventually client1.purchaseStateIs(id, "submitted") check eventually client1.purchaseStateIs(id, "submitted")
let request = client1.getPurchase(id).get.request.get let request = client1.getPurchase(id).get.request.get
check request.ask.duration == 1.u256 check request.ask.duration == 100.u256
check request.ask.reward == 2.u256 check request.ask.reward == 2.u256
check request.ask.proofProbability == 3.u256 check request.ask.proofProbability == 3.u256
check request.expiry == expiry check request.expiry == expiry
@ -229,6 +229,10 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
check responsePast.status == "400 Bad Request" check responsePast.status == "400 Bad Request"
check responsePast.body == "Expiry needs to be in future" check responsePast.body == "Expiry needs to be in future"
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)"
test "expired request partially pays out for stored time": test "expired request partially pays out for stored time":
let marketplace = Marketplace.new(Marketplace.address, provider.getSigner()) let marketplace = Marketplace.new(Marketplace.address, provider.getSigner())
let tokenAddress = await marketplace.token() let tokenAddress = await marketplace.token()

2
vendor/codex-contracts-eth vendored

@ -1 +1 @@
Subproject commit b625f0d519abc9b84cf759868779daa56ceb28c8 Subproject commit 87461f6b835cceff898798098fd14c1144d19b40