removes trailing bytes before de-duplicating shreds #4769
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
behzadnouri
force-pushed
the
shred-dedup-exclude-trailing-bytes
branch
from
af315ae to
70a8df5
Compare
behzadnouri
changed the title
behzadnouri
force-pushed
the
shred-dedup-exclude-trailing-bytes
branch
2 times, most recently
from
c64f351 to
6a701a6
Compare
For backward compatibility we need to allow trailing bytes in the
packet after the shred payload.
The extra bytes are truncated in Shred{Code,Data}::from_payload:
https://github.com/anza-xyz/agave/blob/744482070/ledger/src/shred/merkle.rs#L513
https://github.com/anza-xyz/agave/blob/744482070/ledger/src/shred/merkle.rs#L574
but that happens late after shred deduper which might allow duplicate
shreds to pass through.
The commit updates shred::wire::get_shred{,_mut} to remove trailing
bytes and excludes them from the deduper.
behzadnouri
force-pushed
the
shred-dedup-exclude-trailing-bytes
branch
from
6a701a6 to
a4fd832
Compare
steviez
reviewed
Feb 5, 2025
steviez
approved these changes
Feb 5, 2025
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.
Problem
For backward compatibility we need to allow trailing bytes in the packet after the shred payload.
The extra bytes are truncated in
Shred{Code,Data}::from_payload:https://github.com/anza-xyz/agave/blob/744482070/ledger/src/shred/merkle.rs#L513
https://github.com/anza-xyz/agave/blob/744482070/ledger/src/shred/merkle.rs#L574
but that happens late after shred deduper which might allow duplicate shreds to pass through.
Summary of Changes
The commit updates
shred::wire::get_shred{,_mut}to remove trailing bytes and excludes them from the deduper.