@@ -1389,8 +1389,6 @@ proc doRangeSyncStep(
13891389 # return true
13901390
13911391 try :
1392- debug " Requesting blocks range from peer"
1393-
13941392 let
13951393 blocks =
13961394 (await beaconBlocksByRange_v2 (
@@ -1525,8 +1523,6 @@ proc doRangeSidecarsStep(
15251523 SyncPushResponse ()
15261524 of ConsensusFork .Deneb , ConsensusFork .Electra :
15271525 try :
1528- debug " Requesting blob sidecars range from peer"
1529-
15301526 let
15311527 data =
15321528 (await blobSidecarsByRange (peer, request.data.slot,
@@ -1622,8 +1618,6 @@ proc doRangeSidecarsStep(
16221618 peer.updateScore (PeerScoreNoValues )
16231619 return true
16241620
1625- debug " Requesting data column sidecars range from peer"
1626-
16271621 let
16281622 data =
16291623 (await dataColumnSidecarsByRange (
@@ -1808,11 +1802,11 @@ proc startPeer(
18081802 if isNil (peerEntry):
18091803 return
18101804
1811- debug " Peer current root state" ,
1812- local_head = dag.head.slot,
1813- head_distance = overseer.syncDistance (peer)
1814-
18151805 if overseer.finalizedDistance ().get () < 4 'u64 :
1806+ debug " Peer current root state" ,
1807+ local_head = dag.head.slot,
1808+ head_distance = overseer.syncDistance (peer)
1809+
18161810 if not (await overseer.doPeerUpdateRoots (peer)):
18171811 return
18181812 if not (overseer.pool.checkPeerScore (peer)):
@@ -1825,14 +1819,14 @@ proc startPeer(
18251819
18261820 let checkpoint = getStateField (dag.headState, finalized_checkpoint)
18271821
1828- debug " Peer current forward state" ,
1829- local_checkpoint = shortLog (checkpoint),
1830- peer_finalized_distance = overseer.finalizedDistance (peer),
1831- finalized_distance = overseer.finalizedDistance ().get (),
1832- forward_block_buffer = shortLog (overseer.fblockBuffer)
1833-
18341822 if overseer.finalizedDistance ().get () > 1 'u64 :
18351823 # TODO (cheatfate): we should check for WSP.
1824+ debug " Peer current forward state" ,
1825+ local_checkpoint = shortLog (checkpoint),
1826+ peer_finalized_distance = overseer.finalizedDistance (peer),
1827+ finalized_distance = overseer.finalizedDistance ().get (),
1828+ forward_block_buffer = shortLog (overseer.fblockBuffer)
1829+
18361830 if not (overseer.fblockBuffer.almostFull ()):
18371831 if not (await overseer.doRangeSyncStep (peer, SyncQueueKind .Forward )):
18381832 return
@@ -1844,13 +1838,12 @@ proc startPeer(
18441838 if not (overseer.pool.checkPeerScore (peer)):
18451839 return
18461840
1847- debug " Peer current backfill state" ,
1848- needs_backfill = dag.needsBackfill (),
1849- backfill_slot = dag.backfill.slot,
1850- backfill_distance = overseer.backfillDistance (),
1851- backward_block_buffer = shortLog (overseer.bblockBuffer)
1852-
18531841 if dag.needsBackfill ():
1842+ debug " Peer current backfill state" ,
1843+ needs_backfill = dag.needsBackfill (),
1844+ backfill_slot = dag.backfill.slot,
1845+ backfill_distance = overseer.backfillDistance (),
1846+ backward_block_buffer = shortLog (overseer.bblockBuffer)
18541847 if overseer.wallSyncDistance () <= SyncDeviationSlotsCount :
18551848 if not (overseer.bblockBuffer.almostFull ()):
18561849 if not (
@@ -2031,17 +2024,17 @@ proc timeMonitoringLoop(
20312024
20322025 overseer.statusMessages[0 ] =
20332026 if overseer.finalizedDistance.isNone ():
2034- " initializing"
2027+ " [ initializing] "
20352028 else :
20362029 if overseer.finalizedDistance ().get () > 0 'u64 :
20372030 forwardPerf.formatString ()
20382031 else :
2039- " finished"
2032+ " [ finished] "
20402033 overseer.statusMessages[1 ] =
20412034 if overseer.backfillDistance () > 0 'u64 :
20422035 backwardPerf.formatString ()
20432036 else :
2044- " finished"
2037+ " [ finished] "
20452038
20462039 debug " Overseer debug statistics" ,
20472040 wall_slot = overseer.beaconClock.now ().slotOrZero (),
0 commit comments