LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix regressions in tx verifier

Browse source
This commit is contained in:
ThomasV 2013-09-02 08:50:39 +02:00
parent 1ba3008b49
commit e9b103b283
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/blockchain.py
View file

@ -53,7 +53,6 @@ class BlockchainVerifier(threading.Thread):
with self.lock: with self.lock:
self.running = True self.running = True
requested_merkle = []
requested_chunks = [] requested_chunks = []
requested_headers = [] requested_headers = []
all_chunks = False all_chunks = False

19
lib/verifier.py
View file

@ -96,16 +96,18 @@ class TxVerifier(threading.Thread):
with self.lock: return self.running with self.lock: return self.running
def run(self): def run(self):
with self.lock:
self.running = True
requested_merkle = []
while self.is_running(): while self.is_running():
# request missing tx # request missing tx
if all_chunks: for tx_hash, tx_height in self.transactions.items():
for tx_hash, tx_height in self.transactions.items(): if tx_hash not in self.verified_tx:
if tx_hash not in self.verified_tx: if self.merkle_roots.get(tx_hash) is None and tx_hash not in requested_merkle:
if self.merkle_roots.get(tx_hash) is None and tx_hash not in requested_merkle: print_error('requesting merkle', tx_hash)
print_error('requesting merkle', tx_hash) self.interface.send([ ('blockchain.transaction.get_merkle',[tx_hash, tx_height]) ], 'txverifier')
self.interface.send([ ('blockchain.transaction.get_merkle',[tx_hash, tx_height]) ], 'txverifier') requested_merkle.append(tx_hash)
requested_merkle.append(tx_hash)
try: try:
r = self.interface.get_response('txverifier',timeout=1) r = self.interface.get_response('txverifier',timeout=1)
@ -136,12 +138,11 @@ class TxVerifier(threading.Thread):
if not header: return if not header: return
assert header.get('merkle_root') == self.merkle_roots[tx_hash] assert header.get('merkle_root') == self.merkle_roots[tx_hash]
# we passed all the tests # we passed all the tests
header = self.read_header(tx_height)
timestamp = header.get('timestamp') timestamp = header.get('timestamp')
with self.lock: with self.lock:
self.verified_tx[tx_hash] = (tx_height, timestamp, pos) self.verified_tx[tx_hash] = (tx_height, timestamp, pos)
print_error("verified %s"%tx_hash) print_error("verified %s"%tx_hash)
self.storage.set_key('verified_tx3', self.verified_tx, True) self.storage.put('verified_tx3', self.verified_tx, True)
self.interface.trigger_callback('updated') self.interface.trigger_callback('updated')

1
lib/wallet.py
View file

@ -1307,6 +1307,7 @@ class Wallet:
self.interface = interface self.interface = interface
self.verifier = TxVerifier(interface, blockchain, self.storage) self.verifier = TxVerifier(interface, blockchain, self.storage)
self.verifier.start() self.verifier.start()
self.set_verifier(self.verifier)
self.synchronizer = WalletSynchronizer(self) self.synchronizer = WalletSynchronizer(self)
self.synchronizer.start() self.synchronizer.start()