qt+android: add lightning URI support
This commit is contained in:
@@ -17,7 +17,7 @@ from electrum import bitcoin, constants
|
||||
from electrum.transaction import tx_from_any, PartialTxOutput
|
||||
from electrum.util import (parse_URI, InvalidBitcoinURI, TxMinedInfo, maybe_extract_bolt11_invoice,
|
||||
InvoiceError, format_time)
|
||||
from electrum.lnaddr import lndecode
|
||||
from electrum.lnaddr import lndecode, LnInvoiceException
|
||||
from electrum.logging import Logger
|
||||
|
||||
from .dialogs.confirm_tx_dialog import ConfirmTxDialog
|
||||
@@ -170,6 +170,15 @@ class SendScreen(CScreen, Logger):
|
||||
def set_URI(self, text: str):
|
||||
if not self.app.wallet:
|
||||
return
|
||||
# interpret as lighting URI
|
||||
bolt11_invoice = maybe_extract_bolt11_invoice(text)
|
||||
if bolt11_invoice:
|
||||
self.set_ln_invoice(bolt11_invoice)
|
||||
# interpret as BIP21 URI
|
||||
else:
|
||||
self.set_bip21(text)
|
||||
|
||||
def set_bip21(self, text: str):
|
||||
try:
|
||||
uri = parse_URI(text, self.app.on_pr, loop=self.app.asyncio_loop)
|
||||
except InvalidBitcoinURI as e:
|
||||
@@ -188,8 +197,8 @@ class SendScreen(CScreen, Logger):
|
||||
try:
|
||||
invoice = str(invoice).lower()
|
||||
lnaddr = lndecode(invoice)
|
||||
except Exception as e:
|
||||
self.app.show_info(invoice + _(" is not a valid Lightning invoice: ") + repr(e)) # repr because str(Exception()) == ''
|
||||
except LnInvoiceException as e:
|
||||
self.app.show_info(_("Invoice is not a valid Lightning invoice: ") + repr(e)) # repr because str(Exception()) == ''
|
||||
return
|
||||
self.address = invoice
|
||||
self.message = dict(lnaddr.tags).get('d', None)
|
||||
|
||||
@@ -79,7 +79,7 @@ from electrum.exchange_rate import FxThread
|
||||
from electrum.simple_config import SimpleConfig
|
||||
from electrum.logging import Logger
|
||||
from electrum.lnutil import ln_dummy_address, extract_nodeid, ConnStringFormatError
|
||||
from electrum.lnaddr import lndecode, LnDecodeException
|
||||
from electrum.lnaddr import lndecode, LnInvoiceException
|
||||
|
||||
from .exception_window import Exception_Hook
|
||||
from .amountedit import AmountEdit, BTCAmountEdit, FreezableLineEdit, FeerateEdit, SizedFreezableLineEdit
|
||||
@@ -1962,12 +1962,15 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
|
||||
else:
|
||||
self.payment_request_error_signal.emit()
|
||||
|
||||
def parse_lightning_invoice(self, invoice):
|
||||
def set_ln_invoice(self, invoice: str):
|
||||
"""Parse ln invoice, and prepare the send tab for it."""
|
||||
try:
|
||||
lnaddr = lndecode(invoice)
|
||||
except Exception as e:
|
||||
raise LnDecodeException(e) from e
|
||||
except LnInvoiceException as e:
|
||||
self.show_error(_("Error parsing Lightning invoice") + f":\n{e}")
|
||||
return
|
||||
|
||||
self.payto_e.lightning_invoice = invoice
|
||||
pubkey = bh2u(lnaddr.pubkey.serialize())
|
||||
for k,v in lnaddr.tags:
|
||||
if k == 'd':
|
||||
@@ -1980,22 +1983,18 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
|
||||
self.message_e.setText(description)
|
||||
if lnaddr.get_amount_sat() is not None:
|
||||
self.amount_e.setAmount(lnaddr.get_amount_sat())
|
||||
#self.amount_e.textEdited.emit("")
|
||||
self.set_onchain(False)
|
||||
|
||||
def set_onchain(self, b):
|
||||
self._is_onchain = b
|
||||
self.max_button.setEnabled(b)
|
||||
|
||||
def pay_to_URI(self, URI):
|
||||
if not URI:
|
||||
return
|
||||
def set_bip21(self, text: str):
|
||||
try:
|
||||
out = util.parse_URI(URI, self.on_pr)
|
||||
out = util.parse_URI(text, self.on_pr)
|
||||
except InvalidBitcoinURI as e:
|
||||
self.show_error(_("Error parsing URI") + f":\n{e}")
|
||||
return
|
||||
self.show_send_tab()
|
||||
self.payto_URI = out
|
||||
r = out.get('r')
|
||||
sig = out.get('sig')
|
||||
@@ -2016,8 +2015,19 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
|
||||
self.message_e.setText(message)
|
||||
if amount:
|
||||
self.amount_e.setAmount(amount)
|
||||
self.amount_e.textEdited.emit("")
|
||||
|
||||
def pay_to_URI(self, text: str):
|
||||
if not text:
|
||||
return
|
||||
# first interpret as lightning invoice
|
||||
bolt11_invoice = maybe_extract_bolt11_invoice(text)
|
||||
if bolt11_invoice:
|
||||
self.set_ln_invoice(bolt11_invoice)
|
||||
else:
|
||||
self.set_bip21(text)
|
||||
# update fiat amount
|
||||
self.amount_e.textEdited.emit("")
|
||||
self.show_send_tab()
|
||||
|
||||
def do_clear(self):
|
||||
self.max_button.setChecked(False)
|
||||
|
||||
@@ -166,12 +166,7 @@ class PayToEdit(CompletionTextEdit, ScanQRTextEdit, Logger):
|
||||
# try LN invoice
|
||||
bolt11_invoice = maybe_extract_bolt11_invoice(data)
|
||||
if bolt11_invoice is not None:
|
||||
try:
|
||||
self.win.parse_lightning_invoice(bolt11_invoice)
|
||||
except LnDecodeException as e:
|
||||
self.errors.append(PayToLineError(line_content=data, exc=e))
|
||||
else:
|
||||
self.lightning_invoice = bolt11_invoice
|
||||
self.win.set_ln_invoice(bolt11_invoice)
|
||||
return
|
||||
# try "address, amount" on-chain format
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user