gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix solana feature status stake % overflow (#15468)

Browse Source 
(cherry picked from commit f7c0b69fd4)

Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
mergify[bot]
2021-02-22 21:08:25 +00:00
committed by GitHub
parent 451d974f26
commit b21ce376fb
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cli/src/feature.rs
View File

@ -221,7 +221,7 @@ pub fn process_feature_subcommand(
} }
} }
fn active_stake_by_feature_set(rpc_client: &RpcClient) -> Result<HashMap<u32, u64>, ClientError> { fn active_stake_by_feature_set(rpc_client: &RpcClient) -> Result<HashMap<u32, f64>, ClientError> {
// Validator identity -> feature set // Validator identity -> feature set
let feature_set_map = rpc_client let feature_set_map = rpc_client
.get_cluster_nodes()? .get_cluster_nodes()?
@ -239,7 +239,7 @@ fn active_stake_by_feature_set(rpc_client: &RpcClient) -> Result<HashMap<u32, u6
.sum(); .sum();
// Sum all active stake by feature set // Sum all active stake by feature set
let mut active_stake_by_feature_set = HashMap::new(); let mut active_stake_by_feature_set: HashMap<u32, u64> = HashMap::new();
for vote_account in vote_accounts.current { for vote_account in vote_accounts.current {
if let Some(Some(feature_set)) = feature_set_map.get(&vote_account.node_pubkey) { if let Some(Some(feature_set)) = feature_set_map.get(&vote_account.node_pubkey) {
*active_stake_by_feature_set.entry(*feature_set).or_default() += *active_stake_by_feature_set.entry(*feature_set).or_default() +=
@ -251,11 +251,15 @@ fn active_stake_by_feature_set(rpc_client: &RpcClient) -> Result<HashMap<u32, u6
} }
} }
// Convert active stake to a percentage so the caller doesn't need `total_active_stake` Ok(active_stake_by_feature_set
for (_, val) in active_stake_by_feature_set.iter_mut() { .into_iter()
*val = *val * 100 / total_active_stake; .map(|(feature_set, active_stake)| {
} (
Ok(active_stake_by_feature_set) feature_set,
active_stake as f64 * 100. / total_active_stake as f64,
)
})
.collect())
} }
// Feature activation is only allowed when 95% of the active stake is on the current feature set // Feature activation is only allowed when 95% of the active stake is on the current feature set
@ -266,7 +270,7 @@ fn feature_activation_allowed(rpc_client: &RpcClient, quiet: bool) -> Result<boo
let feature_activation_allowed = active_stake_by_feature_set let feature_activation_allowed = active_stake_by_feature_set
.get(&my_feature_set) .get(&my_feature_set)
.map(|percentage| *percentage >= 95) .map(|percentage| *percentage >= 95.)
.unwrap_or(false); .unwrap_or(false);
if !feature_activation_allowed && !quiet { if !feature_activation_allowed && !quiet {
@ -288,10 +292,10 @@ fn feature_activation_allowed(rpc_client: &RpcClient, quiet: bool) -> Result<boo
println!("{}", style("Cluster Feature Sets and Stakes:").bold()); println!("{}", style("Cluster Feature Sets and Stakes:").bold());
for (feature_set, percentage) in active_stake_by_feature_set.iter() { for (feature_set, percentage) in active_stake_by_feature_set.iter() {
if *feature_set == 0 { if *feature_set == 0 {
println!("unknown - {}%", percentage); println!(" unknown - {:.2}%", percentage);
} else { } else {
println!( println!(
"{} - {}% {}", " {:<10} - {:.2}% {}",
feature_set, feature_set,
percentage, percentage,
if *feature_set == my_feature_set { if *feature_set == my_feature_set {