From f890fe54fe93dd4148165d306646a4af2df95cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Mei=C3=9Fner?= Date: Wed, 15 Nov 2023 16:56:51 +0100 Subject: [PATCH] Cleans up feature gate of enable_program_redeployment_cooldown. --- programs/bpf_loader/src/lib.rs | 47 ++++++++-------------------------- 1 file changed, 10 insertions(+), 37 deletions(-) diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs index 2b745d88815775..e9ec2f7bff7bb3 100644 --- a/programs/bpf_loader/src/lib.rs +++ b/programs/bpf_loader/src/lib.rs @@ -36,8 +36,8 @@ use { feature_set::{ bpf_account_data_direct_mapping, delay_visibility_of_program_deployment, enable_bpf_loader_extend_program_ix, enable_bpf_loader_set_authority_checked_ix, - enable_program_redeployment_cooldown, limit_max_instruction_trace_length, - native_programs_consume_cu, remove_bpf_loader_incorrect_program_id, + limit_max_instruction_trace_length, native_programs_consume_cu, + remove_bpf_loader_incorrect_program_id, }, instruction::{AccountMeta, InstructionError}, loader_instruction::LoaderInstruction, @@ -779,12 +779,7 @@ fn process_loader_upgradeable_instruction( .get(buffer_data_offset..) .ok_or(InstructionError::AccountDataTooSmall)?; dst_slice.copy_from_slice(src_slice); - if invoke_context - .feature_set - .is_active(&enable_program_redeployment_cooldown::id()) - { - buffer.set_data_length(UpgradeableLoaderState::size_of_buffer(0))?; - } + buffer.set_data_length(UpgradeableLoaderState::size_of_buffer(0))?; } // Update the Program account @@ -897,11 +892,7 @@ fn process_loader_upgradeable_instruction( upgrade_authority_address, } = programdata.get_state()? { - if invoke_context - .feature_set - .is_active(&enable_program_redeployment_cooldown::id()) - && clock.slot == slot - { + if clock.slot == slot { ic_logger_msg!(log_collector, "Program was deployed in this block already"); return Err(InstructionError::InvalidArgument); } @@ -988,12 +979,7 @@ fn process_loader_upgradeable_instruction( )?; buffer.set_lamports(0)?; programdata.set_lamports(programdata_balance_required)?; - if invoke_context - .feature_set - .is_active(&enable_program_redeployment_cooldown::id()) - { - buffer.set_data_length(UpgradeableLoaderState::size_of_buffer(0))?; - } + buffer.set_data_length(UpgradeableLoaderState::size_of_buffer(0))?; ic_logger_msg!(log_collector, "Upgraded program {:?}", new_program_id); } @@ -1150,12 +1136,7 @@ fn process_loader_upgradeable_instruction( instruction_context.try_borrow_instruction_account(transaction_context, 0)?; let close_key = *close_account.get_key(); let close_account_state = close_account.get_state()?; - if invoke_context - .feature_set - .is_active(&enable_program_redeployment_cooldown::id()) - { - close_account.set_data_length(UpgradeableLoaderState::size_of_uninitialized())?; - } + close_account.set_data_length(UpgradeableLoaderState::size_of_uninitialized())?; match close_account_state { UpgradeableLoaderState::Uninitialized => { let mut recipient_account = instruction_context @@ -1195,18 +1176,10 @@ fn process_loader_upgradeable_instruction( ic_logger_msg!(log_collector, "Program account not owned by loader"); return Err(InstructionError::IncorrectProgramId); } - if invoke_context - .feature_set - .is_active(&enable_program_redeployment_cooldown::id()) - { - let clock = invoke_context.get_sysvar_cache().get_clock()?; - if clock.slot == slot { - ic_logger_msg!( - log_collector, - "Program was deployed in this block already" - ); - return Err(InstructionError::InvalidArgument); - } + let clock = invoke_context.get_sysvar_cache().get_clock()?; + if clock.slot == slot { + ic_logger_msg!(log_collector, "Program was deployed in this block already"); + return Err(InstructionError::InvalidArgument); } match program_account.get_state()? {