v2.2: Fix - Allow ExtendProgramChecked in CPI (backport of #6245) (#6443)

Fix - Allow ExtendProgramChecked in CPI (#6245)

* Allows invoking ExtendProgramChecked in CPI.

* Rekeys the feature enable_extend_program_checked.

(cherry picked from commit f5616d3)

Co-authored-by: Alexander Meißner <AlexanderMeissner@gmx.net>

Author: mergify[bot]

Cargo.lock

@@ -446,7 +446,7 @@ solana-last-restart-slot = "2.2.1"
 solana-lattice-hash = { path = "lattice-hash", version = "=2.2.16" }
 solana-ledger = { path = "ledger", version = "=2.2.16" }
 solana-loader-v2-interface = "2.2.1"
-solana-loader-v3-interface = "4.0.1"
+solana-loader-v3-interface = "5.0.0"
 solana-loader-v4-interface = "2.2.1"
 solana-loader-v4-program = { path = "programs/loader-v4", version = "=2.2.16" }
 solana-local-cluster = { path = "local-cluster", version = "=2.2.16" }

Cargo.toml

@@ -1018,7 +1018,7 @@ pub mod mask_out_rent_epoch_in_vm_serialization {
 }
 
 pub mod enable_extend_program_checked {
-    solana_pubkey::declare_id!("97QCmR4QtfeQsAti9srfHFk5uMRFP95CvXG8EGr615HM");
+    solana_pubkey::declare_id!("2oMRZEDWT2tqtYMofhmmfQ8SsjqUFzT6sYXppQDavxwz");
 }
 
 pub static FEATURE_NAMES: LazyLock<AHashMap<Pubkey, &'static str>> = LazyLock::new(|| {

feature-set/src/lib.rs

@@ -23,7 +23,7 @@ solana-clap-utils = { workspace = true }
 solana-cli-config = { workspace = true }
 solana-entry = { workspace = true }
 solana-ledger = { workspace = true }
-solana-loader-v3-interface = "=4.0.1"
+solana-loader-v3-interface = "5.0.0"
 solana-logger = "=2.3.1"
 solana-rpc-client = { workspace = true }
 solana-rpc-client-api = { workspace = true }

genesis/Cargo.toml

@@ -1,7 +1,9 @@
 use {
     super::*,
     crate::serialization::account_data_region_memory_state,
-    agave_feature_set::enable_bpf_loader_set_authority_checked_ix,
+    agave_feature_set::{
+        enable_bpf_loader_set_authority_checked_ix, enable_extend_program_checked,
+    },
     scopeguard::defer,
     solana_loader_v3_interface::instruction as bpf_loader_upgradeable,
     solana_measure::measure::Measure,
@@ -1067,6 +1069,12 @@ fn check_authorized_program(
                     && bpf_loader_upgradeable::is_set_authority_checked_instruction(
                         instruction_data,
                     ))
+                || (invoke_context
+                    .get_feature_set()
+                    .is_active(&enable_extend_program_checked::id())
+                    && bpf_loader_upgradeable::is_extend_program_checked_instruction(
+                        instruction_data,
+                    ))
                 || bpf_loader_upgradeable::is_close_instruction(instruction_data)))
         || is_precompile(program_id, |feature_id: &Pubkey| {
             invoke_context.get_feature_set().is_active(feature_id)

programs/bpf_loader/src/syscalls/cpi.rs

@@ -124,7 +124,7 @@ solana-compute-budget-instruction = { workspace = true, features = [
 ] }
 solana-fee = { workspace = true }
 solana-ledger = { workspace = true }
-solana-loader-v3-interface = "4.0.1"
+solana-loader-v3-interface = "5.0.0"
 solana-loader-v4-interface = "2.2.1"
 solana-log-collector = { workspace = true }
 solana-logger = { workspace = true }