Skip to content

Commit cfaef69

Browse files
committed
remove default argument from GetMinimumFee
1 parent 5af6572 commit cfaef69

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/qt/coincontroldialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
510510
nBytes -= 34;
511511

512512
// Fee
513-
nPayFee = CWallet::GetMinimumFee(nBytes, coinControl->nConfirmTarget, ::mempool, ::feeEstimator);
513+
nPayFee = CWallet::GetMinimumFee(nBytes, coinControl->nConfirmTarget, ::mempool, ::feeEstimator, nullptr /* FeeCalculation */, false /* ignoreGlobalPayTxFee */);
514514

515515
if (nPayAmount > 0)
516516
{

src/wallet/wallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2724,7 +2724,7 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletT
27242724
if (coinControl && coinControl->nConfirmTarget > 0)
27252725
currentConfirmationTarget = coinControl->nConfirmTarget;
27262726

2727-
CAmount nFeeNeeded = GetMinimumFee(nBytes, currentConfirmationTarget, ::mempool, ::feeEstimator, &feeCalc);
2727+
CAmount nFeeNeeded = GetMinimumFee(nBytes, currentConfirmationTarget, ::mempool, ::feeEstimator, &feeCalc, false /* ignoreGlobalPayTxFee */);
27282728
if (coinControl && coinControl->fOverrideFeeRate)
27292729
nFeeNeeded = coinControl->nFeeRate.GetFee(nBytes);
27302730

src/wallet/wallet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
963963
* Estimate the minimum fee considering user set parameters
964964
* and the required fee
965965
*/
966-
static CAmount GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool, const CBlockPolicyEstimator& estimator, FeeCalculation *feeCalc = nullptr, bool ignoreGlobalPayTxFee = false);
966+
static CAmount GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool, const CBlockPolicyEstimator& estimator, FeeCalculation *feeCalc, bool ignoreGlobalPayTxFee);
967967
/**
968968
* Return the minimum required fee taking into account the
969969
* floating relay fee and user set minimum transaction fee

0 commit comments

Comments
 (0)