Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Allow fork choice to support multiple versions of a slot #16266

Merged
merged 8 commits into from
Apr 12, 2021

Conversation

carllin
Copy link
Contributor

@carllin carllin commented Mar 31, 2021

Problem

Fork choice doesn't track separate sets of votes if validators vote on one version of a slot, dump it, then repair another version

Summary of Changes

Add support for tracking multiple versions of slots in fork choice

TODO: Figure out best way to handle the case described here: 153aaa2#diff-0bd0e50030bdee14082c678da5f3098df8156825fa86c59ad55ddbd2a3669585R92-R119

Fixes #

@carllin carllin requested review from sakridge and jstarry March 31, 2021 09:41
@codecov
Copy link

codecov bot commented Apr 1, 2021

Codecov Report

Merging #16266 (1d461b9) into master (92f4018) will increase coverage by 0.0%.
The diff coverage is 92.1%.

@@           Coverage Diff            @@
##           master   #16266    +/-   ##
========================================
  Coverage    80.1%    80.2%            
========================================
  Files         413      413            
  Lines      110490   111187   +697     
========================================
+ Hits        88558    89212   +654     
- Misses      21932    21975    +43     

@carllin carllin force-pushed the FixReplayStage branch 10 times, most recently from beba884 to e741e3b Compare April 6, 2021 04:21
@carllin carllin force-pushed the FixReplayStage branch 2 times, most recently from e9bcc27 to ca060b2 Compare April 8, 2021 03:13
core/src/consensus.rs Outdated Show resolved Hide resolved
core/src/heaviest_subtree_fork_choice.rs Show resolved Hide resolved
core/src/heaviest_subtree_fork_choice.rs Show resolved Hide resolved
core/src/heaviest_subtree_fork_choice.rs Show resolved Hide resolved
core/src/heaviest_subtree_fork_choice.rs Outdated Show resolved Hide resolved
core/src/heaviest_subtree_fork_choice.rs Show resolved Hide resolved
core/src/heaviest_subtree_fork_choice.rs Show resolved Hide resolved
core/src/heaviest_subtree_fork_choice.rs Outdated Show resolved Hide resolved
core/src/heaviest_subtree_fork_choice.rs Show resolved Hide resolved
core/src/heaviest_subtree_fork_choice.rs Outdated Show resolved Hide resolved
@carllin carllin force-pushed the FixReplayStage branch 3 times, most recently from a892a6c to e9c5b60 Compare April 11, 2021 00:48
core/src/consensus.rs Outdated Show resolved Hide resolved
core/src/heaviest_subtree_fork_choice.rs Show resolved Hide resolved
core/src/heaviest_subtree_fork_choice.rs Show resolved Hide resolved
core/src/heaviest_subtree_fork_choice.rs Outdated Show resolved Hide resolved
core/src/heaviest_subtree_fork_choice.rs Show resolved Hide resolved
core/src/heaviest_subtree_fork_choice.rs Show resolved Hide resolved
jstarry
jstarry previously approved these changes Apr 11, 2021
@mergify mergify bot dismissed jstarry’s stale review April 11, 2021 23:29

Pull request has been modified.

jstarry
jstarry previously approved these changes Apr 11, 2021
Copy link
Contributor

@jstarry jstarry left a comment

Choose a reason for hiding this comment

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

Lgtm

@mergify mergify bot dismissed jstarry’s stale review April 12, 2021 03:54

Pull request has been modified.

@carllin carllin added the v1.6 label Apr 12, 2021
@carllin carllin merged commit dc7030f into solana-labs:master Apr 12, 2021
mergify bot pushed a commit that referenced this pull request Apr 12, 2021
mergify bot added a commit that referenced this pull request Apr 12, 2021
…6480)

(cherry picked from commit dc7030f)

Co-authored-by: carllin <carl@solana.com>
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants