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

Additional snapshot sync checks (#3318)

Browse Source 
* Additional snapshot sync checks

* Proper checks

* Proper highset block check


Former-commit-id: 402a6ca55670f9c197b3d673e91528b853b1b7d6
This commit is contained in:
Arkadiy Paronyan 2016-11-09 19:40:36 +01:00
parent bfc99f5a76
commit 20ca56490e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sync/src/chain.rs
View File

@ -457,12 +457,19 @@ impl ChainSync {
if self.state != SyncState::WaitingPeers { if self.state != SyncState::WaitingPeers {
return; return;
} }
let best_block = io.chain().chain_info().best_block_number; // Make sure the snapshot block is not too far away from best block and network best block and
// that it is higher than fork detection block
let our_best_block = io.chain().chain_info().best_block_number;
let fork_block = self.fork_block.as_ref().map(|&(n, _)| n).unwrap_or(0);
let (best_hash, max_peers, snapshot_peers) = { let (best_hash, max_peers, snapshot_peers) = {
//collect snapshot infos from peers //collect snapshot infos from peers
let snapshots = self.peers.iter() let snapshots = self.peers.iter()
.filter(|&(_, p)| p.is_allowed() && p.snapshot_number.map_or(false, |sn| best_block < sn && (sn - best_block) > SNAPSHOT_RESTORE_THRESHOLD)) .filter(|&(_, p)| p.is_allowed() && p.snapshot_number.map_or(false, |sn|
our_best_block < sn && (sn - our_best_block) > SNAPSHOT_RESTORE_THRESHOLD &&
sn > fork_block &&
self.highest_block.map_or(true, |highest| highest >= sn && (highest - sn) <= SNAPSHOT_RESTORE_THRESHOLD)
))
.filter_map(|(p, peer)| peer.snapshot_hash.map(|hash| (p, hash.clone()))); .filter_map(|(p, peer)| peer.snapshot_hash.map(|hash| (p, hash.clone())));
let mut snapshot_peers = HashMap::new(); let mut snapshot_peers = HashMap::new();