AaronFiore/electrum
1
0
Fork 0
Code Activity

Index request by ID instead of receiving address.

Browse Source 
Replace get_key_for_outgoing_invoice, get_key_for_incoming_request
with Invoice.get_id()

When a new request is created, reuse addresses of expired requests (fixes #7927)

The API is changed for the following commands:
 get_request, get_invoice,
 list_requests, list_invoices,
 delete_request, delete_invoice
This commit is contained in:
ThomasV
2022-08-15 14:14:25 +02:00
parent 7d317761da
commit 14e96f4d53
11 changed files with 114 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/gui/kivy/uix/screens.py
View File

@@ -272,7 +272,7 @@ class SendScreen(CScreen, Logger):
status = self.app.wallet.get_invoice_status(item)
status_str = item.get_status_str(status)
is_lightning = item.is_lightning()
key = self.app.wallet.get_key_for_outgoing_invoice(item)
key = item.get_id()
if is_lightning:
address = item.rhash
if self.app.wallet.lnworker:
@@ -486,7 +486,7 @@ class ReceiveScreen(CScreen):
self.address = addr
def on_address(self, addr):
req = self.app.wallet.get_request(addr)
req = self.app.wallet.get_request_by_addr(addr)
self.status = ''
if req:
self.message = req.get('memo', '')
@@ -539,7 +539,7 @@ class ReceiveScreen(CScreen):
address = req.get_address()
else:
address = req.lightning_invoice
key = self.app.wallet.get_key_for_receive_request(req)
key = req.get_id()
amount = req.get_amount_sat()
description = req.message
status = self.app.wallet.get_invoice_status(req)