feat(net): validate merkle root before block broadcast#6716
Open
xxo1shine wants to merge 1 commit intotronprotocol:developfrom
Open
feat(net): validate merkle root before block broadcast#6716xxo1shine wants to merge 1 commit intotronprotocol:developfrom
xxo1shine wants to merge 1 commit intotronprotocol:developfrom
Conversation
…fied on permission revocation Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
xxo1shine
force-pushed
the
fix/block-merkle-broadcast-and-sig-bypass-1
branch
from
d13259c to
193f361
Compare
alan-eth
reviewed
Apr 29, 2026
Comment on lines
+350
to
+354
| try { | ||
| block.validateMerkleRoot(); | ||
| } catch (BadBlockException e) { | ||
| throw new P2pException(TypeEnum.BLOCK_MERKLE_ERROR, e.getMessage()); | ||
| } |
There was a problem hiding this comment.
Nice work moving the merkle check before broadcast — that's exactly the right place to catch tampered blocks before we forward them. 🎯
Minor consistency nit: when wrapping BadBlockException here, you're passing e.getMessage() as the message string, but the existing flow in processBlock (around L302) wraps it as throw new P2pException(TypeEnum.BLOCK_MERKLE_ERROR, e) (the exception itself becomes the cause). Would it make sense to do the same here so the original stack trace is preserved when this propagates up? It also keeps the two BLOCK_MERKLE_ERROR throw sites symmetric.
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.
What does this PR do?
Why are these changes required?
This PR has been tested by:
Follow up
Extra details