foster/bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-05 14:06:27 -05:00
Code Issues Activity

wallet: remove totalfee from createBumpTransaction()

Browse source
This commit is contained in:
Jon Atack 2020-03-10 18:40:57 +01:00
parent e347cfa9a7
commit 4a0b27bb01
No known key found for this signature in database
GPG key ID: 4F5721B3D0E3921D
3 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/interfaces/wallet.cpp
View file

@ -253,19 +253,12 @@ public:
} }
bool createBumpTransaction(const uint256& txid, bool createBumpTransaction(const uint256& txid,
const CCoinControl& coin_control, const CCoinControl& coin_control,
CAmount total_fee,
std::vector<std::string>& errors, std::vector<std::string>& errors,
CAmount& old_fee, CAmount& old_fee,
CAmount& new_fee, CAmount& new_fee,
CMutableTransaction& mtx) override CMutableTransaction& mtx) override
{ {
if (total_fee > 0) { return feebumper::CreateRateBumpTransaction(*m_wallet.get(), txid, coin_control, errors, old_fee, new_fee, mtx) == feebumper::Result::OK;
return feebumper::CreateTotalBumpTransaction(m_wallet.get(), txid, coin_control, total_fee, errors, old_fee, new_fee, mtx) ==
feebumper::Result::OK;
} else {
return feebumper::CreateRateBumpTransaction(*m_wallet.get(), txid, coin_control, errors, old_fee, new_fee, mtx) ==
feebumper::Result::OK;
}
} }
bool signBumpTransaction(CMutableTransaction& mtx) override { return feebumper::SignTransaction(*m_wallet.get(), mtx); } bool signBumpTransaction(CMutableTransaction& mtx) override { return feebumper::SignTransaction(*m_wallet.get(), mtx); }
bool commitBumpTransaction(const uint256& txid, bool commitBumpTransaction(const uint256& txid,

1
src/interfaces/wallet.h
View file

@ -155,7 +155,6 @@ public:
//! Create bump transaction. //! Create bump transaction.
virtual bool createBumpTransaction(const uint256& txid, virtual bool createBumpTransaction(const uint256& txid,
const CCoinControl& coin_control, const CCoinControl& coin_control,
CAmount total_fee,
std::vector<std::string>& errors, std::vector<std::string>& errors,
CAmount& old_fee, CAmount& old_fee,
CAmount& new_fee, CAmount& new_fee,

2
src/qt/walletmodel.cpp
View file

@ -482,7 +482,7 @@ bool WalletModel::bumpFee(uint256 hash, uint256& new_hash)
CAmount old_fee; CAmount old_fee;
CAmount new_fee; CAmount new_fee;
CMutableTransaction mtx; CMutableTransaction mtx;
if (!m_wallet->createBumpTransaction(hash, coin_control, 0 /* totalFee */, errors, old_fee, new_fee, mtx)) { if (!m_wallet->createBumpTransaction(hash, coin_control, errors, old_fee, new_fee, mtx)) {
QMessageBox::critical(nullptr, tr("Fee bump error"), tr("Increasing transaction fee failed") + "<br />(" + QMessageBox::critical(nullptr, tr("Fee bump error"), tr("Increasing transaction fee failed") + "<br />(" +
(errors.size() ? QString::fromStdString(errors[0]) : "") +")"); (errors.size() ? QString::fromStdString(errors[0]) : "") +")");
return false; return false;