AaronFiore/electrum
1
0
Fork 0
Code Activity

fix paying bip70 payment request with Qt GUI

Browse Source
This commit is contained in:
SomberNight
2019-12-31 03:08:47 +01:00
parent 787ac5fe99
commit 1d0aa4042a
2 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/gui/qt/history_list.py
View File

@@ -621,7 +621,7 @@ class HistoryList(MyTreeView, AcceptFileDragDrop):
height = self.wallet.get_tx_height(tx_hash).height height = self.wallet.get_tx_height(tx_hash).height
is_relevant, is_mine, v, fee = self.wallet.get_wallet_delta(tx) is_relevant, is_mine, v, fee = self.wallet.get_wallet_delta(tx)
is_unconfirmed = height <= 0 is_unconfirmed = height <= 0
#pr_key = self.wallet.invoices.paid.get(tx_hash) invoice_keys = self.wallet._get_relevant_invoice_keys_for_tx(tx)
menu = QMenu() menu = QMenu()
if height in [TX_HEIGHT_FUTURE, TX_HEIGHT_LOCAL]: if height in [TX_HEIGHT_FUTURE, TX_HEIGHT_LOCAL]:
menu.addAction(_("Remove"), lambda: self.remove_local_tx(tx_hash)) menu.addAction(_("Remove"), lambda: self.remove_local_tx(tx_hash))
@@ -643,8 +643,8 @@ class HistoryList(MyTreeView, AcceptFileDragDrop):
child_tx = self.wallet.cpfp(tx, 0) child_tx = self.wallet.cpfp(tx, 0)
if child_tx: if child_tx:
menu.addAction(_("Child pays for parent"), lambda: self.parent.cpfp(tx, child_tx)) menu.addAction(_("Child pays for parent"), lambda: self.parent.cpfp(tx, child_tx))
#if pr_key: if invoice_keys:
# menu.addAction(read_QIcon("seal"), _("View invoice"), lambda: self.parent.show_invoice(pr_key)) menu.addAction(read_QIcon("seal"), _("View invoice"), lambda: [self.parent.show_invoice(key) for key in invoice_keys])
if tx_URL: if tx_URL:
menu.addAction(_("View on block explorer"), lambda: webopen(tx_URL)) menu.addAction(_("View on block explorer"), lambda: webopen(tx_URL))
menu.exec_(self.viewport().mapToGlobal(position)) menu.exec_(self.viewport().mapToGlobal(position))

34
electrum/gui/qt/main_window.py
View File

@@ -1745,7 +1745,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
self.payment_request = None self.payment_request = None
self.do_clear() self.do_clear()
def on_pr(self, request): def on_pr(self, request: 'paymentrequest.PaymentRequest'):
self.set_onchain(True)
self.payment_request = request self.payment_request = request
if self.payment_request.verify(self.contacts): if self.payment_request.verify(self.contacts):
self.payment_request_ok_signal.emit() self.payment_request_ok_signal.emit()
@@ -1922,7 +1923,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
pr.verify(self.contacts) pr.verify(self.contacts)
self.show_bip70_details(pr) self.show_bip70_details(pr)
def show_bip70_details(self, pr): def show_bip70_details(self, pr: 'paymentrequest.PaymentRequest'):
key = pr.get_id() key = pr.get_id()
d = WindowModalDialog(self, _("BIP70 Invoice")) d = WindowModalDialog(self, _("BIP70 Invoice"))
vbox = QVBoxLayout(d) vbox = QVBoxLayout(d)
@@ -1930,7 +1931,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
grid.addWidget(QLabel(_("Requestor") + ':'), 0, 0) grid.addWidget(QLabel(_("Requestor") + ':'), 0, 0)
grid.addWidget(QLabel(pr.get_requestor()), 0, 1) grid.addWidget(QLabel(pr.get_requestor()), 0, 1)
grid.addWidget(QLabel(_("Amount") + ':'), 1, 0) grid.addWidget(QLabel(_("Amount") + ':'), 1, 0)
outputs_str = '\n'.join(map(lambda x: self.format_amount(x[2])+ self.base_unit() + ' @ ' + x[1], pr.get_outputs())) outputs_str = '\n'.join(map(lambda x: self.format_amount(x.value)+ self.base_unit() + ' @ ' + x.address, pr.get_outputs()))
grid.addWidget(QLabel(outputs_str), 1, 1) grid.addWidget(QLabel(outputs_str), 1, 1)
expires = pr.get_expiration_date() expires = pr.get_expiration_date()
grid.addWidget(QLabel(_("Memo") + ':'), 2, 0) grid.addWidget(QLabel(_("Memo") + ':'), 2, 0)
@@ -1950,26 +1951,17 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
data = f.write(pr.raw) data = f.write(pr.raw)
self.show_message(_('Invoice saved as' + ' ' + fn)) self.show_message(_('Invoice saved as' + ' ' + fn))
exportButton = EnterButton(_('Save'), do_export) exportButton = EnterButton(_('Save'), do_export)
def do_delete(): # note: "delete" disabled as invoice is saved with a different key in wallet.invoices that we do not have here
if self.question(_('Delete invoice?')): # def do_delete():
self.wallet.delete_invoices(key) # if self.question(_('Delete invoice?')):
self.history_list.update() # self.wallet.delete_invoice(key)
self.invoice_list.update() # self.history_list.update()
d.close() # self.invoice_list.update()
deleteButton = EnterButton(_('Delete'), do_delete) # d.close()
vbox.addLayout(Buttons(exportButton, deleteButton, CloseButton(d))) # deleteButton = EnterButton(_('Delete'), do_delete)
vbox.addLayout(Buttons(exportButton, CloseButton(d)))
d.exec_() d.exec_()
def pay_bip70_invoice(self, key):
pr = self.wallet.get_invoice(key)
self.payment_request = pr
self.prepare_for_payment_request()
pr.error = None # this forces verify() to re-run
if pr.verify(self.contacts):
self.payment_request_ok()
else:
self.payment_request_error()
def create_console_tab(self): def create_console_tab(self):
from .console import Console from .console import Console
self.console = console = Console() self.console = console = Console()