mirror of
https://github.com/status-im/nim-dagger.git
synced 2025-02-07 12:26:08 +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.
40 lines
995 B
Nim
40 lines
995 B
Nim
import std/times
|
|
import pkg/chronos
|
|
import codex/clock
|
|
|
|
export clock
|
|
|
|
type
|
|
MockClock* = ref object of Clock
|
|
time: SecondsSince1970
|
|
waiting: seq[Waiting]
|
|
Waiting = ref object
|
|
until: SecondsSince1970
|
|
future: Future[void]
|
|
|
|
func new*(_: type MockClock,
|
|
time: SecondsSince1970 = getTime().toUnix): MockClock =
|
|
MockClock(time: time)
|
|
|
|
proc set*(clock: MockClock, time: SecondsSince1970) =
|
|
clock.time = time
|
|
var index = 0
|
|
while index < clock.waiting.len:
|
|
if clock.waiting[index].until <= clock.time:
|
|
clock.waiting[index].future.complete()
|
|
clock.waiting.del(index)
|
|
else:
|
|
inc index
|
|
|
|
proc advance*(clock: MockClock, seconds: int64) =
|
|
clock.set(clock.time + seconds)
|
|
|
|
method now*(clock: MockClock): SecondsSince1970 =
|
|
clock.time
|
|
|
|
method waitUntil*(clock: MockClock, time: SecondsSince1970) {.async.} =
|
|
if time > clock.now():
|
|
let future = newFuture[void]()
|
|
clock.waiting.add(Waiting(until: time, future: future))
|
|
await future
|