From c107fd25679c9decb2d28fe37f0f24cedf6d9930 Mon Sep 17 00:00:00 2001
From: Lee *!* Clagett <vtnerd@users.noreply.github.com>
Date: Fri, 28 Aug 2026 16:36:46 -0400
Subject: [PATCH] Fix spend public key for new check in upstream construct_tx
 (#15)

(cherry picked from commit 2ab30fbdb4be3bd182259853c120c7b92f819184)
---
 src/backend.cpp | 2 +-
 src/wallet.cpp  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/backend.cpp b/src/backend.cpp
index 45cd64f..b0fb705 100644
--- a/src/backend.cpp
+++ b/src/backend.cpp
@@ -1540,7 +1540,7 @@ namespace lwsf { namespace internal { namespace backend
   cryptonote::account_keys wallet::get_primary_keys() const
   {
     return {
-      {primary.view.pub, primary.spend.pub}, primary.spend.sec, primary.view.sec
+      {primary.spend.pub, primary.view.pub}, primary.spend.sec, primary.view.sec
     }; 
   }
 
diff --git a/src/wallet.cpp b/src/wallet.cpp
index b8ba0e5..22c9ed3 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -1576,6 +1576,7 @@ namespace lwsf { namespace internal
 
             std::unordered_map<crypto::public_key, cryptonote::subaddress_index> subs;
             std::vector<cryptonote::tx_source_entry> sources;
+            subs.emplace(change_account.m_spend_public_key, cryptonote::subaddress_index{subaddr_account, 0});
             for (const auto& spend : spending)
             {
               const auto& source = spend.second->receives.at(spend.first);