diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -547,10 +547,6 @@ // Fee nPayFee = GetMinimumFee(nBytes, nTxConfirmTarget, g_mempool); - if (nPayFee > Amount::zero() && - coinControl->nMinimumTotalFee > nPayFee) { - nPayFee = coinControl->nMinimumTotalFee; - } if (nPayAmount > Amount::zero()) { nChange = nAmount - nPayAmount; @@ -622,7 +618,7 @@ l7->setText(fDust ? tr("yes") : tr("no")); // Change l8->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nChange)); - if (nPayFee > Amount::zero() && (coinControl->nMinimumTotalFee < nPayFee)) { + if (nPayFee > Amount::zero()) { l3->setText(ASYMP_UTF8 + l3->text()); l4->setText(ASYMP_UTF8 + l4->text()); if (nChange > Amount::zero() && diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -839,19 +839,6 @@ - - - - If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte. - - - total at least - - - groupCustomFee - - - diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -158,7 +158,6 @@ std::max(0, std::min(1, settings.value("nFeeRadio").toInt()))) ->setChecked(true); ui->groupCustomFee->setId(ui->radioCustomPerKilobyte, 0); - ui->groupCustomFee->setId(ui->radioCustomAtLeast, 1); ui->groupCustomFee ->button(std::max( 0, std::min(1, settings.value("nCustomFeeRadio").toInt()))) @@ -742,10 +741,6 @@ ui->radioCustomPerKilobyte->setEnabled( ui->radioCustomFee->isChecked() && !ui->checkBoxMinimumFee->isChecked()); - ui->radioCustomAtLeast->setEnabled( - ui->radioCustomFee->isChecked() && - !ui->checkBoxMinimumFee->isChecked() && - CoinControlDialog::coinControl->HasSelected()); ui->customFee->setEnabled(ui->radioCustomFee->isChecked() && !ui->checkBoxMinimumFee->isChecked()); } @@ -753,19 +748,8 @@ void SendCoinsDialog::updateGlobalFeeVariables() { if (ui->radioSmartFee->isChecked()) { payTxFee = CFeeRate(Amount::zero()); - - // set nMinimumTotalFee to 0 to not accidentally pay a custom fee - CoinControlDialog::coinControl->nMinimumTotalFee = Amount::zero(); } else { payTxFee = CFeeRate(Amount(ui->customFee->value())); - - // if user has selected to set a minimum absolute fee, pass the value to - // coincontrol - // set nMinimumTotalFee to 0 in case of user has selected that the fee - // is per KB - CoinControlDialog::coinControl->nMinimumTotalFee = - ui->radioCustomAtLeast->isChecked() ? ui->customFee->value() - : Amount::zero(); } } @@ -980,22 +964,6 @@ return; } - if (model->getOptionsModel()->getCoinControlFeatures()) { - // enable minimum absolute fee UI controls - ui->radioCustomAtLeast->setVisible(true); - - // only enable the feature if inputs are selected - ui->radioCustomAtLeast->setEnabled( - ui->radioCustomFee->isChecked() && - !ui->checkBoxMinimumFee->isChecked() && - CoinControlDialog::coinControl->HasSelected()); - } else { - // in case coin control is disabled (=default), hide minimum absolute - // fee UI controls - ui->radioCustomAtLeast->setVisible(false); - return; - } - // set pay amounts CoinControlDialog::payAmounts.clear(); CoinControlDialog::fSubtractFeeFromAmount = false; diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h --- a/src/wallet/coincontrol.h +++ b/src/wallet/coincontrol.h @@ -17,8 +17,6 @@ //! Includes watch only addresses which match the ISMINE_WATCH_SOLVABLE //! criteria bool fAllowWatchOnly; - //! Minimum absolute fee (not per kilobyte) - Amount nMinimumTotalFee; //! Override estimated feerate bool fOverrideFeeRate; //! Feerate to use if overrideFeeRate is true @@ -33,7 +31,6 @@ fAllowOtherInputs = false; fAllowWatchOnly = false; setSelected.clear(); - nMinimumTotalFee = Amount::zero(); nFeeRate = CFeeRate(Amount::zero()); fOverrideFeeRate = false; nConfirmTarget = 0; diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3063,11 +3063,6 @@ Amount nFeeNeeded = GetMinimumFee(nBytes, currentConfirmationTarget, g_mempool); - if (coinControl && nFeeNeeded > Amount::zero() && - coinControl->nMinimumTotalFee > nFeeNeeded) { - nFeeNeeded = coinControl->nMinimumTotalFee; - } - if (coinControl && coinControl->fOverrideFeeRate) { nFeeNeeded = coinControl->nFeeRate.GetFeeCeiling(nBytes); }