Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-12-22 19:49:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

send: fix default fee priority

Browse source
This commit is contained in:
tobtoht 2024-03-08 17:54:16 +01:00
parent fd4fbdb688
commit 83042f3d0f
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libwalletqt/PendingTransaction.h
View file

@ -22,13 +22,6 @@ public:
}; };
Q_ENUM(Status) 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; Status status() const;
QString errorString() const; QString errorString() const;
const std::exception_ptr getException() const; const std::exception_ptr getException() const;

9
src/libwalletqt/Wallet.cpp
View file

@ -838,7 +838,7 @@ void Wallet::createTransaction(const QString &address, quint64 amount, const QSt
std::set<uint32_t> subaddr_indices; std::set<uint32_t> subaddr_indices;
Monero::PendingTransaction *ptImpl = m_walletImpl->createTransaction(address.toStdString(), "", all ? Monero::optional<uint64_t>() : Monero::optional<uint64_t>(amount), constants::mixin, Monero::PendingTransaction *ptImpl = m_walletImpl->createTransaction(address.toStdString(), "", all ? Monero::optional<uint64_t>() : Monero::optional<uint64_t>(amount), constants::mixin,
static_cast<Monero::PendingTransaction::Priority>(this->tx_priority), Monero::PendingTransaction::Priority_Default,
currentSubaddressAccount(), subaddr_indices, m_selectedInputs); currentSubaddressAccount(), subaddr_indices, m_selectedInputs);
QVector<QString> addresses{address}; QVector<QString> addresses{address};
@ -865,7 +865,7 @@ void Wallet::createTransactionMultiDest(const QVector<QString> &addresses, const
std::set<uint32_t> subaddr_indices; std::set<uint32_t> subaddr_indices;
Monero::PendingTransaction *ptImpl = m_walletImpl->createTransactionMultDest(dests, "", amount, constants::mixin, Monero::PendingTransaction *ptImpl = m_walletImpl->createTransactionMultDest(dests, "", amount, constants::mixin,
static_cast<Monero::PendingTransaction::Priority>(this->tx_priority), Monero::PendingTransaction::Priority_Default,
currentSubaddressAccount(), subaddr_indices, m_selectedInputs); currentSubaddressAccount(), subaddr_indices, m_selectedInputs);
this->onTransactionCreated(ptImpl, addresses); this->onTransactionCreated(ptImpl, addresses);
@ -885,7 +885,10 @@ void Wallet::sweepOutputs(const QVector<QString> &keyImages, QString address, bo
for (const auto &key_image : keyImages) { for (const auto &key_image : keyImages) {
kis.push_back(key_image.toStdString()); kis.push_back(key_image.toStdString());
} }
Monero::PendingTransaction *ptImpl = m_walletImpl->createTransactionSelected(kis, address.toStdString(), outputs, static_cast<Monero::PendingTransaction::Priority>(this->tx_priority)); Monero::PendingTransaction *ptImpl = m_walletImpl->createTransactionSelected(kis,
address.toStdString(),
outputs,
Monero::PendingTransaction::Priority_Default);
QVector<QString> addresses {address}; QVector<QString> addresses {address};
this->onTransactionCreated(ptImpl, addresses); this->onTransactionCreated(ptImpl, addresses);

2
src/libwalletqt/Wallet.h
View file

@ -405,8 +405,6 @@ public:
//! create a view only wallet //! create a view only wallet
bool createViewOnly(const QString &path, const QString &password) const; 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 QString tmpTxDescription; // TODO: remove the need for this var
bool refreshedOnce = false; bool refreshedOnce = false;