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

Cleanup - feature gate of `stop_sibling_instruction_search_at_parent` (#34841) 

Cleanup feature gate of stop_sibling_instruction_search_at_parent.
This commit is contained in:
Alexander Meißner 2024-01-19 09:07:30 +01:00 committed by GitHub
parent 6976b750a9
commit b5b829111c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
programs/bpf_loader/src/syscalls/mod.rs
View File

@ -40,14 +40,10 @@ use {
enable_big_mod_exp_syscall, enable_partitioned_epoch_reward, enable_poseidon_syscall, enable_big_mod_exp_syscall, enable_partitioned_epoch_reward, enable_poseidon_syscall,
error_on_syscall_bpf_function_hash_collisions, last_restart_slot_sysvar, error_on_syscall_bpf_function_hash_collisions, last_restart_slot_sysvar,
reject_callx_r10, remaining_compute_units_syscall_enabled, reject_callx_r10, remaining_compute_units_syscall_enabled,
stop_sibling_instruction_search_at_parent, stop_truncating_strings_in_syscalls, stop_truncating_strings_in_syscalls, switch_to_new_elf_parser,
switch_to_new_elf_parser,
}, },
hash::{Hash, Hasher}, hash::{Hash, Hasher},
instruction::{ instruction::{AccountMeta, InstructionError, ProcessedSiblingInstruction},
AccountMeta, InstructionError, ProcessedSiblingInstruction,
TRANSACTION_LEVEL_STACK_HEIGHT,
},
keccak, native_loader, poseidon, keccak, native_loader, poseidon,
precompiles::is_precompile, precompiles::is_precompile,
program::MAX_RETURN_DATA, program::MAX_RETURN_DATA,
@ -1361,9 +1357,6 @@ declare_builtin_function!(
let budget = invoke_context.get_compute_budget(); let budget = invoke_context.get_compute_budget();
consume_compute_meter(invoke_context, budget.syscall_base_cost)?; consume_compute_meter(invoke_context, budget.syscall_base_cost)?;
let stop_sibling_instruction_search_at_parent = invoke_context
.feature_set
.is_active(&stop_sibling_instruction_search_at_parent::id());
// Reverse iterate through the instruction trace, // Reverse iterate through the instruction trace,
// ignoring anything except instructions on the same level // ignoring anything except instructions on the same level
@ -1377,10 +1370,7 @@ declare_builtin_function!(
let instruction_context = invoke_context let instruction_context = invoke_context
.transaction_context .transaction_context
.get_instruction_context_at_index_in_trace(index_in_trace)?; .get_instruction_context_at_index_in_trace(index_in_trace)?;
if (stop_sibling_instruction_search_at_parent if instruction_context.get_stack_height() < stack_height {
|| instruction_context.get_stack_height() == TRANSACTION_LEVEL_STACK_HEIGHT)
&& instruction_context.get_stack_height() < stack_height
{
break; break;
} }
if instruction_context.get_stack_height() == stack_height { if instruction_context.get_stack_height() == stack_height {