Merge branch 'master' into feat/rework-zk-proving

Author: dryajov

codex/codex.nim

@@ -83,7 +83,9 @@ proc bootstrapInteractions(s: CodexServer): Future[void] {.async.} =
       error "Persistence enabled, but no Ethereum account was set"
       quit QuitFailure
 
-    let provider = JsonRpcProvider.new(config.ethProvider)
+    let provider = JsonRpcProvider.new(
+      config.ethProvider, maxPriorityFeePerGas = config.maxPriorityFeePerGas.u256
+    )
     await waitForSync(provider)
     var signer: Signer
     if account =? config.ethAccount:

codex/conf.nim

@@ -45,15 +45,15 @@ import ./utils
 import ./nat
 import ./utils/natutils
 
-from ./contracts/config import DefaultRequestCacheSize
+from ./contracts/config import DefaultRequestCacheSize, DefaultMaxPriorityFeePerGas
 from ./validationconfig import MaxSlots, ValidationGroups
 
 export units, net, codextypes, logutils, completeCmdArg, parseCmdArg, NatConfig
 export ValidationGroups, MaxSlots
 
 export
   DefaultQuotaBytes, DefaultBlockTtl, DefaultBlockInterval, DefaultNumBlocksPerInterval,
-  DefaultRequestCacheSize
+  DefaultRequestCacheSize, DefaultMaxPriorityFeePerGas
 
 type ThreadCount* = range[0 .. 256]
 
@@ -376,6 +376,15 @@ type
         hidden
       .}: uint16
 
+      maxPriorityFeePerGas* {.
+        desc:
+          "Sets the default maximum priority fee per gas for Ethereum EIP-1559 transactions, in wei, when not provided by the network.",
+        defaultValue: DefaultMaxPriorityFeePerGas,
+        defaultValueDesc: $DefaultMaxPriorityFeePerGas,
+        name: "max-priority-fee-per-gas",
+        hidden
+      .}: uint64
+
       case persistenceCmd* {.defaultValue: noCmd, command.}: PersistenceCmd
       of PersistenceCmd.prover:
         circuitDir* {.

codex/contracts/config.nim

@@ -5,6 +5,7 @@ import pkg/questionable/results
 export contractabi
 
 const DefaultRequestCacheSize* = 128.uint16
+const DefaultMaxPriorityFeePerGas* = 1_000_000_000.uint64
 
 type
   MarketplaceConfig* = object

codex/purchasing/states/submitted.nim

@@ -30,12 +30,12 @@ method run*(
     requestId = purchase.requestId
 
   proc wait() {.async.} =
-    let done = newFuture[void]()
+    let done = newAsyncEvent()
     proc callback(_: RequestId) =
-      done.complete()
+      done.fire()
 
     let subscription = await market.subscribeFulfillment(request.id, callback)
-    await done
+    await done.wait()
     await subscription.unsubscribe()
 
   proc withTimeout(future: Future[void]) {.async.} =

codex/sales/statemachine.nim

@@ -12,7 +12,7 @@ export asyncstatemachine
 
 type
   SaleState* = ref object of State
-  SaleError* = ref object of CodexError
+  SaleError* = object of CodexError
 
 method onCancelled*(
     state: SaleState, request: StorageRequest

codex/sales/states/preparing.nim

@@ -51,7 +51,9 @@ method run*(
     await agent.subscribe()
 
     without request =? data.request:
-      raiseAssert "no sale request"
+      error "request could not be retrieved", id = data.requestId
+      let error = newException(SaleError, "request could not be retrieved")
+      return some State(SaleErrored(error: error))
 
     let slotId = slotId(data.requestId, data.slotIndex)
     let state = await market.slotState(slotId)

codex/sales/states/unknown.nim

@@ -38,6 +38,11 @@ method run*(
     await agent.retrieveRequest()
     await agent.subscribe()
 
+    without request =? data.request:
+      error "request could not be retrieved", id = data.requestId
+      let error = newException(SaleError, "request could not be retrieved")
+      return some State(SaleErrored(error: error))
+
     let slotId = slotId(data.requestId, data.slotIndex)
     let slotState = await market.slotState(slotId)
 

tests/codex/sales/states/testpreparing.nim

@@ -72,6 +72,12 @@ asyncchecksuite "sales state 'preparing'":
     let next = state.onSlotFilled(request.id, slotIndex)
     check !next of SaleFilled
 
+  test "run switches to errored when the request cannot be retrieved":
+    agent = newSalesAgent(context, request.id, slotIndex, StorageRequest.none)
+    let next = !(await state.run(agent))
+    check next of SaleErrored
+    check SaleErrored(next).error.msg == "request could not be retrieved"
+
   proc createAvailability(enabled = true) {.async.} =
     let a = await reservations.createAvailability(
       availability.totalSize,

tests/codex/sales/states/testunknown.nim

@@ -20,15 +20,22 @@ suite "sales state 'unknown'":
   let slotId = slotId(request.id, slotIndex)
 
   var market: MockMarket
+  var context: SalesContext
   var agent: SalesAgent
   var state: SaleUnknown
 
   setup:
     market = MockMarket.new()
-    let context = SalesContext(market: market)
-    agent = newSalesAgent(context, request.id, slotIndex, StorageRequest.none)
+    context = SalesContext(market: market)
+    agent = newSalesAgent(context, request.id, slotIndex, request.some)
     state = SaleUnknown.new()
 
+  test "switches to error state when the request cannot be retrieved":
+    agent = newSalesAgent(context, request.id, slotIndex, StorageRequest.none)
+    let next = await state.run(agent)
+    check !next of SaleErrored
+    check SaleErrored(!next).error.msg == "request could not be retrieved"
+
   test "switches to error state when on chain state cannot be fetched":
     let next = await state.run(agent)
     check !next of SaleErrored
@@ -37,6 +44,7 @@ suite "sales state 'unknown'":
     market.slotState[slotId] = SlotState.Free
     let next = await state.run(agent)
     check !next of SaleErrored
+    check SaleErrored(!next).error.msg == "Slot state on chain should not be 'free'"
 
   test "switches to filled state when on chain state is 'filled'":
     market.slotState[slotId] = SlotState.Filled

tests/contracts/testMarket.nim

@@ -537,6 +537,8 @@ ethersuite "On-Chain Market":
 
     let (_, fromTime) = await ethProvider.blockNumberAndTimestamp(BlockTag.latest)
 
+    await ethProvider.advanceTime(1.u256)
+
     await market.reserveSlot(request.id, 1.uint64)
     await market.reserveSlot(request.id, 2.uint64)
     await market.fillSlot(request.id, 1.uint64, proof, request.ask.collateralPerSlot)