From faf0428b60831434838b70fe064c87b8ee024ab5 Mon Sep 17 00:00:00 2001 From: debris Date: Sun, 27 Aug 2017 12:47:00 +0200 Subject: [PATCH 1/2] fixed pending block panic, closes #6239 --- ethcore/src/ethereum/ethash.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs index 6235255e4..fc7b27403 100644 --- a/ethcore/src/ethereum/ethash.rs +++ b/ethcore/src/ethereum/ethash.rs @@ -187,7 +187,14 @@ impl Engine for Arc { /// Additional engine-specific information for the user/developer concerning `header`. fn extra_info(&self, header: &Header) -> BTreeMap { - map!["nonce".to_owned() => format!("0x{}", header.nonce().hex()), "mixHash".to_owned() => format!("0x{}", header.mix_hash().hex())] + if header.seal().len() == self.seal_fields() { + map![ + "nonce".to_owned() => format!("0x{}", header.nonce().hex()), + "mixHash".to_owned() => format!("0x{}", header.mix_hash().hex()) + ] + } else { + BTreeMap::default() + } } fn schedule(&self, block_number: BlockNumber) -> Schedule { From 622632616c48431314e707e613cf1f8e5f70ee2f Mon Sep 17 00:00:00 2001 From: Hawstein Date: Mon, 28 Aug 2017 15:19:04 +0800 Subject: [PATCH 2/2] fix bloom bitvecjournal storage allocation (#6390) --- util/bloom/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/bloom/src/lib.rs b/util/bloom/src/lib.rs index 16e0e5368..91897ed44 100644 --- a/util/bloom/src/lib.rs +++ b/util/bloom/src/lib.rs @@ -37,9 +37,9 @@ struct BitVecJournal { impl BitVecJournal { pub fn new(size: usize) -> BitVecJournal { - let extra = if size % 8 > 0 { 1 } else { 0 }; + let extra = if size % 64 > 0 { 1 } else { 0 }; BitVecJournal { - elems: vec![0u64; size / 8 + extra], + elems: vec![0u64; size / 64 + extra], journal: HashSet::new(), } }