From 2e52899d6fe7495d2efd1b00656a0da9c9d3e210 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Wed, 27 Jun 2018 21:54:57 +0200 Subject: [PATCH] improve Qt Receive tab for LN payment requests --- electrum/gui/qt/main_window.py | 7 ++++- electrum/gui/qt/request_list.py | 49 ++++++++++++++++++++++++++++----- lib/lnworker.py | 11 +++++++- 3 files changed, 58 insertions(+), 9 deletions(-) diff --git a/electrum/gui/qt/main_window.py b/electrum/gui/qt/main_window.py index aa384c97..5de6f995 100644 --- a/electrum/gui/qt/main_window.py +++ b/electrum/gui/qt/main_window.py @@ -895,6 +895,11 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): self.request_list.update() self.clear_receive_tab() + def delete_lightning_payreq(self, payreq_key): + self.wallet.lnworker.delete_invoice(payreq_key) + self.request_list.update() + self.clear_receive_tab() + def get_request_URI(self, addr): req = self.wallet.receive_requests[addr] message = self.wallet.labels.get(addr, '') @@ -968,7 +973,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): self.show_error(_('Error adding payment request') + ':\n' + str(e)) else: self.sign_payment_request(addr) - self.save_request_button.setEnabled(False) + #self.save_request_button.setEnabled(False) finally: self.address_list.update() diff --git a/electrum/gui/qt/request_list.py b/electrum/gui/qt/request_list.py index 7b09fade..46501ccd 100644 --- a/electrum/gui/qt/request_list.py +++ b/electrum/gui/qt/request_list.py @@ -30,9 +30,15 @@ from electrum.paymentrequest import PR_UNKNOWN from PyQt5.QtGui import * from PyQt5.QtCore import * from PyQt5.QtWidgets import QTreeWidgetItem, QMenu, QHeaderView + +from electrum.bitcoin import COIN + from .util import MyTreeWidget, pr_tooltips, pr_icons +REQUEST_TYPE_BITCOIN = 0 +REQUEST_TYPE_LN = 1 + class RequestList(MyTreeWidget): filter_columns = [0, 1, 2, 3] # Date, Address, Description, Amount @@ -78,7 +84,7 @@ class RequestList(MyTreeWidget): def on_update(self): self.wallet = self.parent.wallet # hide receive tab if no receive requests available - b = len(self.wallet.receive_requests) > 0 + b = len(self.wallet.receive_requests) > 0 or len(self.wallet.lnworker.invoices) > 0 self.setVisible(b) self.parent.receive_requests_label.setVisible(b) if not b: @@ -115,13 +121,16 @@ class RequestList(MyTreeWidget): item.setToolTip(1, 'signed by '+ requestor) if status is not PR_UNKNOWN: item.setIcon(6, self.icon_cache.get(pr_icons.get(status))) + item.setData(0, Qt.UserRole, REQUEST_TYPE_BITCOIN) + item.setData(0, Qt.UserRole+1, address) self.addTopLevelItem(item) # lightning - for k, r in self.wallet.lnworker.invoices.items(): + for payreq_key, r in self.wallet.lnworker.invoices.items(): from electrum.lightning_payencode.lnaddr import lndecode import electrum.constants as constants lnaddr = lndecode(r, expected_hrp=constants.net.SEGWIT_HRP) - amount_str = self.parent.format_amount(lnaddr.amount*100000000) + amount_sat = lnaddr.amount*COIN if lnaddr.amount else None + amount_str = self.parent.format_amount(amount_sat) if amount_sat else '' for k,v in lnaddr.tags: if k == 'd': description = v @@ -130,15 +139,26 @@ class RequestList(MyTreeWidget): description = '' date = format_time(lnaddr.date) item = QTreeWidgetItem([date, r, description, amount_str, '']) - item.setIcon(1, QIcon(":icons/lightning.png")) + item.setIcon(1, self.icon_cache.get(":icons/lightning.png")) + item.setData(0, Qt.UserRole, REQUEST_TYPE_LN) + item.setData(0, Qt.UserRole+1, payreq_key) self.addTopLevelItem(item) - def create_menu(self, position): item = self.itemAt(position) if not item: return - addr = str(item.text(1)) + request_type = item.data(0, Qt.UserRole) + menu = None + if request_type == REQUEST_TYPE_BITCOIN: + menu = self.create_menu_bitcoin_payreq(item) + elif request_type == REQUEST_TYPE_LN: + menu = self.create_menu_ln_payreq(item) + if menu: + menu.exec_(self.viewport().mapToGlobal(position)) + + def create_menu_bitcoin_payreq(self, item): + addr = str(item.data(0, Qt.UserRole + 1)) req = self.wallet.receive_requests.get(addr) if req is None: self.update() @@ -152,4 +172,19 @@ class RequestList(MyTreeWidget): menu.addAction(_("Save as BIP70 file"), lambda: self.parent.export_payment_request(addr)) menu.addAction(_("Delete"), lambda: self.parent.delete_payment_request(addr)) run_hook('receive_list_menu', menu, addr) - menu.exec_(self.viewport().mapToGlobal(position)) + return menu + + def create_menu_ln_payreq(self, item): + payreq_key = item.data(0, Qt.UserRole + 1) + req = self.wallet.lnworker.invoices.get(payreq_key) + if req is None: + self.update() + return + column = self.currentColumn() + column_title = self.headerItem().text(column) + column_data = item.text(column) + menu = QMenu(self) + menu.addAction(_("Copy {}").format(column_title), lambda: self.parent.app.clipboard().setText(column_data)) + menu.addAction(_("Copy URI"), lambda: self.parent.view_and_paste('URI', '', req)) + menu.addAction(_("Delete"), lambda: self.parent.delete_lightning_payreq(payreq_key)) + return menu diff --git a/lib/lnworker.py b/lib/lnworker.py index 192976a3..4df151d5 100644 --- a/lib/lnworker.py +++ b/lib/lnworker.py @@ -209,7 +209,8 @@ class LNWorker(PrintError): is_open = lambda chan: self.channel_state[chan.channel_id] == "OPEN" payment_preimage = os.urandom(32) RHASH = sha256(payment_preimage) - pay_req = lnencode(LnAddr(RHASH, amount_sat/Decimal(COIN), tags=[('d', message)]), self.privkey) + amount_btc = amount_sat/Decimal(COIN) if amount_sat else None + pay_req = lnencode(LnAddr(RHASH, amount_btc, tags=[('d', message)]), self.privkey) decoded = lndecode(pay_req, expected_hrp=constants.net.SEGWIT_HRP) assert decoded.pubkey.serialize() == privkey_to_pubkey(self.privkey) self.invoices[bh2u(payment_preimage)] = pay_req @@ -217,6 +218,14 @@ class LNWorker(PrintError): self.wallet.storage.write() return pay_req + def delete_invoice(self, payreq_key): + try: + del self.invoices[payreq_key] + except KeyError: + return + self.wallet.storage.put('lightning_invoices', self.invoices) + self.wallet.storage.write() + def list_channels(self): return serialize_channels(self.channels)