From 12c5a0237b26904a9ee6cb9f6e785d5c934b2a9f Mon Sep 17 00:00:00 2001
From: cryptozoidberg <crypto.zoidberg@gmail.com>
Date: Wed, 24 Jul 2024 23:49:00 +0400
Subject: [PATCH] fixed asset_emission_and_unconfirmed_balance

---
 src/wallet/wallet2.cpp             | 26 +++++++++++++++++++-------
 tests/core_tests/chaingen_main.cpp |  2 +-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 891d76c4..28a754c0 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -3703,12 +3703,13 @@ bool wallet2::balance(std::unordered_map<crypto::public_key, wallet_public::asse
         m_has_bare_unspent_outputs = true;
     }
   }
-
+  std::unordered_map<crypto::public_key, bool> subtransfers_by_assets_map;
   for(auto& utx : m_unconfirmed_txs)
   {
     for (auto& subtransfer : utx.second.subtransfers)
     {
       wallet_public::asset_balance_entry_base& e = balances[subtransfer.asset_id];
+      subtransfers_by_assets_map[subtransfer.asset_id] = subtransfer.is_income;
       if (subtransfer.is_income)
       {
         e.total += subtransfer.amount;
@@ -3729,16 +3730,27 @@ bool wallet2::balance(std::unordered_map<crypto::public_key, wallet_public::asse
         }
       }
     }
-    if (utx.second.has_outgoing_entries())
-    {
+    
+    //has outgoing entries for each asset 
+    //if (utx.second.has_outgoing_entries())
+    //{
       //collect change to unconfirmed
       for (const auto& emp_entry : utx.second.employed_entries.receive)
       {
-        wallet_public::asset_balance_entry_base& e = balances[emp_entry.asset_id];
-        e.total += emp_entry.amount;
+        auto it_employed_entry = subtransfers_by_assets_map.find(emp_entry.asset_id);
+        if (it_employed_entry == subtransfers_by_assets_map.end())
+        {
+          LOG_ERROR("Intenral error, check the wallet code at give location");
+          continue;
+        }
+        if (!(it_employed_entry->second)) // if is_incoming == false, then we need to check for change and add it to total
+        {
+          wallet_public::asset_balance_entry_base& e = balances[emp_entry.asset_id];
+          e.total += emp_entry.amount;
+        }
       }
-
-    }
+    //}
+    
   }
 
   return true;
diff --git a/tests/core_tests/chaingen_main.cpp b/tests/core_tests/chaingen_main.cpp
index 51e02734..70268520 100644
--- a/tests/core_tests/chaingen_main.cpp
+++ b/tests/core_tests/chaingen_main.cpp
@@ -1289,7 +1289,7 @@ int main(int argc, char* argv[])
     GENERATE_AND_PLAY(zarcanum_block_with_txs);
     GENERATE_AND_PLAY(asset_depoyment_and_few_zc_utxos);
     GENERATE_AND_PLAY_HF(assets_and_pos_mining, "4-*");
-    // GENERATE_AND_PLAY_HF(asset_emission_and_unconfirmed_balance, "4-*");
+    GENERATE_AND_PLAY_HF(asset_emission_and_unconfirmed_balance, "4-*");
     
     GENERATE_AND_PLAY_HF(pos_fuse_test, "4-*");