zebra.lucky
/
electrum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

qml: move technical details to bottom of InvoiceDialog, add routing hints

master
Sander van Grieken 3 years ago
parent
206bacbcb3
commit
2881c49671
2 changed files with 134 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 188
      electrum/gui/qml/components/InvoiceDialog.qml
  2. 29
      electrum/gui/qml/qeinvoice.py

188
electrum/gui/qml/components/InvoiceDialog.qml
Unescape View File

@ -118,82 +118,6 @@ ElDialog {
} }
} }
Label {
Layout.columnSpan: 2
Layout.topMargin: constants.paddingSmall
visible: invoice.invoiceType == Invoice.LightningInvoice
text: qsTr('Remote Pubkey')
color: Material.accentColor
}
TextHighlightPane {
Layout.columnSpan: 2
Layout.fillWidth: true
visible: invoice.invoiceType == Invoice.LightningInvoice
leftPadding: constants.paddingMedium
RowLayout {
width: parent.width
Label {
id: pubkeyLabel
Layout.fillWidth: true
text: 'pubkey' in invoice.lnprops ? invoice.lnprops.pubkey : ''
font.family: FixedFont
wrapMode: Text.Wrap
}
ToolButton {
icon.source: '../../icons/share.png'
icon.color: 'transparent'
enabled: pubkeyLabel.text
onClicked: {
var dialog = app.genericShareDialog.createObject(app,
{ title: qsTr('Node public key'), text: invoice.lnprops.pubkey }
)
dialog.open()
}
}
}
}
Label {
Layout.columnSpan: 2
Layout.topMargin: constants.paddingSmall
visible: invoice.invoiceType == Invoice.LightningInvoice
text: qsTr('Payment hash')
color: Material.accentColor
}
TextHighlightPane {
Layout.columnSpan: 2
Layout.fillWidth: true
visible: invoice.invoiceType == Invoice.LightningInvoice
leftPadding: constants.paddingMedium
RowLayout {
width: parent.width
Label {
id: paymenthashLabel
Layout.fillWidth: true
text: 'payment_hash' in invoice.lnprops ? invoice.lnprops.payment_hash : ''
font.family: FixedFont
wrapMode: Text.Wrap
}
ToolButton {
icon.source: '../../icons/share.png'
icon.color: 'transparent'
enabled: paymenthashLabel.text
onClicked: {
var dialog = app.genericShareDialog.createObject(app,
{ title: qsTr('Payment hash'), text: invoice.lnprops.payment_hash }
)
dialog.open()
}
}
}
}
Label { Label {
Layout.columnSpan: 2 Layout.columnSpan: 2
Layout.topMargin: constants.paddingSmall Layout.topMargin: constants.paddingSmall
@ -366,6 +290,118 @@ ElDialog {
} }
Heading {
Layout.columnSpan: 2
text: qsTr('Technical properties')
}
Label {
Layout.columnSpan: 2
Layout.topMargin: constants.paddingSmall
visible: invoice.invoiceType == Invoice.LightningInvoice
text: qsTr('Remote Pubkey')
color: Material.accentColor
}
TextHighlightPane {
Layout.columnSpan: 2
Layout.fillWidth: true
visible: invoice.invoiceType == Invoice.LightningInvoice
leftPadding: constants.paddingMedium
RowLayout {
width: parent.width
Label {
id: pubkeyLabel
Layout.fillWidth: true
text: 'pubkey' in invoice.lnprops ? invoice.lnprops.pubkey : ''
font.family: FixedFont
wrapMode: Text.Wrap
}
ToolButton {
icon.source: '../../icons/share.png'
icon.color: 'transparent'
enabled: pubkeyLabel.text
onClicked: {
var dialog = app.genericShareDialog.createObject(app,
{ title: qsTr('Node public key'), text: invoice.lnprops.pubkey }
)
dialog.open()
}
}
}
}
Label {
Layout.columnSpan: 2
Layout.topMargin: constants.paddingSmall
visible: invoice.invoiceType == Invoice.LightningInvoice
text: qsTr('Payment hash')
color: Material.accentColor
}
TextHighlightPane {
Layout.columnSpan: 2
Layout.fillWidth: true
visible: invoice.invoiceType == Invoice.LightningInvoice
leftPadding: constants.paddingMedium
RowLayout {
width: parent.width
Label {
id: paymenthashLabel
Layout.fillWidth: true
text: 'payment_hash' in invoice.lnprops ? invoice.lnprops.payment_hash : ''
font.family: FixedFont
wrapMode: Text.Wrap
}
ToolButton {
icon.source: '../../icons/share.png'
icon.color: 'transparent'
enabled: paymenthashLabel.text
onClicked: {
var dialog = app.genericShareDialog.createObject(app, {
title: qsTr('Payment hash'),
text: invoice.lnprops.payment_hash
})
dialog.open()
}
}
}
}
Label {
Layout.columnSpan: 2
Layout.topMargin: constants.paddingSmall
visible: 'r' in invoice.lnprops && invoice.lnprops.r.length
text: qsTr('Routing hints')
color: Material.accentColor
}
Repeater {
visible: 'r' in invoice.lnprops && invoice.lnprops.r.length
model: invoice.lnprops.r
TextHighlightPane {
Layout.columnSpan: 2
Layout.fillWidth: true
RowLayout {
width: parent.width
Label {
text: modelData.scid
}
Label {
Layout.fillWidth: true
text: modelData.node
wrapMode: Text.Wrap
}
}
}
}
} }
} }

