From 13bd2b4371bb7ec19f3edeb15ee6ef777256401c Mon Sep 17 00:00:00 2001 From: Gary Rong Date: Wed, 18 Jun 2025 14:31:38 +0800 Subject: [PATCH] eth: polish --- eth/catalyst/api.go | 2 +- eth/downloader/beacondevsync.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go index e5a99a5253..03eb3c7b61 100644 --- a/eth/catalyst/api.go +++ b/eth/catalyst/api.go @@ -283,7 +283,7 @@ func (api *ConsensusAPI) forkchoiceUpdated(update engine.ForkchoiceStateV1, payl // that should be fixed, not papered over. header := api.remoteBlocks.get(update.HeadBlockHash) if header == nil { - log.Warn("Forkchoice requested unknown head, trying to retrieve it from a random peer", "hash", update.HeadBlockHash) + log.Warn("Forkchoice requested unknown head, trying to retrieve from network", "hash", update.HeadBlockHash) retrievedHead, err := api.eth.Downloader().GetHeader(update.HeadBlockHash) if err != nil { log.Warn("Could not retrieve unknown head from peers") diff --git a/eth/downloader/beacondevsync.go b/eth/downloader/beacondevsync.go index 314704a751..0032eb53b9 100644 --- a/eth/downloader/beacondevsync.go +++ b/eth/downloader/beacondevsync.go @@ -64,20 +64,21 @@ func (d *Downloader) GetHeader(hash common.Hash) (*types.Header, error) { // available due to fresh startup d.peers.lock.RLock() defer d.peers.lock.RUnlock() + for _, peer := range d.peers.peers { if peer == nil { return nil, errors.New("could not find peer") } // Found a peer, attempt to retrieve the header whilst blocking and // retry if it fails for whatever reason - log.Debug("Attempting to retrieve sync target", "peer", peer.id) + log.Debug("Attempting to retrieve sync target", "peer", peer.id, "hash", hash) headers, metas, err := d.fetchHeadersByHash(peer, hash, 1, 0, false) if err != nil || len(headers) != 1 { continue } // Head header retrieved, if the hash matches, start the actual sync if metas[0] != hash { - log.Warn("Received invalid sync target", "want", hash, "have", metas[0]) + log.Warn("Received invalid sync target", "peer", peer.id, "want", hash, "have", metas[0]) continue } return headers[0], nil