Merge pull request #2147

c88bb60 transaction: async commit (ph4r05)

3 files changed, 29 insertions, 11 deletions

diff --git a/main.qml b/main.qml
index 3da05b4d..53247364 100644
--- a/main.qml
+++ b/main.qml
@@ -306,6 +306,7 @@ ApplicationWindow {
             currentWallet.connectionStatusChanged.disconnect(onWalletConnectionStatusChanged)
             currentWallet.deviceButtonRequest.disconnect(onDeviceButtonRequest);
             currentWallet.deviceButtonPressed.disconnect(onDeviceButtonPressed);
+            currentWallet.transactionCommitted.disconnect(onTransactionCommitted);
             middlePanel.paymentClicked.disconnect(handlePayment);
             middlePanel.sweepUnmixableClicked.disconnect(handleSweepUnmixable);
             middlePanel.getProofClicked.disconnect(handleGetProof);
@@ -363,6 +364,7 @@ ApplicationWindow {
         currentWallet.connectionStatusChanged.connect(onWalletConnectionStatusChanged)
         currentWallet.deviceButtonRequest.connect(onDeviceButtonRequest);
         currentWallet.deviceButtonPressed.connect(onDeviceButtonPressed);
+        currentWallet.transactionCommitted.connect(onTransactionCommitted);
         middlePanel.paymentClicked.connect(handlePayment);
         middlePanel.sweepUnmixableClicked.connect(handleSweepUnmixable);
         middlePanel.getProofClicked.connect(handleGetProof);
@@ -948,16 +950,6 @@ ApplicationWindow {
 
     // called after user confirms transaction
     function handleTransactionConfirmed(fileName) {
-        // grab transaction.txid before commit, since it clears it.
-        // we actually need to copy it, because QML will incredibly
-        // call the function multiple times when the variable is used
-        // after commit, where it returns another result...
-        // Of course, this loop is also calling the function multiple
-        // times, but at least with the same result.
-        var txid = [], txid_org = transaction.txid, txid_text = ""
-        for (var i = 0; i < txid_org.length; ++i)
-          txid[i] = txid_org[i]
-
         // View only wallet - we save the tx
         if(viewOnly && saveTxDialog.fileUrl){
             // No file specified - abort
@@ -972,12 +964,19 @@ ApplicationWindow {
             transaction.setFilename(path);
         }
 
-        if (!transaction.commit()) {
+        appWindow.showProcessingSplash(qsTr("Sending transaction ..."));
+        currentWallet.commitTransactionAsync(transaction);
+    }
+
+    function onTransactionCommitted(success, transaction, txid) {
+        hideProcessingSplash();
+        if (!success) {
             console.log("Error committing transaction: " + transaction.errorString);
             informationPopup.title = qsTr("Error") + translationManager.emptyString
             informationPopup.text  = qsTr("Couldn't send the money: ") + transaction.errorString
             informationPopup.icon  = StandardIcon.Critical
         } else {
+            var txid_text = ""
             informationPopup.title = qsTr("Information") + translationManager.emptyString
             for (var i = 0; i < txid.length; ++i) {
                 if (txid_text.length > 0)
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);