Count missing UTXOs and log just once
They're a temporary phenomenon but it's handy to see how often these things happen. Fixes #10.
This commit is contained in:
parent
55cc1d3d65
commit
a07ed5876b
@ -175,6 +175,8 @@ class MemPool(LoggedClass):
|
|||||||
'''
|
'''
|
||||||
hex_hashes = set(hex_hashes)
|
hex_hashes = set(hex_hashes)
|
||||||
touched = set()
|
touched = set()
|
||||||
|
missing_utxos = 0
|
||||||
|
|
||||||
initial = self.count < 0
|
initial = self.count < 0
|
||||||
if initial:
|
if initial:
|
||||||
self.logger.info('beginning import of {:,d} mempool txs'
|
self.logger.info('beginning import of {:,d} mempool txs'
|
||||||
@ -225,10 +227,8 @@ class MemPool(LoggedClass):
|
|||||||
return mempool_entry[1][txin.prev_idx], True
|
return mempool_entry[1][txin.prev_idx], True
|
||||||
entry = utxo_lookup(txin.prev_hash, txin.prev_idx)
|
entry = utxo_lookup(txin.prev_hash, txin.prev_idx)
|
||||||
if entry == NO_CACHE_ENTRY:
|
if entry == NO_CACHE_ENTRY:
|
||||||
# Not possible unless daemon is lying or we're corrupted?
|
# This happens when the daemon is a block ahead of us
|
||||||
self.logger.warning('no UTXO found for {} / {}'
|
# and has mempool txs spending new txs in that block
|
||||||
.format(hash_to_str(txin.prev_hash),
|
|
||||||
txin.prev_idx))
|
|
||||||
raise MissingUTXOError
|
raise MissingUTXOError
|
||||||
value, = struct.unpack('<Q', entry[-8:])
|
value, = struct.unpack('<Q', entry[-8:])
|
||||||
return (entry[:21], value), False
|
return (entry[:21], value), False
|
||||||
@ -254,7 +254,11 @@ class MemPool(LoggedClass):
|
|||||||
infos = (txin_info(txin) for txin in tx.inputs)
|
infos = (txin_info(txin) for txin in tx.inputs)
|
||||||
txin_pairs, unconfs = zip(*infos)
|
txin_pairs, unconfs = zip(*infos)
|
||||||
except MissingUTXOError:
|
except MissingUTXOError:
|
||||||
# If we were missing a UTXO for some reason drop this tx
|
# Drop this TX. If other mempool txs depend on it
|
||||||
|
# it's harmless - next time the mempool is refreshed
|
||||||
|
# they'll either be cleaned up or the UTXOs will no
|
||||||
|
# longer be missing.
|
||||||
|
missing_utxos += 1
|
||||||
del self.txs[hex_hash]
|
del self.txs[hex_hash]
|
||||||
continue
|
continue
|
||||||
self.txs[hex_hash] = (txin_pairs, txout_pairs, any(unconfs))
|
self.txs[hex_hash] = (txin_pairs, txout_pairs, any(unconfs))
|
||||||
@ -267,6 +271,11 @@ class MemPool(LoggedClass):
|
|||||||
self.hash168s[hash168].add(hex_hash)
|
self.hash168s[hash168].add(hex_hash)
|
||||||
touched.add(hash168)
|
touched.add(hash168)
|
||||||
|
|
||||||
|
if missing_utxos:
|
||||||
|
self.logger.info('{:,d} txs had missing UTXOs; probably the '
|
||||||
|
'daemon is a block or two ahead of us'
|
||||||
|
.format(missing_utxos))
|
||||||
|
|
||||||
self.count += 1
|
self.count += 1
|
||||||
if self.count % 25 == 0 or gone:
|
if self.count % 25 == 0 or gone:
|
||||||
self.count = 0
|
self.count = 0
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user