grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #343 from ethcore/sync

Browse Source 
Fixed sync stalling on fork
This commit is contained in:
Nikolay Volf 2016-02-04 15:48:49 +03:00
commit a87e63f996
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sync/src/chain.rs
View File

@ -322,13 +322,13 @@ impl ChainSync {
//validate chain //validate chain
let base_hash = self.last_imported_hash.clone().unwrap(); let base_hash = self.last_imported_hash.clone().unwrap();
if self.have_common_block && number == self.current_base_block() + 1 && info.parent_hash != base_hash { if self.have_common_block && number == self.current_base_block() + 1 && info.parent_hash != base_hash {
// TODO: lower peer rating // Part of the forked chain. Restart to find common block again
debug!(target: "sync", "Mismatched block header {} {}", number, hash); debug!(target: "sync", "Mismatched block header {} {}, restarting sync", number, hash);
continue; self.restart(io);
return Ok(());
} }
if self.headers.find_item(&(number - 1)).map_or(false, |p| p.hash != info.parent_hash) { if self.headers.find_item(&(number - 1)).map_or(false, |p| p.hash != info.parent_hash) {
// mismatching parent id, delete the previous block and don't add this one // mismatching parent id, delete the previous block and don't add this one
// TODO: lower peer rating
debug!(target: "sync", "Mismatched block header {} {}", number, hash); debug!(target: "sync", "Mismatched block header {} {}", number, hash);
self.remove_downloaded_blocks(number - 1); self.remove_downloaded_blocks(number - 1);
continue; continue;