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

Soften vote account identity mismatch from panic to runtime error

Browse Source
This commit is contained in:
Michael Vines
2022-01-13 17:14:04 -08:00
parent 304afd42c6
commit debac00724
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/consensus.rs
View File

@ -1157,10 +1157,6 @@ impl Tower {
self.node_pubkey, self.node_pubkey,
bank.slot(), bank.slot(),
); );
assert_eq!(
self.vote_state.node_pubkey, self.node_pubkey,
"vote account's node_pubkey doesn't match",
);
} else { } else {
self.initialize_root(root); self.initialize_root(root);
info!( info!(

8
core/src/replay_stage.rs
View File

@ -1454,6 +1454,14 @@ impl ReplayStage {
} }
Ok(vote_state) => vote_state, Ok(vote_state) => vote_state,
}; };
if vote_state.node_pubkey != node_keypair.pubkey() {
info!(
"Vote account node_pubkey mismatch: {} (expected: {}). Unable to vote",
vote_state.node_pubkey,
node_keypair.pubkey()
);
return None;
}
let authorized_voter_pubkey = let authorized_voter_pubkey =
if let Some(authorized_voter_pubkey) = vote_state.get_authorized_voter(bank.epoch()) { if let Some(authorized_voter_pubkey) = vote_state.get_authorized_voter(bank.epoch()) {
authorized_voter_pubkey authorized_voter_pubkey