From 9a342732225c3b5c14a4635086f154b2de330f5b Mon Sep 17 00:00:00 2001
From: ygd58 <buraysandro9@gmail.com>
Date: Fri, 27 Mar 2026 22:56:58 +0100
Subject: [PATCH] feat: populate owner_program_id in public transaction
 pre_states

Now AccountWithMetadata.owner_program_id is set from the account's
actual program_owner when building pre_states for execution.

Programs can now reliably check account ownership:
  if let Some(owner) = account.owner_program_id {
      assert_eq!(owner, SELF_PROGRAM_ID);
  }

Refs #347
---
 nssa/src/public_transaction/transaction.rs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nssa/src/public_transaction/transaction.rs b/nssa/src/public_transaction/transaction.rs
index 8151f8cf..ed370ca0 100644
--- a/nssa/src/public_transaction/transaction.rs
+++ b/nssa/src/public_transaction/transaction.rs
@@ -109,11 +109,20 @@ impl PublicTransaction {
             .account_ids
             .iter()
             .map(|account_id| {
+                let account = state.get_account_by_id(*account_id);
+                let owner_program_id = account.program_owner;
+                let is_default_owner = owner_program_id == nssa_core::program::DEFAULT_PROGRAM_ID;
                 AccountWithMetadata::new(
-                    state.get_account_by_id(*account_id),
+                    account,
                     signer_account_ids.contains(account_id),
                     *account_id,
                 )
+                .with_owner_program_id(if is_default_owner {
+                    // Uninitialized accounts have no meaningful owner
+                    nssa_core::program::DEFAULT_PROGRAM_ID
+                } else {
+                    owner_program_id
+                })
             })
             .collect();