v1.18: blockstore: scaffolding for chained merkle root conflict detection (backport of #719)#729
Merged
AshwinSekar merged 2 commits intov1.18from Apr 23, 2024
Merged
Conversation
Author
|
Cherry-pick of 411fdc9 has failed: To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
99b264c to
4b3ea9f
Compare
) * blockstore: scaffolding for chained merkle root conflict detection * pr feedback: use dummy feature key until final plumbing (cherry picked from commit 411fdc9) # Conflicts: # sdk/src/feature_set.rs
4b3ea9f to
e6a3555
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## v1.18 #729 +/- ##
=========================================
- Coverage 81.6% 81.5% -0.1%
=========================================
Files 827 827
Lines 224878 225085 +207
=========================================
+ Hits 183512 183643 +131
- Misses 41366 41442 +76 |
behzadnouri
approved these changes
Apr 23, 2024
anwayde
pushed a commit
to firedancer-io/agave
that referenced
this pull request
Jul 23, 2024
…tion (backport of anza-xyz#719) (anza-xyz#729) * blockstore: scaffolding for chained merkle root conflict detection (anza-xyz#719) * blockstore: scaffolding for chained merkle root conflict detection * pr feedback: use dummy feature key until final plumbing (cherry picked from commit 411fdc9) # Conflicts: # sdk/src/feature_set.rs * fix feature_set conflicts --------- Co-authored-by: Ashwin Sekar <ashwin@anza.xyz> Co-authored-by: Ashwin Sekar <ashwin@solana.com>
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
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.
Split from #102
The scaffolding needed to detect chained merkle root conflicts for sending duplicate proofs:
Contributes to solana-labs#34897
This is an automatic backport of pull request #719 done by Mergify.