diff options
| author | ezegom <ezegom@bu.edu> | 2019-07-29 18:02:02 -0400 |
|---|---|---|
| committer | Gregory Sanders <gsanders87@gmail.com> | 2019-09-28 07:34:14 -0400 |
| commit | 88e5f997dfab3f03bb1ec3f149eaff8dcc2981fe (patch) | |
| tree | c12b6f6dedd79c9a13890d0bfd97a0ee298baa55 /src/wallet/feebumper.cpp | |
| parent | 1a4c791cf49ff15aa9deba4388c0180b8f47f15b (diff) | |
| download | bitcoin-88e5f997dfab3f03bb1ec3f149eaff8dcc2981fe.tar.xz | |
rpc bumpfee: add fee_rate argument
Diffstat (limited to 'src/wallet/feebumper.cpp')
| -rw-r--r-- | src/wallet/feebumper.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp index 1e25d4ee28..ce76f4e512 100644 --- a/src/wallet/feebumper.cpp +++ b/src/wallet/feebumper.cpp @@ -258,7 +258,12 @@ Result CreateRateBumpTransaction(CWallet* wallet, const uint256& txid, const CCo } } - new_coin_control.m_feerate = EstimateFeeRate(wallet, wtx, new_coin_control, old_fee); + if (coin_control.m_feerate) { + // The user provided a feeRate argument. + } else { + // The user did not provide a feeRate argument + new_coin_control.m_feerate = EstimateFeeRate(wallet, wtx, new_coin_control, old_fee); + } // Fill in required inputs we are double-spending(all of them) // N.B.: bip125 doesn't require all the inputs in the replaced transaction to be |