remove old fork choice measure and stats - vote stake * lockout

solana-labs · Jan 16, 2024 · aea4b12 · aea4b12
1 parent c7ddf00
commit aea4b12
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 28 deletions.
diff --git a/core/src/consensus.rs b/core/src/consensus.rs
@@ -157,7 +157,6 @@ pub(crate) struct ComputedBankState {
     pub voted_stakes: VotedStakes,
     pub total_stake: Stake,
     pub bank_stake: Stake,
-    pub bank_weight: u128,
     // Tree of intervals of lockouts of the form [slot, slot + slot.lockout],
     // keyed by end of the range
     pub lockout_intervals: LockoutIntervals,
@@ -319,7 +318,6 @@ impl Tower {
         let mut vote_slots = HashSet::new();
         let mut voted_stakes = HashMap::new();
         let mut total_stake = 0;
-        let mut bank_weight = 0;
         let mut bank_stake = 0;
         // Tree of intervals of lockouts of the form [slot, slot + slot.lockout],
         // keyed by end of the range
@@ -391,7 +389,6 @@ impl Tower {
             process_slot_vote_unchecked(&mut vote_state, bank_slot);
 
             for vote in &vote_state.votes {
-                bank_weight += vote.lockout.lockout() as u128 * voted_stake as u128;
                 bank_stake += voted_stake;
                 vote_slots.insert(vote.slot());
             }
@@ -401,13 +398,11 @@ impl Tower {
                     let vote =
                         Lockout::new_with_confirmation_count(root, MAX_LOCKOUT_HISTORY as u32);
                     trace!("ROOT: {}", vote.slot());
-                    bank_weight += vote.lockout() as u128 * voted_stake as u128;
                     vote_slots.insert(vote.slot());
                 }
             }
             if let Some(root) = vote_state.root_slot {
                 let vote = Lockout::new_with_confirmation_count(root, MAX_LOCKOUT_HISTORY as u32);
-                bank_weight += vote.lockout() as u128 * voted_stake as u128;
                 bank_stake += voted_stake;
                 vote_slots.insert(vote.slot());
             }
@@ -444,7 +439,6 @@ impl Tower {
             voted_stakes,
             total_stake,
             bank_stake,
-            bank_weight,
             lockout_intervals,
             my_latest_landed_vote,
         }
@@ -2275,7 +2269,6 @@ pub mod test {
         let ComputedBankState {
             voted_stakes,
             total_stake,
-            bank_weight,
             ..
         } = Tower::collect_vote_lockouts(
             &Pubkey::default(),
@@ -2290,10 +2283,6 @@ pub mod test {
         let mut new_votes = latest_validator_votes_for_frozen_banks.take_votes_dirty_set(0);
         new_votes.sort();
         assert_eq!(new_votes, account_latest_votes);
-
-        // Each account has 1 vote in it. After simulating a vote in collect_vote_lockouts,
-        // the account will have 2 votes, with lockout 2 + 4 = 6. So expected weight for
-        assert_eq!(bank_weight, 12)
     }
 
     #[test]
@@ -2330,11 +2319,7 @@ pub mod test {
         assert_eq!(tower.vote_state.root_slot, Some(0));
         let mut latest_validator_votes_for_frozen_banks =
             LatestValidatorVotesForFrozenBanks::default();
-        let ComputedBankState {
-            voted_stakes,
-            bank_weight,
-            ..
-        } = Tower::collect_vote_lockouts(
+        let ComputedBankState { voted_stakes, .. } = Tower::collect_vote_lockouts(
             &Pubkey::default(),
             MAX_LOCKOUT_HISTORY as u64,
             &accounts,

diff --git a/core/src/consensus/progress_map.rs b/core/src/consensus/progress_map.rs
@@ -294,7 +294,6 @@ impl ForkProgress {
 #[derive(Debug, Clone, Default)]
 pub struct ForkStats {
     pub bank_stake: Stake,
-    pub fork_weight: u128,
     pub total_stake: Stake,
     pub block_height: u64,
     pub has_voted: bool,
@@ -310,6 +309,13 @@ pub struct ForkStats {
     pub my_latest_landed_vote: Option<Slot>,
 }
 
+impl ForkStats {
+    /// Return the percentage of bank_stake over total_stake.
+    pub fn bank_weight(&self) -> u64 {
+        100 * self.bank_stake / self.total_stake
+    }
+}
+
 #[derive(Clone, Default)]
 pub struct PropagatedStats {
     pub propagated_validators: HashSet<Pubkey>,

diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs
@@ -3296,7 +3296,6 @@ impl ReplayStage {
                         voted_stakes,
                         total_stake,
                         bank_stake,
-                        bank_weight,
                         lockout_intervals,
                         my_latest_landed_vote,
                         ..
@@ -3308,7 +3307,6 @@ impl ReplayStage {
                     stats.total_stake = total_stake;
                     stats.voted_stakes = voted_stakes;
                     stats.lockout_intervals = lockout_intervals;
-                    stats.fork_weight = bank_weight;
                     stats.block_height = bank.block_height();
                     stats.my_latest_landed_vote = my_latest_landed_vote;
                     stats.computed = true;
@@ -3317,17 +3315,14 @@ impl ReplayStage {
                         "bank_weight",
                         ("slot", bank_slot, i64),
                         ("bank_stake", stats.bank_stake, i64),
-                        // u128 too large for influx, convert to hex
-                        ("weight", format!("{:X}", stats.fork_weight), String),
+                        ("bank_weight", stats.bank_weight(), i64),
                     );
 
                     info!(
-                        "{} slot_weight: {} {:2}% {}% {:.2} {}",
+                        "{} slot_weight: {} {:2}% {}%",
                         my_vote_pubkey,
                         bank_slot,
-                        100 * stats.bank_stake / stats.total_stake, // percentage vote stake in total_stake
-                        100 * stats.fork_weight / stats.total_stake as u128,
-                        ((stats.fork_weight / stats.total_stake as u128) as f64).log2(), // average lockout depth for voted stake
+                        stats.bank_weight(), // percentage bank stake in total_stake
                         bank.parent().map(|b| b.slot()).unwrap_or(0)
                     );
                 }
@@ -3671,7 +3666,7 @@ impl ReplayStage {
                 vote_threshold,
                 propagated_stake,
                 is_leader_slot,
-                fork_weight,
+                bank_weight,
                 total_threshold_stake,
                 total_epoch_stake,
             ) = {
@@ -3684,7 +3679,7 @@ impl ReplayStage {
                     fork_stats.vote_threshold,
                     propagated_stats.propagated_validators_stake,
                     propagated_stats.is_leader_slot,
-                    fork_stats.fork_weight,
+                    fork_stats.bank_weight(),
                     fork_stats.total_stake,
                     propagated_stats.total_epoch_stake,
                 )
@@ -3719,7 +3714,7 @@ impl ReplayStage {
                 && propagation_confirmed
                 && switch_fork_decision.can_vote()
             {
-                info!("voting: {} {}", candidate_vote_bank.slot(), fork_weight);
+                info!("voting: {} {}", candidate_vote_bank.slot(), bank_weight);
                 SelectVoteAndResetForkResult {
                     vote_bank: Some((candidate_vote_bank.clone(), switch_fork_decision)),
                     reset_bank: Some(candidate_vote_bank.clone()),