aboutsummaryrefslogtreecommitdiff
path: root/src/qt/walletmodel.cpp
diff options
context:
space:
mode:
authorSjors Provoost <sjors@sprovoost.nl>2018-08-01 18:43:46 +0200
committerSjors Provoost <sjors@sprovoost.nl>2018-08-01 18:43:46 +0200
commitd795c610d3095eeff1bfe5c1a34877cf0a841823 (patch)
tree12d7283e8d47e592949337b12d90eb29f314c781 /src/qt/walletmodel.cpp
parentc88529a178d5ca719ebab597a4c4c3437327b2f6 (diff)
downloadbitcoin-d795c610d3095eeff1bfe5c1a34877cf0a841823.tar.xz
[qt] TransactionView: highlight replacement tx after fee bump
Diffstat (limited to 'src/qt/walletmodel.cpp')
-rw-r--r--src/qt/walletmodel.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index cd55b40b71..17df1bd4d1 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -492,7 +492,7 @@ bool WalletModel::saveReceiveRequest(const std::string &sAddress, const int64_t
return m_wallet->addDestData(dest, key, sRequest);
}
-bool WalletModel::bumpFee(uint256 hash)
+bool WalletModel::bumpFee(uint256 hash, uint256& new_hash)
{
CCoinControl coin_control;
coin_control.m_signal_bip125_rbf = true;
@@ -544,8 +544,7 @@ bool WalletModel::bumpFee(uint256 hash)
return false;
}
// commit the bumped transaction
- uint256 txid;
- if(!m_wallet->commitBumpTransaction(hash, std::move(mtx), errors, txid)) {
+ if(!m_wallet->commitBumpTransaction(hash, std::move(mtx), errors, new_hash)) {
QMessageBox::critical(0, tr("Fee bump error"), tr("Could not commit transaction") + "<br />(" +
QString::fromStdString(errors[0])+")");
return false;