From 77da203547b83c70d12552a86bb7beee52f6383e Mon Sep 17 00:00:00 2001 From: gary rong Date: Fri, 9 Mar 2018 17:51:30 +0800 Subject: eth: update higest block we know during the sync if a higher was found (#16283) * eth: update higest block we know during the sync if a higher was found * eth: avoid useless sync in fast sync --- eth/sync.go | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'eth/sync.go') diff --git a/eth/sync.go b/eth/sync.go index 2da1464bc..e49e40087 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -188,6 +188,14 @@ func (pm *ProtocolManager) synchronise(peer *peer) { atomic.StoreUint32(&pm.fastSync, 1) mode = downloader.FastSync } + + if mode == downloader.FastSync { + // Make sure the peer's total difficulty we are synchronizing is higher. + if pm.blockchain.GetTdByHash(pm.blockchain.CurrentFastBlock().Hash()).Cmp(pTd) >= 0 { + return + } + } + // Run the sync cycle, and disable fast sync if we've went past the pivot block if err := pm.downloader.Synchronise(peer.id, pHead, pTd, mode); err != nil { return -- cgit v1.2.3