Update for changed master base (since PR #3642)

mjfh · mjfh · commit 1f5bf63d9d01 · 2025-10-23T16:11:40.000+01:00
diff --git a/tools/syncer/helpers/sync_ticker.nim b/tools/syncer/helpers/sync_ticker.nim
@@ -11,8 +11,7 @@
 {.push raises: [].}
 
 import
-  std/strutils,
-  pkg/[chronos, chronicles, eth/common, stint, stew/interval_set],
+  pkg/[chronos, chronicles, eth/common, stew/interval_set],
   ../../../execution_chain/sync/beacon/worker/[blocks, headers, worker_desc]
 
 logScope:
diff --git a/tools/syncer/replay/replay_desc.nim b/tools/syncer/replay/replay_desc.nim
@@ -56,6 +56,12 @@ type
   ReplayEndUpFn* = proc() {.gcsafe, raises: [].}
     ## Terminator control directive for runner/dispatcher
 
+  ReplayGetPeerFn* = GetPeerFn[BeaconCtxData,BeaconBuddyData]
+    ## Shortcut
+
+  ReplayGetPeersFn* = GetPeersFn[BeaconCtxData,BeaconBuddyData]
+    ## Shortcut
+
   ReplayRef* = ref object of BeaconHandlersSyncRef
     ## Overlay handlers extended by descriptor data for caching replay state
     ctx*: BeaconCtxRef                  ## Parent context
@@ -64,7 +70,7 @@ type
     stopQuit*: bool                     ## Quit after replay
     backup*: BeaconHandlersRef          ## Can restore previous handlers
     reader*: ReplayReaderRef            ## Input records
-
+    getPeerSave*: ReplayGetPeerFn       ## Additionsl restore settings
 
   ReplayPayloadRef* = ref object of RootRef
     ## Decoded payload base record
diff --git a/tools/syncer/replay/replay_reader/reader_reclog.nim b/tools/syncer/replay/replay_reader/reader_reclog.nim
@@ -77,10 +77,14 @@ proc addX(
                     $base.blkUnpr.value.bLeastLen
 
   if base.peerCtx.isSome() and
-     (0 < base.peerCtx.value.nHdrErrors or
-      0 < base.peerCtx.value.nBlkErrors):
-    q.add "nErr=(" & $base.peerCtx.value.nHdrErrors &
-               "," & $base.peerCtx.value.nBlkErrors & ")"
+     (0 < base.peerCtx.value.nErrors.fetch.hdr or
+      0 < base.peerCtx.value.nErrors.fetch.bdy or
+      0 < base.peerCtx.value.nErrors.apply.hdr or
+      0 < base.peerCtx.value.nErrors.apply.blk):
+    q.add "nErr=(" & $base.peerCtx.value.nErrors.fetch.hdr &
+               "," & $base.peerCtx.value.nErrors.fetch.bdy &
+               ";" & $base.peerCtx.value.nErrors.apply.hdr &
+               "," & $base.peerCtx.value.nErrors.apply.blk & ")"
 
   if base.slowPeer.isSome():
     q.add "slowPeer=" & base.slowPeer.value.short()
@@ -170,6 +174,8 @@ func toStrSeq(n: int; w: ReplaySchedPeerBegin): seq[string] =
   var res = newSeqOfCap[string](20)
   res.addX(w.replayLabel, n, w.bag)
   res.add "peer=" & $w.bag.peerIP & ":" & $w.bag.peerPort
+  res.add "info=" & $w.bag.rank.assessed
+  res.add "rank=" & $w.bag.rank.ranking
   res
 
 func toStrSeq(n: int; w: ReplaySchedPeerEnd): seq[string] =
@@ -186,8 +192,8 @@ func toStrSeq(n: int; w: ReplayFetchHeaders): seq[string] =
     rLen = w.bag.req.maxResults
     rRev = if w.bag.req.reverse: "rev" else: ""
   if w.bag.req.startBlock.isHash:
-    res.add "req=" &
-      w.bag.req.startBlock.hash.short & "[" & $rLen & "]" & rRev
+    res.add "req=" & w.bag.req.startBlock.hash.short & "[" & $rLen & "]" & rRev
+    res.add "bn=" & w.bag.bn.bnStr
   else:
     res.add "req=" &
       w.bag.req.startBlock.number.bnStr & "[" & $rLen & "]" & rRev
diff --git a/tools/syncer/replay/replay_runner/runner_desc.nim b/tools/syncer/replay/replay_runner/runner_desc.nim
@@ -84,6 +84,15 @@ type
     # Instruction handling
     instrNumber*: uint                 ## Instruction counter
 
+# ------------------------------------------------------------------------------
+# Fake scheduler `getPeer()` and `getPeers()` for replay runner
+# ------------------------------------------------------------------------------
+
+proc replayGetPeerFn*(run: ReplayRunnerRef): ReplayGetPeerFn =
+  result = proc(peerID: Hash): BeaconBuddyRef =
+    run.peers.withValue(peerID,val):
+      return val[]
+
 # ------------------------------------------------------------------------------
 # End
 # ------------------------------------------------------------------------------
diff --git a/tools/syncer/replay/replay_runner/runner_dispatch/dispatch_headers.nim b/tools/syncer/replay/replay_runner/runner_dispatch/dispatch_headers.nim
@@ -57,6 +57,7 @@ func getBeaconError(e: ReplayWaitError): BeaconError =
 proc fetchHeadersHandler*(
     buddy: BeaconBuddyRef;
     req: BlockHeadersRequest;
+    bn: BlockNumber;
       ): Future[Result[FetchHeadersData,BeaconError]]
       {.async: (raises: []).} =
   ## Replacement for `getBlockHeaders()` handler.
@@ -80,7 +81,10 @@ proc fetchHeadersHandler*(
         ", expected=" & instr.bag.req.startBlock.toStr &
         # -----
         ", reqLen=" & $req.maxResults &
-        ", expected=" & $instr.bag.req.maxResults
+        ", expected=" & $instr.bag.req.maxResults &
+        # -----
+        ", bn=" & bn.bnStr &
+        ", expected=" & instr.bag.bn.bnStr
     data = instr
 
   buddy.withInstr(ReplaySyncHeaders, info):
diff --git a/tools/syncer/replay/replay_runner/runner_dispatch/dispatch_helpers.nim b/tools/syncer/replay/replay_runner/runner_dispatch/dispatch_helpers.nim
@@ -175,8 +175,7 @@ proc newPeerImpl(
     run:              run,
     ctx:              run.ctx,
     only: BeaconBuddyData(
-      nRespErrors:   (instr.bag.peerCtx.value.nHdrErrors,
-                      instr.bag.peerCtx.value.nBlkErrors)),
+      nErrors:        instr.bag.peerCtx.value.nErrors),
     peerID:           instr.bag.peerCtx.value.peerID,
     peer: Peer(
       dispatcher:     run.ethState.capa,
@@ -348,17 +347,17 @@ proc peerStatesDifferImpl(
       info info & ": peer ctrl states differ", n, serial, peer,
         ctrl=buddy.ctrl.state, expected=instr.bag.peerCtx.value.peerCtrl
 
-    if instr.bag.peerCtx.value.nHdrErrors != buddy.only.nRespErrors.hdr:
+    if instr.bag.peerCtx.value.nErrors.fetch != buddy.nErrors.fetch:
       statesDiffer = true
-      info info & ": peer header errors differ", n, serial, peer,
-        nHdrErrors=buddy.only.nRespErrors.hdr,
-        expected=instr.bag.peerCtx.value.nHdrErrors
+      info info & ": peer fetch errors differ", n, serial, peer,
+        nHdrErrors=buddy.nErrors.fetch,
+        expected=instr.bag.peerCtx.value.nErrors
 
-    if instr.bag.peerCtx.value.nBlkErrors != buddy.only.nRespErrors.blk:
+    if instr.bag.peerCtx.value.nErrors.apply != buddy.only.nErrors.apply:
       statesDiffer = true
-      info info & ": peer body errors differ", n, serial, peer,
-        nBlkErrors=buddy.only.nRespErrors.blk,
-        expected=instr.bag.peerCtx.value.nBlkErrors
+      info info & ": peer apply errors differ", n, serial, peer,
+        nHdrErrors=buddy.nErrors.apply,
+        expected=instr.bag.peerCtx.value.nErrors.apply
 
   return statesDiffer
 
diff --git a/tools/syncer/replay/replay_runner/runner_dispatch/dispatch_sched.nim b/tools/syncer/replay/replay_runner/runner_dispatch/dispatch_sched.nim
@@ -60,7 +60,7 @@ proc schedPeerProcessImpl(
   # Activate peer
   buddy.run.nPeers.inc
 
-  discard await run.backup.schedPeer(buddy)
+  discard await run.backup.schedPeer(buddy, instr.bag.rank)
   buddy.processFinishedClearFrame(instr, info)
 
   trace info & ": end", n=run.iNum, serial=instr.bag.serial,
diff --git a/tools/syncer/replay/replay_setup.nim b/tools/syncer/replay/replay_setup.nim
@@ -65,7 +65,7 @@ proc noOpSchedDaemon(ctx: BeaconCtxRef):
     Future[Duration] {.async: (raises: []).} =
   return replayWaitMuted
 
-proc noOpSchedPeer(buddy: BeaconBuddyRef):
+proc noOpSchedPeer(buddy: BeaconBuddyRef; rank: PeerRanking):
     Future[Duration] {.async: (raises: []).} =
   return replayWaitMuted
 
@@ -95,20 +95,21 @@ proc replayStartCB(rpl: ReplayRunnerRef) =
   ##
   # Set up redirect handlers for replay
   rpl.version =          ReplayRunnerID
-  #   activate                               # use as is
-  #   suspend                                # use as is
+  #   activate                                  # use as is
+  #   suspend                                   # use as is
   rpl.reader =           ReplayReaderRef.init(rpl.captStrm)
   rpl.schedDaemon =      noOpSchedDaemon
-  rpl.schedStart =       noOpSchedStartFalse # `false` => don't register
+  rpl.schedStart =       noOpSchedStartFalse    # `false` => don't register
   rpl.schedStop =        noOpBuddy
-  rpl.schedPool =        noOpSchedPoolTrue   # `true` => stop repeating
+  rpl.schedPool =        noOpSchedPoolTrue      # `true` => stop repeating
   rpl.schedPeer =        noOpSchedPeer
-  rpl.getBlockHeaders =  fetchHeadersHandler # from dispatcher
+  rpl.getBlockHeaders =  fetchHeadersHandler    # from dispatcher
   rpl.syncBlockHeaders = noOpBuddy
-  rpl.getBlockBodies =   fetchBodiesHandler  # from dispatcher
+  rpl.getBlockBodies =   fetchBodiesHandler     # from dispatcher
   rpl.syncBlockBodies =  noOpBuddy
-  rpl.importBlock =      importBlockHandler  # from dispatcher
+  rpl.importBlock =      importBlockHandler     # from dispatcher
   rpl.syncImportBlock =  noOpBuddy
+  rpl.ctx.getPeer =      rpl.replayGetPeerFn()  # normally provided by scheduler
 
   rpl.initRunner()
 
@@ -120,6 +121,7 @@ proc replayStartCB(rpl: ReplayRunnerRef) =
     ReplayRunnerRef(self).destroyRunner()
     stopInfo.onException(DontQuit):
       ReplayRunnerRef(self).captStrm.close()
+    ReplayRunnerRef(self).ctx.getPeer =       ReplayRunnerRef(self).getPeerSave
     ReplayRunnerRef(self).ctx.pool.handlers = ReplayRunnerRef(self).backup
 
   # Start fake scheduler
@@ -155,6 +157,7 @@ proc replaySetup*(
     fakeImport:       fakeImport,
     stopQuit:         not noStopQuit,
     backup:           ctx.pool.handlers,
+    getPeerSave:      ctx.getPeer,
 
     # This is still the old descriptor which will be updated when
     # `startSync()` is run.
diff --git a/tools/syncer/syncer_test_client_replay.nim b/tools/syncer/syncer_test_client_replay.nim
@@ -10,7 +10,7 @@
 import
   std/[cmdline, os, strutils, terminal],
   pkg/[chronicles, results],
-  ../../execution_chain/[config, nimbus_desc, nimbus_execution_client],
+  ../../execution_chain/[conf, nimbus_desc, nimbus_execution_client],
   ../../execution_chain/sync/beacon,
   ./helpers/sync_ticker,
   ./replay/replay_setup
diff --git a/tools/syncer/syncer_test_client_trace.nim b/tools/syncer/syncer_test_client_trace.nim
@@ -10,7 +10,7 @@
 import
   std/[cmdline, os, strutils, terminal],
   pkg/[chronicles, confutils, results],
-  ../../execution_chain/[config, nimbus_desc, nimbus_execution_client],
+  ../../execution_chain/[conf, nimbus_desc, nimbus_execution_client],
   ../../execution_chain/sync/beacon,
   ./helpers/sync_ticker,
   ./trace/trace_setup
diff --git a/tools/syncer/trace/trace_desc.nim b/tools/syncer/trace/trace_desc.nim
@@ -28,7 +28,7 @@ export
   worker_desc
 
 const
-  TraceVersionID* = 20250917
+  TraceVersionID* = 20251022
 
   TraceSetupID* = 1                   ## Phase 1 layout ID, prepare
   TraceRunnerID* = 10                 ## Phase 2 layout ID, full execution
@@ -93,8 +93,7 @@ type
     ## Optional sub-object for `TraceRecBase`
     peerCtrl*: BuddyRunState          ## Sync peer run state
     peerID*: Hash                     ## Sync peer ID (if any)
-    nHdrErrors*: uint8                ## Header tranfer errors
-    nBlkErrors*: uint8                ## Body tranfer errors
+    nErrors*: BuddyErrors             ## Peer errors
 
   TraceRecBase* = object of RootObj
     ## Trace context applicable with and without known peer
@@ -160,7 +159,8 @@ type
   TraceSchedPeerBegin* = object of TraceRecBase
     ## Environment is captured before the peer handler body is executed.
     peerIP*: IpAddress                ## Descriptor argument
-    peerPort*: Port                   ## Descriptor argument
+    peerPort*: Port                   ## Ditto
+    rank*: PeerRanking                ## Prototype argument
 
   TraceSchedPeerEnd* = object of TraceRecBase
     ## Environment is captured when leaving peer handler.
@@ -172,6 +172,7 @@ type
     ## Environment is captured after the `getBlockHeaders()` handler is run.
     req*: BlockHeadersRequest         ## Fetch request
     ivReq*: BnRange                   ## Request as interval of block numbers
+    bn*: BlockNumber                  ## Ditto
     fetched*: Opt[FetchHeadersData]   ## If dowloaded successfully
     error*: Opt[BeaconError]
 
diff --git a/tools/syncer/trace/trace_setup/setup_headers.nim b/tools/syncer/trace/trace_setup/setup_headers.nim
@@ -29,17 +29,19 @@ logScope:
 proc fetchHeadersTrace*(
     buddy: BeaconBuddyRef;
     req: BlockHeadersRequest;
+    bn: BlockNumber;
       ): Future[Result[FetchHeadersData,BeaconError]]
       {.async: (raises: []).} =
   ## Replacement for `getBlockHeaders()` handler which in addition writes data
   ## to the output stream for tracing.
   ##
-  let data = await buddy.ctx.trace.backup.getBlockHeaders(buddy, req)
+  let data = await buddy.ctx.trace.backup.getBlockHeaders(buddy, req, bn)
 
   if not buddy.ctx.hibernate:
     var tRec: TraceFetchHeaders
     tRec.init buddy
     tRec.req = req
+    tRec.bn = bn
     if data.isOk:
       tRec.fetched = Opt.some(data.value)
     else:
diff --git a/tools/syncer/trace/trace_setup/setup_helpers.nim b/tools/syncer/trace/trace_setup/setup_helpers.nim
@@ -67,10 +67,9 @@ proc init*(tb: var TraceRecBase; buddy: BeaconBuddyRef) =
   if not trc.isNil:
     tb.init ctx
     tb.peerCtx = Opt.some(TracePeerCtx(
-      peerCtrl:   buddy.ctrl.state,
-      peerID:     buddy.peerID,
-      nHdrErrors: buddy.only.nRespErrors.hdr,
-      nBlkErrors: buddy.only.nRespErrors.blk))
+      peerCtrl: buddy.ctrl.state,
+      peerID:   buddy.peerID,
+      nErrors:  buddy.nErrors))
 
 # ------------------------------------------------------------------------------
 # Public helpers
diff --git a/tools/syncer/trace/trace_setup/setup_sched.nim b/tools/syncer/trace/trace_setup/setup_sched.nim
@@ -138,6 +138,7 @@ proc schedPoolTrace*(buddy: BeaconBuddyRef; last: bool; laps: int): bool =
 
 proc schedPeerTrace*(
     buddy: BeaconBuddyRef;
+    rank: PeerRanking;
       ): Future[Duration]
       {.async: (raises: []).} =
   ## Similar to `schedDaemonTrace()`
@@ -152,13 +153,15 @@ proc schedPeerTrace*(
     tBeg.frameID = Opt.some(tBeg.serial)
     tBeg.peerIP = buddy.getIP()
     tBeg.peerPort = buddy.getPort()
+    tBeg.rank = rank
     buddy.traceWrite tBeg
 
     trace "+Peer", peer=($buddy.peer), peerID=buddy.peerID.short,
+      rankInfo=($rank.assessed), rank=($rank.ranking),
       serial=tBeg.serial, frameID=tBeg.frameID.value.idStr,
       syncState=tBeg.syncState
 
-  let idleTime = await ctx.trace.backup.schedPeer(buddy)
+  let idleTime = await ctx.trace.backup.schedPeer(buddy, rank)
 
   if noisy:
     var tEnd: TraceSchedPeerEnd
