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

getProgramAccounts to check for existing validator-info (#5404)

This commit is contained in:
Tyera Eulberg 2019-08-02 08:40:54 -06:00 committed by Michael Vines
parent a6c4525998
commit e360e63b74
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
validator-info/src/validator_info.rs
View File

@ -283,10 +283,27 @@ fn main() -> Result<(), Box<dyn error::Error>> {
};
let validator_keypair = read_keypair(id_path)?;
// Create validator-info keypair to use if info_pubkey no provided or does not exist
// Check for existing validator-info account
let all_config = rpc_client.get_program_accounts(&solana_config_api::id())?;
let existing_account = all_config
.iter()
.filter(|(_, account)| {
let key_list: ConfigKeys =
deserialize(&account.data).map_err(|_| false).unwrap();
key_list.keys.contains(&(id(), false))
})
.find(|(pubkey, account)| {
let (validator_pubkey, _) =
parse_validator_info(&pubkey, &account.data).unwrap();
validator_pubkey == validator_keypair.pubkey()
});
// Create validator-info keypair to use if info_pubkey not provided or does not exist
let info_keypair = Keypair::new();
let mut info_pubkey = if let Some(pubkey) = matches.value_of("info_pubkey") {
pubkey.parse::<Pubkey>().unwrap()
} else if let Some(validator_info) = existing_account {
validator_info.0
} else {
info_keypair.pubkey()
};