Skip to content

Commit c109e7d

Browse files
committed
Merge bitcoin/bitcoin#24530: wallet: assert BnB's internally calculated waste is the same as GetSelectionWaste
ec7d736 [wallet] assert BnB internally calculated waste is the same as GetSelectionWaste() (glozow) Pull request description: #22009 introduced a `GetSelectionWaste()` function to determine how much "waste" a coin selection solution has, and is a mirror of the waste calculated inside of `SelectCoinsBnB()`. It would be bad for these two waste metrics to deviate, since it could negatively affect how often we select the BnB solution. Add an assertion to help tests catch a potential accidental change. ACKs for top commit: achow101: ACK ec7d736 Xekyo: ACK ec7d736 Tree-SHA512: 3ab7ad45ae92e7ce3f21824fb975105b6be8382edf47c252df5d13d973a3abdcb675132d223b42fcbb669cca879672c904b8a58d0676e12bf381a9219f4db37c
2 parents a817174 + ec7d736 commit c109e7d

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/wallet/coinselection.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ std::optional<SelectionResult> SelectCoinsBnB(std::vector<OutputGroup>& utxo_poo
163163
result.AddInput(utxo_pool.at(i));
164164
}
165165
}
166+
result.ComputeAndSetWaste(CAmount{0});
167+
assert(best_waste == result.GetWaste());
166168

167169
return result;
168170
}

src/wallet/spend.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,6 @@ std::optional<SelectionResult> AttemptSelection(const CWallet& wallet, const CAm
379379
// Note that unlike KnapsackSolver, we do not include the fee for creating a change output as BnB will not create a change output.
380380
std::vector<OutputGroup> positive_groups = GroupOutputs(wallet, coins, coin_selection_params, eligibility_filter, true /* positive_only */);
381381
if (auto bnb_result{SelectCoinsBnB(positive_groups, nTargetValue, coin_selection_params.m_cost_of_change)}) {
382-
bnb_result->ComputeAndSetWaste(CAmount(0));
383382
results.push_back(*bnb_result);
384383
}
385384

0 commit comments

Comments
 (0)