77 serialization:: { create_memory_region_of_account, modify_memory_region_of_account} ,
88 } ,
99 solana_account_info:: AccountInfo ,
10- solana_instruction:: { error :: InstructionError , AccountMeta , Instruction } ,
10+ solana_instruction:: { AccountMeta , Instruction , error :: InstructionError } ,
1111 solana_loader_v3_interface:: instruction as bpf_loader_upgradeable,
1212 solana_program_entrypoint:: MAX_PERMITTED_DATA_INCREASE ,
13- solana_pubkey:: { Pubkey , PubkeyError , MAX_SEEDS } ,
13+ solana_pubkey:: { MAX_SEEDS , Pubkey , PubkeyError } ,
1414 solana_sbpf:: { ebpf, memory_region:: MemoryMapping } ,
1515 solana_sdk_ids:: { bpf_loader, bpf_loader_deprecated, native_loader} ,
1616 solana_stable_layout:: stable_instruction:: StableInstruction ,
1717 solana_svm_log_collector:: ic_msg,
1818 solana_svm_measure:: measure:: Measure ,
1919 solana_svm_timings:: ExecuteTimings ,
2020 solana_transaction_context:: {
21- vm_slice :: VmSlice , BorrowedInstructionAccount , IndexOfAccount ,
22- MAX_ACCOUNTS_PER_INSTRUCTION , MAX_INSTRUCTION_DATA_LEN ,
21+ BorrowedInstructionAccount , IndexOfAccount , MAX_ACCOUNTS_PER_INSTRUCTION ,
22+ MAX_INSTRUCTION_DATA_LEN , vm_slice :: VmSlice ,
2323 } ,
2424 std:: mem,
2525 thiserror:: Error ,
@@ -247,7 +247,7 @@ pub struct CallerAccount<'a> {
247247
248248impl < ' a > CallerAccount < ' a > {
249249 pub fn get_serialized_data (
250- memory_mapping : & solana_sbpf:: memory_region:: MemoryMapping < ' _ > ,
250+ memory_mapping : & solana_sbpf:: memory_region:: MemoryMapping ,
251251 vm_addr : u64 ,
252252 len : u64 ,
253253 stricter_abi_and_runtime_constraints : bool ,
@@ -286,7 +286,7 @@ impl<'a> CallerAccount<'a> {
286286 // Create a CallerAccount given an AccountInfo.
287287 pub fn from_account_info (
288288 invoke_context : & InvokeContext ,
289- memory_mapping : & solana_sbpf:: memory_region:: MemoryMapping < ' _ > ,
289+ memory_mapping : & solana_sbpf:: memory_region:: MemoryMapping ,
290290 check_aligned : bool ,
291291 _vm_addr : u64 ,
292292 account_info : & solana_account_info:: AccountInfo ,
@@ -296,7 +296,7 @@ impl<'a> CallerAccount<'a> {
296296
297297 let stricter_abi_and_runtime_constraints = invoke_context
298298 . get_feature_set ( )
299- . stricter_abi_and_runtime_constraints ;
299+ . virtual_address_space_adjustments ;
300300 let account_data_direct_mapping =
301301 invoke_context. get_feature_set ( ) . account_data_direct_mapping ;
302302
@@ -409,7 +409,7 @@ impl<'a> CallerAccount<'a> {
409409 // Create a CallerAccount given a SolAccountInfo.
410410 fn from_sol_account_info (
411411 invoke_context : & InvokeContext ,
412- memory_mapping : & solana_sbpf:: memory_region:: MemoryMapping < ' _ > ,
412+ memory_mapping : & solana_sbpf:: memory_region:: MemoryMapping ,
413413 check_aligned : bool ,
414414 vm_addr : u64 ,
415415 account_info : & SolAccountInfo ,
@@ -419,7 +419,7 @@ impl<'a> CallerAccount<'a> {
419419
420420 let stricter_abi_and_runtime_constraints = invoke_context
421421 . get_feature_set ( )
422- . stricter_abi_and_runtime_constraints ;
422+ . virtual_address_space_adjustments ;
423423 let account_data_direct_mapping =
424424 invoke_context. get_feature_set ( ) . account_data_direct_mapping ;
425425
@@ -513,7 +513,7 @@ pub trait SyscallInvokeSigned {
513513 fn translate_accounts < ' a > (
514514 account_infos_addr : u64 ,
515515 account_infos_len : u64 ,
516- memory_mapping : & MemoryMapping < ' _ > ,
516+ memory_mapping : & MemoryMapping ,
517517 invoke_context : & mut InvokeContext ,
518518 check_aligned : bool ,
519519 ) -> Result < Vec < TranslatedAccount < ' a > > , Error > ;
@@ -592,7 +592,7 @@ pub fn translate_instruction_rust(
592592pub fn translate_accounts_rust < ' a > (
593593 account_infos_addr : u64 ,
594594 account_infos_len : u64 ,
595- memory_mapping : & MemoryMapping < ' _ > ,
595+ memory_mapping : & MemoryMapping ,
596596 invoke_context : & mut InvokeContext ,
597597 check_aligned : bool ,
598598) -> Result < Vec < TranslatedAccount < ' a > > , Error > {
@@ -730,7 +730,7 @@ pub fn translate_instruction_c(
730730pub fn translate_accounts_c < ' a > (
731731 account_infos_addr : u64 ,
732732 account_infos_len : u64 ,
733- memory_mapping : & MemoryMapping < ' _ > ,
733+ memory_mapping : & MemoryMapping ,
734734 invoke_context : & mut InvokeContext ,
735735 check_aligned : bool ,
736736) -> Result < Vec < TranslatedAccount < ' a > > , Error > {
@@ -822,7 +822,7 @@ pub fn cpi_common<S: SyscallInvokeSigned>(
822822 }
823823 let stricter_abi_and_runtime_constraints = invoke_context
824824 . get_feature_set ( )
825- . stricter_abi_and_runtime_constraints ;
825+ . virtual_address_space_adjustments ;
826826 let account_data_direct_mapping = invoke_context. get_feature_set ( ) . account_data_direct_mapping ;
827827 let check_aligned = invoke_context. get_check_aligned ( ) ;
828828
@@ -945,7 +945,7 @@ where
945945{
946946 let stricter_abi_and_runtime_constraints = invoke_context
947947 . get_feature_set ( )
948- . stricter_abi_and_runtime_constraints ;
948+ . virtual_address_space_adjustments ;
949949
950950 // In the same vein as the other check_account_info_pointer() checks, we don't lock
951951 // this pointer to a specific address but we don't want it to be inside accounts, or
@@ -1000,14 +1000,14 @@ fn translate_accounts_common<'a, T, F>(
10001000 account_infos : & [ T ] ,
10011001 account_infos_addr : u64 ,
10021002 invoke_context : & mut InvokeContext ,
1003- memory_mapping : & MemoryMapping < ' _ > ,
1003+ memory_mapping : & MemoryMapping ,
10041004 check_aligned : bool ,
10051005 do_translate : F ,
10061006) -> Result < Vec < TranslatedAccount < ' a > > , Error >
10071007where
10081008 F : Fn (
10091009 & InvokeContext ,
1010- & MemoryMapping < ' _ > ,
1010+ & MemoryMapping ,
10111011 bool ,
10121012 u64 ,
10131013 & T ,
@@ -1029,7 +1029,7 @@ where
10291029
10301030 let stricter_abi_and_runtime_constraints = invoke_context
10311031 . get_feature_set ( )
1032- . stricter_abi_and_runtime_constraints ;
1032+ . virtual_address_space_adjustments ;
10331033 let account_data_direct_mapping = invoke_context. get_feature_set ( ) . account_data_direct_mapping ;
10341034
10351035 for ( instruction_account_index, instruction_account) in
@@ -1265,7 +1265,7 @@ fn update_caller_account_region(
12651265// accounts (regardless of the current size of an account).
12661266fn update_caller_account (
12671267 invoke_context : & InvokeContext ,
1268- memory_mapping : & MemoryMapping < ' _ > ,
1268+ memory_mapping : & MemoryMapping ,
12691269 check_aligned : bool ,
12701270 caller_account : & mut CallerAccount < ' _ > ,
12711271 callee_account : & mut BorrowedInstructionAccount < ' _ , ' _ > ,
@@ -1371,7 +1371,7 @@ mod tests {
13711371 solana_sdk_ids:: { bpf_loader, system_program} ,
13721372 solana_svm_feature_set:: SVMFeatureSet ,
13731373 solana_transaction_context:: {
1374- transaction_accounts :: KeyedAccountSharedData , IndexOfAccount , InstructionAccount ,
1374+ IndexOfAccount , InstructionAccount , transaction_accounts :: KeyedAccountSharedData ,
13751375 } ,
13761376 std:: {
13771377 cell:: { Cell , RefCell } ,
@@ -1405,7 +1405,7 @@ mod tests {
14051405 . map( |a| ( a. 0 , a. 1 ) )
14061406 . collect:: <Vec <KeyedAccountSharedData >>( ) ;
14071407 let mut feature_set = SVMFeatureSet :: all_enabled( ) ;
1408- feature_set. stricter_abi_and_runtime_constraints = false ;
1408+ feature_set. virtual_address_space_adjustments = false ;
14091409 let feature_set = & feature_set;
14101410 with_mock_invoke_context_with_feature_set!(
14111411 $invoke_context,
0 commit comments