From 77da203547b83c70d12552a86bb7beee52f6383e Mon Sep 17 00:00:00 2001
From: gary rong <garyrong0905@gmail.com>
Date: Fri, 9 Mar 2018 17:51:30 +0800
Subject: [PATCH] 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/downloader/downloader.go | 8 ++++++++
 eth/sync.go                  | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go
index 70febf4cb1..62842adbc6 100644
--- a/eth/downloader/downloader.go
+++ b/eth/downloader/downloader.go
@@ -1296,6 +1296,14 @@ func (d *Downloader) processHeaders(origin uint64, pivot uint64, td *big.Int) er
 				headers = headers[limit:]
 				origin += uint64(limit)
 			}
+
+			// Update the highest block number we know if a higher one is found.
+			d.syncStatsLock.Lock()
+			if d.syncStatsChainHeight < origin {
+				d.syncStatsChainHeight = origin - 1
+			}
+			d.syncStatsLock.Unlock()
+
 			// Signal the content downloaders of the availablility of new tasks
 			for _, ch := range []chan bool{d.bodyWakeCh, d.receiptWakeCh} {
 				select {
diff --git a/eth/sync.go b/eth/sync.go
index 2da1464bc5..e49e40087e 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