From 19448ba078379846213fd3d5691feefb2b2f4810 Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Mon, 28 Feb 2022 23:56:34 -0700 Subject: [PATCH] Allow sub-rent-exempt-minimum transfers to `1nc1nerator` (#23382) * Add failing test * Allow small burns to incinerator * Use check_id method --- runtime/src/account_rent_state.rs | 4 +++- runtime/src/bank.rs | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/runtime/src/account_rent_state.rs b/runtime/src/account_rent_state.rs index ec70a0541f..297ebfaa10 100644 --- a/runtime/src/account_rent_state.rs +++ b/runtime/src/account_rent_state.rs @@ -79,7 +79,9 @@ pub(crate) fn check_rent_state_with_account( account_state: &AccountSharedData, ) -> Result<()> { submit_rent_state_metrics(pre_rent_state, post_rent_state); - if !post_rent_state.transition_allowed_from(pre_rent_state) { + if !solana_sdk::incinerator::check_id(address) + && !post_rent_state.transition_allowed_from(pre_rent_state) + { debug!( "Account {} not rent exempt, state {:?}", address, account_state, diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 3bfa88a573..903d8b4491 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -16725,6 +16725,28 @@ pub(crate) mod tests { )); } + // Ensure System transfers of any size can be made to the incinerator + #[test] + fn test_rent_state_incinerator() { + let GenesisConfigInfo { + mut genesis_config, + mint_keypair, + .. + } = create_genesis_config_with_leader(sol_to_lamports(100.), &Pubkey::new_unique(), 42); + genesis_config.rent = Rent::default(); + let rent_exempt_minimum = genesis_config.rent.minimum_balance(0); + + // Activate features, including require_rent_exempt_accounts + activate_all_features(&mut genesis_config); + + let bank = Bank::new_for_tests(&genesis_config); + + for amount in [rent_exempt_minimum - 1, rent_exempt_minimum] { + bank.transfer(amount, &mint_keypair, &solana_sdk::incinerator::id()) + .unwrap(); + } + } + #[test] fn test_rent_state_list_len() { let GenesisConfigInfo {