Skip to content

feat(sync-v2): Stop running callLater when a block is voided in handle_get_peer_block_hashes() #873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msbrogli merged 1 commit into from
Nov 13, 2023
Merged

feat(sync-v2): Stop running callLater when a block is voided in handle_get_peer_block_hashes() #873

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions hathor/p2p/sync_v2/agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,9 @@ def handle_get_tips(self, _payload: str) -> None:
return
self.log.debug('handle_get_tips')
# TODO Use a streaming of tips
for txid in self.tx_storage.indexes.mempool_tips.get():
self.send_tips(txid)
for tx_id in self.tx_storage.indexes.mempool_tips.get():
self.send_tips(tx_id)
self.log.debug('tips end')
self.send_message(ProtocolMessages.TIPS_END)

def send_tips(self, tx_id: bytes) -> None:
Expand Down Expand Up @@ -610,6 +611,7 @@ def handle_get_peer_block_hashes(self, payload: str) -> None:
assert self.tx_storage.indexes is not None
heights = json.loads(payload)
if len(heights) > 20:
self.log.info('too many heights', heights_qty=len(heights))
self.protocol.send_error_and_close_connection('GET-PEER-BLOCK-HASHES: too many heights')
return
data = []
Expand All @@ -619,10 +621,7 @@ def handle_get_peer_block_hashes(self, payload: str) -> None:
break
blk = self.tx_storage.get_transaction(blk_hash)
if blk.get_metadata().voided_by:
# The height index might have voided blocks when there is a draw.
# Let's try again soon.
self.reactor.callLater(3, self.handle_get_peer_block_hashes, payload)
return
break
data.append((h, blk_hash.hex()))
payload = json.dumps(data)
self.send_message(ProtocolMessages.PEER_BLOCK_HASHES, payload)
Expand Down