Merge pull request #135

111248f Make the new sweep functions use async transactions (moneromooo.monero)
c779b37 Support for sweeping all outputs (moneromooo.monero)
2143392 Add a button to sweep unmixable outputs (moneromooo.monero)

2 files changed, 60 insertions, 1 deletions

diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index 78cb6949..5f3cd5f3 100644
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -216,7 +216,6 @@ PendingTransaction *Wallet::createTransaction(const QString &dst_addr, const QSt
     return result;
 }
 
-
 void Wallet::createTransactionAsync(const QString &dst_addr, const QString &payment_id,
                                quint64 amount, quint32 mixin_count,
                                PendingTransaction::Priority priority)
@@ -233,7 +232,51 @@ void Wallet::createTransactionAsync(const QString &dst_addr, const QString &paym
     });
 }
 
+PendingTransaction *Wallet::createTransactionAll(const QString &dst_addr, const QString &payment_id,
+                                                 quint32 mixin_count, PendingTransaction::Priority priority)
+{
+    Bitmonero::PendingTransaction * ptImpl = m_walletImpl->createTransaction(
+                dst_addr.toStdString(), payment_id.toStdString(), Bitmonero::optional<uint64_t>(), mixin_count,
+                static_cast<Bitmonero::PendingTransaction::Priority>(priority));
+    PendingTransaction * result = new PendingTransaction(ptImpl, this);
+    return result;
+}
+
+void Wallet::createTransactionAllAsync(const QString &dst_addr, const QString &payment_id,
+                               quint32 mixin_count,
+                               PendingTransaction::Priority priority)
+{
+    QFuture<PendingTransaction*> future = QtConcurrent::run(this, &Wallet::createTransactionAll,
+                                  dst_addr, payment_id, mixin_count, priority);
+    QFutureWatcher<PendingTransaction*> * watcher = new QFutureWatcher<PendingTransaction*>();
+    watcher->setFuture(future);
+    connect(watcher, &QFutureWatcher<PendingTransaction*>::finished,
+            this, [this, watcher,dst_addr,payment_id,mixin_count]() {
+        QFuture<PendingTransaction*> future = watcher->future();
+        watcher->deleteLater();
+        emit transactionCreated(future.result(),dst_addr,payment_id,mixin_count);
+    });
+}
+
+PendingTransaction *Wallet::createSweepUnmixableTransaction()
+{
+    Bitmonero::PendingTransaction * ptImpl = m_walletImpl->createSweepUnmixableTransaction();
+    PendingTransaction * result = new PendingTransaction(ptImpl, this);
+    return result;
+}
 
+void Wallet::createSweepUnmixableTransactionAsync()
+{
+    QFuture<PendingTransaction*> future = QtConcurrent::run(this, &Wallet::createSweepUnmixableTransaction);
+    QFutureWatcher<PendingTransaction*> * watcher = new QFutureWatcher<PendingTransaction*>();
+    watcher->setFuture(future);
+    connect(watcher, &QFutureWatcher<PendingTransaction*>::finished,
+            this, [this, watcher]() {
+        QFuture<PendingTransaction*> future = watcher->future();
+        watcher->deleteLater();
+        emit transactionCreated(future.result(),"","",0);
+    });
+}
 
 void Wallet::disposeTransaction(PendingTransaction *t)
 {
diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h
index fc7363e8..14308ce5 100644
--- a/src/libwalletqt/Wallet.h
+++ b/src/libwalletqt/Wallet.h
@@ -126,10 +126,26 @@ public:
     Q_INVOKABLE PendingTransaction * createTransaction(const QString &dst_addr, const QString &payment_id,
                                                        quint64 amount, quint32 mixin_count,
                                                        PendingTransaction::Priority priority);
+
     //! creates async transaction
     Q_INVOKABLE void createTransactionAsync(const QString &dst_addr, const QString &payment_id,
                                             quint64 amount, quint32 mixin_count,
                                             PendingTransaction::Priority priority);
+
+    //! creates transaction with all outputs
+    Q_INVOKABLE PendingTransaction * createTransactionAll(const QString &dst_addr, const QString &payment_id,
+                                                       quint32 mixin_count, PendingTransaction::Priority priority);
+
+    //! creates async transaction with all outputs
+    Q_INVOKABLE void createTransactionAllAsync(const QString &dst_addr, const QString &payment_id,
+                                               quint32 mixin_count, PendingTransaction::Priority priority);
+
+    //! creates sweep unmixable transaction
+    Q_INVOKABLE PendingTransaction * createSweepUnmixableTransaction();
+
+    //! creates async sweep unmixable transaction
+    Q_INVOKABLE void createSweepUnmixableTransactionAsync();
+
     //! deletes transaction and frees memory
     Q_INVOKABLE void disposeTransaction(PendingTransaction * t);