From 83042f3d0fbf53e70410d62b01e579d951b60538 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Fri, 8 Mar 2024 17:54:16 +0100 Subject: [PATCH] send: fix default fee priority --- src/libwalletqt/PendingTransaction.h | 7 ------- src/libwalletqt/Wallet.cpp | 9 ++++++--- src/libwalletqt/Wallet.h | 2 -- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/libwalletqt/PendingTransaction.h b/src/libwalletqt/PendingTransaction.h index 7e4d952..9e71f71 100644 --- a/src/libwalletqt/PendingTransaction.h +++ b/src/libwalletqt/PendingTransaction.h @@ -22,13 +22,6 @@ public: }; Q_ENUM(Status) - enum Priority { - Priority_Low = Monero::PendingTransaction::Priority_Low, - Priority_Medium = Monero::PendingTransaction::Priority_Medium, - Priority_High = Monero::PendingTransaction::Priority_High - }; - - Status status() const; QString errorString() const; const std::exception_ptr getException() const; diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index bf6f1c5..e5c2bbb 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -838,7 +838,7 @@ void Wallet::createTransaction(const QString &address, quint64 amount, const QSt std::set subaddr_indices; Monero::PendingTransaction *ptImpl = m_walletImpl->createTransaction(address.toStdString(), "", all ? Monero::optional() : Monero::optional(amount), constants::mixin, - static_cast(this->tx_priority), + Monero::PendingTransaction::Priority_Default, currentSubaddressAccount(), subaddr_indices, m_selectedInputs); QVector addresses{address}; @@ -865,7 +865,7 @@ void Wallet::createTransactionMultiDest(const QVector &addresses, const std::set subaddr_indices; Monero::PendingTransaction *ptImpl = m_walletImpl->createTransactionMultDest(dests, "", amount, constants::mixin, - static_cast(this->tx_priority), + Monero::PendingTransaction::Priority_Default, currentSubaddressAccount(), subaddr_indices, m_selectedInputs); this->onTransactionCreated(ptImpl, addresses); @@ -885,7 +885,10 @@ void Wallet::sweepOutputs(const QVector &keyImages, QString address, bo for (const auto &key_image : keyImages) { kis.push_back(key_image.toStdString()); } - Monero::PendingTransaction *ptImpl = m_walletImpl->createTransactionSelected(kis, address.toStdString(), outputs, static_cast(this->tx_priority)); + Monero::PendingTransaction *ptImpl = m_walletImpl->createTransactionSelected(kis, + address.toStdString(), + outputs, + Monero::PendingTransaction::Priority_Default); QVector addresses {address}; this->onTransactionCreated(ptImpl, addresses); diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h index d24e402..03decd5 100644 --- a/src/libwalletqt/Wallet.h +++ b/src/libwalletqt/Wallet.h @@ -405,8 +405,6 @@ public: //! create a view only wallet bool createViewOnly(const QString &path, const QString &password) const; - PendingTransaction::Priority tx_priority = PendingTransaction::Priority::Priority_Low; - QString tmpTxDescription; // TODO: remove the need for this var bool refreshedOnce = false;