This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
EIP-98: Optional transaction state root #4296
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
arkpar
added
A0-pleasereview 🤓
tomusdrw
reviewed
Jan 25, 2017
| @@ -375,6 +375,9 @@ impl<'x> OpenBlock<'x> { | |||
| let unclosed_state = s.block.state.clone(); | |||
|
|
|||
| s.engine.on_close_block(&mut s.block); | |||
| if let Err(e) = s.block.state.commit() { | |||
| warn!("Encountered error on state commit: {}", e); | |||
There was a problem hiding this comment.
Shouldn't that error be propagated upstream?
There was a problem hiding this comment.
This is how commit error are handles in the rest of the codebase.
| @@ -65,6 +67,7 @@ impl From<ethjson::spec::Params> for CommonParams { | |||
| subprotocol_name: p.subprotocol_name.unwrap_or_else(|| "eth".to_owned()), | |||
| min_gas_limit: p.min_gas_limit.into(), | |||
| fork_block: if let (Some(n), Some(h)) = (p.fork_block, p.fork_hash) { Some((n.into(), h.into())) } else { None }, | |||
| eip98_transition: p.eip98_transition.map_or(0, Into::into), | |||
There was a problem hiding this comment.
Wouldn't that enable eip98 automatically for spec files where that prop is not defined (private chains?)?
There was a problem hiding this comment.
Yes, that is the intention
| @@ -519,8 +519,14 @@ impl State { | |||
|
|
|||
| // TODO uncomment once to_pod() works correctly. | |||
| // trace!("Applied transaction. Diff:\n{}\n", state_diff::diff_pod(&old, &self.to_pod())); | |||
| self.commit()?; | |||
| let receipt = Receipt::new(self.root().clone(), e.cumulative_gas_used, e.logs); | |||
| let state_root = match env_info.number < engine.params().eip98_transition { | |||
There was a problem hiding this comment.
Using if-else here would a bit more idiomatic and suprisingly shorter then match.
tomusdrw
added
A6-mustntgrumble 💦
arkpar
added
A0-pleasereview 🤓
tomusdrw
added
A8-looksgood 🦄
arkpar
changed the title
arkpar
changed the title
arkpar
added
A7-looksgoodtestsfail 🤖
gavofyork
approved these changes
Jan 25, 2017
arkpar
added
A0-pleasereview 🤓
gavofyork
added
A8-looksgood 🦄
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR removes intermediate trie commits when EIP-98 is enabled. Actual transaction parallelization is to follow.