AaronFiore/electrum
1
0
Fork 0
Code Activity

payment_identifier: if a bip21 uri contains a lightning invoice without fallback address,

Browse Source 
and an address is present in the bip21 uri path, register the on-chain address in the
Invoice.outputs field to allow paying onchain from a saved Invoice later (when the PI
is unavailable). Fixes #8654
This commit is contained in:
Sander van Grieken
2023-11-01 12:47:28 +01:00
parent af61b9d86b
commit ec8500bd55
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/invoices.py
View File

@@ -304,7 +304,7 @@ class Invoice(BaseInvoice):
def can_be_paid_onchain(self) -> bool: def can_be_paid_onchain(self) -> bool:
if self.is_lightning(): if self.is_lightning():
return bool(self._lnaddr.get_fallback_address()) return bool(self._lnaddr.get_fallback_address()) or (bool(self.outputs))
else: else:
return True return True

5
electrum/payment_identifier.py
View File

@@ -257,6 +257,11 @@ class PaymentIdentifier(Logger):
if bolt11: if bolt11:
try: try:
self.bolt11 = Invoice.from_bech32(bolt11) self.bolt11 = Invoice.from_bech32(bolt11)
# carry BIP21 onchain address in Invoice.outputs in case bolt11 doesn't contain a fallback
# address but the BIP21 URI has one.
if bip21_address := self.bip21.get('address'):
amount = self.bip21.get('amount', 0)
self.bolt11.outputs = [PartialTxOutput.from_address_and_value(bip21_address, amount)]
except InvoiceError as e: except InvoiceError as e:
self.logger.debug(self._get_error_from_invoiceerror(e)) self.logger.debug(self._get_error_from_invoiceerror(e))
self.set_state(PaymentIdentifierState.AVAILABLE) self.set_state(PaymentIdentifierState.AVAILABLE)