Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

fix request_synced_transactions edge cases

Browse source
This commit is contained in:
Jack Robison 2020-12-22 15:17:32 -05:00
parent 479b5d31a9
commit 8c71b744f3
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lbry/wallet/ledger.py
View file

@ -415,6 +415,7 @@ class Ledger(metaclass=LedgerRegistry):
"Blockchain Reorganization: attempting rewind to height %s from starting height %s", "Blockchain Reorganization: attempting rewind to height %s from starting height %s",
height, height+rewound height, height+rewound
) )
self._tx_cache.clear()
else: else:
raise IndexError(f"headers.connect() returned negative number ({added})") raise IndexError(f"headers.connect() returned negative number ({added})")
@ -646,8 +647,8 @@ class Ledger(metaclass=LedgerRegistry):
pending_sync = {} pending_sync = {}
async for tx in self.request_transactions(((txid, height) for txid, height in to_request.values())): async for tx in self.request_transactions(((txid, height) for txid, height in to_request.values())):
pending_sync[tx.id] = tx pending_sync[tx.id] = tx
yield tx for f in asyncio.as_completed([self._sync(tx, remote_history, pending_sync) for tx in pending_sync.values()]):
await asyncio.gather(*(self._sync(tx, remote_history, pending_sync) for tx in pending_sync.values())) yield await f
async def _single_batch(self, batch, remote_heights): async def _single_batch(self, batch, remote_heights):
heights = {remote_heights[txid] for txid in batch} heights = {remote_heights[txid] for txid in batch}
@ -682,11 +683,12 @@ class Ledger(metaclass=LedgerRegistry):
if txi.txo_ref.id in referenced_txos: if txi.txo_ref.id in referenced_txos:
txi.txo_ref = referenced_txos[txi.txo_ref.id].ref txi.txo_ref = referenced_txos[txi.txo_ref.id].ref
else: else:
tx = await self.db.get_transaction(txid=wanted_txid) tx_from_db = await self.db.get_transaction(txid=txi.txo_ref.tx_ref.id)
if tx is None: if tx_from_db is None:
log.warning("%s not on db, not on cache, but on remote history!", txi.txo_ref.id) log.warning("%s not on db, not on cache, but on remote history!", txi.txo_ref.id)
else: else:
txi.txo_ref = tx.outputs[txi.txo_ref.position].ref txi.txo_ref = tx_from_db.outputs[txi.txo_ref.position].ref
return tx
async def get_address_manager_for_address(self, address) -> Optional[AddressManager]: async def get_address_manager_for_address(self, address) -> Optional[AddressManager]:
details = await self.db.get_address(address=address) details = await self.db.get_address(address=address)