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

refactor: `check_update_vote_state_slots_are_valid` (#34555) 

refactor: check_update_vote_state_slots_are_valid
This commit is contained in:
Justin Starry 2024-01-06 00:50:50 +08:00 committed by GitHub
parent bbb4118ac4
commit 1f8b0b1a8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
programs/vote/src/vote_state/mod.rs
View File

@ -186,19 +186,19 @@ fn check_update_vote_state_slots_are_valid(
return Err(VoteError::EmptySlots); return Err(VoteError::EmptySlots);
} }
// If the vote state update is not new enough, return
if let Some(last_vote_slot) = vote_state.votes.back().map(|lockout| lockout.slot()) {
if vote_state_update.lockouts.back().unwrap().slot() <= last_vote_slot {
return Err(VoteError::VoteTooOld);
}
}
let last_vote_state_update_slot = vote_state_update let last_vote_state_update_slot = vote_state_update
.lockouts .lockouts
.back() .back()
.expect("must be nonempty, checked above") .expect("must be nonempty, checked above")
.slot(); .slot();
// If the vote state update is not new enough, return
if let Some(last_vote_slot) = vote_state.votes.back().map(|lockout| lockout.slot()) {
if last_vote_state_update_slot <= last_vote_slot {
return Err(VoteError::VoteTooOld);
}
}
if slot_hashes.is_empty() { if slot_hashes.is_empty() {
return Err(VoteError::SlotsMismatch); return Err(VoteError::SlotsMismatch);
} }
@ -211,28 +211,22 @@ fn check_update_vote_state_slots_are_valid(
return Err(VoteError::VoteTooOld); return Err(VoteError::VoteTooOld);
} }
// Check if the proposed root is too old // Overwrite the proposed root if it is too old to be in the SlotHash history
let original_proposed_root = vote_state_update.root; if let Some(proposed_root) = vote_state_update.root {
if let Some(new_proposed_root) = original_proposed_root {
// If the new proposed root `R` is less than the earliest slot hash in the history // If the new proposed root `R` is less than the earliest slot hash in the history
// such that we cannot verify whether the slot was actually was on this fork, set // such that we cannot verify whether the slot was actually was on this fork, set
// the root to the latest vote in the current vote that's less than R. // the root to the latest vote in the vote state that's less than R. If no
if earliest_slot_hash_in_history > new_proposed_root { // votes from the vote state are less than R, use its root instead.
if proposed_root < earliest_slot_hash_in_history {
// First overwrite the proposed root with the vote state's root
vote_state_update.root = vote_state.root_slot; vote_state_update.root = vote_state.root_slot;
let mut prev_slot = Slot::MAX;
let current_root = vote_state_update.root; // Then try to find the latest vote in vote state that's less than R
for vote in vote_state.votes.iter().rev() { for vote in vote_state.votes.iter().rev() {
let is_slot_bigger_than_root = current_root if vote.slot() <= proposed_root {
.map(|current_root| vote.slot() > current_root)
.unwrap_or(true);
// Ensure we're iterating from biggest to smallest vote in the
// current vote state
assert!(vote.slot() < prev_slot && is_slot_bigger_than_root);
if vote.slot() <= new_proposed_root {
vote_state_update.root = Some(vote.slot()); vote_state_update.root = Some(vote.slot());
break; break;
} }
prev_slot = vote.slot();
} }
} }
} }