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

v1.18: blockstore: scaffolding for chained merkle root conflict detection (backport of #719) #729

Merged
merged 2 commits into from
Apr 23, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 10, 2024

Split from #102
The scaffolding needed to detect chained merkle root conflicts for sending duplicate proofs:

  • feature gate
  • window service processing
  • find previous consecutive erasure set
  • check forward / backwards chaining

Contributes to solana-labs#34897


This is an automatic backport of pull request #719 done by Mergify.

@mergify mergify bot added the conflicts label Apr 10, 2024
Copy link
Author

mergify bot commented Apr 10, 2024

Cherry-pick of 411fdc9 has failed:

On branch mergify/bp/v1.18/pr-719
Your branch is up to date with 'origin/v1.18'.

You are currently cherry-picking commit 411fdc9312.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   core/src/window_service.rs
	modified:   ledger/src/blockstore.rs
	modified:   ledger/src/blockstore_db.rs
	modified:   ledger/src/blockstore_meta.rs
	modified:   ledger/src/shred.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdk/src/feature_set.rs

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

@AshwinSekar AshwinSekar marked this pull request as draft April 11, 2024 21:34
@AshwinSekar AshwinSekar force-pushed the mergify/bp/v1.18/pr-719 branch 2 times, most recently from 99b264c to 4b3ea9f Compare April 23, 2024 14:29
AshwinSekar and others added 2 commits April 23, 2024 14:33
)

* 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
@AshwinSekar AshwinSekar marked this pull request as ready for review April 23, 2024 14:34
@codecov-commenter
Copy link

Codecov Report

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

Project coverage is 81.5%. Comparing base (c4e7b6b) to head (e6a3555).

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     

@AshwinSekar AshwinSekar merged commit c5b1426 into v1.18 Apr 23, 2024
36 checks passed
@AshwinSekar AshwinSekar deleted the mergify/bp/v1.18/pr-719 branch April 23, 2024 17:36
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants