interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cmd/geth, eth: bump version & tmp fix for incorrect TD peers

This commit is contained in:
obscuren 2015-05-03 14:11:47 +02:00
parent f2a2b2ac70
commit ba2236fa51
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/geth/main.go
View File

@ -47,7 +47,7 @@ import _ "net/http/pprof"
const ( const (
ClientIdentifier = "Geth" ClientIdentifier = "Geth"
Version = "0.9.14" Version = "0.9.15"
) )
var ( var (

7
eth/sync.go
View File

@ -89,6 +89,13 @@ func (pm *ProtocolManager) synchronise(peer *peer) {
return return
} }
// FIXME if we have the hash in our chain and the TD of the peer is
// much higher than ours, something is wrong with us or the peer.
// Check if the hash is on our own chain
if pm.chainman.HasBlock(peer.recentHash) {
return
}
// Get the hashes from the peer (synchronously) // Get the hashes from the peer (synchronously)
err := pm.downloader.Synchronise(peer.id, peer.recentHash) err := pm.downloader.Synchronise(peer.id, peer.recentHash)
if err != nil && err == downloader.ErrBadPeer { if err != nil && err == downloader.ErrBadPeer {