blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add deepest slot metric (#34186) 

* reset to deepest slot when last vote is for an invalid fork.

* pr feedback: comments, height starts at 1
This commit is contained in:
Ashwin Sekar 2023-11-21 04:07:00 -05:00 committed by GitHub
parent 0e6dd54f81
commit 504f2ee892
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 563 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

536
core/src/consensus/heaviest_subtree_fork_choice.rs
View File

File diff suppressed because it is too large Load Diff

78
core/src/replay_stage.rs
View File

@ -6512,8 +6512,9 @@ pub(crate) mod tests {
);
// 4 should be the heaviest slot, but should not be votable
// because of lockout. 5 is no longer valid due to it being a duplicate.
let (vote_fork, reset_fork, _) = run_compute_and_select_forks(
// because of lockout. 5 is no longer valid due to it being a duplicate, however we still
// reset onto 5.
let (vote_fork, reset_fork, heaviest_fork_failures) = run_compute_and_select_forks(
&bank_forks,
&mut progress,
&mut tower,
@ -6522,7 +6523,41 @@ pub(crate) mod tests {
None,
);
assert!(vote_fork.is_none());
assert!(reset_fork.is_none());
assert_eq!(reset_fork, Some(5));
assert_eq!(
heaviest_fork_failures,
vec![
HeaviestForkFailures::FailedSwitchThreshold(4, 0, 10000),
HeaviestForkFailures::LockedOut(4)
]
);
// Continue building on 5
let forks = tr(5) / (tr(6) / (tr(7) / (tr(8) / (tr(9)))) / tr(10));
vote_simulator.bank_forks = bank_forks;
vote_simulator.progress = progress;
vote_simulator.fill_bank_forks(forks, &HashMap::<Pubkey, Vec<u64>>::new(), true);
let (bank_forks, mut progress) = (vote_simulator.bank_forks, vote_simulator.progress);
// 4 is still the heaviest slot, but not votable beecause of lockout.
// 9 is the deepest slot from our last voted fork (5), so it is what we should
// reset to.
let (vote_fork, reset_fork, heaviest_fork_failures) = run_compute_and_select_forks(
&bank_forks,
&mut progress,
&mut tower,
&mut vote_simulator.heaviest_subtree_fork_choice,
&mut vote_simulator.latest_validator_votes_for_frozen_banks,
None,
);
assert!(vote_fork.is_none());
assert_eq!(reset_fork, Some(9));
assert_eq!(
heaviest_fork_failures,
vec![
HeaviestForkFailures::FailedSwitchThreshold(4, 0, 10000),
HeaviestForkFailures::LockedOut(4)
]
);
// If slot 5 is marked as confirmed, it becomes the heaviest bank on same slot again
let mut duplicate_slots_to_repair = DuplicateSlotsToRepair::default();
@ -6544,12 +6579,16 @@ pub(crate) mod tests {
&mut purge_repair_slot_counter,
SlotStateUpdate::DuplicateConfirmed(duplicate_confirmed_state),
);
// The confirmed hash is detected in `progress`, which means
// it's confirmation on the replayed block. This means we have
// the right version of the block, so `duplicate_slots_to_repair`
// should be empty
assert!(duplicate_slots_to_repair.is_empty());
let (vote_fork, reset_fork, _) = run_compute_and_select_forks(
// We should still reset to slot 9 as it's the heaviest on the now valid
// fork.
let (vote_fork, reset_fork, heaviest_fork_failures) = run_compute_and_select_forks(
&bank_forks,
&mut progress,
&mut tower,
@ -6557,9 +6596,40 @@ pub(crate) mod tests {
&mut vote_simulator.latest_validator_votes_for_frozen_banks,
None,
);
assert!(vote_fork.is_none());
assert_eq!(reset_fork.unwrap(), 9);
assert_eq!(
heaviest_fork_failures,
vec![
HeaviestForkFailures::FailedSwitchThreshold(4, 0, 10000),
HeaviestForkFailures::LockedOut(4)
]
);
// Resetting our forks back to how it was should allow us to reset to our
// last vote which was previously marked as invalid and now duplicate confirmed
let bank6_hash = bank_forks.read().unwrap().bank_hash(6).unwrap();
let _ = vote_simulator
.heaviest_subtree_fork_choice
.split_off(&(6, bank6_hash));
// Should now pick 5 as the heaviest fork from last vote again.
let (vote_fork, reset_fork, heaviest_fork_failures) = run_compute_and_select_forks(
&bank_forks,
&mut progress,
&mut tower,
&mut vote_simulator.heaviest_subtree_fork_choice,
&mut vote_simulator.latest_validator_votes_for_frozen_banks,
None,
);
assert!(vote_fork.is_none());
assert_eq!(reset_fork.unwrap(), 5);
assert_eq!(
heaviest_fork_failures,
vec![
HeaviestForkFailures::FailedSwitchThreshold(4, 0, 10000),
HeaviestForkFailures::LockedOut(4)
]
);
}
#[test]