LBRYCommunity/hub
1
0
Fork 0
Code Issues 35 Pull requests 6 Projects Releases Packages Wiki Activity

fix touched_hashXs not being cleaned up

Browse source
This commit is contained in:
Jack Robison 2022-04-12 16:24:49 -04:00
parent 7c5b02c5a1
commit a2c046b513
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scribe/hub/mempool.py
View file

@ -52,6 +52,7 @@ class HubMemPool:
self.logger = logging.getLogger(__name__) self.logger = logging.getLogger(__name__)
self.txs = {} self.txs = {}
self.raw_mempool = {} self.raw_mempool = {}
self.tx_touches = {}
self.touched_hashXs: typing.DefaultDict[bytes, typing.Set[bytes]] = defaultdict(set) # None can be a key self.touched_hashXs: typing.DefaultDict[bytes, typing.Set[bytes]] = defaultdict(set) # None can be a key
self.refresh_secs = refresh_secs self.refresh_secs = refresh_secs
self.mempool_process_time_metric = mempool_process_time_metric self.mempool_process_time_metric = mempool_process_time_metric
@ -74,18 +75,18 @@ class HubMemPool:
self.logger.error("failed to process mempool, retrying later") self.logger.error("failed to process mempool, retrying later")
return set() return set()
raise err raise err
# hashXs = self.hashXs # hashX: [tx_hash, ...] # hashXs = self.hashXs # hashX: [tx_hash, ...]
touched_hashXs = set() touched_hashXs = set()
# Remove txs that aren't in mempool anymore # Remove txs that aren't in mempool anymore
for tx_hash in set(self.txs).difference(self.raw_mempool.keys()): for tx_hash in set(self.txs).difference(self.raw_mempool.keys()):
tx = self.txs.pop(tx_hash) tx = self.txs.pop(tx_hash)
tx_hashXs = {hashX for hashX, value in tx.in_pairs}.union({hashX for hashX, value in tx.out_pairs}) tx_hashXs = self.tx_touches.pop(tx_hash)
for hashX in tx_hashXs: for hashX in tx_hashXs:
if hashX in self.touched_hashXs and tx_hash in self.touched_hashXs[hashX]: if hashX in self.touched_hashXs:
self.touched_hashXs[hashX].remove(tx_hash) if tx_hash in self.touched_hashXs[hashX]:
if not self.touched_hashXs[hashX]: self.touched_hashXs[hashX].remove(tx_hash)
if not len(self.touched_hashXs[hashX]):
self.touched_hashXs.pop(hashX) self.touched_hashXs.pop(hashX)
touched_hashXs.update(tx_hashXs) touched_hashXs.update(tx_hashXs)
@ -133,11 +134,13 @@ class HubMemPool:
tx.fee = max(0, (sum(v for _, v in tx.prevouts) - tx.fee = max(0, (sum(v for _, v in tx.prevouts) -
sum(v for _, v in tx.out_pairs))) sum(v for _, v in tx.out_pairs)))
self.txs[tx_hash] = tx self.txs[tx_hash] = tx
self.tx_touches[tx_hash] = tx_touches = set()
# print(f"added {tx_hash[::-1].hex()} reader to mempool") # print(f"added {tx_hash[::-1].hex()} reader to mempool")
for hashX, value in itertools.chain(tx.prevouts, tx.out_pairs): for hashX, value in itertools.chain(tx.prevouts, tx.out_pairs):
self.touched_hashXs[hashX].add(tx_hash) self.touched_hashXs[hashX].add(tx_hash)
touched_hashXs.add(hashX) touched_hashXs.add(hashX)
tx_touches.add(hashX)
mempool_tx_count_metric.set(len(self.txs)) mempool_tx_count_metric.set(len(self.txs))
mempool_touched_address_count_metric.set(len(self.touched_hashXs)) mempool_touched_address_count_metric.set(len(self.touched_hashXs))