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

Various state copy optimizations #2172

Merged
merged 5 commits into from
Sep 21, 2016
Merged

Various state copy optimizations #2172

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7297500
Avoid cloning clean stuff
tomusdrw Sep 19, 2016
16f4535
Don't clone state when closing/locking blocks
rphmeier Sep 19, 2016
7d7fd74
handle errors in commit
rphmeier Sep 19, 2016
9e97da5
revert `close_and_lock` changes
rphmeier Sep 19, 2016
24b4332
defer state root update until post state commit
rphmeier Sep 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ethcore/src/block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@ impl<'x> OpenBlock<'x> {
if s.block.base.header.receipts_root().is_zero() || s.block.base.header.receipts_root() == &SHA3_NULL_RLP {
s.block.base.header.set_receipts_root(ordered_trie_root(s.block.receipts.iter().map(|r| r.rlp_bytes().to_vec()).collect()));
}

s.block.base.header.set_state_root(s.block.state.root().clone());
s.block.base.header.set_log_bloom(s.block.receipts.iter().fold(LogBloom::zero(), |mut b, r| {b = &b | &r.log_bloom; b})); //TODO: use |= operator
s.block.base.header.set_gas_used(s.block.receipts.last().map_or(U256::zero(), |r| r.gas_used));
Expand Down Expand Up @@ -419,6 +420,10 @@ impl ClosedBlock {
warn!("Error committing closed block's state: {:?}", e);
}

// set the state root here, after commit recalculates with the block
// rewards.
self.block.base.header.set_state_root(self.block.state.root().clone());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line cannot exist. it breaks mining.


LockedBlock {
block: self.block,
uncle_bytes: self.uncle_bytes,
Expand Down