diff --git a/src/wallet/coinselection.cpp b/src/wallet/coinselection.cpp index b10a2d7dc183e2..3371049883969b 100644 --- a/src/wallet/coinselection.cpp +++ b/src/wallet/coinselection.cpp @@ -345,6 +345,13 @@ util::Result CoinGrinder(std::vector& utxo_pool, c best_selection_weight = curr_weight; best_selection_amount = curr_amount; } + } else if (!best_selection.empty() && curr_weight + min_tail_weight[curr_tail] * ((total_target - curr_amount) / utxo_pool[curr_tail].GetSelectionAmount()) > best_selection_weight) { + // Compare minimal tail weight and last selected amount with the amount missing to gauge whether a better weight is still possible. + if (utxo_pool[curr_tail].m_weight <= min_tail_weight[curr_tail]) { + should_cut = true; + } else { + should_shift = true; + } } if (curr_try >= TOTAL_TRIES) { diff --git a/src/wallet/test/coinselector_tests.cpp b/src/wallet/test/coinselector_tests.cpp index 1c7203a4a204e3..325c026afa7b2e 100644 --- a/src/wallet/test/coinselector_tests.cpp +++ b/src/wallet/test/coinselector_tests.cpp @@ -1111,7 +1111,7 @@ BOOST_AUTO_TEST_CASE(coin_grinder_tests) // 4) Test that two less valuable UTXOs with a combined lower weight are preferred over a more valuable heavier UTXO // 5) Test finding a solution in a UTXO pool with mixed weights // 6) Test that the lightest solution among many clones is found - // 7) Lots of tiny UTXOs of different amounts quickly exhausts the search attempts + // 7) Test that lots of tiny UTXOs can be skipped if they are too heavy while there are enough funds in lookahead FastRandomContext rand; CoinSelectionParams dummy_params{ // Only used to provide the 'avoid_partial' flag. @@ -1180,7 +1180,7 @@ BOOST_AUTO_TEST_CASE(coin_grinder_tests) }); BOOST_CHECK(res); // If this takes more attempts, the implementation has regressed - size_t expected_attempts = 184; + size_t expected_attempts = 37; BOOST_CHECK_MESSAGE(res->GetSelectionsEvaluated() == expected_attempts, strprintf("Expected %i attempts, but got %i", expected_attempts, res->GetSelectionsEvaluated())); } @@ -1226,7 +1226,7 @@ BOOST_AUTO_TEST_CASE(coin_grinder_tests) }); BOOST_CHECK(res); // If this takes more attempts, the implementation has regressed - size_t expected_attempts = 218; + size_t expected_attempts = 182; BOOST_CHECK_MESSAGE(res->GetSelectionsEvaluated() == expected_attempts, strprintf("Expected %i attempts, but got %i", expected_attempts, res->GetSelectionsEvaluated())); } @@ -1271,7 +1271,7 @@ BOOST_AUTO_TEST_CASE(coin_grinder_tests) { // ################################################################################################################# - // 7) Lots of tiny UTXOs of different amounts quickly exhausts the search attempts + // 7) Test that lots of tiny UTXOs can be skipped if they are too heavy while there are enough funds in lookahead // ################################################################################################################# CAmount target = 1.9L * COIN; int max_weight = 40000; // WU @@ -1287,11 +1287,11 @@ BOOST_AUTO_TEST_CASE(coin_grinder_tests) return available_coins; }); SelectionResult expected_result(CAmount(0), SelectionAlgorithm::CG); - add_coin(1.8 * COIN, 1, expected_result); + add_coin(1 * COIN, 1, expected_result); add_coin(1 * COIN, 2, expected_result); BOOST_CHECK(EquivalentResult(expected_result, *res)); // If this takes more attempts, the implementation has regressed - size_t expected_attempts = 100'000; + size_t expected_attempts = 7; BOOST_CHECK_MESSAGE(res->GetSelectionsEvaluated() == expected_attempts, strprintf("Expected %i attempts, but got %i", expected_attempts, res->GetSelectionsEvaluated())); } }