mirror of
https://github.com/status-im/nim-dagger.git
synced 2025-01-10 22:55:47 +00:00
d56eb6aee1
* [contracts] Add SlotFreed event * [integration] allow test node to be stopped twice * [cli] add --validator option * [contracts] remove dead code * [contracts] instantiate OnChainMarket and OnChainClock only once * [contracts] add Validation * [sales] remove duplicate import * [market] add missing import * [market] subscribe to all SlotFilled events * [market] add freeSlot() * [sales] fix warnings * [market] subscribe to SlotFreed events * [contracts] fix warning * [validator] keep track of filled slots * [validation] remove slots that have ended * [proving] absorb Proofs into Market Both Proofs and Market are abstractions around the Marketplace contract, having them separately is more trouble than it's worth at the moment. * [market] add markProofAsMissing() * [clock] speed up waiting for clock in tests * [validator] mark proofs as missing * [timer] fix error on node shutdown * [cli] handle --persistence and --validator separately * [market] allow retrieval of proof timeout value * [validator] do not subscribe to SlotFreed events Freed slots are already handled in removeSlotsThatHaveEnded(), and onSlotsFreed() interfered with its iterator. * [validator] Start validation at the start of a new period To decrease the likelihood that we hit the validation timeout. * [validator] do not mark proofs as missing after timeout * [market] check whether proof can be marked as missing * [validator] simplify validation Simulate a transaction to mark proof as missing, instead of trying to keep track of all the conditions that may lead to a proof being marked as missing. * [build] use nim-ethers PR #40 Uses "pending" blocktag instead of "latest" blocktag for better simulation of transactions before sending them. https://github.com/status-im/nim-ethers/pull/40 * [integration] integration test for validator * [validator] monitor a maximum number of slots Adds cli parameter --validator-max-slots. * [market] fix missing collateral argument After rebasing, add the new argument to fillSlot calls. * [build] update to nim-ethers 0.2.5 * [validator] use Set instead of Table to keep track of slots * [validator] add logging * [validator] add test for slot failure * [market] use "pending" blocktag to use more up to date block time * [contracts] remove unused import * [validator] fix: wait until after period ends The smart contract checks that 'end < block.timestamp', so we need to wait until the block timestamp is greater than the period end.
36 lines
984 B
Nim
36 lines
984 B
Nim
import pkg/chronos
|
|
import pkg/stew/endians2
|
|
import pkg/upraises
|
|
|
|
type
|
|
Clock* = ref object of RootObj
|
|
SecondsSince1970* = int64
|
|
Timeout* = object of CatchableError
|
|
|
|
method now*(clock: Clock): SecondsSince1970 {.base, upraises: [].} =
|
|
raiseAssert "not implemented"
|
|
|
|
method waitUntil*(clock: Clock, time: SecondsSince1970) {.base,async.} =
|
|
while clock.now() < time:
|
|
await sleepAsync(1.seconds)
|
|
|
|
proc withTimeout*(future: Future[void],
|
|
clock: Clock,
|
|
expiry: SecondsSince1970) {.async.} =
|
|
let timeout = clock.waitUntil(expiry)
|
|
try:
|
|
await future or timeout
|
|
finally:
|
|
await timeout.cancelAndWait()
|
|
if not future.completed:
|
|
await future.cancelAndWait()
|
|
raise newException(Timeout, "Timed out")
|
|
|
|
proc toBytes*(i: SecondsSince1970): seq[byte] =
|
|
let asUint = cast[uint64](i)
|
|
@(asUint.toBytes)
|
|
|
|
proc toSecondsSince1970*(bytes: seq[byte]): SecondsSince1970 =
|
|
let asUint = uint64.fromBytes(bytes)
|
|
cast[int64](asUint)
|