Merge branch 'release' into develop

src/version.h.in

@@ -8,6 +8,6 @@
 #define PROJECT_REVISION "0"
 #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION
 
-#define PROJECT_VERSION_BUILD_NO 265
+#define PROJECT_VERSION_BUILD_NO 266
 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO)
 #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]"

src/wallet/wallet2.cpp

@@ -58,6 +58,8 @@ using namespace currency;
 #define WALLET_MIN_UTXO_COUNT_FOR_DEFRAGMENTATION_TX                  3   // TODO: @#@# consider descreasing to mimic normal tx
 #define WALLET_MAX_UTXO_COUNT_FOR_DEFRAGMENTATION_TX                  10  // TODO: @#@# consider descreasing to mimic normal tx
 
+#define WALLET_TX_MAX_ALLOWED_FEE                                     (COIN * 100)
+
 #undef LOG_DEFAULT_CHANNEL
 #define LOG_DEFAULT_CHANNEL "wallet"
 ENABLE_CHANNEL_BY_DEFAULT("wallet")
@@ -7125,6 +7127,8 @@ void wallet2::finalize_transaction(currency::finalize_tx_param& ftp, currency::f
     ftp, result);
   //TIME_MEASURE_FINISH_MS(construct_tx_time);
   THROW_IF_FALSE_WALLET_EX(r, error::tx_not_constructed, ftp.sources, ftp.prepared_destinations, ftp.unlock_time);
+  uint64_t effective_fee = get_tx_fee(result.tx);
+  THROW_IF_FALSE_WALLET_CMN_ERR_EX(effective_fee <= WALLET_TX_MAX_ALLOWED_FEE, "tx fee is WAY too big: " << print_money_brief(effective_fee) << ", max allowed is " << print_money_brief(WALLET_TX_MAX_ALLOWED_FEE));
 
   //TIME_MEASURE_START_MS(sign_ms_input_time);
   if (ftp.multisig_id != currency::null_hash)
