From 36cf5cdac1d2382dcaeaf74839bd46e56879149a Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 15:46:05 -0700 Subject: [PATCH] v2.1: Fix flaky test_transaction_result_does_not_affect_bankhash (backport of #3916) (#4578) * Fix flaky test_transaction_result_does_not_affect_bankhash (#3916) (cherry picked from commit c5473e4b37ac55e60d03e6d56dd613874f397431) # Conflicts: # ledger/src/blockstore_processor.rs * resolve merge conflicts --------- Co-authored-by: Andrew Fitzgerald Co-authored-by: steviez --- ledger/src/blockstore_processor.rs | 23 ++++++++++++++------- ledger/src/genesis_utils.rs | 18 ++++++++++++++++- runtime/src/genesis_utils.rs | 32 +++++++++++++++++++++++++++--- 3 files changed, 62 insertions(+), 11 deletions(-) diff --git a/ledger/src/blockstore_processor.rs b/ledger/src/blockstore_processor.rs index b8186e7a9a3ee8..df8a35d2196ccc 100644 --- a/ledger/src/blockstore_processor.rs +++ b/ledger/src/blockstore_processor.rs @@ -2306,7 +2306,8 @@ pub mod tests { crate::{ blockstore_options::{AccessType, BlockstoreOptions}, genesis_utils::{ - create_genesis_config, create_genesis_config_with_leader, GenesisConfigInfo, + create_genesis_config, create_genesis_config_with_leader, + create_genesis_config_with_mint_keypair, GenesisConfigInfo, }, }, assert_matches::assert_matches, @@ -2333,6 +2334,7 @@ pub mod tests { pubkey::Pubkey, rent_debits::RentDebits, signature::{Keypair, Signer}, + signer::SeedDerivable, system_instruction::SystemError, system_transaction, transaction::{Transaction, TransactionError}, @@ -2349,6 +2351,7 @@ pub mod tests { vote_transaction, }, std::{collections::BTreeSet, sync::RwLock}, + test_case::test_case, trees::tr, }; @@ -3411,14 +3414,19 @@ pub mod tests { } } - #[test] - fn test_transaction_result_does_not_affect_bankhash() { + #[test_case(true; "rent_collected")] + #[test_case(false; "rent_not_collected")] + fn test_transaction_result_does_not_affect_bankhash(fee_payer_in_rent_partition: bool) { solana_logger::setup(); let GenesisConfigInfo { genesis_config, mint_keypair, .. - } = create_genesis_config(1000); + } = if fee_payer_in_rent_partition { + create_genesis_config(1000) + } else { + create_genesis_config_with_mint_keypair(Keypair::from_seed(&[1u8; 32]).unwrap(), 1000) + }; fn get_instruction_errors() -> Vec { vec![ @@ -3484,7 +3492,7 @@ pub mod tests { Ok(()) }); - let mock_program_id = solana_sdk::pubkey::new_rand(); + let mock_program_id = Pubkey::new_unique(); let (bank, _bank_forks) = Bank::new_with_mockup_builtin_for_tests( &genesis_config, @@ -3548,11 +3556,12 @@ pub mod tests { let entry = next_entry(&bank.last_blockhash(), 1, vec![tx]); let bank = Arc::new(bank); - let _result = process_entries_for_tests_without_scheduler(&bank, vec![entry]); + let result = process_entries_for_tests_without_scheduler(&bank, vec![entry]); + assert!(result.is_ok()); // No failing transaction error - only instruction errors bank.freeze(); assert_eq!(blockhash_ok, bank.last_blockhash()); - assert!(bankhash_ok != bank.hash()); + assert_eq!(bankhash_ok == bank.hash(), fee_payer_in_rent_partition); if let Some(bankhash) = bankhash_err { assert_eq!(bankhash, bank.hash()); } diff --git a/ledger/src/genesis_utils.rs b/ledger/src/genesis_utils.rs index d31b453e9bf646..684427808208a9 100644 --- a/ledger/src/genesis_utils.rs +++ b/ledger/src/genesis_utils.rs @@ -1,13 +1,29 @@ pub use solana_runtime::genesis_utils::{ bootstrap_validator_stake_lamports, create_genesis_config_with_leader, GenesisConfigInfo, }; +use { + solana_runtime::genesis_utils::create_genesis_config_with_leader_with_mint_keypair, + solana_sdk::{pubkey::Pubkey, signature::Keypair}, +}; // same as genesis_config::create_genesis_config, but with bootstrap_validator staking logic // for the core crate tests pub fn create_genesis_config(mint_lamports: u64) -> GenesisConfigInfo { create_genesis_config_with_leader( mint_lamports, - &solana_sdk::pubkey::new_rand(), + &Pubkey::new_unique(), + bootstrap_validator_stake_lamports(), + ) +} + +pub fn create_genesis_config_with_mint_keypair( + mint_keypair: Keypair, + mint_lamports: u64, +) -> GenesisConfigInfo { + create_genesis_config_with_leader_with_mint_keypair( + mint_keypair, + mint_lamports, + &Pubkey::new_unique(), bootstrap_validator_stake_lamports(), ) } diff --git a/runtime/src/genesis_utils.rs b/runtime/src/genesis_utils.rs index 0e91fe08616acd..afae386dd50412 100644 --- a/runtime/src/genesis_utils.rs +++ b/runtime/src/genesis_utils.rs @@ -10,6 +10,7 @@ use { pubkey::Pubkey, rent::Rent, signature::{Keypair, Signer}, + signer::SeedDerivable, stake::state::StakeStateV2, system_program, }, @@ -169,15 +170,40 @@ pub fn create_genesis_config_with_leader( validator_pubkey: &Pubkey, validator_stake_lamports: u64, ) -> GenesisConfigInfo { - let mint_keypair = Keypair::new(); - let voting_keypair = Keypair::new(); + // Use deterministic keypair so we don't get confused by randomness in tests + let mint_keypair = Keypair::from_seed(&[ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, + ]) + .unwrap(); + + create_genesis_config_with_leader_with_mint_keypair( + mint_keypair, + mint_lamports, + validator_pubkey, + validator_stake_lamports, + ) +} + +pub fn create_genesis_config_with_leader_with_mint_keypair( + mint_keypair: Keypair, + mint_lamports: u64, + validator_pubkey: &Pubkey, + validator_stake_lamports: u64, +) -> GenesisConfigInfo { + // Use deterministic keypair so we don't get confused by randomness in tests + let voting_keypair = Keypair::from_seed(&[ + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, + ]) + .unwrap(); let genesis_config = create_genesis_config_with_leader_ex( mint_lamports, &mint_keypair.pubkey(), validator_pubkey, &voting_keypair.pubkey(), - &solana_sdk::pubkey::new_rand(), + &Pubkey::new_unique(), validator_stake_lamports, VALIDATOR_LAMPORTS, FeeRateGovernor::new(0, 0), // most tests can't handle transaction fees