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

cleanup feature: return_data_syscall_enabled (#25877)

This commit is contained in:
Jack May 2022-06-09 23:26:53 -07:00 committed by GitHub
parent 72f7aaf954
commit fe4793e049
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
programs/bpf_loader/src/syscalls.rs
View File

@ -27,8 +27,8 @@ use {
executables_incur_cpi_data_cost, fixed_memcpy_nonoverlapping_check, executables_incur_cpi_data_cost, fixed_memcpy_nonoverlapping_check,
libsecp256k1_0_5_upgrade_enabled, limit_secp256k1_recovery_id, libsecp256k1_0_5_upgrade_enabled, limit_secp256k1_recovery_id,
prevent_calling_precompiles_as_programs, quick_bail_on_panic, prevent_calling_precompiles_as_programs, quick_bail_on_panic,
return_data_syscall_enabled, secp256k1_recover_syscall_enabled, syscall_saturated_math, secp256k1_recover_syscall_enabled, syscall_saturated_math, update_syscall_base_costs,
update_syscall_base_costs, zk_token_sdk_enabled, zk_token_sdk_enabled,
}, },
hash::{Hasher, HASH_BYTES}, hash::{Hasher, HASH_BYTES},
instruction::{ instruction::{
@ -145,9 +145,6 @@ pub fn register_syscalls(
let disable_fees_sysvar = invoke_context let disable_fees_sysvar = invoke_context
.feature_set .feature_set
.is_active(&disable_fees_sysvar::id()); .is_active(&disable_fees_sysvar::id());
let return_data_syscall_enabled = invoke_context
.feature_set
.is_active(&return_data_syscall_enabled::id());
let mut syscall_registry = SyscallRegistry::default(); let mut syscall_registry = SyscallRegistry::default();
@ -332,16 +329,12 @@ pub fn register_syscalls(
)?; )?;
// Return data // Return data
register_feature_gated_syscall!( syscall_registry.register_syscall_by_name(
syscall_registry,
return_data_syscall_enabled,
b"sol_set_return_data", b"sol_set_return_data",
SyscallSetReturnData::init, SyscallSetReturnData::init,
SyscallSetReturnData::call, SyscallSetReturnData::call,
)?; )?;
register_feature_gated_syscall!( syscall_registry.register_syscall_by_name(
syscall_registry,
return_data_syscall_enabled,
b"sol_get_return_data", b"sol_get_return_data",
SyscallGetReturnData::init, SyscallGetReturnData::init,
SyscallGetReturnData::call, SyscallGetReturnData::call,