diff options
| author | Samuel Dobson <dobsonsa68@gmail.com> | 2019-11-23 08:06:14 +1300 |
|---|---|---|
| committer | Samuel Dobson <dobsonsa68@gmail.com> | 2019-11-23 08:06:35 +1300 |
| commit | cef87f7a48f76c33f55fc54f199a905a2fa0bb15 (patch) | |
| tree | 0ba63dfead2528f0ae743a8444f7ab69a8801c2b /src/wallet/wallet.h | |
| parent | bb862d7864cc4889285e1a3713e3864d667cf30a (diff) | |
| parent | b007efdf1910db1d38671d6435d2f379bbf847d2 (diff) | |
| download | bitcoin-cef87f7a48f76c33f55fc54f199a905a2fa0bb15.tar.xz | |
Merge #17290: Enable BnB coin selection for preset inputs and subtract fee from outputs
b007efdf1910db1d38671d6435d2f379bbf847d2 Allow BnB when subtract fee from outputs (Andrew Chow)
db15e71e79b24601853703bebd1c92f4b523fd5f Use BnB when preset inputs are selected (Andrew Chow)
Pull request description:
Currently we explicitly disable BnB when there are preset inputs selected or when the subtract fee from outputs option is enabled. This PR enables BnB for both cases.
Kind of an alternative to #17246 (implements the subtract fee from outputs part of it) and borrows a test from there too.
ACKs for top commit:
instagibbs:
reACK https://github.com/bitcoin/bitcoin/pull/17290/commits/b007efdf1910db1d38671d6435d2f379bbf847d2
Sjors:
re-ACK b007efdf1910db1d38671d6435d2f379bbf847d2
Tree-SHA512: 933276b09b2fa2ab43db7f0b98762f06f6f5fa8606195f96aca9fa1cb71ae4ee7156028dd482b1cada82ddd0996a9daf12ea5c152589fdf192cd96cbc51e99df
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index a6b9c0131a..e4b8163f02 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -584,6 +584,8 @@ struct CoinSelectionParams size_t change_spend_size = 0; CFeeRate effective_fee = CFeeRate(0); size_t tx_noinputs_size = 0; + //! Indicate that we are subtracting the fee from outputs + bool m_subtract_fee_outputs = false; CoinSelectionParams(bool use_bnb, size_t change_output_size, size_t change_spend_size, CFeeRate effective_fee, size_t tx_noinputs_size) : use_bnb(use_bnb), change_output_size(change_output_size), change_spend_size(change_spend_size), effective_fee(effective_fee), tx_noinputs_size(tx_noinputs_size) {} CoinSelectionParams() {} |