v4.0: blockstore: mark CMR conflicts as dead under validate_chained_block_id (backport of #11334)#11558
Open
mergify[bot] wants to merge 1 commit intov4.0from
Open
v4.0: blockstore: mark CMR conflicts as dead under validate_chained_block_id (backport of #11334)#11558mergify[bot] wants to merge 1 commit intov4.0from
mergify[bot] wants to merge 1 commit intov4.0from
Conversation
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## v4.0 #11558 +/- ##
=========================================
- Coverage 83.0% 83.0% -0.1%
=========================================
Files 838 838
Lines 316793 316786 -7
=========================================
- Hits 263229 263190 -39
- Misses 53564 53596 +32 🚀 New features to boost your workflow:
|
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.
Problem
The feature
chained_merkle_conflict_duplicate_proofswas designed preenforce_fixed_fec_setin order to notice duplicate blocks when there were undersized FEC sets.With
enforce_fixed_fec_setthis feature is no longer needed and has been abandoned.However FD requires that the CMR is correct across FEC sets. We do not need to mark the block as duplicate or send some sort of duplicate proofs via gossip, just mark the block as dead.
Summary of Changes
As part of SIMD-0340, mark the block as dead instead. In a follow up we'll remove the abandoned feature.
We wish to backport this PR as SIMD-0340 is critical for FD and needs to be activated in 4.0
See the amendment
solana-foundation/solana-improvement-documents#502
This is an automatic backport of pull request #11334 done by Mergify.