mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 10:38:42 +01:00
Code Issues Projects Releases Wiki Activity

wallet: account for preselected inputs in target

Browse Source 
When we have preselected inputs the coin selection search target is reduced
by the sum of (effective) values. This causes incorrect m_target value.

Create separate instance of SelectionResult for all the preselected inputs and
set the target equal to the sum of (effective) values. Target for preselected
SelectionResult is equal to the delta for the search target. To get the final
SelectionResult with accurate m_target we merge both SelectionResult instances.
This commit is contained in:
S3RK 2022-07-06 08:15:20 +02:00
parent f8e796348b
commit e3210a7225
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wallet/spend.cpp
View File

@ -607,12 +607,15 @@ std::optional<SelectionResult> SelectCoins(const CWallet& wallet, CoinsResult& a
Shuffle(available_coins.other.begin(), available_coins.other.end(), coin_selection_params.rng_fast); Shuffle(available_coins.other.begin(), available_coins.other.end(), coin_selection_params.rng_fast);
} }
SelectionResult preselected(preset_inputs.GetSelectionAmount(), SelectionAlgorithm::MANUAL);
preselected.AddInput(preset_inputs);
// Coin Selection attempts to select inputs from a pool of eligible UTXOs to fund the // Coin Selection attempts to select inputs from a pool of eligible UTXOs to fund the
// transaction at a target feerate. If an attempt fails, more attempts may be made using a more // transaction at a target feerate. If an attempt fails, more attempts may be made using a more
// permissive CoinEligibilityFilter. // permissive CoinEligibilityFilter.
std::optional<SelectionResult> res = [&] { std::optional<SelectionResult> res = [&] {
// Pre-selected inputs already cover the target amount. // Pre-selected inputs already cover the target amount.
if (value_to_select <= 0) return std::make_optional(SelectionResult(nTargetValue, SelectionAlgorithm::MANUAL)); if (value_to_select <= 0) return std::make_optional(SelectionResult(value_to_select, SelectionAlgorithm::MANUAL));
// If possible, fund the transaction with confirmed UTXOs only. Prefer at least six // If possible, fund the transaction with confirmed UTXOs only. Prefer at least six
// confirmations on outputs received from other wallets and only spend confirmed change. // confirmations on outputs received from other wallets and only spend confirmed change.
@ -666,7 +669,7 @@ std::optional<SelectionResult> SelectCoins(const CWallet& wallet, CoinsResult& a
if (!res) return std::nullopt; if (!res) return std::nullopt;
// Add preset inputs to result // Add preset inputs to result
res->AddInput(preset_inputs); res->Merge(preselected);
if (res->GetAlgo() == SelectionAlgorithm::MANUAL) { if (res->GetAlgo() == SelectionAlgorithm::MANUAL) {
res->ComputeAndSetWaste(coin_selection_params.m_cost_of_change); res->ComputeAndSetWaste(coin_selection_params.m_cost_of_change);
} }