From bc38ef27d80117f73e2c20798d73384c3c289e22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Mei=C3=9Fner?= <AlexanderMeissner@gmx.net>
Date: Tue, 19 Sep 2023 16:29:52 +0200
Subject: [PATCH] Feature - Enable Program-Runtime-v2 and Loader-v4 (#33294)

* Adds a new feature `enable_program_runtime_v2_and_loader_v4`.

* Adds a feature gated builtin entry for the solana_loader_v4_program.
---
 runtime/src/builtins.rs | 6 ++++++
 sdk/src/feature_set.rs  | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/runtime/src/builtins.rs b/runtime/src/builtins.rs
index 5a21424cc..06a170933 100644
--- a/runtime/src/builtins.rs
+++ b/runtime/src/builtins.rs
@@ -101,4 +101,10 @@ pub static BUILTINS: &[BuiltinPrototype] = &[
         name: "zk_token_proof_program",
         entrypoint: solana_zk_token_proof_program::process_instruction,
     },
+    BuiltinPrototype {
+        feature_id: Some(feature_set::enable_program_runtime_v2_and_loader_v4::id()),
+        program_id: solana_sdk::loader_v4::id(),
+        name: "loader_v4",
+        entrypoint: solana_loader_v4_program::process_instruction,
+    },
 ];
diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs
index 9a52f20dd..95ea3f3b6 100644
--- a/sdk/src/feature_set.rs
+++ b/sdk/src/feature_set.rs
@@ -685,6 +685,10 @@ pub mod remaining_compute_units_syscall_enabled {
     solana_sdk::declare_id!("5TuppMutoyzhUSfuYdhgzD47F92GL1g89KpCZQKqedxP");
 }
 
+pub mod enable_program_runtime_v2_and_loader_v4 {
+    solana_sdk::declare_id!("8oBxsYqnCvUTGzgEpxPcnVf7MLbWWPYddE33PftFeBBd");
+}
+
 lazy_static! {
     /// Map of feature identifiers to user-visible description
     pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
@@ -851,6 +855,7 @@ lazy_static! {
         (enable_poseidon_syscall::id(), "Enable Poseidon syscall"),
         (timely_vote_credits::id(), "use timeliness of votes in determining credits to award"),
         (remaining_compute_units_syscall_enabled::id(), "enable the remaining_compute_units syscall"),
+        (enable_program_runtime_v2_and_loader_v4::id(), "Enable Program-Runtime-v2 and Loader-v4 #33293"),
         /*************** ADD NEW FEATURES HERE ***************/
     ]
     .iter()