wip: pruned gap sync with ConsensusBroadcast origin#9678
Closed
wip: pruned gap sync with ConsensusBroadcast origin#9678
ConsensusBroadcast origin#9678Conversation
sistemd
commented
Sep 8, 2025
Comment on lines
+1478
to
+1489
| // Calculate the weight of the block in case it is missing. | ||
| let stored_weight = aux_schema::load_block_weight(&*self.client, hash) | ||
| .map_err(|e| ConsensusError::ClientImport(e.to_string()))?; | ||
| // If the stored weight is missing, it means it was skipped when the block was first | ||
| // imported. It needs to happen again, along with epoch change tracking. | ||
| if stored_weight.is_some() { | ||
| // When re-importing existing block strip away intermediates. | ||
| // In case of initial sync intermediates should not be present... | ||
| let _ = block.remove_intermediate::<BabeIntermediate<Block>>(INTERMEDIATE_KEY); | ||
| block.fork_choice = Some(ForkChoiceStrategy::Custom(false)); | ||
| return self.inner.import_block(block).await.map_err(Into::into) | ||
| } |
Contributor
Author
There was a problem hiding this comment.
This is the really ugly part - first warp sync imports the block, but skips a bunch of stuff, including the weight calculation. Then when re-importing we check if the weight is missing, and if it is, we do everything in the re-import that normally happens during regular block import (weight calculation and epoch changes tracking).
sistemd
commented
Sep 8, 2025
| /// Re-validate existing block. | ||
| pub import_existing: bool, | ||
| /// Re-validate existing block. | ||
| pub allow_missing_parent: bool, |
Contributor
Author
There was a problem hiding this comment.
I know you want me to rename this - I'll get to it eventually 😄
sistemd
commented
Sep 8, 2025
Comment on lines
+505
to
+511
| let create_gap = if origin == BlockOrigin::ConsensusBroadcast { | ||
| // Never create gaps for consensus imported blocks, because this import origin is used | ||
| // during warp sync, and the following gap sync needs to import all blocks. | ||
| false | ||
| } else { | ||
| create_gap | ||
| }; |
Contributor
There was a problem hiding this comment.
This one we could get rid of. In the end you have control over the import parameters here:
You could just set create_gap to false there.
Contributor
|
Ah btw, if this importing of justifications currently fails on master, please make sure that this does not get published in the 2509 release. Meaning that you should revert the old changes that don't work, and backport the revert. |
github-merge-queue Bot
pushed a commit
that referenced
this pull request
Feb 13, 2026
This PR fixes block import during Warp sync, which was silently failing due to "Unknown parent" errors - a typical case during Warp sync and the `full_node_warp_sync` test was not detecting such failure. Changes - Relaxed verification for Warp synced blocks: The fix relaxes verification requirements for Warp synced blocks by not performing full verification, with the assumption that these blocks are part of the finalized chain and have already been verified using the provided warp sync proof. - New `BlockOrigin` variants: For improved clarity, two additional `BlockOrigin` items have been introduced: - `WarpSync` - `GapSync` - Gap sync improvements: Warp synced blocks are now skipped during the gap sync block import phase, which required improvements to gap handling when committing the block import operation in the database. - Enhanced testing: The Warp sync zombienet test has been modified to more thoroughly assert both warp and gap sync phases. This PR builds on changes by @sistemd in #9678 --------- Co-authored-by: sistemd <enntheprogrammer@gmail.com> Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>
lrubasze
added a commit
that referenced
this pull request
Mar 4, 2026
This PR fixes block import during Warp sync, which was silently failing due to "Unknown parent" errors - a typical case during Warp sync and the `full_node_warp_sync` test was not detecting such failure. Changes - Relaxed verification for Warp synced blocks: The fix relaxes verification requirements for Warp synced blocks by not performing full verification, with the assumption that these blocks are part of the finalized chain and have already been verified using the provided warp sync proof. - New `BlockOrigin` variants: For improved clarity, two additional `BlockOrigin` items have been introduced: - `WarpSync` - `GapSync` - Gap sync improvements: Warp synced blocks are now skipped during the gap sync block import phase, which required improvements to gap handling when committing the block import operation in the database. - Enhanced testing: The Warp sync zombienet test has been modified to more thoroughly assert both warp and gap sync phases. This PR builds on changes by @sistemd in #9678 --------- Co-authored-by: sistemd <enntheprogrammer@gmail.com> Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>
paritytech-release-backport-bot Bot
pushed a commit
that referenced
this pull request
Mar 4, 2026
This PR fixes block import during Warp sync, which was silently failing due to "Unknown parent" errors - a typical case during Warp sync and the `full_node_warp_sync` test was not detecting such failure. Changes - Relaxed verification for Warp synced blocks: The fix relaxes verification requirements for Warp synced blocks by not performing full verification, with the assumption that these blocks are part of the finalized chain and have already been verified using the provided warp sync proof. - New `BlockOrigin` variants: For improved clarity, two additional `BlockOrigin` items have been introduced: - `WarpSync` - `GapSync` - Gap sync improvements: Warp synced blocks are now skipped during the gap sync block import phase, which required improvements to gap handling when committing the block import operation in the database. - Enhanced testing: The Warp sync zombienet test has been modified to more thoroughly assert both warp and gap sync phases. This PR builds on changes by @sistemd in #9678 --------- Co-authored-by: sistemd <enntheprogrammer@gmail.com> Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit b2a4296)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 is only the changes for BABE right now, AURA side also needs to be updated. IMO this is not looking very good.