This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Uncle inclusion in block authoring. #578
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
gavofyork
added
A0-pleasereview 🤓
gavofyork
removed
the
A3-inprogress ⏳
| @@ -203,7 +203,7 @@ pub struct Client { | |||
| extra_data: RwLock<Bytes>, | |||
| } | |||
|
|
|||
| const HISTORY: u64 = 1000; | |||
arkpar
added
A5-grumble 🔥
|
Needs merge |
gavofyork
added
A0-pleasereview 🤓
arkpar
added
A8-looksgood 🦄
gavofyork
added
the
A3-inprogress ⏳
gavofyork
added
A0-pleasereview 🤓
| @@ -220,8 +220,8 @@ impl<'x> OpenBlock<'x> { | |||
| /// NOTE Will check chain constraints and the uncle number but will NOT check | |||
| /// that the header itself is actually valid. | |||
| pub fn push_uncle(&mut self, valid_uncle_header: Header) -> Result<(), BlockError> { | |||
| if self.block.base.uncles.len() >= self.engine.maximum_uncle_count() { | |||
| return Err(BlockError::TooManyUncles(OutOfBounds{min: None, max: Some(self.engine.maximum_uncle_count()), found: self.block.base.uncles.len()})); | |||
| if self.block.base.uncles.len() + 1 > self.engine.maximum_uncle_count() { | |||
There was a problem hiding this comment.
Make this a little more readable
| @@ -200,6 +201,7 @@ pub struct Client<V = CanonVerifier> where V: Verifier { | |||
| panic_handler: Arc<PanicHandler>, | |||
|
|
|||
| // for sealing... | |||
| sealing_enabled: AtomicBool, | |||
There was a problem hiding this comment.
Add flag for remembering if we should be sealing or not.
arkpar
added
A8-looksgood 🦄
gavofyork
pushed a commit
that referenced
this pull request
Mar 5, 2016
Uncle inclusion in block authoring.
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.
No description provided.