merge main into feat-caller-program-id-and-flash-swap

nssa/src/validated_state_diff.rs

@@ -119,7 +119,7 @@ impl ValidatedStateDiff {
                 chained_call.program_id, chained_call.pre_states, chained_call.instruction_data
             );
             let mut program_output =
-                program.execute(&chained_call.pre_states, &chained_call.instruction_data)?;
+                program.execute(caller_program_id, &chained_call.pre_states, &chained_call.instruction_data)?;
             debug!(
                 "Program {:?} output: {:?}",
                 chained_call.program_id, program_output

program_methods/guest/src/bin/clock.rs

@@ -40,6 +40,7 @@ fn main() {
     let (
         ProgramInput {
             self_program_id,
+            caller_program_id,
             pre_states,
             instruction: timestamp,
         },
@@ -84,6 +85,7 @@ fn main() {
 
     ProgramOutput::new(
         self_program_id,
+        caller_program_id,
         instruction_words,
         vec![pre_01, pre_10, pre_50],
         vec![post_01, post_10, post_50],

test_program_methods/guest/src/bin/clock_chain_caller.rs

@@ -15,6 +15,7 @@ fn main() {
     let (
         ProgramInput {
             self_program_id,
+            caller_program_id,
             pre_states,
             instruction: (clock_program_id, timestamp),
         },
@@ -33,7 +34,7 @@ fn main() {
         pda_seeds: vec![],
     };
 
-    ProgramOutput::new(self_program_id, instruction_words, pre_states, post_states)
+    ProgramOutput::new(self_program_id, caller_program_id, instruction_words, pre_states, post_states)
         .with_chained_calls(vec![chained_call])
         .write();
 }

test_program_methods/guest/src/bin/pinata_cooldown.rs

@@ -49,6 +49,7 @@ fn main() {
     let (
         ProgramInput {
             self_program_id,
+            caller_program_id,
             pre_states,
             instruction: (),
         },
@@ -102,6 +103,7 @@ fn main() {
 
     ProgramOutput::new(
         self_program_id,
+        caller_program_id,
         instruction_words,
         vec![pinata, winner, clock_pre],
         vec![

test_program_methods/guest/src/bin/time_locked_transfer.rs

@@ -19,6 +19,7 @@ fn main() {
     let (
         ProgramInput {
             self_program_id,
+            caller_program_id,
             pre_states,
             instruction: (amount, deadline),
         },
@@ -58,6 +59,7 @@ fn main() {
 
     ProgramOutput::new(
         self_program_id,
+        caller_program_id,
         instruction_words,
         vec![sender_pre, receiver_pre, clock_pre],
         vec![