foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-13 11:25:02 -05:00
Code Issues Activity

wallet: clean post coin selection max weight filter

Browse source 
Now the coin selection algorithms contemplate the
maximum allowed weight internally and return
std::nullopt if their result exceeds it.
This commit is contained in:
furszy 2022-12-18 21:10:07 -03:00
parent 2d112584e3
commit 5a2bc45ee0
No known key found for this signature in database
GPG key ID: 5DD23CCC686AA623
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/wallet/spend.cpp
View file

@ -590,21 +590,9 @@ util::Result<SelectionResult> ChooseSelectionResult(const CAmount& nTargetValue,
return errors.empty() ? util::Error() : errors.front(); return errors.empty() ? util::Error() : errors.front();
} }
std::vector<SelectionResult> eligible_results;
std::copy_if(results.begin(), results.end(), std::back_inserter(eligible_results), [coin_selection_params](const SelectionResult& result) {
const auto initWeight{coin_selection_params.tx_noinputs_size * WITNESS_SCALE_FACTOR};
return initWeight + result.GetWeight() <= static_cast<int>(MAX_STANDARD_TX_WEIGHT);
});
if (eligible_results.empty()) {
return util::Error{_("The inputs size exceeds the maximum weight. "
"Please try sending a smaller amount or manually consolidating your wallet's UTXOs")};
}
// Choose the result with the least waste // Choose the result with the least waste
// If the waste is the same, choose the one which spends more inputs. // If the waste is the same, choose the one which spends more inputs.
auto& best_result = *std::min_element(eligible_results.begin(), eligible_results.end()); return *std::min_element(results.begin(), results.end());
return best_result;
} }
util::Result<SelectionResult> SelectCoins(const CWallet& wallet, CoinsResult& available_coins, const PreSelectedInputs& pre_set_inputs, util::Result<SelectionResult> SelectCoins(const CWallet& wallet, CoinsResult& available_coins, const PreSelectedInputs& pre_set_inputs,