LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

sync: fetch proofs and txs in batches

Browse source
This commit is contained in:
Victor Shyba 2018-10-10 18:59:12 -03:00 committed by Lex Berezhny
parent cab8981716
commit 7bdcaa6737
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/unit/test_ledger.py
View file

@ -24,7 +24,7 @@ class MockNetwork:
return defer.succeed(self.history) return defer.succeed(self.history)
def get_merkle(self, txid, height): def get_merkle(self, txid, height):
return {'merkle': ['abcd01'], 'pos': 1} return defer.succeed({'merkle': ['abcd01'], 'pos': 1})
def get_transaction(self, tx_hash): def get_transaction(self, tx_hash):
self.get_transaction_called.append(tx_hash) self.get_transaction_called.append(tx_hash)

17
torba/baseledger.py
View file

@ -203,11 +203,9 @@ class BaseLedger(metaclass=LedgerRegistry):
working_branch = double_sha256(combined) working_branch = double_sha256(combined)
return hexlify(working_branch[::-1]) return hexlify(working_branch[::-1])
@defer.inlineCallbacks def validate_transaction_and_set_position(self, tx, height, merkle):
def validate_transaction_and_set_position(self, tx, height):
if not height <= len(self.headers): if not height <= len(self.headers):
return False return False
merkle = yield self.network.get_merkle(tx.id, height)
merkle_root = self.get_root_of_merkle_tree(merkle['merkle'], merkle['pos'], tx.hash) merkle_root = self.get_root_of_merkle_tree(merkle['merkle'], merkle['pos'], tx.hash)
header = self.headers[height] header = self.headers[height]
tx.position = merkle['pos'] tx.position = merkle['pos']
@ -353,6 +351,15 @@ class BaseLedger(metaclass=LedgerRegistry):
def update_history(self, address): def update_history(self, address):
remote_history = yield self.network.get_history(address) remote_history = yield self.network.get_history(address)
local_history = yield self.get_local_history(address) local_history = yield self.get_local_history(address)
proofs = {
entry['tx_hash']: self.network.get_merkle(entry['tx_hash'], entry['height'])
for index, entry in enumerate(remote_history)
if index >= len(local_history) or (entry['tx_hash'], entry['height']) != local_history[index]
}
network_txs = {key: self.network.get_transaction(key) for key in proofs.keys()}
yield defer.DeferredList(list(proofs.values()) + list(network_txs.values()))
proofs = {key: value.result for key, value in proofs.items()}
network_txs = {key: value.result for key, value in network_txs.items()}
synced_history = StringIO() synced_history = StringIO()
for i, (hex_id, remote_height) in enumerate(map(itemgetter('tx_hash', 'height'), remote_history)): for i, (hex_id, remote_height) in enumerate(map(itemgetter('tx_hash', 'height'), remote_history)):
@ -372,14 +379,14 @@ class BaseLedger(metaclass=LedgerRegistry):
tx = yield self.db.get_transaction(txid=hex_id) tx = yield self.db.get_transaction(txid=hex_id)
save_tx = None save_tx = None
if tx is None: if tx is None:
_raw = yield self.network.get_transaction(hex_id) _raw = network_txs[hex_id]
tx = self.transaction_class(unhexlify(_raw)) tx = self.transaction_class(unhexlify(_raw))
save_tx = 'insert' save_tx = 'insert'
tx.height = remote_height tx.height = remote_height
if remote_height > 0 and (not tx.is_verified or tx.position == -1): if remote_height > 0 and (not tx.is_verified or tx.position == -1):
yield self.validate_transaction_and_set_position(tx, remote_height) self.validate_transaction_and_set_position(tx, remote_height, proofs[hex_id])
if save_tx is None: if save_tx is None:
save_tx = 'update' save_tx = 'update'