Prioritize primary blocks over secondary blocks #6013 #7550
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
|
I'm not done with the implementation and I am yet to test it. |
|
Please review @bkchr |
bkchr
reviewed
Feb 14, 2025
Comment on lines
+1659
to
+1693
| // Determine if the current block is primary or secondary | ||
| let is_primary = pre_digest.is_primary(); | ||
|
|
||
| // Determine if the last best block is primary or secondary | ||
| let last_best_is_primary = { | ||
| let last_best_header = self.client.header(last_best) | ||
| .map_err(|e| ConsensusError::ChainLookup(e.to_string()))? | ||
| .ok_or_else(|| { | ||
| ConsensusError::ChainLookup( | ||
| "No header for last best block.".to_string(), | ||
| ) | ||
| })?; | ||
| let last_best_pre_digest = find_pre_digest::<Block>(&last_best_header).expect( | ||
| "valid babe headers must contain a predigest; header has been already verified; qed", | ||
| ); | ||
| last_best_pre_digest.is_primary() | ||
| }; | ||
|
|
||
| Some(ForkChoiceStrategy::Custom( | ||
| if is_primary && !last_best_is_primary { | ||
| // Always prefer primary blocks over secondary blocks | ||
| true | ||
| } else if !is_primary && last_best_is_primary { | ||
| // Never prefer secondary blocks over primary blocks | ||
| false | ||
| } else if total_weight > last_best_weight { | ||
| // If both are primary or both are secondary, prefer the heavier chain | ||
| true | ||
| } else if total_weight == last_best_weight { | ||
| // If weights are equal, prefer the longer chain | ||
| number > last_best_number | ||
| } else { | ||
| false | ||
| } | ||
| )) |
There was a problem hiding this comment.
It would be nice if you could follow my proposal here: #6013 (comment)
The weight needs to be stored in the shared object. Otherwise the issue will not be solved. The code you have written here still has the same issues, because the new best block was not yet imported.
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.
Attempts to resolve #6013
Description
modified the fork-choice logic to explicitly prioritize primary blocks over secondary blocks. This should resolve the inconsistency in the fork-choice rule and ensure that the validator consistently chooses the primary block when available.