modularise message routing for sidecars #7751
Open
+209
−150
Conversation
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
arnetheduck
reviewed
Nov 24, 2025
Comment on lines
+271
to
+273
| let v = router.validateRouteBlock(blck, checkValidator) | ||
| if v.isErr(): | ||
| return err(v.error) |
Member
There was a problem hiding this comment.
Suggested change
| let v = router.validateRouteBlock(blck, checkValidator) | |
| if v.isErr(): | |
| return err(v.error) | |
| ? router.validateRouteBlock(blck, checkValidator) |
| sidecarOpt = Opt.some(blobs.mapIt(newClone(it))) | ||
| proc publishSidecars( | ||
| router: ref MessageRouter, | ||
| blck: ForkySignedBeaconBlock, |
Member
There was a problem hiding this comment.
Suggested change
| blck: ForkySignedBeaconBlock, | |
| blck: fulu.SignedBeaconBlock, |
we should not be defining this function for mismatching sidecar and block forks
Comment on lines
+153
to
+155
| if not (sidecarsOpt.isSome() and typeof(blck).kind >= ConsensusFork.Fulu): | ||
| return Opt.none(fulu.DataColumnSidecars) | ||
|
|
Member
There was a problem hiding this comment.
Suggested change
| if not (sidecarsOpt.isSome() and typeof(blck).kind >= ConsensusFork.Fulu): | |
| return Opt.none(fulu.DataColumnSidecars) |
| const finalSidecars = noSidecars | ||
| elif someSidecarsOpt is NoSidecarsAtFork and | ||
| typeof(blck).kind in ConsensusFork.Deneb..ConsensusFork.Electra: | ||
| let finalSidecars = Opt.none(BlobSidecars) |
Member
There was a problem hiding this comment.
why is there no routing here?
| forkyBlck, Opt.some( | ||
| forkyBlck.create_blob_sidecars(kzg_proofs, blobs)), | ||
| Opt.none(seq[fulu.DataColumnSidecar]), | ||
| checkValidator = true) |
Member
There was a problem hiding this comment.
why not overload routeSignedBeaconBlock too?
tersec
reviewed
Nov 24, 2025
| MsgSource.api, blck, sidecarOpt) | ||
| proc publishSidecars*( | ||
| router: ref MessageRouter, | ||
| blck: ForkySignedBeaconBlock, |
Contributor
There was a problem hiding this comment.
Same point about mismatching block types/sidecar types
tersec
reviewed
Nov 24, 2025
| if dc.index in allowed: | ||
| finalCols.add newClone(dc) | ||
|
|
||
| return Opt.some(finalCols) |
Contributor
There was a problem hiding this comment.
Can use implicit return (no return, just Opt.some(finalCols))
tersec
reviewed
Nov 24, 2025
| NoSidecarsAtFork | | ||
| Opt[seq[BlobSidecar]] | | ||
| Opt[seq[fulu.DataColumnSidecar]] | | ||
| Opt[seq[gloas.DataColumnSidecar]] |
Contributor
There was a problem hiding this comment.
This PR doesn't seem to treat gloas.DataColumnSidecar at all?
tersec
reviewed
Nov 24, 2025
| # proposer ownership checks | ||
| let vindex = ValidatorIndex(blck.message.proposer_index) | ||
| if checkValidator and (vindex in router.processor.validatorPool[]): | ||
| warn "A validator client attempts to send a block from validator that is also manager by beacon node", |
tersec
reviewed
Nov 24, 2025
| if checkValidator and (vindex in router.processor.validatorPool[]): | ||
| warn "A validator client attempts to send a block from validator that is also manager by beacon node", | ||
| validator_index = vindex | ||
| return err("Block could not be sent from validator that is also managed by the beacon node") |
Contributor
There was a problem hiding this comment.
It's no really that a block could not be sent, but that it wasn't
tersec
reviewed
Nov 24, 2025
| for blob in blobs: | ||
| finalBlobs.add newClone(blob) | ||
|
|
||
| return Opt.some(finalBlobs) |
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.
No description provided.