29
electrum/gui/qml/qeinvoice.py
Unescape View File

@ -16,6 +16,7 @@ from electrum.logging import get_logger
from electrum.transaction import PartialTxOutput from electrum.transaction import PartialTxOutput
from electrum.util import (parse_URI, InvalidBitcoinURI, InvoiceError, from electrum.util import (parse_URI, InvalidBitcoinURI, InvoiceError,
maybe_extract_lightning_payment_identifier) maybe_extract_lightning_payment_identifier)
from electrum.lnutil import format_short_channel_id
from electrum.lnurl import decode_lnurl, request_lnurl, callback_lnurl from electrum.lnurl import decode_lnurl, request_lnurl, callback_lnurl
from electrum.bitcoin import COIN from electrum.bitcoin import COIN
from electrum.paymentrequest import PaymentRequest from electrum.paymentrequest import PaymentRequest
@ -144,6 +145,7 @@ class QEInvoiceParser(QEInvoice):
self._effectiveInvoice = None self._effectiveInvoice = None
self._amount = QEAmount() self._amount = QEAmount()
self._userinfo = '' self._userinfo = ''
self._lnprops = {}
self._timer = QTimer(self) self._timer = QTimer(self)
self._timer.setSingleShot(True) self._timer.setSingleShot(True)
@ -227,25 +229,36 @@ class QEInvoiceParser(QEInvoice):
status = self._wallet.wallet.get_invoice_status(self._effectiveInvoice) status = self._wallet.wallet.get_invoice_status(self._effectiveInvoice)
return self._effectiveInvoice.get_status_str(status) return self._effectiveInvoice.get_status_str(status)
# single address only, TODO: n outputs
@pyqtProperty(str, notify=invoiceChanged) @pyqtProperty(str, notify=invoiceChanged)
def address(self): def address(self):
return self._effectiveInvoice.get_address() if self._effectiveInvoice else '' return self._effectiveInvoice.get_address() if self._effectiveInvoice else ''
@pyqtProperty('QVariantMap', notify=invoiceChanged) @pyqtProperty('QVariantMap', notify=invoiceChanged)
def lnprops(self): def lnprops(self):
return self._lnprops
def set_lnprops(self):
self._lnprops = {}
if not self.invoiceType == QEInvoice.Type.LightningInvoice: if not self.invoiceType == QEInvoice.Type.LightningInvoice:
return {} return
lnaddr = self._effectiveInvoice._lnaddr lnaddr = self._effectiveInvoice._lnaddr
self._logger.debug(str(lnaddr)) ln_routing_info = lnaddr.get_routing_info('r')
self._logger.debug(str(lnaddr.get_routing_info('t'))) self._logger.debug(str(ln_routing_info))
return {
self._lnprops = {
'pubkey': lnaddr.pubkey.serialize().hex(), 'pubkey': lnaddr.pubkey.serialize().hex(),
'payment_hash': lnaddr.paymenthash.hex(), 'payment_hash': lnaddr.paymenthash.hex(),
't': '', #lnaddr.get_routing_info('t')[0][0].hex(), 'r': [{
'r': '' #lnaddr.get_routing_info('r')[0][0][0].hex() 'node': self.name_for_node_id(x[-1][0]),
'scid': format_short_channel_id(x[-1][1])
} for x in ln_routing_info] if ln_routing_info else []
} }
def name_for_node_id(self, node_id):
node_info = self._wallet.wallet.lnworker.channel_db.get_node_info_for_node_id(node_id=node_id)
return node_info.alias if node_info.alias else node_id.hex()
@pyqtSlot() @pyqtSlot()
def clear(self): def clear(self):
self.recipient = '' self.recipient = ''
@ -276,6 +289,8 @@ class QEInvoiceParser(QEInvoice):
else: else:
self.setInvoiceType(QEInvoice.Type.OnchainInvoice) self.setInvoiceType(QEInvoice.Type.OnchainInvoice)
self.set_lnprops()
self.canSave = True self.canSave = True
self.determine_can_pay() self.determine_can_pay()

Write Preview
Loading…
Cancel
Save