From 062a5ccb1a8c4c92181809d48a8aba481e4e6a75 Mon Sep 17 00:00:00 2001
From: Pankaj Garg <pankaj@solana.com>
Date: Fri, 13 Oct 2023 07:21:18 -0700
Subject: [PATCH] Prevent delay_visibility_of_program_deployment feature from
 cache pruning (#33689)

(cherry picked from commit fd9297775a4b2e0e3f4a6f8bf4ed757e81ea1ad0)

# Conflicts:
#	runtime/src/bank.rs
---
 runtime/src/bank.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index 4b486d8424acf7..ffe111800db41d 100644
--- 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