AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet fixes for lightning disabled (follow up 6058829870)

Browse Source
This commit is contained in:
ThomasV
2020-06-05 15:04:33 +02:00
parent 56f4932f10
commit d9747a2ff1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/wallet.py
View File

@@ -1631,7 +1631,7 @@ class Abstract_Wallet(AddressSynchronizer, ABC):
def get_invoice_status(self, invoice: Invoice): def get_invoice_status(self, invoice: Invoice):
if invoice.is_lightning(): if invoice.is_lightning():
status = self.lnworker.get_invoice_status(invoice) status = self.lnworker.get_invoice_status(invoice) if self.lnworker else PR_UNKNOWN
else: else:
status = PR_PAID if self.is_onchain_invoice_paid(invoice) else PR_UNPAID status = PR_PAID if self.is_onchain_invoice_paid(invoice) else PR_UNPAID
return self.check_expired_status(invoice, status) return self.check_expired_status(invoice, status)
@@ -1641,7 +1641,7 @@ class Abstract_Wallet(AddressSynchronizer, ABC):
if r is None: if r is None:
return PR_UNKNOWN return PR_UNKNOWN
if r.is_lightning(): if r.is_lightning():
status = self.lnworker.get_payment_status(bfh(r.rhash)) status = self.lnworker.get_payment_status(bfh(r.rhash)) if self.lnworker else PR_UNKNOWN
else: else:
paid, conf = self.get_payment_status(r.get_address(), r.amount) paid, conf = self.get_payment_status(r.get_address(), r.amount)
status = PR_PAID if paid else PR_UNPAID status = PR_PAID if paid else PR_UNPAID
@@ -1712,7 +1712,7 @@ class Abstract_Wallet(AddressSynchronizer, ABC):
} }
if is_lightning: if is_lightning:
d['invoice'] = x.invoice d['invoice'] = x.invoice
if status == PR_UNPAID: if self.lnworker and status == PR_UNPAID:
d['can_pay'] = self.lnworker.can_pay_invoice(x) d['can_pay'] = self.lnworker.can_pay_invoice(x)
else: else:
d['outputs'] = [y.to_legacy_tuple() for y in x.outputs] d['outputs'] = [y.to_legacy_tuple() for y in x.outputs]