Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

Commit 600eefd

Browse files
tomusdrwniklasad1
authored andcommitted
Fix empty steps (#9939)
* Don't send empty step twice or empty step then block. * Perform basic validation of locally sealed blocks. * Don't include empty step twice.
1 parent d65db75 commit 600eefd

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

ethcore/src/client/client.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2305,11 +2305,7 @@ impl ScheduleInfo for Client {
23052305
impl ImportSealedBlock for Client {
23062306
fn import_sealed_block(&self, block: SealedBlock) -> EthcoreResult<H256> {
23072307
let start = Instant::now();
2308-
let raw = block.rlp_bytes();
23092308
let header = block.header().clone();
2310-
let hash = header.hash();
2311-
self.notify(|n| n.block_pre_import(&raw, &hash, header.difficulty()));
2312-
23132309
let route = {
23142310
// Do a super duper basic verification to detect potential bugs
23152311
if let Err(e) = self.engine.verify_block_basic(&header) {
@@ -2327,31 +2323,32 @@ impl ImportSealedBlock for Client {
23272323
let block_data = block.rlp_bytes();
23282324

23292325
let route = self.importer.commit_block(block, &header, encoded::Block::new(block_data), self);
2330-
trace!(target: "client", "Imported sealed block #{} ({})", header.number(), hash);
2326+
trace!(target: "client", "Imported sealed block #{} ({})", header.number(), header.hash());
23312327
self.state_db.write().sync_cache(&route.enacted, &route.retracted, false);
23322328
route
23332329
};
2330+
let h = header.hash();
23342331
let route = ChainRoute::from([route].as_ref());
23352332
self.importer.miner.chain_new_blocks(
23362333
self,
2337-
&[hash],
2334+
&[h],
23382335
&[],
23392336
route.enacted(),
23402337
route.retracted(),
23412338
self.engine.seals_internally().is_some(),
23422339
);
23432340
self.notify(|notify| {
23442341
notify.new_blocks(
2345-
vec![hash],
2342+
vec![h],
23462343
vec![],
23472344
route.clone(),
2348-
vec![hash],
2345+
vec![h],
23492346
vec![],
23502347
start.elapsed(),
23512348
);
23522349
});
23532350
self.db.read().key_value().flush().expect("DB flush failed.");
2354-
Ok(hash)
2351+
Ok(h)
23552352
}
23562353
}
23572354

0 commit comments

Comments
 (0)