From 6622ca024482afeb5b76b43cea539b15f00b80c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Mei=C3=9Fner?= Date: Tue, 1 Aug 2023 21:00:34 +0200 Subject: [PATCH] Adds missing feature pubkeys to the FEATURES_AFFECTING_RBPF list. --- programs/bpf_loader/src/syscalls/mod.rs | 5 +++-- runtime/src/bank.rs | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/bpf_loader/src/syscalls/mod.rs b/programs/bpf_loader/src/syscalls/mod.rs index cc634eebd4680c..a64acf7650bb37 100644 --- a/programs/bpf_loader/src/syscalls/mod.rs +++ b/programs/bpf_loader/src/syscalls/mod.rs @@ -158,10 +158,11 @@ pub fn create_program_runtime_environment<'a>( let disable_deploy_of_alloc_free_syscall = reject_deployment_of_broken_elfs && feature_set.is_active(&disable_deploy_of_alloc_free_syscall::id()); let last_restart_slot_syscall_enabled = feature_set.is_active(&last_restart_slot_sysvar::id()); + // !!! ATTENTION !!! + // When adding new features for RBPF here, + // also add them to `Bank::apply_builtin_program_feature_transitions()`. use rand::Rng; - // When adding new features for RBPF, - // also add them to `Bank::apply_builtin_program_feature_transitions()`. let config = Config { max_call_depth: compute_budget.max_call_depth, stack_frame_size: compute_budget.stack_frame_size, diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index c34c142737b512..8a44e011dca45f 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -7981,6 +7981,13 @@ impl Bank { feature_set::switch_to_new_elf_parser::id(), feature_set::bpf_account_data_direct_mapping::id(), feature_set::enable_alt_bn128_syscall::id(), + feature_set::enable_big_mod_exp_syscall::id(), + feature_set::blake3_syscall_enabled::id(), + feature_set::curve25519_syscall_enabled::id(), + feature_set::disable_fees_sysvar::id(), + feature_set::enable_partitioned_epoch_reward::id(), + feature_set::disable_deploy_of_alloc_free_syscall::id(), + feature_set::last_restart_slot_sysvar::id(), ]; if !only_apply_transitions_for_new_features || FEATURES_AFFECTING_RBPF