forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 09:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

internal: fix downloader synchronising judgement

Browse source
This commit is contained in:
rjl493456442 2018-03-03 13:26:33 +08:00
parent fa375955ad
commit d5c3458b37
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
eth/downloader/downloader.go
View file

@ -253,10 +253,18 @@ func (d *Downloader) Progress() ethereum.SyncProgress {
case LightSync: case LightSync:
current = d.lightchain.CurrentHeader().Number.Uint64() current = d.lightchain.CurrentHeader().Number.Uint64()
} }
// If the current block number is greater than the highest block number when synchronization started
// due to pivot point moving, using the current block number as a replacement.
highest := d.syncStatsChainHeight
if current > highest {
highest = current
}
return ethereum.SyncProgress{ return ethereum.SyncProgress{
StartingBlock: d.syncStatsChainOrigin, StartingBlock: d.syncStatsChainOrigin,
CurrentBlock: current, CurrentBlock: current,
HighestBlock: d.syncStatsChainHeight, HighestBlock: highest,
PulledStates: d.syncStatsState.processed, PulledStates: d.syncStatsState.processed,
KnownStates: d.syncStatsState.processed + d.syncStatsState.pending, KnownStates: d.syncStatsState.processed + d.syncStatsState.pending,
} }

2
internal/ethapi/api.go
View file

@ -80,7 +80,7 @@ func (s *PublicEthereumAPI) Syncing() (interface{}, error) {
progress := s.b.Downloader().Progress() progress := s.b.Downloader().Progress()
// Return not syncing if the synchronisation already completed // Return not syncing if the synchronisation already completed
if progress.CurrentBlock >= progress.HighestBlock { if !s.b.Downloader().Synchronising() {
return false, nil return false, nil
} }
// Otherwise gather the block sync stats // Otherwise gather the block sync stats