qml: run tx broadcast in thread, re-enable broadcast button in TxDetails when broadcast fails

show notification when broadcast fails

electrum/gui/qml/components/WalletMainView.qml

@@ -267,6 +267,9 @@ Item {
             })
             dialog.open()
         }
+        function onBroadcastFailed() {
+            notificationPopup.show(qsTr('Broadcast transaction failed'))
+        }
     }
 
     Component {

electrum/gui/qml/qetxdetails.py

@@ -284,4 +284,24 @@ class QETxDetails(QObject):
     @pyqtSlot()
     def broadcast(self):
         assert self._tx.is_complete()
+
+        try:
+            self._wallet.broadcastfailed.disconnect(self.onBroadcastFailed)
+        except:
+            pass
+        self._wallet.broadcastFailed.connect(self.onBroadcastFailed)
+
+        self._can_broadcast = False
+        self.detailsChanged.emit()
+
         self._wallet.broadcast(self._tx)
+
+    @pyqtSlot(str,str,str)
+    def onBroadcastFailed(self, txid, code, reason):
+        if txid != self._txid:
+            return
+
+        self._wallet.broadcastFailed.disconnect(self.onBroadcastFailed)
+
+        self._can_broadcast = True
+        self.detailsChanged.emit()

electrum/gui/qml/qewallet.py

@@ -62,7 +62,7 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
     paymentFailed = pyqtSignal([str,str], arguments=['key','reason'])
     requestNewPassword = pyqtSignal()
     transactionSigned = pyqtSignal([str], arguments=['txid'])
-    #broadcastSucceeded = pyqtSignal([str], arguments=['txid'])
+    broadcastSucceeded = pyqtSignal([str], arguments=['txid'])
     broadcastFailed = pyqtSignal([str,str,str], arguments=['txid','code','reason'])
     labelsUpdated = pyqtSignal()
     otpRequested = pyqtSignal()
@@ -476,21 +476,25 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
     def broadcast(self, tx):
         assert tx.is_complete()
 
-        self.network = self.wallet.network # TODO not always defined?
+        network = self.wallet.network # TODO not always defined?
 
-        try:
+        def broadcast_thread():
-            self._logger.info('running broadcast in thread')
+            try:
-            self.network.run_from_another_thread(self.network.broadcast_transaction(tx))
+                self._logger.info('running broadcast in thread')
-            self._logger.info('broadcast submit done')
+                result = network.run_from_another_thread(network.broadcast_transaction(tx))
-        except TxBroadcastError as e:
+                self._logger.info(repr(result))
-            self.broadcastFailed.emit(tx.txid(),'',repr(e))
+            except TxBroadcastError as e:
-            self._logger.error(e)
+                self._logger.error(repr(e))
-        except BestEffortRequestFailed as e:
+                self.broadcastFailed.emit(tx.txid(),'',repr(e))
-            self.broadcastFailed.emit(tx.txid(),'',repr(e))
+            except BestEffortRequestFailed as e:
-            self._logger.error(e)
+                self._logger.error(repr(e))
+                self.broadcastFailed.emit(tx.txid(),'',repr(e))
+            else:
+                self.broadcastSucceeded.emit(tx.txid())
+
+        threading.Thread(target=broadcast_thread).start()
 
         #TODO: properly catch server side errors, e.g. bad-txns-inputs-missingorspent
-        #might need callback from network.py
 
     paymentAuthRejected = pyqtSignal()
     def ln_auth_rejected(self):