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

`validator-info get/set` no longer crash on invalid account data

This commit is contained in:
Michael Vines 2020-09-15 13:47:25 -07:00
parent 5ab4109b7e
commit 56282f0c01
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cli/src/validator_info.rs
View File

@ -271,10 +271,12 @@ pub fn process_set_validator_info(
let all_config = rpc_client.get_program_accounts(&solana_config_program::id())?; let all_config = rpc_client.get_program_accounts(&solana_config_program::id())?;
let existing_account = all_config let existing_account = all_config
.iter() .iter()
.filter(|(_, account)| { .filter(
let key_list: ConfigKeys = deserialize(&account.data).map_err(|_| false).unwrap(); |(_, account)| match deserialize::<ConfigKeys>(&account.data) {
key_list.keys.contains(&(validator_info::id(), false)) Ok(key_list) => key_list.keys.contains(&(validator_info::id(), false)),
}) Err(_) => false,
},
)
.find(|(pubkey, account)| { .find(|(pubkey, account)| {
let (validator_pubkey, _) = parse_validator_info(&pubkey, &account).unwrap(); let (validator_pubkey, _) = parse_validator_info(&pubkey, &account).unwrap();
validator_pubkey == config.signers[0].pubkey() validator_pubkey == config.signers[0].pubkey()
@ -385,10 +387,10 @@ pub fn process_get_validator_info(
all_config all_config
.into_iter() .into_iter()
.filter(|(_, validator_info_account)| { .filter(|(_, validator_info_account)| {
let key_list: ConfigKeys = deserialize(&validator_info_account.data) match deserialize::<ConfigKeys>(&validator_info_account.data) {
.map_err(|_| false) Ok(key_list) => key_list.keys.contains(&(validator_info::id(), false)),
.unwrap(); Err(_) => false,
key_list.keys.contains(&(validator_info::id(), false)) }
}) })
.collect() .collect()
}; };