AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet.get_history: take locks.

Browse Source 
Re the check at the end: "history not synchronized" - it's not that it's not synchronized,
rather that the history is changing while being computed.
This commit is contained in:
SomberNight
2020-10-18 22:21:06 +02:00
parent 777095fda8
commit 8ac6d3b17d
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
electrum/address_synchronizer.py
View File

@@ -96,8 +96,14 @@ class AddressSynchronizer(Logger):
self.load_and_cleanup() self.load_and_cleanup()
def with_lock(func):
def func_wrapper(self: 'AddressSynchronizer', *args, **kwargs):
with self.lock:
return func(self, *args, **kwargs)
return func_wrapper
def with_transaction_lock(func): def with_transaction_lock(func):
def func_wrapper(self, *args, **kwargs): def func_wrapper(self: 'AddressSynchronizer', *args, **kwargs):
with self.transaction_lock: with self.transaction_lock:
return func(self, *args, **kwargs) return func(self, *args, **kwargs)
return func_wrapper return func_wrapper
@@ -468,6 +474,8 @@ class AddressSynchronizer(Logger):
self.threadlocal_cache.local_height = orig_val self.threadlocal_cache.local_height = orig_val
return f return f
@with_lock
@with_transaction_lock
@with_local_height_cached @with_local_height_cached
def get_history(self, *, domain=None) -> Sequence[HistoryItem]: def get_history(self, *, domain=None) -> Sequence[HistoryItem]:
# get domain # get domain
@@ -501,10 +509,9 @@ class AddressSynchronizer(Logger):
balance=balance)) balance=balance))
balance -= delta balance -= delta
h2.reverse() h2.reverse()
# fixme: this may happen if history is incomplete
if balance != 0: if balance != 0:
self.logger.warning("history not synchronized") raise Exception("wallet.get_history() failed balance sanity-check")
return []
return h2 return h2