Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adds Merkle shred variant with retransmitter's signature #35293

Merged
merged 1 commit into from
Feb 28, 2024

Conversation

behzadnouri
Copy link
Contributor

@behzadnouri behzadnouri commented Feb 22, 2024

Problem

Locking down Turbine propagation path.

Summary of Changes

Added Merkle shred variant with reserved buffer for retransmitter's signature.

Copy link

codecov bot commented Feb 23, 2024

Codecov Report

Attention: Patch coverage is 96.09375% with 5 lines in your changes are missing coverage. Please review.

Project coverage is 81.7%. Comparing base (8ad125d) to head (f4e95fc).

❗ Current head f4e95fc differs from pull request most recent head 1f853c4. Consider uploading reports for the commit 1f853c4 to get more accurate results

Additional details and impacted files
@@            Coverage Diff            @@
##           master   #35293     +/-   ##
=========================================
- Coverage    81.7%    81.7%   -0.1%     
=========================================
  Files         834      834             
  Lines      224235   224288     +53     
=========================================
+ Hits       183390   183431     +41     
- Misses      40845    40857     +12     

ledger/src/shred/merkle.rs Outdated Show resolved Hide resolved
@@ -148,12 +150,14 @@ impl ShredData {
// ShredCode::capacity(proof_size).unwrap()
// - ShredData::SIZE_OF_HEADERS
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see that ShredCode::capacity already subtracts ShredCode::SIZE_OF_HEADERS. Should this be

- (ShredData::SIZE_OF_HEADERS - ShredCode::SIZE_OF_HEADERS)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

got it, so since the data header is also erasure coded and data shred must be the same length of coding shred, we add the restricted section, which is the size of the coding shred header.

ledger/src/blockstore.rs Show resolved Hide resolved
Moving towards locking down Turbine propagation path, the commit
reserves a buffer within shred payload for retransmitter's signature.
Copy link
Contributor

@bw-solana bw-solana left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@behzadnouri behzadnouri merged commit a7a41e7 into solana-labs:master Feb 28, 2024
35 checks passed
@behzadnouri behzadnouri deleted the shred-variant-resigned branch February 28, 2024 20:31
@behzadnouri behzadnouri added the v1.18 PRs that should be backported to v1.18 label Feb 28, 2024
Copy link
Contributor

mergify bot commented Feb 28, 2024

Backports to the beta branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. Exceptions include CI/metrics changes, CLI improvements and documentation updates on a case by case basis.

mergify bot pushed a commit that referenced this pull request Feb 28, 2024
Moving towards locking down Turbine propagation path, the commit
reserves a buffer within shred payload for retransmitter's signature.

(cherry picked from commit a7a41e7)
mergify bot added a commit that referenced this pull request Feb 29, 2024
…port of #35293) (#35357)

adds Merkle shred variant with retransmitter's signature (#35293)

Moving towards locking down Turbine propagation path, the commit
reserves a buffer within shred payload for retransmitter's signature.

(cherry picked from commit a7a41e7)

Co-authored-by: behzad nouri <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v1.18 PRs that should be backported to v1.18
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants