feat: expiry specified with number of seconds (#793)

codex/contracts/market.nim

@@ -126,6 +126,11 @@ method getRequestEnd*(market: OnChainMarket,
   convertEthersError:
     return await market.contract.requestEnd(id)
 
+method requestExpiresAt*(market: OnChainMarket,
+                      id: RequestId): Future[SecondsSince1970] {.async.} =
+  convertEthersError:
+    return await market.contract.requestExpiry(id)
+
 method getHost(market: OnChainMarket,
                requestId: RequestId,
                slotIndex: UInt256): Future[?Address] {.async.} =

codex/contracts/marketplace.nim

@@ -55,6 +55,7 @@ proc mySlots*(marketplace: Marketplace): seq[SlotId] {.contract, view.}
 proc requestState*(marketplace: Marketplace, requestId: RequestId): RequestState {.contract, view.}
 proc slotState*(marketplace: Marketplace, slotId: SlotId): SlotState {.contract, view.}
 proc requestEnd*(marketplace: Marketplace, requestId: RequestId): SecondsSince1970 {.contract, view.}
+proc requestExpiry*(marketplace: Marketplace, requestId: RequestId): SecondsSince1970 {.contract, view.}
 
 proc proofTimeout*(marketplace: Marketplace): UInt256 {.contract, view.}
 

codex/market.nim

@@ -84,6 +84,10 @@ method getRequestEnd*(market: Market,
                       id: RequestId): Future[SecondsSince1970] {.base, async.} =
   raiseAssert("not implemented")
 
+method requestExpiresAt*(market: Market,
+                      id: RequestId): Future[SecondsSince1970] {.base, async.} =
+  raiseAssert("not implemented")
+
 method getHost*(market: Market,
                 requestId: RequestId,
                 slotIndex: UInt256): Future[?Address] {.base, async.} =

codex/purchasing.nim

@@ -18,18 +18,15 @@ type
     clock: Clock
     purchases: Table[PurchaseId, Purchase]
     proofProbability*: UInt256
-    requestExpiryInterval*: UInt256
   PurchaseTimeout* = Timeout
 
 const DefaultProofProbability = 100.u256
-const DefaultRequestExpiryInterval = (10 * 60).u256
 
 proc new*(_: type Purchasing, market: Market, clock: Clock): Purchasing =
   Purchasing(
     market: market,
     clock: clock,
     proofProbability: DefaultProofProbability,
-    requestExpiryInterval: DefaultRequestExpiryInterval,
   )
 
 proc load*(purchasing: Purchasing) {.async.} =
@@ -52,8 +49,6 @@ proc populate*(purchasing: Purchasing,
   result = request
   if result.ask.proofProbability == 0.u256:
     result.ask.proofProbability = purchasing.proofProbability
-  if result.expiry == 0.u256:
-    result.expiry = (purchasing.clock.now().u256 + purchasing.requestExpiryInterval)
   if result.nonce == Nonce.default:
     var id = result.nonce.toArray
     doAssert randomBytes(id) == 32

codex/purchasing/states/submitted.nim

@@ -34,7 +34,7 @@ method run*(state: PurchaseSubmitted, machine: Machine): Future[?State] {.async.
     await subscription.unsubscribe()
 
   proc withTimeout(future: Future[void]) {.async.} =
-    let expiry = request.expiry.truncate(int64) + 1
+    let expiry = (await market.requestExpiresAt(request.id)) + 1
     trace "waiting for request fulfillment or expiry", expiry
     await future.withTimeout(clock, expiry)
 

codex/rest/api.nim

@@ -399,7 +399,7 @@ proc initPurchasingApi(node: CodexNodeRef, router: var RestRouter) =
       ## duration         - the duration of the request in seconds
       ## proofProbability - how often storage proofs are required
       ## reward           - the maximum amount of tokens paid per second per slot to hosts the client is willing to pay
-      ## expiry           - timestamp, in seconds, when the request expires if the Request does not find requested amount of nodes to host the data
+      ## expiry           - specifies threshold in seconds from now when the request expires if the Request does not find requested amount of nodes to host the data
       ## nodes            - number of nodes the content should be stored on
       ## tolerance        - allowed number of nodes that can be lost before content is lost
       ## colateral        - requested collateral from hosts when they fill slot
@@ -425,15 +425,8 @@ proc initPurchasingApi(node: CodexNodeRef, router: var RestRouter) =
         without expiry =? params.expiry:
           return RestApiResponse.error(Http400, "Expiry required")
 
-        if node.clock.isNil:
+        if expiry <= 0 or expiry >= params.duration:
-          return RestApiResponse.error(Http500)
+          return RestApiResponse.error(Http400, "Expiry needs value bigger then zero and smaller then the request's duration")
-
-        if expiry <= node.clock.now.u256:
-          return RestApiResponse.error(Http400, "Expiry needs to be in future. Now: " & $node.clock.now)
-
-        let expiryLimit = node.clock.now.u256 + params.duration
-        if expiry > expiryLimit:
-          return RestApiResponse.error(Http400, "Expiry has to be before the request's end (now + duration). Limit: " & $expiryLimit)
 
         without purchaseId =? await node.requestStorage(
           cid,
@@ -494,7 +487,7 @@ proc initPurchasingApi(node: CodexNodeRef, router: var RestRouter) =
 
 proc initNodeApi(node: CodexNodeRef, conf: CodexConf, router: var RestRouter) =
   ## various node management api's
-  ## 
+  ##
   router.api(
     MethodGet,
     "/api/codex/v1/spr") do () -> RestApiResponse:

codex/sales/salesagent.nim

@@ -72,8 +72,11 @@ proc subscribeCancellation(agent: SalesAgent) {.async.} =
     without request =? data.request:
       return
 
+    let market = agent.context.market
+    let expiry = await market.requestExpiresAt(data.requestId)
+
     while true:
-      let deadline = max(clock.now, request.expiry.truncate(int64)) + 1
+      let deadline = max(clock.now, expiry) + 1
       trace "Waiting for request to be cancelled", now=clock.now, expiry=deadline
       await clock.waitUntil(deadline)
 

openapi.yaml

@@ -213,8 +213,7 @@ components:
           description: Number as decimal string that represents how much collateral is asked from hosts that wants to fill a slots
         expiry:
           type: string
-          description: Number as decimal string that represents expiry time of the request (in unix timestamp)
+          description: Number as decimal string that represents expiry threshold in seconds from when the Request is submitted. When the threshold is reached and the Request does not find requested amount of nodes to host the data, the Request is voided. The number of seconds can not be higher then the Request's duration itself.
-
     StorageAsk:
       type: object
       required:

tests/codex/helpers/mockmarket.nim

@@ -20,6 +20,7 @@ type
     activeSlots*: Table[Address, seq[SlotId]]
     requested*: seq[StorageRequest]
     requestEnds*: Table[RequestId, SecondsSince1970]
+    requestExpiry*: Table[RequestId, SecondsSince1970]
     requestState*: Table[RequestId, RequestState]
     slotState*: Table[SlotId, SlotState]
     fulfilled*: seq[Fulfillment]
@@ -165,6 +166,10 @@ method getRequestEnd*(market: MockMarket,
                       id: RequestId): Future[SecondsSince1970] {.async.} =
   return market.requestEnds[id]
 
+method requestExpiresAt*(market: MockMarket,
+                      id: RequestId): Future[SecondsSince1970] {.async.} =
+  return market.requestExpiry[id]
+
 method getHost*(market: MockMarket,
                requestId: RequestId,
                slotIndex: UInt256): Future[?Address] {.async.} =

tests/codex/sales/testsales.nim

@@ -473,6 +473,9 @@ asyncchecksuite "Sales":
     check eventually (await reservations.all(Availability)).get == @[availability]
 
   test "makes storage available again when request expires":
+    let expiry = getTime().toUnix() + 10
+    market.requestExpiry[request.id] = expiry
+
     let origSize = availability.freeSize
     sales.onStore = proc(request: StorageRequest,
                          slot: UInt256,
@@ -486,11 +489,14 @@ asyncchecksuite "Sales":
     # would otherwise not set the timeout early enough as it uses `clock.now` in the deadline calculation.
     await sleepAsync(chronos.milliseconds(100))
     market.requestState[request.id]=RequestState.Cancelled
-    clock.set(request.expiry.truncate(int64)+1)
+    clock.set(expiry + 1)
     check eventually (await reservations.all(Availability)).get == @[availability]
     check getAvailability().freeSize == origSize
 
   test "verifies that request is indeed expired from onchain before firing onCancelled":
+    let expiry = getTime().toUnix() + 10
+    market.requestExpiry[request.id] = expiry
+
     let origSize = availability.freeSize
     sales.onStore = proc(request: StorageRequest,
                          slot: UInt256,
@@ -504,7 +510,7 @@ asyncchecksuite "Sales":
     # If we would not await, then the `clock.set` would run "too fast" as the `subscribeCancellation()`
     # would otherwise not set the timeout early enough as it uses `clock.now` in the deadline calculation.
     await sleepAsync(chronos.milliseconds(100))
-    clock.set(request.expiry.truncate(int64)+1)
+    clock.set(expiry + 1)
     check getAvailability().freeSize == 0
 
     market.requestState[request.id]=RequestState.Cancelled # Now "on-chain" is also expired

tests/codex/sales/testsalesagent.nim

@@ -41,19 +41,7 @@ method run*(state: MockErrorState, machine: Machine): Future[?State] {.async.} =
   raise newException(ValueError, "failure")
 
 asyncchecksuite "Sales agent":
-  var request = StorageRequest(
+  let request = StorageRequest.example
-    ask: StorageAsk(
-      slots: 4,
-      slotSize: 100.u256,
-      duration: 60.u256,
-      reward: 10.u256,
-    ),
-    content: StorageContent(
-      cid: "some cid"
-    ),
-    expiry: (getTime() + initDuration(hours=1)).toUnix.u256
-  )
-
   var agent: SalesAgent
   var context: SalesContext
   var slotIndex: UInt256
@@ -62,6 +50,7 @@ asyncchecksuite "Sales agent":
 
   setup:
     market = MockMarket.new()
+    market.requestExpiry[request.id] = getTime().toUnix() + request.expiry.truncate(int64)
     clock = MockClock.new()
     context = SalesContext(market: market, clock: clock)
     slotIndex = 0.u256
@@ -109,7 +98,7 @@ asyncchecksuite "Sales agent":
     agent.start(MockState.new())
     await agent.subscribe()
     market.requestState[request.id] = RequestState.Cancelled
-    clock.set(request.expiry.truncate(int64) + 1)
+    clock.set(market.requestExpiry[request.id] + 1)
     check eventually onCancelCalled
 
   for requestState in {RequestState.New, Started, Finished, Failed}:
@@ -117,7 +106,7 @@ asyncchecksuite "Sales agent":
       agent.start(MockState.new())
       await agent.subscribe()
       market.requestState[request.id] = requestState
-      clock.set(request.expiry.truncate(int64) + 1)
+      clock.set(market.requestExpiry[request.id] + 1)
       await sleepAsync(100.millis)
       check not onCancelCalled
 
@@ -126,7 +115,7 @@ asyncchecksuite "Sales agent":
       agent.start(MockState.new())
       await agent.subscribe()
       market.requestState[request.id] = requestState
-      clock.set(request.expiry.truncate(int64) + 1)
+      clock.set(market.requestExpiry[request.id] + 1)
       check eventually agent.data.cancelled.finished
 
   test "cancelled future is finished (cancelled) when onFulfilled called":

tests/codex/testpurchasing.nim

@@ -19,7 +19,7 @@ asyncchecksuite "Purchasing":
   var purchasing: Purchasing
   var market: MockMarket
   var clock: MockClock
-  var request: StorageRequest
+  var request, populatedRequest: StorageRequest
 
   setup:
     market = MockMarket.new()
@@ -34,6 +34,12 @@ asyncchecksuite "Purchasing":
       )
     )
 
+    # We need request which has stable ID during the whole Purchasing pipeline
+    # for some tests (related to expiry). Because of Purchasing.populate() we need
+    # to do the steps bellow.
+    populatedRequest = StorageRequest.example
+    populatedRequest.client = await market.getSigner()
+
   test "submits a storage request when asked":
     discard await purchasing.purchase(request)
     check eventually market.requested.len > 0
@@ -63,23 +69,6 @@ asyncchecksuite "Purchasing":
     check eventually market.requested.len > 0
     check market.requested[0].ask.proofProbability == 42.u256
 
-  test "has a default value for request expiration interval":
-    check purchasing.requestExpiryInterval != 0.u256
-
-  test "can change default value for request expiration interval":
-    purchasing.requestExpiryInterval = 42.u256
-    let start = getTime().toUnix()
-    discard await purchasing.purchase(request)
-    check eventually market.requested.len > 0
-    check market.requested[0].expiry == (start + 42).u256
-
-  test "can override expiry time per request":
-    let expiry = (getTime().toUnix() + 42).u256
-    request.expiry = expiry
-    discard await purchasing.purchase(request)
-    check eventually market.requested.len > 0
-    check market.requested[0].expiry == expiry
-
   test "includes a random nonce in every storage request":
     discard await purchasing.purchase(request)
     discard await purchasing.purchase(request)
@@ -92,29 +81,37 @@ asyncchecksuite "Purchasing":
     check market.requested[0].client == await market.getSigner()
 
   test "succeeds when request is finished":
-    let purchase = await purchasing.purchase(request)
+    market.requestExpiry[populatedRequest.id] = getTime().toUnix() + 10
+    let purchase = await purchasing.purchase(populatedRequest)
+
     check eventually market.requested.len > 0
     let request = market.requested[0]
     let requestEnd = getTime().toUnix() + 42
     market.requestEnds[request.id] = requestEnd
+
     market.emitRequestFulfilled(request.id)
     clock.set(requestEnd + 1)
     await purchase.wait()
     check purchase.error.isNone
 
   test "fails when request times out":
-    let purchase = await purchasing.purchase(request)
+    let expiry = getTime().toUnix() + 10
+    market.requestExpiry[populatedRequest.id] = expiry
+    let purchase = await purchasing.purchase(populatedRequest)
     check eventually market.requested.len > 0
     let request = market.requested[0]
-    clock.set(request.expiry.truncate(int64) + 1)
+
+    clock.set(expiry + 1)
     expect PurchaseTimeout:
       await purchase.wait()
 
   test "checks that funds were withdrawn when purchase times out":
-    let purchase = await purchasing.purchase(request)
+    let expiry = getTime().toUnix() + 10
+    market.requestExpiry[populatedRequest.id] = expiry
+    let purchase = await purchasing.purchase(populatedRequest)
     check eventually market.requested.len > 0
     let request = market.requested[0]
-    clock.set(request.expiry.truncate(int64) + 1)
+    clock.set(expiry + 1)
     expect PurchaseTimeout:
       await purchase.wait()
     check market.withdrawn == @[request.id]

tests/contracts/testContracts.nim

@@ -85,7 +85,8 @@ ethersuite "Marketplace contracts":
     check endBalance == (startBalance + request.ask.duration * request.ask.reward + request.ask.collateral)
 
   test "cannot mark proofs missing for cancelled request":
-    await ethProvider.advanceTimeTo(request.expiry + 1)
+    let expiry = await marketplace.requestExpiry(request.id)
+    await ethProvider.advanceTimeTo((expiry + 1).u256)
     switchAccount(client)
     let missingPeriod = periodicity.periodOf(await ethProvider.currentTime())
     await ethProvider.advanceTime(periodicity.seconds)

tests/contracts/testMarket.nim

@@ -32,6 +32,10 @@ ethersuite "On-Chain Market":
     let currentPeriod = periodicity.periodOf(await ethProvider.currentTime())
     await ethProvider.advanceTimeTo(periodicity.periodEnd(currentPeriod) + 1)
 
+  proc advanceToCancelledRequest(request: StorageRequest) {.async.} =
+    let expiry = (await market.requestExpiresAt(request.id)) + 1
+    await ethProvider.advanceTimeTo(expiry.u256)
+
   proc waitUntilProofRequired(slotId: SlotId) {.async.} =
     await advanceToNextPeriod()
     while not (
@@ -70,22 +74,19 @@ ethersuite "On-Chain Market":
 
   test "supports withdrawing of funds":
     await market.requestStorage(request)
-    await ethProvider.advanceTimeTo(request.expiry + 1)
+    await advanceToCancelledRequest(request)
     await market.withdrawFunds(request.id)
 
   test "supports request subscriptions":
     var receivedIds: seq[RequestId]
     var receivedAsks: seq[StorageAsk]
-    var receivedExpirys: seq[UInt256]
     proc onRequest(id: RequestId, ask: StorageAsk, expiry: UInt256) =
       receivedIds.add(id)
       receivedAsks.add(ask)
-      receivedExpirys.add(expiry)
     let subscription = await market.subscribeRequests(onRequest)
     await market.requestStorage(request)
     check receivedIds == @[request.id]
     check receivedAsks == @[request.ask]
-    check receivedExpirys == @[request.expiry]
     await subscription.unsubscribe()
 
   test "supports filling of slots":
@@ -216,7 +217,7 @@ ethersuite "On-Chain Market":
       receivedIds.add(id)
     let subscription = await market.subscribeRequestCancelled(request.id, onRequestCancelled)
 
-    await ethProvider.advanceTimeTo(request.expiry + 1)
+    await advanceToCancelledRequest(request)
     await market.withdrawFunds(request.id)
     check receivedIds == @[request.id]
     await subscription.unsubscribe()
@@ -255,7 +256,7 @@ ethersuite "On-Chain Market":
       receivedIds.add(requestId)
 
     let subscription = await market.subscribeRequestCancelled(request.id, onRequestCancelled)
-    await ethProvider.advanceTimeTo(request.expiry + 1) # shares expiry with otherRequest
+    advanceToCancelledRequest(otherRequest) # shares expiry with otherRequest
     await market.withdrawFunds(otherRequest.id)
     check receivedIds.len == 0
     await market.withdrawFunds(request.id)
@@ -338,13 +339,12 @@ ethersuite "On-Chain Market":
     # 6 blocks, we only need to check 5 "blocks ago". We don't need to check the
     # `approve` for the first `requestStorage` call, so that's 1 less again = 4
     # "blocks ago".
-    check eventually (
+
-      (await market.queryPastStorageRequests(5)) ==
+    proc getsPastRequest(): Future[bool] {.async.} =
-      @[
+      let reqs = await market.queryPastStorageRequests(5)
-        PastStorageRequest(requestId: request.id, ask: request.ask, expiry: request.expiry),
+      reqs.mapIt(it.requestId) == @[request.id, request1.id, request2.id]
-        PastStorageRequest(requestId: request1.id, ask: request1.ask, expiry: request1.expiry),
+
-        PastStorageRequest(requestId: request2.id, ask: request2.ask, expiry: request2.expiry)
+    check eventually await getsPastRequest()
-      ])
 
   test "past event query can specify negative `blocksAgo` parameter":
     await market.requestStorage(request)

tests/examples.nim

@@ -59,7 +59,7 @@ proc example*(_: type StorageRequest): StorageRequest =
       cid: "zb2rhheVmk3bLks5MgzTqyznLu1zqGH5jrfTA1eAZXrjx7Vob",
       merkleRoot: array[32, byte].example
     ),
-    expiry: (getTime() + 1.hours).toUnix.u256,
+    expiry:(60 * 60).u256, # 1 hour ,
     nonce: Nonce.example
   )
 

tests/integration/codexclient.nim

@@ -70,7 +70,7 @@ proc requestStorageRaw*(
     reward: UInt256,
     proofProbability: UInt256,
     collateral: UInt256,
-    expiry: UInt256 = 0.u256,
+    expiry: uint = 0,
     nodes: uint = 1,
     tolerance: uint = 0
 ): Response =
@@ -88,7 +88,7 @@ proc requestStorageRaw*(
     }
 
   if expiry != 0:
-    json["expiry"] = %expiry
+    json["expiry"] = %($expiry)
 
   return client.http.post(url, $json)
 
@@ -98,7 +98,7 @@ proc requestStorage*(
     duration: UInt256,
     reward: UInt256,
     proofProbability: UInt256,
-    expiry: UInt256,
+    expiry: uint,
     collateral: UInt256,
     nodes: uint = 1,
     tolerance: uint = 0

tests/integration/marketplacesuite.nim

@@ -68,11 +68,9 @@ template marketplacesuite*(name: string, body: untyped) =
                         expiry: uint64 = 4.periods,
                         nodes = providers().len,
                         tolerance = 0): Future[PurchaseId] {.async.} =
-      let expiry = (await ethProvider.currentTime()) + expiry.u256
-
       let id = client.requestStorage(
         cid,
-        expiry=expiry,
+        expiry=expiry.uint,
         duration=duration.u256,
         proofProbability=proofProbability.u256,
         collateral=collateral,

tests/integration/testIntegration.nim

@@ -112,10 +112,9 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
     check availability in client1.getAvailabilities().get
 
   test "node handles storage request":
-    let expiry = (await ethProvider.currentTime()) + 10
     let cid = client1.upload("some file contents").get
-    let id1 = client1.requestStorage(cid, duration=100.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=10, collateral=200.u256).get
-    let id2 = client1.requestStorage(cid, duration=400.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=10, collateral=201.u256).get
     check id1 != id2
 
   test "node retrieves purchase status":
@@ -124,13 +123,12 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
     let chunker = RandomChunker.new(rng, size = DefaultBlockSize * 2, chunkSize = DefaultBlockSize * 2)
     let data = await chunker.getBytes()
     let cid = client1.upload(byteutils.toHex(data)).get
-    let expiry = (await ethProvider.currentTime()) + 30
     let id = client1.requestStorage(
       cid,
       duration=100.u256,
       reward=2.u256,
       proofProbability=3.u256,
-      expiry=expiry,
+      expiry=30,
       collateral=200.u256,
       nodes=2,
       tolerance=1).get
@@ -139,16 +137,15 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
     check request.ask.duration == 100.u256
     check request.ask.reward == 2.u256
     check request.ask.proofProbability == 3.u256
-    check request.expiry == expiry
+    check request.expiry == 30
     check request.ask.collateral == 200.u256
     check request.ask.slots == 2'u64
     check request.ask.maxSlotLoss == 1'u64
 
   # TODO: We currently do not support encoding single chunks
   # test "node retrieves purchase status with 1 chunk":
-  #   let expiry = (await ethProvider.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 id = client1.requestStorage(cid, duration=1.u256, reward=2.u256, proofProbability=3.u256, expiry=30, 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
@@ -159,13 +156,12 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
   #   check request.ask.maxSlotLoss == 1'u64
 
   test "node remembers purchase status after restart":
-    let expiry = (await ethProvider.currentTime()) + 30
     let cid = client1.upload("some file contents").get
     let id = client1.requestStorage(cid,
                                     duration=100.u256,
                                     reward=2.u256,
                                     proofProbability=3.u256,
-                                    expiry=expiry,
+                                    expiry=30,
                                     collateral=200.u256).get
     check eventually client1.purchaseStateIs(id, "submitted")
 
@@ -177,7 +173,7 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
     check request.ask.duration == 100.u256
     check request.ask.reward == 2.u256
     check request.ask.proofProbability == 3.u256
-    check request.expiry == expiry
+    check request.expiry == 30
     check request.ask.collateral == 200.u256
     check request.ask.slots == 1'u64
     check request.ask.maxSlotLoss == 0'u64
@@ -189,14 +185,13 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
     let availability = client2.postAvailability(totalSize=size, duration=20*60.u256, minPrice=300.u256, maxCollateral=300.u256).get
 
     # client 1 requests storage
-    let expiry = (await ethProvider.currentTime()) + 5*60
     let cid = client1.upload(data).get
     let id = client1.requestStorage(
       cid,
       duration=10*60.u256,
       reward=400.u256,
       proofProbability=3.u256,
-      expiry=expiry,
+      expiry=5*60,
       collateral=200.u256,
       nodes = 5,
       tolerance = 2).get
@@ -228,14 +223,13 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
     discard client2.postAvailability(totalSize=size, duration=20*60.u256, minPrice=300.u256, maxCollateral=300.u256).get
 
     # client 1 requests storage
-    let expiry = (await ethProvider.currentTime()) + 5*60
     let cid = client1.upload(data).get
     let id = client1.requestStorage(
       cid,
       duration=duration,
       reward=reward,
       proofProbability=3.u256,
-      expiry=expiry,
+      expiry=5*60,
       collateral=200.u256,
       nodes = nodes,
       tolerance = 2).get
@@ -253,12 +247,11 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
 
   test "request storage fails if nodes and tolerance aren't correct":
     let cid = client1.upload("some file contents").get
-    let expiry = (await ethProvider.currentTime()) + 30
     let responseBefore = client1.requestStorageRaw(cid,
       duration=100.u256,
       reward=2.u256,
       proofProbability=3.u256,
-      expiry=expiry,
+      expiry=30,
       collateral=200.u256,
       nodes=1,
       tolerance=1)
@@ -267,20 +260,15 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
     check responseBefore.body == "Tolerance cannot be greater or equal than nodes (nodes - tolerance)"
 
   test "node requires expiry and its value to be in future":
-    let currentTime = await ethProvider.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)
+    let responseBefore = client1.requestStorageRaw(cid, duration=10.u256, reward=2.u256, proofProbability=3.u256, collateral=200.u256, expiry=10)
-    check responsePast.status == "400 Bad Request"
-    check "Expiry needs to be in future" in responsePast.body
-
-    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 "Expiry has to be before the request's end (now + duration)" in responseBefore.body
+    check "Expiry needs value bigger then zero and smaller then the request's duration" in responseBefore.body
 
   test "updating non-existing availability":
     let nonExistingResponse = client1.patchAvailabilityRaw(AvailabilityId.example, duration=100.u256.some, minPrice=200.u256.some, maxCollateral=200.u256.some)
@@ -317,14 +305,13 @@ twonodessuite "Integration tests", debug1 = false, debug2 = false:
     let availability = client1.postAvailability(totalSize=originalSize, duration=20*60.u256, minPrice=300.u256, maxCollateral=300.u256).get
 
     # Lets create storage request that will utilize some of the availability's space
-    let expiry = (await ethProvider.currentTime()) + 5*60
     let cid = client2.upload(data).get
     let id = client2.requestStorage(
       cid,
       duration=10*60.u256,
       reward=400.u256,
       proofProbability=3.u256,
-      expiry=expiry,
+      expiry=5*60,
       collateral=200.u256,
       nodes = 5,
       tolerance = 2).get

vendor/codex-contracts-eth

@@ -1 +1 @@
-Subproject commit a58427e496088b904aed070e92f1c479c45fd852
+Subproject commit 57e8cd5013325f05e16833a5320b575d32a403f3