diff options
| author | Alex Morcos <morcos@chaincode.com> | 2017-06-13 14:02:55 -0400 |
|---|---|---|
| committer | Alex Morcos <morcos@chaincode.com> | 2017-07-06 22:20:23 -0400 |
| commit | f0bf33da8357bd6aff100bbe5b84a7f01937e379 (patch) | |
| tree | 7fe52cd82773d8bd31f35fc74489d1527784c53b /src/wallet/feebumper.cpp | |
| parent | e0738e3d319ab50466bf76c95841bb7275ad4d22 (diff) | |
| download | bitcoin-f0bf33da8357bd6aff100bbe5b84a7f01937e379.tar.xz | |
Change default fee estimation mode.
Fee estimates will default to be non-conservative if the transaction in question is opt-in-RBF.
Diffstat (limited to 'src/wallet/feebumper.cpp')
| -rw-r--r-- | src/wallet/feebumper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp index a36f6798f0..a25530d8bd 100644 --- a/src/wallet/feebumper.cpp +++ b/src/wallet/feebumper.cpp @@ -165,7 +165,7 @@ CFeeBumper::CFeeBumper(const CWallet *pWallet, const uint256 txidIn, int newConf nNewFee = totalFee; nNewFeeRate = CFeeRate(totalFee, maxNewTxSize); } else { - bool conservative_estimate = CalculateEstimateType(FeeEstimateMode::UNSET); + bool conservative_estimate = CalculateEstimateType(FeeEstimateMode::UNSET, newTxReplaceable); nNewFee = CWallet::GetMinimumFee(maxNewTxSize, newConfirmTarget, mempool, ::feeEstimator, nullptr /* FeeCalculation */, ignoreGlobalPayTxFee, conservative_estimate); nNewFeeRate = CFeeRate(nNewFee, maxNewTxSize); |