Fix when starting fast sync, forked #1290
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
pipermerriam
approved these changes
Sep 13, 2018
| @@ -720,6 +721,10 @@ def validate_uncles(self, block: BaseBlock) -> None: | |||
| """ | |||
| Validate the uncles for the given block. | |||
| """ | |||
| if block.header.uncles_hash == EMPTY_UNCLE_HASH and len(block.uncles) == 0: | |||
There was a problem hiding this comment.
If you get back in here, you might expand this to:
has_uncles = len(block.uncles) > 0
should_have_uncles = block.header.uncles_hash != EMPTY_UNCLE_HASH
if not has_uncles and not should_have_uncles:
return #otpimization
elif has_uncles and not should_have_uncles:
raise ValidationError("Block has uncles but header suggests uncles should be empty")
elif should_have_uncles and not has_uncles:
raise ValidationError("Header suggests block should have uncles but block has no uncles")There was a problem hiding this comment.
Will do in a follow-up
| @@ -220,7 +220,7 @@ def call_later(self, delay: float, callback: 'Callable[..., None]', *args: Any) | |||
|
|
|||
| @functools.wraps(callback) | |||
| async def _call_later_wrapped() -> None: | |||
| self.sleep(delay) | |||
| await self.sleep(delay) | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What was wrong?
When running fast sync, it might start on a fork from the end of the last sync. This was causing a crash.
Other similar problems are currently possible (but shouldn't be for long), like starting later than the canonical head, because headers were saved into an inconsistent state.
How was it fixed?
Catch the
ValidationErrorwhen trying to register the block/receipt download tasks. Confirm that the parent header already exists (which the common sync should have already done). Then allow the sync to continue, with a log.This required a change in
OrderedTaskPreparation: it can now accept multiple "already finished" tasks.Some other bonus fixes:
Cute Animal Picture