Prevent delay_visibility_of_program_deployment feature from cache pru…

…ning (#33689) (cherry picked from commit fd92977) # Conflicts: # runtime/src/bank.rs
solana-labs · Oct 13, 2023 · 062a5cc · 062a5cc
1 parent 26fc045
commit 062a5cc
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -7464,7 +7464,12 @@ impl Bank {
             feature_set::curve25519_syscall_enabled::id(),
             feature_set::disable_fees_sysvar::id(),
             feature_set::disable_deploy_of_alloc_free_syscall::id(),
+<<<<<<< HEAD
             feature_set::delay_visibility_of_program_deployment::id(),
+=======
+            feature_set::last_restart_slot_sysvar::id(),
+            feature_set::remaining_compute_units_syscall_enabled::id(),
+>>>>>>> fd9297775a (Prevent delay_visibility_of_program_deployment feature from cache pruning (#33689))
         ];
         if !only_apply_transitions_for_new_features
             || FEATURES_AFFECTING_RBPF