forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-25 22:26:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 82199692b0 into f58ac2b46b

Browse source
This commit is contained in:
Henning Diedrich 2016-07-22 11:44:20 +00:00 committed by GitHub
commit 972a8a3589
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
eth/downloader/downloader.go
View file

@ -412,6 +412,14 @@ func (d *Downloader) syncWithPeer(p *peer, hash common.Hash, td *big.Int) (err e
) )
case p.version >= 62: case p.version >= 62:
// essentially double check the peer-reported height. If its
// block at that height turns out to already be in our chain,
// stop search and ignore the alleged higher total difficulty
if d.hasBlockAndState(p.head) {
glog.Infof("%v: advertised a head already in our chain. Ignoring reported higher total difficulty", p)
return nil
}
// Look up the sync boundaries: the common ancestor and the target block // Look up the sync boundaries: the common ancestor and the target block
latest, err := d.fetchHeight(p) latest, err := d.fetchHeight(p)
if err != nil { if err != nil {