AaronFiore/electrum
1
0
Fork 0
Code Activity

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

Browse Source 
show notification when broadcast fails
This commit is contained in:
Sander van Grieken
2022-10-25 16:24:56 +02:00
parent 902f16204c
commit 571c626eb4
3 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
electrum/gui/qml/components/WalletMainView.qml
View File

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

20
electrum/gui/qml/qetxdetails.py
View File

@@ -284,4 +284,24 @@ class QETxDetails(QObject):
@pyqtSlot() @pyqtSlot()
def broadcast(self): def broadcast(self):
assert self._tx.is_complete() 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) 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()

30
electrum/gui/qml/qewallet.py
View File

@@ -62,7 +62,7 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
paymentFailed = pyqtSignal([str,str], arguments=['key','reason']) paymentFailed = pyqtSignal([str,str], arguments=['key','reason'])
requestNewPassword = pyqtSignal() requestNewPassword = pyqtSignal()
transactionSigned = pyqtSignal([str], arguments=['txid']) transactionSigned = pyqtSignal([str], arguments=['txid'])
#broadcastSucceeded = pyqtSignal([str], arguments=['txid']) broadcastSucceeded = pyqtSignal([str], arguments=['txid'])
broadcastFailed = pyqtSignal([str,str,str], arguments=['txid','code','reason']) broadcastFailed = pyqtSignal([str,str,str], arguments=['txid','code','reason'])
labelsUpdated = pyqtSignal() labelsUpdated = pyqtSignal()
otpRequested = pyqtSignal() otpRequested = pyqtSignal()
@@ -476,21 +476,25 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
def broadcast(self, tx): def broadcast(self, tx):
assert tx.is_complete() 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 #TODO: properly catch server side errors, e.g. bad-txns-inputs-missingorspent
#might need callback from network.py
paymentAuthRejected = pyqtSignal() paymentAuthRejected = pyqtSignal()
def ln_auth_rejected(self): def ln_auth_rejected(self):