aboutsummaryrefslogtreecommitdiff
path: root/src/qt
diff options
context:
space:
mode:
authorAlex Morcos <morcos@chaincode.com>2017-06-14 15:15:40 -0400
committerAlex Morcos <morcos@chaincode.com>2017-07-10 12:40:02 -0400
commitf135923ee2cf1a1a9a436626dc5b9219f8ad97da (patch)
treeadde79ee8ba6dc1a97167c2b8686b7d59654f9e4 /src/qt
parentf0bf33da8357bd6aff100bbe5b84a7f01937e379 (diff)
downloadbitcoin-f135923ee2cf1a1a9a436626dc5b9219f8ad97da.tar.xz
Add RPC options for RBF, confirmation target, and conservative fee estimation.
Add support for setting each of these attributes on a per RPC call basis to sendtoaddress, sendmany, fundrawtransaction (already had RBF), and bumpfee (already had RBF and conf target).
Diffstat (limited to 'src/qt')
-rw-r--r--src/qt/walletmodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 354225090f..60b55da3e7 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -668,7 +668,7 @@ bool WalletModel::bumpFee(uint256 hash)
std::unique_ptr<CFeeBumper> feeBump;
{
LOCK2(cs_main, wallet->cs_wallet);
- feeBump.reset(new CFeeBumper(wallet, hash, nTxConfirmTarget, false, 0, true));
+ feeBump.reset(new CFeeBumper(wallet, hash, nTxConfirmTarget, false, 0, true, FeeEstimateMode::UNSET));
}
if (feeBump->getResult() != BumpFeeResult::OK)
{