From 9da51837f9b236316535c24748e0d3017dbc69cd Mon Sep 17 00:00:00 2001 From: cheatfate Date: Fri, 10 Jan 2025 04:27:50 +0200 Subject: [PATCH] Remove LFS fixes from the PR. --- beacon_chain/nimbus_beacon_node.nim | 9 +++------ beacon_chain/sync/sync_overseer.nim | 6 ++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/beacon_chain/nimbus_beacon_node.nim b/beacon_chain/nimbus_beacon_node.nim index 7e772037cd..e0fbc91201 100644 --- a/beacon_chain/nimbus_beacon_node.nim +++ b/beacon_chain/nimbus_beacon_node.nim @@ -381,14 +381,11 @@ proc initFullNode( else: dag.tail.slot - proc getUntrustedBackfillSlot(): Slot = + func getUntrustedBackfillSlot(): Slot = if clist.tail.isSome(): clist.tail.get().blck.slot else: - getLocalWallSlot() - - func getUntrustedFrontfillSlot(): Slot = - getFirstSlotAtFinalizedEpoch() + dag.tail.slot func getFrontfillSlot(): Slot = max(dag.frontfill.get(BlockId()).slot, dag.horizon) @@ -531,7 +528,7 @@ proc initFullNode( dag.cfg.DENEB_FORK_EPOCH, dag.cfg.MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS, SyncQueueKind.Backward, getLocalHeadSlot, getLocalWallSlot, getFirstSlotAtFinalizedEpoch, getUntrustedBackfillSlot, - getUntrustedFrontfillSlot, isWithinWeakSubjectivityPeriod, + getFrontfillSlot, isWithinWeakSubjectivityPeriod, clistPivotSlot, untrustedBlockVerifier, maxHeadAge = 0, shutdownEvent = node.shutdownEvent, flags = syncManagerFlags) diff --git a/beacon_chain/sync/sync_overseer.nim b/beacon_chain/sync/sync_overseer.nim index cbbab92849..c8c6302f66 100644 --- a/beacon_chain/sync/sync_overseer.nim +++ b/beacon_chain/sync/sync_overseer.nim @@ -1,5 +1,5 @@ # beacon_chain -# Copyright (c) 2018-2025 Status Research & Development GmbH +# Copyright (c) 2018-2024 Status Research & Development GmbH # Licensed and distributed under either of # * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). @@ -200,7 +200,7 @@ proc updatePerformance(overseer: SyncOverseerRef, startTick: Moment, # Update status string overseer.statusMsg = Opt.some( - "fill: " & timeleft.toTimeLeftString() & " (" & + timeleft.toTimeLeftString() & " (" & (done * 100).formatBiggestFloat(ffDecimal, 2) & "%) " & overseer.avgSpeed.formatBiggestFloat(ffDecimal, 4) & "slots/s (" & $dag.head.slot & ")") @@ -521,8 +521,6 @@ proc mainLoop*( quit 1 overseer.untrustedInProgress = false - # Reset status bar - overseer.statusMsg = Opt.none(string) # When we finished state rebuilding process - we could start forward # SyncManager which could perform finish sync.