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

Revert "Do not exclude failed simple vote transactions from consensus" (#29745) 

This reverts commit b4237f3f2c.
This commit is contained in:
carllin 2023-01-18 15:13:13 -05:00 committed by GitHub
parent 9d2c71b9a3
commit 1753a0e3af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ledger/src/blockstore_processor.rs
View File

@ -3727,13 +3727,15 @@ pub mod tests {
// Create an transaction that references the new blockhash, should still // Create an transaction that references the new blockhash, should still
// be able to find the blockhash if we process transactions all in the same // be able to find the blockhash if we process transactions all in the same
// batch // batch
let mut expected_signatures = BTreeSet::new(); let mut expected_successful_voter_pubkeys = BTreeSet::new();
let vote_txs: Vec<_> = validator_keypairs let vote_txs: Vec<_> = validator_keypairs
.iter() .iter()
.enumerate() .enumerate()
.map(|(i, validator_keypairs)| { .map(|(i, validator_keypairs)| {
let vote_tx = if i % 3 == 0 { if i % 3 == 0 {
// These votes are correct // These votes are correct
expected_successful_voter_pubkeys
.insert(validator_keypairs.vote_keypair.pubkey());
vote_transaction::new_vote_transaction( vote_transaction::new_vote_transaction(
vec![0], vec![0],
bank0.hash(), bank0.hash(),
@ -3765,20 +3767,18 @@ pub mod tests {
&validator_keypairs.vote_keypair, &validator_keypairs.vote_keypair,
None, None,
) )
}; }
expected_signatures.insert(vote_tx.signatures[0]);
vote_tx
}) })
.collect(); .collect();
let entry = next_entry(&bank_1_blockhash, 1, vote_txs); let entry = next_entry(&bank_1_blockhash, 1, vote_txs);
let (replay_vote_sender, replay_vote_receiver) = crossbeam_channel::unbounded(); let (replay_vote_sender, replay_vote_receiver) = crossbeam_channel::unbounded();
let _ = let _ =
process_entries_for_tests(&bank1, vec![entry], true, None, Some(&replay_vote_sender)); process_entries_for_tests(&bank1, vec![entry], true, None, Some(&replay_vote_sender));
let signatures: BTreeSet<_> = replay_vote_receiver let successes: BTreeSet<Pubkey> = replay_vote_receiver
.try_iter() .try_iter()
.map(|(.., signature)| signature) .map(|(vote_pubkey, ..)| vote_pubkey)
.collect(); .collect();
assert_eq!(signatures, expected_signatures); assert_eq!(successes, expected_successful_voter_pubkeys);
} }
fn make_slot_with_vote_tx( fn make_slot_with_vote_tx(

4
runtime/src/bank_utils.rs
View File

@ -43,8 +43,8 @@ pub fn find_and_send_votes(
sanitized_txs sanitized_txs
.iter() .iter()
.zip(execution_results.iter()) .zip(execution_results.iter())
.for_each(|(tx, _result)| { .for_each(|(tx, result)| {
if tx.is_simple_vote_transaction() { if tx.is_simple_vote_transaction() && result.was_executed_successfully() {
if let Some(parsed_vote) = vote_parser::parse_sanitized_vote_transaction(tx) { if let Some(parsed_vote) = vote_parser::parse_sanitized_vote_transaction(tx) {
if parsed_vote.1.last_voted_slot().is_some() { if parsed_vote.1.last_voted_slot().is_some() {
let _ = vote_sender.send(parsed_vote); let _ = vote_sender.send(parsed_vote);