BOLT12 fixes

electrum/commands.py

@@ -25,6 +25,7 @@
 import io
 import sys
 import datetime
+import dataclasses
 import time
 import argparse
 import json
@@ -43,15 +44,18 @@
 
 import electrum_ecc as ecc
 
-from . import util
+from . import util, bolt12
+from .bolt12 import BOLT12Invoice, BOLT12Offer, BOLT12InvoiceRequest
 from .lnmsg import OnionWireSerializer
 from .lnworker import LN_P2P_NETWORK_TIMEOUT
 from .logging import Logger
 from .onion_message import create_blinded_path, send_onion_message_to
+from .lnonion import BlindedPath
+from .segwit_addr import INVALID_BECH32
 from .submarine_swaps import NostrTransport
 from .util import (
     bfh, json_decode, json_normalize, is_hash256_str, is_hex_str, to_bytes, parse_max_spend, to_decimal,
-    UserFacingException, InvalidPassword
+    UserFacingException, InvalidPassword, json_encode
 )
 from . import bitcoin
 from .bitcoin import is_address,  hash_160, COIN
@@ -1384,6 +1388,73 @@ async def add_request(self, amount, memo='', expiry=3600, lightning=False, force
         req = wallet.get_request(key)
         return wallet.export_request(req)
 
+    @command('wnl')
+    async def pay_bolt12_offer(
+            self,
+            offer: str,
+            amount: Optional[Decimal] = None,
+            payer_note: Optional[str] = None,
+            wallet: Abstract_Wallet = None
+    ):
+        """Retrieve an invoice from a bolt12 offer, and pay that invoice
+
+        arg:str:offer:bolt-12 offer (bech32)
+        arg:decimal:amount:Amount to send
+        arg:str:payer_note:Text note for the recipient
+        """
+        amount_msat = satoshis(amount) * 1000 if amount else None
+        bolt12_offer = bolt12.BOLT12Offer.decode(offer)
+        offer_amount_msat = bolt12_offer.offer_amount
+        if offer_amount_msat and amount_msat and offer_amount_msat != amount_msat:
+            raise ValueError(f"{amount_msat=} different than {offer_amount_msat=}")
+        send_amount = offer_amount_msat or amount_msat
+        if not send_amount:
+            raise ValueError(f"Missing amount to send: {amount_msat=}")
+        lnworker = wallet.lnworker
+        bolt12_invoice, invoice_tlv = await lnworker.request_bolt12_invoice(
+            bolt12_offer,
+            amount_msat=send_amount,
+            payer_note=payer_note,
+        )
+        invoice_bech32 = bolt12.bolt12_tlv_bytes_to_bech32(invoice_tlv, bolt12.BOLT12Invoice)
+        invoice = Invoice.from_bech32(invoice_bech32)
+        success, log = await lnworker.pay_invoice(invoice)
+        return {
+            'success': success,
+            'log': [x.formatted_tuple() for x in log]
+        }
+
+    @command('wnl')
+    async def add_lightning_offer(
+            self,
+            amount: Optional[Decimal] = None,
+            description: Optional[str] = None,
+            relative_expiry: Optional[int] = None,
+            issuer_name: Optional[str] = None,
+            allow_unblinded: bool = False,
+            wallet: Abstract_Wallet = None
+    ):
+        """Create a bolt12 offer.
+
+        arg:decimal:amount:Requested amount (in btc)
+        arg:str:description:Description of the request
+        arg:int:relative_expiry:Time in seconds.
+        arg:str:issuer_name:Issuer name string
+        arg:bool:allow_unblinded:Allow revealing node id for unblinded offers
+        """
+        amount_msat = satoshis(amount) * 1000 if amount else None
+        offer = wallet.lnworker.create_offer(
+            amount_msat=amount_msat,
+            description=description,
+            relative_expiry=relative_expiry,
+            issuer_name=issuer_name,
+            allow_unblinded=allow_unblinded,
+        )
+
+        return {
+            'offer': offer.encode(as_bech32=True)
+        }
+
     @command('wnl')
     async def add_hold_invoice(
             self,
@@ -2229,6 +2300,8 @@ async def send_onion_message(self, node_id_or_blinded_path_hex: str, message: st
 
         node_id_or_blinded_path = bfh(node_id_or_blinded_path_hex)
         assert len(node_id_or_blinded_path) >= 33
+        if len(node_id_or_blinded_path) > 33:  # assume blinded path
+            node_id_or_blinded_path = BlindedPath.decode(node_id_or_blinded_path)
 
         destination_payload = {
             'message': {'text': message.encode('utf-8')}
@@ -2272,11 +2345,27 @@ async def get_blinded_path_via(self, node_id: str, dummy_hops: int = 0, wallet:
                 fd=blinded_path_fd,
                 field_type='blinded_path',
                 count=1,
-                value=blinded_path)
+                value=dataclasses.asdict(blinded_path))
             encoded_blinded_path = blinded_path_fd.getvalue()
 
         return encoded_blinded_path.hex()
 
+    @command('')
+    async def decode_bolt12(self, bech32: str):
+        """Decode bolt12 object
+
+        arg:str:bech32:Offer, Invoice Request or Invoice
+        """
+        dec = bolt12.bech32_decode(bech32, ignore_long_length=True, with_checksum=False)
+        if dec == INVALID_BECH32:
+            raise Exception('invalid bech32')
+        d = {
+            'lni': BOLT12Invoice.decode,
+            'lno': BOLT12Offer.decode,
+            'lnr': BOLT12InvoiceRequest.decode,
+        }[dec.hrp](bech32)
+        return json_encode(d.serialize(with_signature=True))
+
 
 def plugin_command(s, plugin_name):
     """Decorator to register a cli command inside a plugin. To be used within a commands.py file

electrum/gui/qml/components/Bolt12OfferDialog.qml

@@ -0,0 +1,146 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtQuick.Controls.Material
+
+import org.electrum 1.0
+
+import "controls"
+
+ElDialog {
+    id: dialog
+
+    title: qsTr('BOLT12 Offer')
+    iconSource: '../../../icons/bolt12.png'
+
+    property InvoiceParser invoiceParser
+
+    padding: 0
+
+    property bool commentValid: true // TODO?
+    property bool amountValid: amountBtc.textAsSats.satsInt > 0
+    property bool valid: commentValid && amountValid
+
+    ColumnLayout {
+        width: parent.width
+
+        spacing: 0
+
+        GridLayout {
+            id: rootLayout
+            columns: 2
+
+            Layout.fillWidth: true
+            Layout.leftMargin: constants.paddingLarge
+            Layout.rightMargin: constants.paddingLarge
+            Layout.bottomMargin: constants.paddingLarge
+
+            // qml quirk; first cells cannot colspan without messing up the grid width
+            Item { Layout.fillWidth: true; Layout.preferredWidth: 1; Layout.preferredHeight: 1 }
+            Item { Layout.fillWidth: true; Layout.preferredWidth: 1; Layout.preferredHeight: 1 }
+
+            Label {
+                Layout.columnSpan: 2
+                text: qsTr('Issuer')
+                color: Material.accentColor
+                visible: 'issuer' in invoiceParser.offerData
+            }
+            TextHighlightPane {
+                Layout.columnSpan: 2
+                Layout.fillWidth: true
+                visible: 'issuer' in invoiceParser.offerData
+                Label {
+                    width: parent.width
+                    wrapMode: Text.Wrap
+                    text: invoiceParser.offerData['issuer']
+                }
+            }
+            Label {
+                Layout.columnSpan: 2
+                Layout.fillWidth: true
+                text: qsTr('Description')
+                color: Material.accentColor
+            }
+            TextHighlightPane {
+                Layout.columnSpan: 2
+                Layout.fillWidth: true
+                Label {
+                    width: parent.width
+                    text: invoiceParser.offerData['description']
+                    wrapMode: Text.Wrap
+                }
+            }
+            Label {
+                Layout.columnSpan: 2
+                text: qsTr('Amount')
+                color: Material.accentColor
+            }
+
+            RowLayout {
+                Layout.columnSpan: 2
+                Layout.fillWidth: true
+                BtcField {
+                    id: amountBtc
+                    Layout.preferredWidth: rootLayout.width /3
+                    text: 'amount' in invoiceParser.offerData
+                        ? Config.formatSatsForEditing(invoiceParser.offerData['amount']/1000)
+                        : ''
+                    readOnly: 'amount' in invoiceParser.offerData
+                    color: Material.foreground // override gray-out on disabled
+                    fiatfield: amountFiat
+                    onTextAsSatsChanged: {
+                        invoiceParser.amountOverride = textAsSats
+                    }
+                }
+                Label {
+                    text: Config.baseUnit
+                    color: Material.accentColor
+                }
+            }
+
+            RowLayout {
+                Layout.columnSpan: 2
+                visible: Daemon.fx.enabled
+                FiatField {
+                    id: amountFiat
+                    Layout.preferredWidth: rootLayout.width / 3
+                    btcfield: amountBtc
+                    readOnly: btcfield.readOnly
+                }
+                Label {
+                    text: Daemon.fx.fiatCurrency
+                    color: Material.accentColor
+                }
+            }
+
+            Label {
+                Layout.columnSpan: 2
+                text: qsTr('Note')
+                color: Material.accentColor
+            }
+            ElTextArea {
+                id: note
+                Layout.columnSpan: 2
+                Layout.fillWidth: true
+                Layout.minimumHeight: 100
+                wrapMode: TextEdit.Wrap
+                placeholderText: qsTr('Enter an (optional) message for the receiver')
+                // TODO: max 100 chars is arbitrary, not sure what the max size is
+                color: text.length > 100 ? constants.colorError : Material.foreground
+            }
+        }
+
+        FlatButton {
+            Layout.topMargin: constants.paddingLarge
+            Layout.fillWidth: true
+            text: qsTr('Pay')
+            icon.source: '../../icons/confirmed.png'
+            enabled: valid
+            onClicked: {
+                invoiceParser.requestInvoiceFromOffer(note.text)
+                dialog.close()
+            }
+        }
+    }
+
+}

electrum/gui/qml/components/InvoiceDialog.qml

@@ -17,7 +17,11 @@ ElDialog {
     signal doPay
     signal invoiceAmountChanged
 
-    title: invoice.invoiceType == Invoice.OnchainInvoice ? qsTr('On-chain Invoice') : qsTr('Lightning Invoice')
+    title: invoice.invoiceType == Invoice.OnchainInvoice
+            ? qsTr('On-chain Invoice')
+            : invoice.lnprops.is_bolt12
+                ? qsTr('BOLT12 Invoice')
+                : qsTr('Lightning Invoice')
     iconSource: Qt.resolvedUrl('../../icons/tab_send.png')
 
     padding: 0
@@ -107,6 +111,30 @@ ElDialog {
                     }
                 }
 
+                Label {
+                    Layout.columnSpan: 2
+                    Layout.topMargin: constants.paddingSmall
+                    text: qsTr('Issuer')
+                    visible: 'issuer' in invoice.lnprops && invoice.lnprops.issuer != ''
+                    color: Material.accentColor
+                }
+
+                TextHighlightPane {
+                    Layout.columnSpan: 2
+                    Layout.fillWidth: true
+
+                    visible: 'issuer' in invoice.lnprops && invoice.lnprops.issuer != ''
+                    leftPadding: constants.paddingMedium
+
+                    Label {
+                        text: 'issuer' in invoice.lnprops ? invoice.lnprops.issuer : ''
+                        width: parent.width
+                        font.pixelSize: constants.fontSizeXLarge
+                        wrapMode: Text.Wrap
+                        elide: Text.ElideRight
+                    }
+                }
+
                 Label {
                     Layout.columnSpan: 2
                     Layout.topMargin: constants.paddingSmall
@@ -423,6 +451,36 @@ ElDialog {
                     }
                 }
 
+                Label {
+                    Layout.columnSpan: 2
+                    Layout.topMargin: constants.paddingSmall
+                    visible: 'blinded_paths' in invoice.lnprops && invoice.lnprops.blinded_paths.length
+                    text: qsTr('Blinded paths')
+                    color: Material.accentColor
+                }
+
+                Repeater {
+                    visible: 'blinded_paths' in invoice.lnprops && invoice.lnprops.blinded_paths.length
+                    model: invoice.lnprops.blinded_paths
+
+                    TextHighlightPane {
+                        Layout.columnSpan: 2
+                        Layout.fillWidth: true
+
+                        RowLayout {
+                            width: parent.width
+
+                            Label {
+                                Layout.fillWidth: true
+                                text: qsTr('via %1 (%2 hops)')
+                                    .arg(modelData.first_node)
+                                    .arg(modelData.path_length)
+                                wrapMode: Text.Wrap
+                            }
+                        }
+                    }
+                }
+
                 Label {
                     Layout.columnSpan: 2
                     Layout.topMargin: constants.paddingSmall