Merge pull request #2147

c88bb60 transaction: async commit (ph4r05)

2 files changed, 19 insertions, 0 deletions

diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index 9fb9e3ef..2f106aed 100644
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -524,6 +524,22 @@ bool Wallet::submitTxFile(const QString &fileName) const
     return m_walletImpl->importKeyImages(fileName.toStdString() + "_keyImages");
 }
 
+void Wallet::commitTransactionAsync(PendingTransaction *t)
+{
+  QStringList txid(t->txid());
+  QFuture<bool> future = QtConcurrent::run(t, &PendingTransaction::commit);
+
+  QFutureWatcher<bool> * watcher = new QFutureWatcher<bool>();
+
+  connect(watcher, &QFutureWatcher<bool>::finished,
+          this, [this, watcher, t, txid]() {
+        QFuture<bool> future = watcher->future();
+        watcher->deleteLater();
+        emit transactionCommitted(future.result(), t, txid);
+      });
+  watcher->setFuture(future);
+}
+
 void Wallet::disposeTransaction(PendingTransaction *t)
 {
     m_walletImpl->disposeTransaction(t->m_pimpl);
diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h
index 0e51c0e3..39df6cc8 100644
--- a/src/libwalletqt/Wallet.h
+++ b/src/libwalletqt/Wallet.h
@@ -241,6 +241,8 @@ public:
     //! Submit a transfer from file
     Q_INVOKABLE bool submitTxFile(const QString &fileName) const;
 
+    //! asynchronous transaction commit
+    Q_INVOKABLE void commitTransactionAsync(PendingTransaction * t);
 
     //! deletes transaction and frees memory
     Q_INVOKABLE void disposeTransaction(PendingTransaction * t);
@@ -352,6 +354,7 @@ signals:
     void walletCreationHeightChanged();
     void deviceButtonRequest(quint64 buttonCode);
     void deviceButtonPressed();
+    void transactionCommitted(bool status, PendingTransaction *t, QStringList txid);
 
     // emitted when transaction is created async
     void transactionCreated(PendingTransaction * transaction, QString address, QString paymentId, quint32 mixinCount);