From 1a23dcb8d5c394b74648ab6c4a8db47a9d258f37 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Fri, 7 Jun 2019 10:45:10 +0200
Subject: [PATCH] display lightning payment attempts using signal

---
 electrum/gui/qt/main_window.py | 15 ++++++++++-----
 electrum/gui/qt/util.py        |  7 ++++++-
 electrum/lnworker.py           |  1 +
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/electrum/gui/qt/main_window.py b/electrum/gui/qt/main_window.py
index bef520ffb..1411f8ad5 100644
--- a/electrum/gui/qt/main_window.py
+++ b/electrum/gui/qt/main_window.py
@@ -92,6 +92,7 @@ from .history_list import HistoryList, HistoryModel
 from .update_checker import UpdateCheck, UpdateCheckThread
 from .channels_list import ChannelsList
 
+LN_NUM_PAYMENT_ATTEMPTS = 10
 
 class StatusBarButton(QPushButton):
     def __init__(self, icon, tooltip, func):
@@ -120,6 +121,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
     new_fx_quotes_signal = pyqtSignal()
     new_fx_history_signal = pyqtSignal()
     network_signal = pyqtSignal(str, object)
+    ln_payment_attempt_signal = pyqtSignal(str)
     alias_received_signal = pyqtSignal()
     computing_privkeys_signal = pyqtSignal()
     show_privkeys_signal = pyqtSignal()
@@ -223,7 +225,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
                          'new_transaction', 'status',
                          'banner', 'verified', 'fee', 'fee_histogram', 'on_quotes',
                          'on_history', 'channel', 'channels', 'ln_message',
-                         'ln_payment_completed']
+                         'ln_payment_completed', 'ln_payment_attempt']
             # To avoid leaking references to "self" that prevent the
             # window from being GC-ed when closed, callbacks should be
             # methods of this class only, and specifically not be
@@ -372,6 +374,9 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
         elif event == 'channel':
             self.channels_list.update_single_row.emit(*args)
             self.update_status()
+        elif event == 'ln_payment_attempt':
+            msg = _('Sending lightning payment') + '... (%d/%d)'%(args[0]+1, LN_NUM_PAYMENT_ATTEMPTS)
+            self.ln_payment_attempt_signal.emit(msg)
         elif event == 'ln_payment_completed':
             # FIXME it is really inefficient to force update the whole GUI
             # just for a single LN payment. individual rows in lists should be updated instead.
@@ -1673,7 +1678,6 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
 
     def pay_lightning_invoice(self, invoice):
         amount = self.amount_e.get_amount()
-        LN_NUM_PAYMENT_ATTEMPTS = 3
         def on_success(result):
             self.logger.info(f'ln payment success. {result}')
             self.show_error(_('Payment succeeded'))
@@ -1687,12 +1691,13 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
             else:
                 raise e
         def task():
-            success = self.wallet.lnworker.pay(invoice, attempts=LN_NUM_PAYMENT_ATTEMPTS, amount_sat=amount, timeout=30)
+            success = self.wallet.lnworker.pay(invoice, attempts=LN_NUM_PAYMENT_ATTEMPTS, amount_sat=amount, timeout=60)
             if not success:
-                raise PaymentFailure('Failed after {LN_NUM_PAYMENT_ATTEMPTS} attempts')
+                raise PaymentFailure(f'Failed after {LN_NUM_PAYMENT_ATTEMPTS} attempts')
 
         msg = _('Sending lightning payment...')
-        WaitingDialog(self, msg, task, on_success, on_failure)
+        d = WaitingDialog(self, msg, task, on_success, on_failure)
+        self.ln_payment_attempt_signal.connect(d.update)
 
     def do_send(self, preview = False):
         if self.payto_e.is_lightning:
diff --git a/electrum/gui/qt/util.py b/electrum/gui/qt/util.py
index 5e0862fd0..e653de327 100644
--- a/electrum/gui/qt/util.py
+++ b/electrum/gui/qt/util.py
@@ -288,8 +288,9 @@ class WaitingDialog(WindowModalDialog):
         if isinstance(parent, MessageBoxMixin):
             parent = parent.top_level_window()
         WindowModalDialog.__init__(self, parent, _("Please wait"))
+        self.message_label = QLabel(message)
         vbox = QVBoxLayout(self)
-        vbox.addWidget(QLabel(message))
+        vbox.addWidget(self.message_label)
         self.accepted.connect(self.on_accepted)
         self.show()
         self.thread = TaskThread(self)
@@ -302,6 +303,10 @@ class WaitingDialog(WindowModalDialog):
     def on_accepted(self):
         self.thread.stop()
 
+    def update(self, msg):
+        print(msg)
+        self.message_label.setText(msg)
+
 
 def line_dialog(parent, title, label, ok_label, default=None):
     dialog = WindowModalDialog(parent, title)
diff --git a/electrum/lnworker.py b/electrum/lnworker.py
index 588a18712..0b999f1a5 100644
--- a/electrum/lnworker.py
+++ b/electrum/lnworker.py
@@ -683,6 +683,7 @@ class LNWallet(LNWorker):
             route = await self._create_route_from_invoice(decoded_invoice=addr)
             if not self.get_channel_by_short_id(route[0].short_channel_id):
                 assert False, 'Found route with short channel ID we don\'t have: ' + repr(route[0].short_channel_id)
+            self.network.trigger_callback('ln_payment_attempt', i)
             if await self._pay_to_route(route, addr, invoice):
                 return True
         return False