@@ -7525,8 +7529,8 @@ void wallet2::sweep_below(size_t fake_outs_count, const currency::account_public
 
     assets_selection_context needed_money_map;
     needed_money_map[currency::native_coin_asset_id] = {};
-    std::vector<currency::tx_destination_entry> dsts({ tx_destination_entry(amount_swept - fee, destination_addr) });
-    prepare_tx_destinations(needed_money_map, get_current_split_strategy(), tools::tx_dust_policy(), ftp.prepared_destinations, ftp.flags, dsts);
+    const std::vector<currency::tx_destination_entry> dsts({ tx_destination_entry(amount_swept - fee, destination_addr) });
+    prepare_tx_destinations(needed_money_map, get_current_split_strategy(), tools::tx_dust_policy(), dsts, ftp.flags, ftp.prepared_destinations);
 
     currency::transaction tx = AUTO_VAL_INIT(tx);
     crypto::secret_key tx_key = AUTO_VAL_INIT(tx_key);

tests/core_tests/chaingen_main.cpp

@@ -1081,6 +1081,7 @@ int main(int argc, char* argv[])
     GENERATE_AND_PLAY(wallet_unconfimed_tx_balance);
     GENERATE_AND_PLAY_HF(packing_outputs_on_pos_minting_wallet, "3");
     GENERATE_AND_PLAY(wallet_watch_only_and_chain_switch);
+    GENERATE_AND_PLAY_HF(wallet_and_sweep_below, "3-*");
 
     GENERATE_AND_PLAY(wallet_rpc_integrated_address);
     GENERATE_AND_PLAY(wallet_rpc_integrated_address_transfer);

tests/core_tests/wallet_tests.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018 Zano Project
+// Copyright (c) 2014-2024 Zano Project
 // Copyright (c) 2014-2018 The Louisdor Project
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -3753,3 +3753,59 @@ bool wallet_spend_form_auditable_and_track::c1(currency::core& c, size_t ev_inde
 
   return true;
 }
+
+//------------------------------------------------------------------------------
+
+wallet_and_sweep_below::wallet_and_sweep_below()
+{
+  REGISTER_CALLBACK_METHOD(wallet_and_sweep_below, c1);
+}
+
+bool wallet_and_sweep_below::generate(std::vector<test_event_entry>& events) const
+{
+  // Test idea: basic check for wallet2::sweep_below() functionality 
+
+  uint64_t ts = test_core_time::get_time();
+  m_accounts.resize(TOTAL_ACCS_COUNT);
+  account_base preminer_acc;
+  preminer_acc.generate();
+  preminer_acc.set_createtime(ts);
+  account_base& miner_acc = m_accounts[MINER_ACC_IDX]; miner_acc.generate(); miner_acc.set_createtime(ts);
+  account_base& alice_acc = m_accounts[ALICE_ACC_IDX]; alice_acc.generate(); alice_acc.set_createtime(ts);
+  MAKE_GENESIS_BLOCK(events, blk_0, preminer_acc, ts);
+  DO_CALLBACK(events, "configure_core");
+
+  MAKE_NEXT_BLOCK(events, blk_1, blk_0, preminer_acc);
+
+  REWIND_BLOCKS_N_WITH_TIME(events, blk_1r, blk_1, miner_acc, 3 * CURRENCY_MINED_MONEY_UNLOCK_WINDOW - 1);
+
+  DO_CALLBACK(events, "c1");
+  return true;
+}
+
+bool wallet_and_sweep_below::c1(currency::core& c, size_t ev_index, const std::vector<test_event_entry>& events)
+{
+  bool r = false;
+  std::shared_ptr<tools::wallet2> miner_wlt = init_playtime_test_wallet(events, c, MINER_ACC_IDX);
+
+  uint64_t miner_balance = (3 * CURRENCY_MINED_MONEY_UNLOCK_WINDOW - 1) * COIN;
+  uint64_t unlocked_miner_balance = miner_balance - (CURRENCY_MINED_MONEY_UNLOCK_WINDOW - 1) * COIN;
+  CHECK_AND_ASSERT_MES(refresh_wallet_and_check_balance("", "Miner", miner_wlt, miner_balance, false, SIZE_MAX, unlocked_miner_balance), false, "");
+
+  size_t outs_total = 0;
+  size_t amount_total = 0;
+  size_t outs_swept = 0;
+  size_t amount_swept = 0;
+  transaction tx{};
+  miner_wlt->sweep_below(10 /* <- decoys */, m_accounts[ALICE_ACC_IDX].get_public_address(), COIN + 1, payment_id_t(), TESTS_DEFAULT_FEE, outs_total, amount_total, outs_swept, amount_swept, &tx);
+
+  CHECK_AND_ASSERT_MES(amount_swept == amount_total, false, "amount_swept != amount_total");
+  CHECK_AND_ASSERT_MES(amount_swept == COIN * (2 * CURRENCY_MINED_MONEY_UNLOCK_WINDOW), false, "amount_swept = " << amount_swept);
+
+  mine_next_pow_blocks_in_playtime(m_accounts[MINER_ACC_IDX].get_public_address(), c, 1);
+
+  std::shared_ptr<tools::wallet2> alice_wlt = init_playtime_test_wallet(events, c, ALICE_ACC_IDX);
+  CHECK_AND_ASSERT_MES(refresh_wallet_and_check_balance("", "Alice", alice_wlt, amount_swept - TESTS_DEFAULT_FEE, false, SIZE_MAX, 0), false, "");
+
+  return true;
+}

tests/core_tests/wallet_tests.h

@@ -287,3 +287,10 @@ struct wallet_spend_form_auditable_and_track : public wallet_test
 
   mutable std::string m_comment;
 };
+
+struct wallet_and_sweep_below : public wallet_test
+{
+  wallet_and_sweep_below();
+  bool generate(std::vector<test_event_entry>& events) const;
+  bool c1(currency::core& c, size_t ev_index, const std::vector<test_event_entry>& events);
+};