From 3f0e3c1078e8a6df79b95cfcf7edee3f502539be Mon Sep 17 00:00:00 2001 From: jsvisa Date: Thu, 6 Nov 2025 10:07:54 +0800 Subject: [PATCH] Revert "eth/syncer: advance safe and finalized block" This reverts commit b266cc2482fa3c04178ecf2321866087eb0a7697. --- eth/syncer/syncer.go | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/eth/syncer/syncer.go b/eth/syncer/syncer.go index 02dc224d06..6b33ec54ba 100644 --- a/eth/syncer/syncer.go +++ b/eth/syncer/syncer.go @@ -22,7 +22,6 @@ import ( "sync" "time" - beaconparams "github.com/ethereum/go-ethereum/beacon/params" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/eth" @@ -130,11 +129,7 @@ func (s *Syncer) run() { break } if resync { - err := s.backend.Downloader().BeaconDevSync(ethconfig.FullSync, target) - if err == nil { - s.advanceDevFinality() - } - req.errc <- err + req.errc <- s.backend.Downloader().BeaconDevSync(ethconfig.FullSync, target) } case <-ticker.C: @@ -201,33 +196,3 @@ func NewAPI(s *Syncer) *API { func (api *API) Sync(target common.Hash) error { return api.s.Sync(target) } - -// advanceDevFinality synthesizes safe/finalized heads for the dev beacon-sync -func (s *Syncer) advanceDevFinality() { - bc := s.backend.BlockChain() - - head := bc.CurrentBlock() - if head == nil { - return - } - - safeNumber := head.Number.Uint64() - beaconparams.EpochLength - safeHeader := bc.GetHeaderByNumber(safeNumber) - if safeHeader == nil { - log.Warn("Dev sync could not resolve safe header", "number", safeNumber) - return - } - if safe := bc.CurrentSafeBlock(); safe == nil || safe.Hash() != safeHeader.Hash() { - bc.SetSafe(safeHeader) - } - - finalNumber := safeNumber - beaconparams.EpochLength - finalHeader := bc.GetHeaderByNumber(finalNumber) - if finalHeader == nil { - log.Warn("Dev sync could not resolve finalized header", "number", finalNumber) - return - } - if finalized := bc.CurrentFinalBlock(); finalized == nil || finalized.Hash() != finalHeader.Hash() { - bc.SetFinalized(finalHeader) - } -}