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

Remove support to monitor all validators in a cluster for delinquency

Browse Source 
This feature is no longer useful with hundreds of validators
This commit is contained in:
Michael Vines
2020-11-28 17:12:56 -08:00
parent ec167aead9
commit f936ce02f8
1 changed files with 46 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
watchtower/src/main.rs
View File

@@ -91,7 +91,7 @@ fn get_config() -> Config {
.takes_value(true) .takes_value(true)
.validator(is_pubkey_or_keypair) .validator(is_pubkey_or_keypair)
.multiple(true) .multiple(true)
.help("Monitor a specific validator only instead of the entire cluster"), .help("Validator identities to monitor for delinquency")
) )
.arg( .arg(
Arg::with_name("no_duplicate_notifications") Arg::with_name("no_duplicate_notifications")
@@ -135,12 +135,10 @@ fn get_config() -> Config {
}; };
info!("RPC URL: {}", config.json_rpc_url); info!("RPC URL: {}", config.json_rpc_url);
if !config.validator_identity_pubkeys.is_empty() { info!(
info!( "Monitored validators: {:?}",
"Monitored validators: {:?}", config.validator_identity_pubkeys
config.validator_identity_pubkeys );
);
}
config config
} }
@@ -152,11 +150,11 @@ fn get_cluster_info(rpc_client: &RpcClient) -> ClientResult<(u64, Hash, RpcVoteA
} }
fn main() -> Result<(), Box<dyn error::Error>> { fn main() -> Result<(), Box<dyn error::Error>> {
let config = get_config();
solana_logger::setup_with_default("solana=info"); solana_logger::setup_with_default("solana=info");
solana_metrics::set_panic_hook("watchtower"); solana_metrics::set_panic_hook("watchtower");
let config = get_config();
let rpc_client = RpcClient::new(config.json_rpc_url.clone()); let rpc_client = RpcClient::new(config.json_rpc_url.clone());
let notifier = Notifier::default(); let notifier = Notifier::default();
let mut last_transaction_count = 0; let mut last_transaction_count = 0;
@@ -226,59 +224,47 @@ fn main() -> Result<(), Box<dyn error::Error>> {
)); ));
} }
if config.validator_identity_pubkeys.is_empty() { let mut errors = vec![];
if !vote_accounts.delinquent.is_empty() { for validator_identity in config.validator_identity_pubkeys.iter() {
failures.push(( let formatted_validator_identity =
"delinquent", format_labeled_address(&validator_identity, &config.address_labels);
format!("{} delinquent validators", vote_accounts.delinquent.len()), if vote_accounts
)); .delinquent
} .iter()
} else { .any(|vai| vai.node_pubkey == *validator_identity)
let mut errors = vec![]; {
for validator_identity in config.validator_identity_pubkeys.iter() { errors.push(format!("{} delinquent", formatted_validator_identity));
let formatted_validator_identity = } else if !vote_accounts
format_labeled_address(&validator_identity, &config.address_labels); .current
if vote_accounts .iter()
.delinquent .any(|vai| vai.node_pubkey == *validator_identity)
.iter() {
.any(|vai| vai.node_pubkey == *validator_identity) errors.push(format!("{} missing", formatted_validator_identity));
{
errors.push(format!("{} delinquent", formatted_validator_identity));
} else if !vote_accounts
.current
.iter()
.any(|vai| vai.node_pubkey == *validator_identity)
{
errors.push(format!("{} missing", formatted_validator_identity));
}
rpc_client
.get_balance(&Pubkey::from_str(&validator_identity).unwrap_or_default())
.map(lamports_to_sol)
.map(|balance| {
if balance < 10.0 {
// At 1 SOL/day for validator voting fees, this gives over a week to
// find some more SOL
failures.push((
"balance",
format!(
"{} has {} SOL",
formatted_validator_identity, balance
),
));
}
})
.unwrap_or_else(|err| {
warn!(
"Failed to get balance of {}: {:?}",
formatted_validator_identity, err
);
});
} }
if !errors.is_empty() { rpc_client
failures.push(("delinquent", errors.join(","))); .get_balance(&Pubkey::from_str(&validator_identity).unwrap_or_default())
} .map(lamports_to_sol)
.map(|balance| {
if balance < 10.0 {
// At 1 SOL/day for validator voting fees, this gives over a week to
// find some more SOL
failures.push((
"balance",
format!("{} has {} SOL", formatted_validator_identity, balance),
));
}
})
.unwrap_or_else(|err| {
warn!(
"Failed to get balance of {}: {:?}",
formatted_validator_identity, err
);
});
}
if !errors.is_empty() {
failures.push(("delinquent", errors.join(",")));
} }
for failure in failures.iter() { for failure in failures.iter() {