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

Revert "Revert "fix checks in process_vote_authorize (backport #21465) (#21486)""

Browse Source 
This reverts commit 451ea7c9b2.
This commit is contained in:
Tyera Eulberg
2021-12-16 13:52:22 -07:00
committed by Tyera Eulberg
parent 37727fbbc3
commit cc931ff47f
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cli/src/vote.rs
View File

@ -666,24 +666,19 @@ pub fn process_vote_authorize(
let authorized = config.signers[authorized]; let authorized = config.signers[authorized];
let new_authorized_signer = new_authorized.map(|index| config.signers[index]); let new_authorized_signer = new_authorized.map(|index| config.signers[index]);
check_unique_pubkeys(
(&authorized.pubkey(), "authorized_account".to_string()),
(new_authorized_pubkey, "new_authorized_pubkey".to_string()),
)?;
let (_, vote_state) = get_vote_account(rpc_client, vote_account_pubkey, config.commitment)?; let (_, vote_state) = get_vote_account(rpc_client, vote_account_pubkey, config.commitment)?;
match vote_authorize { match vote_authorize {
VoteAuthorize::Voter => { VoteAuthorize::Voter => {
let current_epoch = rpc_client.get_epoch_info()?.epoch;
let current_authorized_voter = vote_state let current_authorized_voter = vote_state
.authorized_voters() .authorized_voters()
.last() .get_authorized_voter(current_epoch)
.ok_or_else(|| { .ok_or_else(|| {
CliError::RpcRequestError( CliError::RpcRequestError(
"Invalid vote account state; no authorized voters found".to_string(), "Invalid vote account state; no authorized voters found".to_string(),
) )
})? })?;
.1; check_current_authority(&current_authorized_voter, &authorized.pubkey())?;
check_current_authority(current_authorized_voter, &authorized.pubkey())?;
if let Some(signer) = new_authorized_signer { if let Some(signer) = new_authorized_signer {
if signer.is_interactive() { if signer.is_interactive() {
return Err(CliError::BadParameter(format!( return Err(CliError::BadParameter(format!(
@ -694,6 +689,10 @@ pub fn process_vote_authorize(
} }
} }
VoteAuthorize::Withdrawer => { VoteAuthorize::Withdrawer => {
check_unique_pubkeys(
(&authorized.pubkey(), "authorized_account".to_string()),
(new_authorized_pubkey, "new_authorized_pubkey".to_string()),
)?;
check_current_authority(&vote_state.authorized_withdrawer, &authorized.pubkey())? check_current_authority(&vote_state.authorized_withdrawer, &authorized.pubkey())?
} }
} }