Browse Source
wallet: use `get_request(addr)` instead of `receive_requests[addr]`
since "invoice unification", requests are often keyed by rhash
patch-4
SomberNight
3 years ago
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
3 changed files with
4 additions and
4 deletions
-
electrum/gui/kivy/main_window.py
-
electrum/gui/qt/main_window.py
-
electrum/wallet.py
|
|
@ -269,7 +269,7 @@ class ElectrumWindow(App, Logger, EventListener): |
|
|
|
def on_event_request_status(self, wallet, key, status): |
|
|
|
if wallet != self.wallet: |
|
|
|
return |
|
|
|
req = self.wallet.receive_requests.get(key) |
|
|
|
req = self.wallet.get_request(key) |
|
|
|
if req is None: |
|
|
|
return |
|
|
|
if self.receive_screen: |
|
|
|
|
|
@ -1134,7 +1134,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener): |
|
|
|
def on_event_request_status(self, wallet, key, status): |
|
|
|
if wallet != self.wallet: |
|
|
|
return |
|
|
|
req = self.wallet.receive_requests.get(key) |
|
|
|
req = self.wallet.get_request(key) |
|
|
|
if req is None: |
|
|
|
return |
|
|
|
if status == PR_PAID: |
|
|
|
|
|
@ -2263,7 +2263,7 @@ class Abstract_Wallet(ABC, Logger, EventListener): |
|
|
|
choice = domain[0] |
|
|
|
for addr in domain: |
|
|
|
if not self.adb.is_used(addr): |
|
|
|
if addr not in self.receive_requests.keys(): |
|
|
|
if self.get_request(addr) is None: |
|
|
|
return addr |
|
|
|
else: |
|
|
|
choice = addr |
|
|
@ -2432,7 +2432,7 @@ class Abstract_Wallet(ABC, Logger, EventListener): |
|
|
|
return |
|
|
|
for txo in tx.outputs(): |
|
|
|
addr = txo.address |
|
|
|
if addr in self.receive_requests: |
|
|
|
if self.get_request(addr): |
|
|
|
status = self.get_request_status(addr) |
|
|
|
util.trigger_callback('request_status', self, addr, status) |
|
|
|
|
|
|
|