aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/qt/bitcoin.cpp17
-rw-r--r--src/qt/bitcoingui.cpp13
-rw-r--r--src/qt/bitcoingui.h10
-rw-r--r--src/qt/sendcoinsdialog.cpp3
-rw-r--r--src/qt/walletmodel.h5
-rw-r--r--src/ui_interface.h3
-rw-r--r--src/wallet.cpp9
-rw-r--r--src/wallet.h4
8 files changed, 8 insertions, 56 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index dbdb34b76a..b74452d4c6 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -74,22 +74,6 @@ static bool ThreadSafeMessageBox(const std::string& message, const std::string&
}
}
-static bool ThreadSafeAskFee(int64_t nFeeRequired)
-{
- if(!guiref)
- return false;
- if(nFeeRequired < CTransaction::nMinTxFee || nFeeRequired <= nTransactionFee || fDaemon)
- return true;
-
- bool payFee = false;
-
- QMetaObject::invokeMethod(guiref, "askFee", GUIUtil::blockingGUIThreadConnection(),
- Q_ARG(qint64, nFeeRequired),
- Q_ARG(bool*, &payFee));
-
- return payFee;
-}
-
static void InitMessage(const std::string &message)
{
if(splashref)
@@ -262,7 +246,6 @@ int main(int argc, char *argv[])
// Subscribe to global signals from core
uiInterface.ThreadSafeMessageBox.connect(ThreadSafeMessageBox);
- uiInterface.ThreadSafeAskFee.connect(ThreadSafeAskFee);
uiInterface.InitMessage.connect(InitMessage);
uiInterface.Translate.connect(Translate);
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 5ffd3f8987..2c40310de0 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -726,19 +726,6 @@ void BitcoinGUI::closeEvent(QCloseEvent *event)
QMainWindow::closeEvent(event);
}
-void BitcoinGUI::askFee(qint64 nFeeRequired, bool *payFee)
-{
- if (!clientModel || !clientModel->getOptionsModel())
- return;
-
- QString strMessage = tr("This transaction is over the size limit. You can still send it for a fee of %1, "
- "which goes to the nodes that process your transaction and helps to support the network. "
- "Do you want to pay the fee?").arg(BitcoinUnits::formatWithUnit(clientModel->getOptionsModel()->getDisplayUnit(), nFeeRequired));
- QMessageBox::StandardButton retval = QMessageBox::question(this, tr("Confirm transaction fee"), strMessage,
- QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Yes);
- *payFee = (retval == QMessageBox::Yes);
-}
-
void BitcoinGUI::incomingTransaction(const QString& date, int unit, qint64 amount, const QString& type, const QString& address)
{
// On new transaction, make an info balloon
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index b9a8a03139..75c61d2a8a 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -135,16 +135,6 @@ public slots:
*/
void message(const QString &title, const QString &message, unsigned int style, bool *ret = NULL);
- /** Asks the user whether to pay the transaction fee or to cancel the transaction.
- It is currently not possible to pass a return value to another thread through
- BlockingQueuedConnection, so an indirected pointer is used.
- https://bugreports.qt-project.org/browse/QTBUG-10440
-
- @param[in] nFeeRequired the required fee
- @param[out] payFee true to pay the fee, false to not pay the fee
- */
- void askFee(qint64 nFeeRequired, bool *payFee);
-
bool handlePaymentRequest(const SendCoinsRecipient& recipient);
/** Show incoming transaction notification for new transactions. */
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 03cf7f51ea..4bf5c3c479 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -452,9 +452,8 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn
msgParams.first = tr("The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.");
msgParams.second = CClientUIInterface::MSG_ERROR;
break;
- // OK and Aborted are included to prevent a compiler warning.
+ // included to prevent a compiler warning.
case WalletModel::OK:
- case WalletModel::Aborted:
default:
return;
}
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index 44a1912ecc..642021df1a 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -75,8 +75,7 @@ public:
AmountWithFeeExceedsBalance,
DuplicateAddress,
TransactionCreationFailed, // Error returned when wallet is still locked
- TransactionCommitFailed,
- Aborted
+ TransactionCommitFailed
};
enum EncryptionStatus
@@ -103,7 +102,7 @@ public:
// Return status record for SendCoins, contains error id + information
struct SendCoinsReturn
{
- SendCoinsReturn(StatusCode status = Aborted):
+ SendCoinsReturn(StatusCode status = OK):
status(status) {}
StatusCode status;
};
diff --git a/src/ui_interface.h b/src/ui_interface.h
index 2378d5dfbb..9b9fb614f7 100644
--- a/src/ui_interface.h
+++ b/src/ui_interface.h
@@ -75,9 +75,6 @@ public:
/** Ask the user whether they want to pay a fee or not. */
boost::signals2::signal<bool (int64_t nFeeRequired), boost::signals2::last_value<bool> > ThreadSafeAskFee;
- /** Handle a URL passed at the command line. */
- boost::signals2::signal<void (const std::string& strURI)> ThreadSafeHandleURI;
-
/** Progress message during initialization. */
boost::signals2::signal<void (const std::string &message)> InitMessage;
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 241e937b1b..3c3d890e2e 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -1434,7 +1434,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
-string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew, bool fAskFee)
+string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew)
{
CReserveKey reservekey(this);
int64_t nFeeRequired;
@@ -1454,9 +1454,6 @@ string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNe
return strError;
}
- if (fAskFee && !uiInterface.ThreadSafeAskFee(nFeeRequired))
- return "ABORTED";
-
if (!CommitTransaction(wtxNew, reservekey))
return _("Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.");
@@ -1465,7 +1462,7 @@ string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNe
-string CWallet::SendMoneyToDestination(const CTxDestination& address, int64_t nValue, CWalletTx& wtxNew, bool fAskFee)
+string CWallet::SendMoneyToDestination(const CTxDestination& address, int64_t nValue, CWalletTx& wtxNew)
{
// Check amount
if (nValue <= 0)
@@ -1477,7 +1474,7 @@ string CWallet::SendMoneyToDestination(const CTxDestination& address, int64_t nV
CScript scriptPubKey;
scriptPubKey.SetDestination(address);
- return SendMoney(scriptPubKey, nValue, wtxNew, fAskFee);
+ return SendMoney(scriptPubKey, nValue, wtxNew);
}
diff --git a/src/wallet.h b/src/wallet.h
index 90209122fd..8e879c5e1a 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -217,8 +217,8 @@ public:
bool CreateTransaction(CScript scriptPubKey, int64_t nValue,
CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, std::string& strFailReason, const CCoinControl *coinControl = NULL);
bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey);
- std::string SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew, bool fAskFee=false);
- std::string SendMoneyToDestination(const CTxDestination &address, int64_t nValue, CWalletTx& wtxNew, bool fAskFee=false);
+ std::string SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew);
+ std::string SendMoneyToDestination(const CTxDestination &address, int64_t nValue, CWalletTx& wtxNew);
bool NewKeyPool();
bool TopUpKeyPool(unsigned int kpSize = 0);
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-07 10:56:59 +0000