diff options
| author | Ilya Kitaev <mbg033@gmail.com> | 2016-06-27 15:45:48 +0300 |
|---|---|---|
| committer | Ilya Kitaev <mbg033@gmail.com> | 2016-06-27 15:45:48 +0300 |
| commit | 409c5701e2004023db58af7575959de4b8256001 (patch) | |
| tree | 222d20ccc4ce224a564551aefc3af714a83710de /src | |
| parent | 17f38a930e33c25392dd565f484009e5eddba56a (diff) | |
| download | monzero-gui-409c5701e2004023db58af7575959de4b8256001.tar.gz monzero-gui-409c5701e2004023db58af7575959de4b8256001.tar.xz monzero-gui-409c5701e2004023db58af7575959de4b8256001.zip | |
Priority aka fee multiplier integrated
Diffstat (limited to 'src')
| -rw-r--r-- | src/libwalletqt/PendingTransaction.h | 9 | ||||
| -rw-r--r-- | src/libwalletqt/Wallet.cpp | 6 | ||||
| -rw-r--r-- | src/libwalletqt/Wallet.h | 10 |
3 files changed, 18 insertions, 7 deletions
diff --git a/src/libwalletqt/PendingTransaction.h b/src/libwalletqt/PendingTransaction.h index d8c4ec1e..8f5fca1c 100644 --- a/src/libwalletqt/PendingTransaction.h +++ b/src/libwalletqt/PendingTransaction.h @@ -23,9 +23,16 @@ public: Status_Ok = Bitmonero::PendingTransaction::Status_Ok, Status_Error = Bitmonero::PendingTransaction::Status_Error }; - Q_ENUM(Status) + enum Priority { + Priority_Low = Bitmonero::PendingTransaction::Priority_Low, + Priority_Medium = Bitmonero::PendingTransaction::Priority_Medium, + Priority_High = Bitmonero::PendingTransaction::Priority_High + }; + Q_ENUM(Priority) + + Status status() const; QString errorString() const; Q_INVOKABLE bool commit(); diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index da9cba01..e6368ad2 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -89,10 +89,12 @@ bool Wallet::refresh() } PendingTransaction *Wallet::createTransaction(const QString &dst_addr, const QString &payment_id, - quint64 amount, quint32 mixin_count) + quint64 amount, quint32 mixin_count, + PendingTransaction::Priority priority) { Bitmonero::PendingTransaction * ptImpl = m_walletImpl->createTransaction( - dst_addr.toStdString(), payment_id.toStdString(), amount, mixin_count); + dst_addr.toStdString(), payment_id.toStdString(), amount, mixin_count, + static_cast<Bitmonero::PendingTransaction::Priority>(priority)); PendingTransaction * result = new PendingTransaction(ptImpl, this); return result; } diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h index 675ff52e..a62c0f14 100644 --- a/src/libwalletqt/Wallet.h +++ b/src/libwalletqt/Wallet.h @@ -3,13 +3,15 @@ #include <QObject> -#include "wallet/wallet2_api.h" // we need to access Status enum here; +#include "wallet/wallet2_api.h" // we need to have an access to the Bitmonero::Wallet::Status enum here; +#include "PendingTransaction.h" // we need to have an access to the PendingTransaction::Priority enum here; + namespace Bitmonero { class Wallet; // forward declaration } -class PendingTransaction; + class TransactionHistory; class Wallet : public QObject @@ -77,8 +79,8 @@ public: //! creates transaction Q_INVOKABLE PendingTransaction * createTransaction(const QString &dst_addr, const QString &payment_id, - quint64 amount, quint32 mixin_count); - + quint64 amount, quint32 mixin_count, + PendingTransaction::Priority priority = PendingTransaction::Priority_Low); //! deletes transaction and frees memory Q_INVOKABLE void disposeTransaction(PendingTransaction * t); |
