From 8f699871d3b7bfe57952e9da1d4a26ab8b29f8da Mon Sep 17 00:00:00 2001 From: jeffro256 Date: Sun, 4 May 2025 01:14:21 -0500 Subject: [PATCH] carrot_impl: sweep all below --- src/wallet/tx_builder.cpp | 5 ++++- src/wallet/tx_builder.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/wallet/tx_builder.cpp b/src/wallet/tx_builder.cpp index e8ff67378..34504b97b 100644 --- a/src/wallet/tx_builder.cpp +++ b/src/wallet/tx_builder.cpp @@ -521,6 +521,7 @@ std::vector make_carrot_transaction_proposa std::vector make_carrot_transaction_proposals_wallet2_sweep_all( const wallet2::transfer_container &transfers, const std::unordered_map &subaddress_map, + const rct::xmr_amount only_below, const cryptonote::account_public_address &address, const bool is_subaddress, const size_t n_dests, @@ -543,7 +544,7 @@ std::vector make_carrot_transaction_proposa if (!is_transfer_usable_for_input_selection(td, subaddr_account, subaddr_indices, - MONEY_SUPPLY, + only_below ? only_below : MONEY_SUPPLY, 0, top_block_index)) continue; @@ -574,6 +575,7 @@ std::vector make_carrot_transaction_proposa //------------------------------------------------------------------------------------------------------------------- std::vector make_carrot_transaction_proposals_wallet2_sweep_all( wallet2 &w, + const rct::xmr_amount only_below, const cryptonote::account_public_address &address, const bool is_subaddress, const size_t n_dests, @@ -595,6 +597,7 @@ std::vector make_carrot_transaction_proposa return make_carrot_transaction_proposals_wallet2_sweep_all( transfers, w.get_subaddress_map_ref(), + only_below, address, is_subaddress, n_dests, diff --git a/src/wallet/tx_builder.h b/src/wallet/tx_builder.h index 333482759..9cbb62caf 100644 --- a/src/wallet/tx_builder.h +++ b/src/wallet/tx_builder.h @@ -103,6 +103,7 @@ std::vector make_carrot_transaction_proposa std::vector make_carrot_transaction_proposals_wallet2_sweep_all( const wallet2::transfer_container &transfers, const std::unordered_map &subaddress_map, + const rct::xmr_amount only_below, const cryptonote::account_public_address &address, const bool is_subaddress, const size_t n_dests, @@ -114,6 +115,7 @@ std::vector make_carrot_transaction_proposa const cryptonote::account_keys &acc_keys); std::vector make_carrot_transaction_proposals_wallet2_sweep_all( wallet2 &w, + const rct::xmr_amount only_below, const cryptonote::account_public_address &address, const bool is_subaddress, const size_t n_dests,