Merge pull request #115

d95e4a3 Write support for tx notes (moneromooo.monero)

4 files changed, 23 insertions, 0 deletions

diff --git a/src/libwalletqt/PendingTransaction.cpp b/src/libwalletqt/PendingTransaction.cpp
index 8c0d8c29..b1441f20 100644
--- a/src/libwalletqt/PendingTransaction.cpp
+++ b/src/libwalletqt/PendingTransaction.cpp
@@ -31,6 +31,15 @@ quint64 PendingTransaction::fee() const
     return m_pimpl->fee();
 }
 
+QList<QString> PendingTransaction::txid() const
+{
+    QList<QString> list;
+    std::vector<std::string> txid = m_pimpl->txid();
+    for (const auto &t: txid)
+        list.append(QString::fromStdString(t));
+    return list;
+}
+
 PendingTransaction::PendingTransaction(Bitmonero::PendingTransaction *pt, QObject *parent)
     : QObject(parent), m_pimpl(pt)
 {
diff --git a/src/libwalletqt/PendingTransaction.h b/src/libwalletqt/PendingTransaction.h
index 8f5fca1c..866431fb 100644
--- a/src/libwalletqt/PendingTransaction.h
+++ b/src/libwalletqt/PendingTransaction.h
@@ -17,6 +17,7 @@ class PendingTransaction : public QObject
     Q_PROPERTY(quint64 amount READ amount)
     Q_PROPERTY(quint64 dust READ dust)
     Q_PROPERTY(quint64 fee READ fee)
+    Q_PROPERTY(QList<QString> txid READ txid)
 
 public:
     enum Status {
@@ -39,6 +40,7 @@ public:
     quint64 amount() const;
     quint64 dust() const;
     quint64 fee() const;
+    QList<QString> txid() const;
 private:
     explicit PendingTransaction(Bitmonero::PendingTransaction * pt, QObject *parent = 0);
 
diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index ef98828c..5ab27a27 100644
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -260,6 +260,15 @@ void Wallet::setPaymentId(const QString &paymentId)
     m_paymentId = paymentId;
 }
 
+bool Wallet::setUserNote(const QString &txid, const QString &note)
+{
+  return m_walletImpl->setUserNote(txid.toStdString(), note.toStdString());
+}
+
+QString Wallet::getUserNote(const QString &txid) const
+{
+  return QString::fromStdString(m_walletImpl->getUserNote(txid.toStdString()));
+}
 
 Wallet::Wallet(Bitmonero::Wallet *w, QObject *parent)
     : QObject(parent)
diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h
index 303dfd24..aec9b2e4 100644
--- a/src/libwalletqt/Wallet.h
+++ b/src/libwalletqt/Wallet.h
@@ -138,6 +138,9 @@ public:
 
     void setPaymentId(const QString &paymentId);
 
+    Q_INVOKABLE bool setUserNote(const QString &txid, const QString &note);
+    Q_INVOKABLE QString getUserNote(const QString &txid) const;
+
     // TODO: setListenter() when it implemented in API
 signals:
     // emitted on every event happened with wallet