AaronFiore/electrum
1
0
Fork 0
Code Activity

abstract database away from wallet and address_synchronizer

Browse Source
This commit is contained in:
ThomasV
2019-02-20 14:45:15 +01:00
parent 7f2083f667
commit 791e680a96
6 changed files with 258 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
electrum/synchronizer.py
View File

@@ -139,7 +139,7 @@ class Synchronizer(SynchronizerBase):
and not self.requested_tx)
async def _on_address_status(self, addr, status):
history = self.wallet.history.get(addr, [])
history = self.wallet.db.get_addr_history(addr)
if history_status(history) == status:
return
if addr in self.requested_histories:
@@ -175,7 +175,7 @@ class Synchronizer(SynchronizerBase):
for tx_hash, tx_height in hist:
if tx_hash in self.requested_tx:
continue
if tx_hash in self.wallet.transactions:
if tx_hash in self.wallet.db.list_transactions():
continue
transaction_hashes.append(tx_hash)
self.requested_tx[tx_hash] = tx_height
@@ -216,7 +216,8 @@ class Synchronizer(SynchronizerBase):
async def main(self):
self.wallet.set_up_to_date(False)
# request missing txns, if any
for history in self.wallet.history.values():
for addr in self.wallet.db.get_history():
history = self.wallet.db.get_addr_history(addr)
# Old electrum servers returned ['*'] when all history for the address
# was pruned. This no longer happens but may remain in old wallets.
if history == ['*']: continue