Pass TimeConfig to ValidatorMonitor (#7613)

ValidatorMonitor uses slot.attestation_deadline() for metrics / logs,
which ultimately depends on SECONDS_PER_SLOT. Passing that config now
reduces the subsequent diff when the compile-time constant is replaced.

Author: etan-status

beacon_chain/nimbus_beacon_node.nim

@@ -913,6 +913,7 @@ proc init*(
   # break existing setups
   let
     validatorMonitor = newClone(ValidatorMonitor.init(
+      cfg.time,
       config.validatorMonitorAuto,
       config.validatorMonitorTotals.get(
         not config.validatorMonitorDetails)))

beacon_chain/trusted_node_sync.nim

@@ -377,7 +377,7 @@ proc doTrustedNodeSync*(
   # Coming this far, we've done what ChainDAGRef.preInit would normally do -
   # we can now load a ChainDAG to start backfilling it
   let
-    validatorMonitor = newClone(ValidatorMonitor.init(false, false))
+    validatorMonitor = newClone(ValidatorMonitor.init(cfg.time, false, false))
     dag = ChainDAGRef.init(cfg, db, validatorMonitor, {}, eraPath = eraDir)
     backfillSlot = max(dag.backfill.slot, 1.Slot) - 1
     horizon = max(dag.horizon, dag.frontfill.valueOr(BlockId()).slot)

beacon_chain/validators/validator_monitor.nim

@@ -194,6 +194,8 @@ type
     summaries: array[2, EpochSummary] # We monitor the current and previous epochs
 
   ValidatorMonitor* = object
+    timeConfig: TimeConfig
+
     epoch: Epoch # The most recent epoch seen in monitoring
 
     monitors: Table[ValidatorPubKey, ref MonitoredValidator]
@@ -257,8 +259,12 @@ proc addAutoMonitor*(
   info "Started monitoring validator",
     validator = shortLog(pubkey), pubkey, index
 
-func init*(T: type ValidatorMonitor, autoRegister = false, totals = false): T =
-  T(autoRegister: autoRegister, totals: totals)
+func init*(
+    T: type ValidatorMonitor,
+    timeConfig: TimeConfig,
+    autoRegister = false,
+    totals = false): T =
+  T(timeConfig: timeConfig, autoRegister: autoRegister, totals: totals)
 
 template summaryIdx(epoch: Epoch): int = (epoch.uint64 mod 2).int
 

ncli/ncli_db.nim

@@ -239,7 +239,7 @@ proc cmdBench(conf: DbConf, cfg: RuntimeConfig) =
 
   echo "Initializing block pool..."
   let
-    validatorMonitor = newClone(ValidatorMonitor.init())
+    validatorMonitor = newClone(ValidatorMonitor.init(cfg.time))
     dag = withTimerRet(timers[tInit]):
       ChainDAGRef.init(cfg, db, validatorMonitor, {}, conf.eraDir)
 
@@ -531,7 +531,7 @@ proc cmdRewindState(conf: DbConf, cfg: RuntimeConfig) =
   echo "Initializing block pool..."
 
   let
-    validatorMonitor = newClone(ValidatorMonitor.init())
+    validatorMonitor = newClone(ValidatorMonitor.init(cfg.time))
     dag = ChainDAGRef.init(cfg, db, validatorMonitor, {}, conf.eraDir)
 
   let bid = dag.getBlockId(fromHex(Eth2Digest, conf.blockRoot)).valueOr:
@@ -569,7 +569,7 @@ proc cmdExportEra(conf: DbConf, cfg: RuntimeConfig) =
     tBlocks
 
   let
-    validatorMonitor = newClone(ValidatorMonitor.init())
+    validatorMonitor = newClone(ValidatorMonitor.init(cfg.time))
     dag = ChainDAGRef.init(cfg, db, validatorMonitor, {}, conf.eraDir)
 
   let tmpState = assignClone(dag.headState)
@@ -751,7 +751,7 @@ proc cmdValidatorPerf(conf: DbConf, cfg: RuntimeConfig) =
 
   echo "# Initializing block pool..."
   let
-    validatorMonitor = newClone(ValidatorMonitor.init())
+    validatorMonitor = newClone(ValidatorMonitor.init(cfg.time))
     dag = ChainDAGRef.init(cfg, db, validatorMonitor, {}, conf.eraDir)
 
   var
@@ -987,7 +987,7 @@ proc cmdValidatorDb(conf: DbConf, cfg: RuntimeConfig) =
 
   echo "Initializing block pool..."
   let
-    validatorMonitor = newClone(ValidatorMonitor.init())
+    validatorMonitor = newClone(ValidatorMonitor.init(cfg.time))
     dag = ChainDAGRef.init(cfg, db, validatorMonitor, {}, conf.eraDir)
 
   let outDb = SqStoreRef.init(conf.outDir, "validatorDb").expect("DB")

research/block_sim.nim

@@ -77,7 +77,7 @@ cli do(
   ChainDAGRef.preInit(db, genesisState[])
   let rng = HmacDrbgContext.new()
   var
-    validatorMonitor = newClone(ValidatorMonitor.init())
+    validatorMonitor = newClone(ValidatorMonitor.init(cfg.time))
     dag = ChainDAGRef.init(cfg, db, validatorMonitor, {})
     taskpool =
       try:

tests/consensus_spec/test_fixture_fork_choice.nim

@@ -101,7 +101,7 @@ proc initialLoad(
 
   let
     cfg = forkedState[].kind.genesisTestRuntimeConfig
-    validatorMonitor = newClone(ValidatorMonitor.init())
+    validatorMonitor = newClone(ValidatorMonitor.init(cfg.time))
     dag = ChainDAGRef.init(cfg, db, validatorMonitor, {})
     fkChoice = newClone(ForkChoice.init(
       dag.getFinalizedEpochRef(), dag.finalizedHead.blck))

tests/consensus_spec/test_fixture_light_client_data_collection.nim

@@ -138,7 +138,7 @@ proc runTest(suiteName, path: string, consensusFork: static ConsensusFork) =
     ChainDAGRef.preInit(db, initial_state[])
 
     let
-      validatorMonitor = newClone(ValidatorMonitor.init(false, false))
+      validatorMonitor = newClone(ValidatorMonitor.init(cfg.time, false, false))
       dag = ChainDAGRef.init(cfg, db, validatorMonitor, {},
         lcDataConfig = LightClientDataConfig(
           serve: true, importMode: LightClientDataImportMode.Full))

tests/test_attestation_pool.nim

@@ -83,7 +83,7 @@ suite "Attestation pool electra processing" & preset():
     const TOTAL_COMMITTEES = 2
     var
       cfg = genesisTestRuntimeConfig(ConsensusFork.Electra)
-      validatorMonitor = newClone(ValidatorMonitor.init())
+      validatorMonitor = newClone(ValidatorMonitor.init(cfg.time))
       dag = init(
         ChainDAGRef, cfg,
         cfg.makeTestDB(

tests/test_beacon_chain_db.nim

@@ -115,7 +115,7 @@ proc getTestStates(
     consensusFork: ConsensusFork): seq[ref ForkedHashedBeaconState] =
   let
     db = cfg.makeTestDB(SLOTS_PER_EPOCH)
-    validatorMonitor = newClone(ValidatorMonitor.init())
+    validatorMonitor = newClone(ValidatorMonitor.init(cfg.time))
     dag = init(ChainDAGRef, cfg, db, validatorMonitor, {})
   var testStates = getTestStates(dag.headState, consensusFork)
 
@@ -258,7 +258,7 @@ suite "Beacon chain DB" & preset():
     block:
       var
         db = cfg.makeTestDB(SLOTS_PER_EPOCH)
-        validatorMonitor = newClone(ValidatorMonitor.init())
+        validatorMonitor = newClone(ValidatorMonitor.init(cfg.time))
         dag = init(ChainDAGRef, cfg, db, validatorMonitor, {})
         state = ForkedHashedBeaconState.new(
           (ref consensusFork.BeaconState)(slot: 10.Slot)[])

tests/test_block_processor.nim

@@ -43,7 +43,7 @@ suite "Block processor" & preset():
         res.BELLATRIX_FORK_EPOCH = GENESIS_EPOCH
         res
       db = cfg.makeTestDB(SLOTS_PER_EPOCH)
-      validatorMonitor = newClone(ValidatorMonitor.init())
+      validatorMonitor = newClone(ValidatorMonitor.init(cfg.time))
       dag = init(ChainDAGRef, cfg, db, validatorMonitor, {})
     var
       taskpool = Taskpool.new()
@@ -112,7 +112,7 @@ suite "Block processor" & preset():
 
     # check that init also reloads block graph
     var
-      validatorMonitor2 = newClone(ValidatorMonitor.init())
+      validatorMonitor2 = newClone(ValidatorMonitor.init(cfg.time))
       dag2 = init(ChainDAGRef, cfg, db, validatorMonitor2, {})
 
     check: