0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-06 14:19:59 -05:00

opt: Skip evaluation of equivalent input sets

When two successive UTXOs match in effective value and weight, we can
skip the second if the prior is not selected: adding it would create an
equivalent input set to a previously evaluated.

E.g. if we have three UTXOs with effective values {5, 3, 3} of the same
weight each, we want to evaluate
{5, _, _}, {5, 3, _}, {5, 3, 3}, {_, 3, _}, {_, 3, 3},
but skip {5, _, 3}, and {_, _, 3}, because the first 3 is not selected,
and we therefore do not need to evaluate the second 3 at the same
position in the input set.

If we reach the end of the branch, we must SHIFT the previously selected
UTXO group instead.
This commit is contained in:
Murch 2024-01-08 15:08:57 -05:00
parent 407b1e3432
commit 451be19dc1
2 changed files with 22 additions and 5 deletions

View file

@ -401,8 +401,9 @@ util::Result<SelectionResult> CoinGrinder(std::vector<OutputGroup>& utxo_pool, c
}; };
SelectionResult result(selection_target, SelectionAlgorithm::CG); SelectionResult result(selection_target, SelectionAlgorithm::CG);
bool is_done = false;
size_t curr_try = 0; size_t curr_try = 0;
while (true) { while (!is_done) {
bool should_shift{false}, should_cut{false}; bool should_shift{false}, should_cut{false};
// Select `next_utxo` // Select `next_utxo`
OutputGroup& utxo = utxo_pool[next_utxo]; OutputGroup& utxo = utxo_pool[next_utxo];
@ -454,16 +455,32 @@ util::Result<SelectionResult> CoinGrinder(std::vector<OutputGroup>& utxo_pool, c
should_shift = true; should_shift = true;
} }
if (should_shift) { while (should_shift) {
// Set `next_utxo` to one after last selected, then deselect last selected UTXO // Set `next_utxo` to one after last selected, then deselect last selected UTXO
if (curr_selection.empty()) { if (curr_selection.empty()) {
// Exhausted search space before running into attempt limit // Exhausted search space before running into attempt limit
is_done = true;
result.SetAlgoCompleted(true); result.SetAlgoCompleted(true);
break; break;
} }
next_utxo = curr_selection.back() + 1; next_utxo = curr_selection.back() + 1;
deselect_last(); deselect_last();
should_shift = false; should_shift = false;
// After SHIFTing to an omission branch, the `next_utxo` might have the same value and same weight as the
// UTXO we just omitted (i.e. it is a "clone"). If so, selecting `next_utxo` would produce an equivalent
// selection as one we previously evaluated. In that case, increment `next_utxo` until we find a UTXO with a
// differing amount or weight.
while (utxo_pool[next_utxo - 1].GetSelectionAmount() == utxo_pool[next_utxo].GetSelectionAmount()
&& utxo_pool[next_utxo - 1].m_weight == utxo_pool[next_utxo].m_weight) {
if (next_utxo >= utxo_pool.size() - 1) {
// Reached end of UTXO pool skipping clones: SHIFT instead
should_shift = true;
break;
}
// Skip clone: previous UTXO is equivalent and unselected
++next_utxo;
}
} }
} }

View file

@ -1180,7 +1180,7 @@ BOOST_AUTO_TEST_CASE(coin_grinder_tests)
}); });
BOOST_CHECK(res); BOOST_CHECK(res);
// Demonstrate how following improvements reduce iteration count and catch any regressions in the future. // Demonstrate how following improvements reduce iteration count and catch any regressions in the future.
size_t expected_attempts = 100'000; size_t expected_attempts = 184;
BOOST_CHECK_MESSAGE(res->GetSelectionsEvaluated() == expected_attempts, strprintf("Expected %i attempts, but got %i", expected_attempts, res->GetSelectionsEvaluated())); BOOST_CHECK_MESSAGE(res->GetSelectionsEvaluated() == expected_attempts, strprintf("Expected %i attempts, but got %i", expected_attempts, res->GetSelectionsEvaluated()));
} }
@ -1202,7 +1202,7 @@ BOOST_AUTO_TEST_CASE(coin_grinder_tests)
add_coin(1 * COIN, 2, expected_result); add_coin(1 * COIN, 2, expected_result);
BOOST_CHECK(EquivalentResult(expected_result, *res)); BOOST_CHECK(EquivalentResult(expected_result, *res));
// Demonstrate how following improvements reduce iteration count and catch any regressions in the future. // Demonstrate how following improvements reduce iteration count and catch any regressions in the future.
size_t expected_attempts = 4; size_t expected_attempts = 3;
BOOST_CHECK_MESSAGE(res->GetSelectionsEvaluated() == expected_attempts, strprintf("Expected %i attempts, but got %i", expected_attempts, res->GetSelectionsEvaluated())); 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)
BOOST_CHECK(EquivalentResult(expected_result, *res)); BOOST_CHECK(EquivalentResult(expected_result, *res));
// Demonstrate how following improvements reduce iteration count and catch any regressions in the future. // Demonstrate how following improvements reduce iteration count and catch any regressions in the future.
// If this takes more attempts, the implementation has regressed // If this takes more attempts, the implementation has regressed
size_t expected_attempts = 82'407; size_t expected_attempts = 43;
BOOST_CHECK_MESSAGE(res->GetSelectionsEvaluated() == expected_attempts, strprintf("Expected %i attempts, but got %i", expected_attempts, res->GetSelectionsEvaluated())); BOOST_CHECK_MESSAGE(res->GetSelectionsEvaluated() == expected_attempts, strprintf("Expected %i attempts, but got %i", expected_attempts, res->GetSelectionsEvaluated()));
} }