forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 18075407c9 into 6d1e292eef

Browse source
This commit is contained in:
gary rong 2018-08-13 05:35:27 +00:00 committed by GitHub
commit 7ce7c8effe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/blockchain.go
View file

@ -107,7 +107,6 @@ type BlockChain struct {
chainmu sync.RWMutex // blockchain insertion lock
procmu sync.RWMutex // block processor lock
checkpoint int // checkpoint counts towards the new checkpoint
currentBlock atomic.Value // Current head of the block chain
currentFastBlock atomic.Value // Current head of the fast-sync chain (may be above the block chain!)

6
eth/sync.go
View file

@ -171,7 +171,7 @@ func (pm *ProtocolManager) synchronise(peer *peer) {
td := pm.blockchain.GetTd(currentBlock.Hash(), currentBlock.NumberU64())
pHead, pTd := peer.Head()
if pTd.Cmp(td) <= 0 {
if pTd == nil || pTd.Cmp(td) <= 0 {
return
}
// Otherwise try to sync with the downloader
@ -190,8 +190,10 @@ func (pm *ProtocolManager) synchronise(peer *peer) {
}
if mode == downloader.FastSync {
currentFastBlock := pm.blockchain.CurrentFastBlock()
fastTd := pm.blockchain.GetTd(currentFastBlock.Hash(), currentFastBlock.NumberU64())
// Make sure the peer's total difficulty we are synchronizing is higher.
if pm.blockchain.GetTdByHash(pm.blockchain.CurrentFastBlock().Hash()).Cmp(pTd) >= 0 {
if pTd.Cmp(fastTd) <= 0 {
return
}
}