AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet: some clean-up re get_address_history vs db.get_addr_history

Browse Source 
note: tests needed changing due to behavioural change in wallet.get_receiving_address()
Previously wallet.get_receiving_address used wallet.db.get_addr_history,
now it (indirectly) uses wallet.get_address_history, which now also considers local txns.
This commit is contained in:
SomberNight
2019-12-07 05:42:28 +01:00
parent d81110014e
commit 8e89c0c971
3 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
electrum/address_synchronizer.py
View File

@@ -110,7 +110,13 @@ class AddressSynchronizer(Logger):
def get_addresses(self):
return sorted(self.db.get_history())
def get_address_history(self, addr):
def get_address_history(self, addr: str) -> Sequence[Tuple[str, int]]:
"""Returns the history for the address, in the format that would be returned by a server.
Note: The difference between db.get_addr_history and this method is that
db.get_addr_history stores the response from a server, so it only includes txns
a server sees, i.e. that does not contain local and future txns.
"""
h = []
# we need self.transaction_lock but get_tx_height will take self.lock
# so we need to take that too here, to enforce order of locks
@@ -378,7 +384,7 @@ class AddressSynchronizer(Logger):
@profiler
def load_local_history(self):
self._history_local = {} # address -> set(txid)
self._history_local = {} # type: Dict[str, Set[str]] # address -> set(txid)
self._address_history_changed_events = defaultdict(asyncio.Event) # address -> Event
for txid in itertools.chain(self.db.list_txi(), self.db.list_txo()):
self._add_tx_to_local_history(txid)
@@ -841,11 +847,10 @@ class AddressSynchronizer(Logger):
xx += x
return cc, uu, xx
def is_used(self, address):
h = self.db.get_addr_history(address)
return len(h) != 0
def is_used(self, address: str) -> bool:
return self.get_address_history_len(address) != 0
def is_empty(self, address):
def is_empty(self, address: str) -> bool:
c, u, x = self.get_addr_balance(address)
return c+u+x == 0