AaronFiore/electrum
1
0
Fork 0
Code Activity

Qt: do not save pending invoice before the user has confirmed payment

Browse Source
This commit is contained in:
ThomasV
2020-12-05 19:27:54 +01:00
parent 5a5ec81e10
commit 56579c282e
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
electrum/gui/qt/main_window.py
View File

@@ -1517,7 +1517,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
return False # no errors return False # no errors
def pay_lightning_invoice(self, invoice: str, *, amount_msat: Optional[int]): def pay_lightning_invoice(self, invoice: str, *, amount_msat: Optional[int], pending_invoice: Optional['Invoice']):
if amount_msat is None: if amount_msat is None:
raise Exception("missing amount for LN invoice") raise Exception("missing amount for LN invoice")
amount_sat = Decimal(amount_msat) / 1000 amount_sat = Decimal(amount_msat) / 1000
@@ -1525,12 +1525,12 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
msg = _("Pay lightning invoice?") + '\n\n' + _("This will send {}?").format(self.format_amount_and_units(amount_sat)) msg = _("Pay lightning invoice?") + '\n\n' + _("This will send {}?").format(self.format_amount_and_units(amount_sat))
if not self.question(msg): if not self.question(msg):
return return
if pending_invoice:
self.save_invoice(pending_invoice)
attempts = LN_NUM_PAYMENT_ATTEMPTS attempts = LN_NUM_PAYMENT_ATTEMPTS
def task(): def task():
self.wallet.lnworker.pay(invoice, amount_msat=amount_msat, attempts=attempts) self.wallet.lnworker.pay(invoice, amount_msat=amount_msat, attempts=attempts)
self.do_clear()
self.wallet.thread.add(task) self.wallet.thread.add(task)
self.invoice_list.update()
def on_request_status(self, wallet, key, status): def on_request_status(self, wallet, key, status):
if wallet != self.wallet: if wallet != self.wallet:
@@ -1591,17 +1591,17 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
invoice = self.read_invoice() invoice = self.read_invoice()
if not invoice: if not invoice:
return return
self.wallet.save_invoice(invoice) self.save_invoice(invoice)
def save_invoice(self, invoice):
self.do_clear() self.do_clear()
self.wallet.save_invoice(invoice)
self.invoice_list.update() self.invoice_list.update()
def do_pay(self): def do_pay(self):
invoice = self.read_invoice() invoice = self.read_invoice()
if not invoice: if not invoice:
return return
self.wallet.save_invoice(invoice)
self.invoice_list.update()
self.do_clear()
self.do_pay_invoice(invoice) self.do_pay_invoice(invoice)
def pay_multiple_invoices(self, invoices): def pay_multiple_invoices(self, invoices):
@@ -1613,10 +1613,10 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
def do_pay_invoice(self, invoice: 'Invoice'): def do_pay_invoice(self, invoice: 'Invoice'):
if invoice.type == PR_TYPE_LN: if invoice.type == PR_TYPE_LN:
assert isinstance(invoice, LNInvoice) assert isinstance(invoice, LNInvoice)
self.pay_lightning_invoice(invoice.invoice, amount_msat=invoice.get_amount_msat()) self.pay_lightning_invoice(invoice.invoice, amount_msat=invoice.get_amount_msat(), pending_invoice=invoice)
elif invoice.type == PR_TYPE_ONCHAIN: elif invoice.type == PR_TYPE_ONCHAIN:
assert isinstance(invoice, OnchainInvoice) assert isinstance(invoice, OnchainInvoice)
self.pay_onchain_dialog(self.get_coins(), invoice.outputs) self.pay_onchain_dialog(self.get_coins(), invoice.outputs, pending_invoice=invoice)
else: else:
raise Exception('unknown invoice type') raise Exception('unknown invoice type')
@@ -1634,9 +1634,11 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
""" """
return self.utxo_list.get_spend_list() return self.utxo_list.get_spend_list()
def pay_onchain_dialog(self, inputs: Sequence[PartialTxInput], def pay_onchain_dialog(
outputs: List[PartialTxOutput], *, self, inputs: Sequence[PartialTxInput],
external_keypairs=None) -> None: outputs: List[PartialTxOutput], *,
external_keypairs=None,
pending_invoice: Optional['Invoice']) -> None:
# trustedcoin requires this # trustedcoin requires this
if run_hook('abort_send', self): if run_hook('abort_send', self):
return return
@@ -1669,6 +1671,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
cancelled, is_send, password, tx = d.run() cancelled, is_send, password, tx = d.run()
if cancelled: if cancelled:
return return
if pending_invoice:
self.save_invoice(pending_invoice)
if is_send: if is_send:
def sign_done(success): def sign_done(success):
if success: if success: