AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet: _requests_addr_to_key map to prefer unexpired reqs if collision

Browse Source
This commit is contained in:
SomberNight
2022-11-18 16:59:47 +00:00
parent d19d82be64
commit 1a8cc68f53
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/wallet.py
View File

@@ -1061,6 +1061,10 @@ class Abstract_Wallet(ABC, Logger, EventListener):
self._requests_addr_to_key = {} self._requests_addr_to_key = {}
for req in self._receive_requests.values(): for req in self._receive_requests.values():
if req.is_lightning() and (addr:=req.get_address()): if req.is_lightning() and (addr:=req.get_address()):
# give priority to not-yet-expired requests, to postpone reusing the address
# FIXME maybe self._receive_requests should be a multi-map instead
if req.has_expired() and addr in self._requests_addr_to_key:
continue
self._requests_addr_to_key[addr] = req.get_id() self._requests_addr_to_key[addr] = req.get_id()
def _prepare_onchain_invoice_paid_detection(self): def _prepare_onchain_invoice_paid_detection(self):