From 595eb312776ac50f02b06c7525c7498977808892 Mon Sep 17 00:00:00 2001
From: Pankaj Garg <pankaj@solana.com>
Date: Wed, 24 May 2023 09:15:47 -0700
Subject: [PATCH] Set deployment slot for non-upgradeable programs (#31792)

* Set deployment slot for non-upgradeable programs

* fix sbf programs test
---
 programs/bpf_loader/src/lib.rs | 2 +-
 programs/sbf/tests/programs.rs | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs
index 822753f81b..d6b09e07d0 100644
--- a/programs/bpf_loader/src/lib.rs
+++ b/programs/bpf_loader/src/lib.rs
@@ -1480,7 +1480,7 @@ fn process_loader_instruction(invoke_context: &mut InvokeContext) -> Result<(),
                 *program.get_key(),
                 program.get_owner(),
                 program.get_data().len(),
-                0,
+                invoke_context.programs_loaded_for_tx_batch.slot(),
                 {},
                 program.get_data(),
             );
diff --git a/programs/sbf/tests/programs.rs b/programs/sbf/tests/programs.rs
index 9a3f2d9778..9a3910f4f7 100644
--- a/programs/sbf/tests/programs.rs
+++ b/programs/sbf/tests/programs.rs
@@ -1593,6 +1593,9 @@ fn test_program_sbf_test_use_latest_executor() {
         )],
         Some(&mint_keypair.pubkey()),
     );
+    bank_client
+        .advance_slot(1, &Pubkey::default())
+        .expect("Failed to advance the slot");
     assert!(bank_client
         .send_and_confirm_message(&[&mint_keypair], message)
         .is_ok());