AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet: use get_request(addr) instead of receive_requests[addr]

Browse Source 
since "invoice unification", requests are often keyed by rhash
This commit is contained in:
SomberNight
2022-07-12 15:38:54 +02:00
parent 44655bcca2
commit 056de017f0
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/gui/kivy/main_window.py
View File

@@ -269,7 +269,7 @@ class ElectrumWindow(App, Logger, EventListener):
def on_event_request_status(self, wallet, key, status): def on_event_request_status(self, wallet, key, status):
if wallet != self.wallet: if wallet != self.wallet:
return return
req = self.wallet.receive_requests.get(key) req = self.wallet.get_request(key)
if req is None: if req is None:
return return
if self.receive_screen: if self.receive_screen:

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

@@ -1134,7 +1134,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
def on_event_request_status(self, wallet, key, status): def on_event_request_status(self, wallet, key, status):
if wallet != self.wallet: if wallet != self.wallet:
return return
req = self.wallet.receive_requests.get(key) req = self.wallet.get_request(key)
if req is None: if req is None:
return return
if status == PR_PAID: if status == PR_PAID:

4
electrum/wallet.py
View File

@@ -2263,7 +2263,7 @@ class Abstract_Wallet(ABC, Logger, EventListener):
choice = domain[0] choice = domain[0]
for addr in domain: for addr in domain:
if not self.adb.is_used(addr): if not self.adb.is_used(addr):
if addr not in self.receive_requests.keys(): if self.get_request(addr) is None:
return addr return addr
else: else:
choice = addr choice = addr
@@ -2432,7 +2432,7 @@ class Abstract_Wallet(ABC, Logger, EventListener):
return return
for txo in tx.outputs(): for txo in tx.outputs():
addr = txo.address addr = txo.address
if addr in self.receive_requests: if self.get_request(addr):
status = self.get_request_status(addr) status = self.get_request_status(addr)
util.trigger_callback('request_status', self, addr, status) util.trigger_callback('request_status', self, addr, status)