This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Various state copy optimizations #2172
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
|
(hold off on merging this just yet, will do a full sync to ensure nothing is broken) |
gavofyork
added
A8-looksgood 🦄
gavofyork
approved these changes
Sep 21, 2016
gavofyork
reviewed
Sep 28, 2016
| @@ -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()); | |||
There was a problem hiding this comment.
this line cannot exist. it breaks mining.
gavofyork
reviewed
Sep 28, 2016
| @@ -167,9 +167,7 @@ impl Engine for Ethash { | |||
| for u in fields.uncles.iter() { | |||
| fields.state.add_balance(u.author(), &(reward * U256::from(8 + u.number() - current_number) / U256::from(8))); | |||
| } | |||
| if let Err(e) = fields.state.commit() { | |||
gavofyork
added a commit
that referenced
this pull request
Sep 28, 2016
gavofyork
added a commit
that referenced
this pull request
Sep 28, 2016
jacogr
added a commit
that referenced
this pull request
Sep 29, 2016
* master: Fixing Delegate Call in JIT (#2378) Prioritizing re-imported transactions (#2372) Revert #2172, pretty much. (#2387) correct sync memory usage calculation (#2385) Update gitlab-ci Fix the traceAddress field in transaction traces. (#2373) Removing extras data from retracted blocks. (#2375) fixed #2263, geth keys with ciphertext shorter than 32 bytes (#2318) Expanse compatibility (#2369) Specify column cache sizes explicitly; default fallback of 2MB (#2358) Canonical state cache (master) (#2311) make block queue into a more generic verification queue and fix block heap size calculation (#2095) Hash Content RPC method (#2355) Reorder transaction_by_hash to favour canon search (#2332) DIV optimization (#2327) Error when deserializing invalid hex (#2339) Changed http:// to https:// on some links (#2349) add a test fix migration system, better errors # Conflicts: # .gitlab-ci.yml
Merged
Closed
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.
Summary of changes:
State::clone(merged to beta in Avoid cloning clean stuff [beta backport] #2173 )State::clone