diff --git a/ethcore/src/block_queue.rs b/ethcore/src/block_queue.rs index ee77c56a4..dcfcec1e4 100644 --- a/ethcore/src/block_queue.rs +++ b/ethcore/src/block_queue.rs @@ -105,7 +105,7 @@ struct Verification { bad: HashSet, } -const MAX_UNVERIFIED_QUEUE_SIZE: usize = 2000; +const MAX_UNVERIFIED_QUEUE_SIZE: usize = 50000; impl BlockQueue { /// Creates a new queue instance. diff --git a/ethcore/src/client.rs b/ethcore/src/client.rs index 3582aca6c..09f7417e8 100644 --- a/ethcore/src/client.rs +++ b/ethcore/src/client.rs @@ -316,12 +316,11 @@ impl Client { self.report.write().unwrap().accrue_block(&block); trace!(target: "client", "Imported #{} ({})", header.number(), header.hash()); ret += 1; - - if self.block_queue.read().unwrap().queue_info().is_empty() { - io.send(NetworkIoMessage::User(SyncMessage::BlockVerified)).unwrap(); - } } self.block_queue.write().unwrap().mark_as_good(&good_blocks); + if !good_blocks.is_empty() && self.block_queue.read().unwrap().queue_info().is_empty() { + io.send(NetworkIoMessage::User(SyncMessage::BlockVerified)).unwrap(); + } ret } diff --git a/parity/main.rs b/parity/main.rs index 6fdbaf82c..28e448705 100644 --- a/parity/main.rs +++ b/parity/main.rs @@ -261,7 +261,7 @@ impl Informant { let sync_info = sync.status(); if let (_, &Some(ref last_cache_info), &Some(ref last_report)) = (self.chain_info.read().unwrap().deref(), self.cache_info.read().unwrap().deref(), self.report.read().unwrap().deref()) { - println!("[ {} {} ]---[ {} blk/s | {} tx/s | {} gas/s //··· {}/{} peers, {} downloaded, {}+{} queued ···// {} ({}) bl {} ({}) ex ]", + println!("[ #{} {} ]---[ {} blk/s | {} tx/s | {} gas/s //··· {}/{} peers, #{}, {}+{} queued ···// {} ({}) bl {} ({}) ex ]", chain_info.best_block_number, chain_info.best_block_hash, (report.blocks_imported - last_report.blocks_imported) / dur, @@ -270,7 +270,7 @@ impl Informant { sync_info.num_active_peers, sync_info.num_peers, - sync_info.blocks_received, + sync_info.last_imported_block_number.unwrap_or(chain_info.best_block_number), queue_info.unverified_queue_size, queue_info.verified_queue_size,