merge queue: embarking unstable (bbe7ead) and [#9394 + #9379] together#9395
Closed
mergify[bot] wants to merge 8 commits into
Closed
merge queue: embarking unstable (bbe7ead) and [#9394 + #9379] together#9395mergify[bot] wants to merge 8 commits into
mergify[bot] wants to merge 8 commits into
Conversation
Replace the two separate sidecar parent-unknown variants
(UnknownParentDataColumn and UnknownParentPartialDataColumn) with a
single header-based variant UnknownParentHeader { peer_id, block_root,
parent_root, slot }. This carries only the header info needed to trigger
a parent lookup, decoupled from the concrete sidecar type.
The two gossip senders (data-column and partial-data-column
ParentUnknown handlers) now emit UnknownParentHeader, and the manager
collapses both handler arms into one. The now-dead
BlockComponent::PartialDataColumn variant (functionally identical to
DataColumn) is removed.
…:Sidecar Use `SyncMessage::UnknownParentSidecarHeader` (was `UnknownParentHeader`) and `BlockComponent::Sidecar` (was `BlockComponent::DataColumn`) for naming consistency with PR 9155. The parent-unknown path is type-agnostic (header-based), so `Sidecar` is the accurate name; `get_type` label updated to "sidecar".
The sidecar parent-unknown path only ever reads the parent root (the
`DownloadResult`'s block_root/seen_timestamp/peer_group were never used, and
`add_child_components` ignores the payload). Replace
`Sidecar(DownloadResult<Hash256>)` with a named-field `Sidecar { parent_root: Hash256 }`.
This was referenced Jun 2, 2026
Open
|
|
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.
✨ Pull request #9394 which was ahead in the queue has been dequeued (for the following reason:
checks failed). The pull request [#9394 + #9379] has been re-embarked. ✨Branch unstable (bbe7ead) and [#9394 + #9379] are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of [#9394 + #9379].
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue rule
defaultfor merge:check-success=local-testnet-successcheck-success=test-suite-success#approved-reviews-by >= 1[🛡 GitHub branch protection]Required conditions to stay in the queue:
#approved-reviews-by >= 1#approved-reviews-by >= 1[🛡 GitHub branch protection]check-success=license/clacheck-success=target-branch-checklabel!=do-not-merge