highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-07 17:00:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

[wallet]: update the data type of change_output_size, change_spend_size and tx_noinputs_size to int

Browse Source 
- This change ensures consistency in transaction size and weight calculation
  within the wallet and prevents conversion overflow when calculating
  `max_selection_weight`.
This commit is contained in:
ismaelsadeeq
2024-03-21 17:05:51 +01:00
parent baab0d2d43
commit b6fc5043c1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wallet/coinselection.h
View File

@ -139,9 +139,9 @@ struct CoinSelectionParams {
/** Randomness to use in the context of coin selection. */ /** Randomness to use in the context of coin selection. */
FastRandomContext& rng_fast; FastRandomContext& rng_fast;
/** Size of a change output in bytes, determined by the output type. */ /** Size of a change output in bytes, determined by the output type. */
size_t change_output_size = 0; int change_output_size = 0;
/** Size of the input to spend a change output in virtual bytes. */ /** Size of the input to spend a change output in virtual bytes. */
size_t change_spend_size = 0; int change_spend_size = 0;
/** Mininmum change to target in Knapsack solver and CoinGrinder: /** Mininmum change to target in Knapsack solver and CoinGrinder:
* select coins to cover the payment and at least this value of change. */ * select coins to cover the payment and at least this value of change. */
CAmount m_min_change_target{0}; CAmount m_min_change_target{0};
@ -162,7 +162,7 @@ struct CoinSelectionParams {
CFeeRate m_discard_feerate; CFeeRate m_discard_feerate;
/** Size of the transaction before coin selection, consisting of the header and recipient /** Size of the transaction before coin selection, consisting of the header and recipient
* output(s), excluding the inputs and change output(s). */ * output(s), excluding the inputs and change output(s). */
size_t tx_noinputs_size = 0; int tx_noinputs_size = 0;
/** Indicate that we are subtracting the fee from outputs */ /** Indicate that we are subtracting the fee from outputs */
bool m_subtract_fee_outputs = false; bool m_subtract_fee_outputs = false;
/** When true, always spend all (up to OUTPUT_GROUP_MAX_ENTRIES) or none of the outputs /** When true, always spend all (up to OUTPUT_GROUP_MAX_ENTRIES) or none of the outputs
@ -175,9 +175,9 @@ struct CoinSelectionParams {
*/ */
bool m_include_unsafe_inputs = false; bool m_include_unsafe_inputs = false;
CoinSelectionParams(FastRandomContext& rng_fast, size_t change_output_size, size_t change_spend_size, CoinSelectionParams(FastRandomContext& rng_fast, int change_output_size, int change_spend_size,
CAmount min_change_target, CFeeRate effective_feerate, CAmount min_change_target, CFeeRate effective_feerate,
CFeeRate long_term_feerate, CFeeRate discard_feerate, size_t tx_noinputs_size, bool avoid_partial) CFeeRate long_term_feerate, CFeeRate discard_feerate, int tx_noinputs_size, bool avoid_partial)
: rng_fast{rng_fast}, : rng_fast{rng_fast},
change_output_size(change_output_size), change_output_size(change_output_size),
change_spend_size(change_spend_size), change_spend_size(change_spend_size),

2
src/wallet/spend.cpp
View File

@ -1059,7 +1059,7 @@ static util::Result<CreatedTransactionResult> CreateTransactionInternal(
if (change_spend_size == -1) { if (change_spend_size == -1) {
coin_selection_params.change_spend_size = DUMMY_NESTED_P2WPKH_INPUT_SIZE; coin_selection_params.change_spend_size = DUMMY_NESTED_P2WPKH_INPUT_SIZE;
} else { } else {
coin_selection_params.change_spend_size = (size_t)change_spend_size; coin_selection_params.change_spend_size = change_spend_size;
} }
// Set discard feerate // Set discard feerate