From 06d26a396be15eae9604166e645391562affdf67 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 19:42:05 +0200 Subject: [PATCH] v1.16: Fix - Adds missing feature pubkeys to the `FEATURES_AFFECTING_RBPF` list (backport of #32703) (#32705) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix - Adds missing feature pubkeys to the `FEATURES_AFFECTING_RBPF` list (#32703) Adds missing feature pubkeys to the FEATURES_AFFECTING_RBPF list. (cherry picked from commit 33c33f5f7958706e2d727d30560353360190e6b7) Co-authored-by: Alexander Meißner --- programs/bpf_loader/src/syscalls/mod.rs | 5 +++-- runtime/src/bank.rs | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/bpf_loader/src/syscalls/mod.rs b/programs/bpf_loader/src/syscalls/mod.rs index da10eced8aba2a..37af4ce8e3f40e 100644 --- a/programs/bpf_loader/src/syscalls/mod.rs +++ b/programs/bpf_loader/src/syscalls/mod.rs @@ -154,10 +154,11 @@ pub fn create_program_runtime_environment<'a>( let disable_fees_sysvar = feature_set.is_active(&disable_fees_sysvar::id()); let disable_deploy_of_alloc_free_syscall = reject_deployment_of_broken_elfs && feature_set.is_active(&disable_deploy_of_alloc_free_syscall::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 0d194863755539..8ff6d416098716 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -7376,6 +7376,11 @@ 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::disable_deploy_of_alloc_free_syscall::id(), ]; if !only_apply_transitions_for_new_features || FEATURES_AFFECTING_RBPF