Set deployment slot for non-upgradeable programs (solana-labs#31792)

* Set deployment slot for non-upgradeable programs * fix sbf programs test
HaoranYi · May 24, 2023 · 1190a31 · 1190a31
1 parent e499928
commit 1190a31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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());