From a744092d9ab7753ca843096a40b1245fdba4eb4e Mon Sep 17 00:00:00 2001
From: cryptozoidberg <crypto.zoidberg@gmail.com>
Date: Tue, 20 Jun 2023 21:59:02 +0200
Subject: [PATCH] last fixes over bunch of tests

---
 src/wallet/wallet2.cpp            | 6 ++++--
 src/wallet/wallet2.h              | 2 +-
 tests/core_tests/wallet_tests.cpp | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index f1a09319..3daccfb9 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -834,7 +834,7 @@ void wallet2::process_new_transaction(const currency::transaction& tx, uint64_t
     }
   }
 
-  if (has_in_transfers || has_out_transfers || is_derivation_used_to_encrypt(tx, derivation))
+  if (has_in_transfers || has_out_transfers || is_derivation_used_to_encrypt(tx, derivation) || ptc.employed_entries.spent.size())
   {
     ptc.timestamp = get_block_datetime(b);
     handle_money(b, ptc);
@@ -898,7 +898,8 @@ void wallet2::prepare_wti_decrypted_attachments(wallet_public::wallet_transfer_i
     account_public_address sender_address = AUTO_VAL_INIT(sender_address);
     wti.show_sender = handle_2_alternative_types_in_variant_container<tx_payer, tx_payer_old>(decrypted_att, [&](const tx_payer& p) { sender_address = p.acc_addr; return false; /* <- continue? */ });
     if (wti.show_sender)
-      wti.remote_addresses.push_back(currency::get_account_address_as_str(sender_address));
+      if(!wti.remote_addresses.size()) 
+        wti.remote_addresses.push_back(currency::get_account_address_as_str(sender_address));
   }
   else
   {
@@ -2136,6 +2137,7 @@ uint64_t wallet2::get_directly_spent_transfer_index_by_input_in_tracking_wallet(
 void wallet2::handle_unconfirmed_tx(process_transaction_context& ptc)
 {
   const transaction& tx = ptc.tx;
+  ptc.timestamp = m_core_runtime_config.get_core_time();
   // read extra
   std::vector<wallet_out_info> outs;
   //uint64_t sum_of_received_native_outs = 0;
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 7d06135e..13ecdb1b 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -490,7 +490,7 @@ namespace tools
       crypto::hash related_tx_id = currency::null_hash; // tx id which caused money lock, if any (ex: escrow proposal transport tx)
       std::vector<payment_details_subtransfer> receved;
 
-      BEGIN_BOOST_SERIALIZATION_SV(104)
+      BEGIN_BOOST_SERIALIZATION()
         BOOST_SERIALIZE(selected_transfers)
         BOOST_SERIALIZE(expiration_time)
         BOOST_SERIALIZE(related_tx_id)
diff --git a/tests/core_tests/wallet_tests.cpp b/tests/core_tests/wallet_tests.cpp
index b4540fcf..06f6931d 100644
--- a/tests/core_tests/wallet_tests.cpp
+++ b/tests/core_tests/wallet_tests.cpp
@@ -1833,7 +1833,7 @@ bool gen_wallet_alias_via_special_wallet_funcs::c1(currency::core& c, size_t ev_
   std::shared_ptr<wlt_lambda_on_transfer2_wrapper> l(new wlt_lambda_on_transfer2_wrapper(
     [biggest_alias_reward](const tools::wallet_public::wallet_transfer_info& wti, const std::list<tools::wallet_public::asset_balance_entry>& balances, uint64_t total_mined) -> bool {
       return std::count(wti.remote_aliases.begin(), wti.remote_aliases.end(), "minerminer") == 1 &&
-        wti.get_native_amount() == biggest_alias_reward;
+        wti.get_native_amount() == biggest_alias_reward + get_tx_fee(wti.tx);
     }
   ));
   alice_wlt->callback(l);