gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Feature disable fees sysvar (#18981)

Browse Source 
* Feature disable fees sysvar

* nudge
This commit is contained in:
Jack May
2021-08-01 17:31:11 -07:00
committed by GitHub
parent 9d2f0e237b
commit 77861e2d40
7 changed files with 42 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,8 +21,8 @@ use solana_sdk::{
entrypoint::{MAX_PERMITTED_DATA_INCREASE, SUCCESS},
epoch_schedule::EpochSchedule,
feature_set::{
blake3_syscall_enabled, enforce_aligned_host_addrs, libsecp256k1_0_5_upgrade_enabled,
memory_ops_syscalls, secp256k1_recover_syscall_enabled,
blake3_syscall_enabled, disable_fees_sysvar, enforce_aligned_host_addrs,
libsecp256k1_0_5_upgrade_enabled, memory_ops_syscalls, secp256k1_recover_syscall_enabled,
},
hash::{Hasher, HASH_BYTES},
ic_msg,
@ -150,8 +150,10 @@ pub fn register_syscalls(
b"sol_get_epoch_schedule_sysvar",
SyscallGetEpochScheduleSysvar::call,
)?;
syscall_registry
.register_syscall_by_name(b"sol_get_fees_sysvar", SyscallGetFeesSysvar::call)?;
if invoke_context.is_feature_active(&disable_fees_sysvar::id()) {
syscall_registry
.register_syscall_by_name(b"sol_get_fees_sysvar", SyscallGetFeesSysvar::call)?;
}
syscall_registry
.register_syscall_by_name(b"sol_get_rent_sysvar", SyscallGetRentSysvar::call)?;
@ -346,6 +348,9 @@ pub fn bind_syscall_context_objects<'a>(
}),
);
let is_fee_sysvar_via_syscall_active =
!invoke_context.is_feature_active(&disable_fees_sysvar::id());
let invoke_context = Rc::new(RefCell::new(invoke_context));
vm.bind_syscall_context_object(
@ -362,13 +367,14 @@ pub fn bind_syscall_context_objects<'a>(
}),
None,
)?;
vm.bind_syscall_context_object(
bind_feature_gated_syscall_context_object!(
vm,
is_fee_sysvar_via_syscall_active,
Box::new(SyscallGetFeesSysvar {
invoke_context: invoke_context.clone(),
loader_id,
}),
None,
)?;
);
vm.bind_syscall_context_object(
Box::new(SyscallGetRentSysvar {
invoke_context: invoke_context.clone(),