davide/pallectrum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

interface: split request_chunk, based on "can_return_early" param

Browse Source
This commit is contained in:
SomberNight
2025-07-15 22:53:35 +00:00
parent 5fad4bff8f
commit 6a56fd756b
4 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
electrum/interface.py
View File

@@ -831,28 +831,43 @@ class Interface(Logger):
headers = list(util.chunks(bfh(res['hex']), size=HEADER_SIZE))
return headers
async def request_chunk(
async def request_chunk_below_max_checkpoint(
self,
height: int,
*,
tip: Optional[int] = None,
can_return_early: bool = False,
height: int,
) -> None:
if not is_non_negative_integer(height):
raise Exception(f"{repr(height)} is not a block height")
assert height <= constants.net.max_checkpoint(), f"{height=} must be <= cp={constants.net.max_checkpoint()}"
index = height // CHUNK_SIZE
if index in self._requested_chunks:
return None
self.logger.debug(f"requesting chunk from height {height}")
try:
self._requested_chunks.add(index)
headers = await self.get_block_headers(start_height=index * CHUNK_SIZE, count=CHUNK_SIZE)
finally:
self._requested_chunks.discard(index)
conn = self.blockchain.connect_chunk(index, data=b"".join(headers))
if not conn:
raise RequestCorrupted(f"chunk ({index=}, for {height=}) does not connect to blockchain")
return None
async def _fast_forward_chain(
self,
*,
height: int,
tip: int,
) -> Optional[Tuple[bool, int]]:
if not is_non_negative_integer(height):
raise Exception(f"{repr(height)} is not a block height")
if not is_non_negative_integer(tip):
raise Exception(f"{repr(tip)} is not a block height")
index = height // CHUNK_SIZE
if can_return_early and index in self._requested_chunks:
return None
#self.logger.debug(f"requesting chunk from height {height}")
size = CHUNK_SIZE
if tip is not None:
size = min(size, tip - index * CHUNK_SIZE + 1)
size = max(size, 0)
try:
self._requested_chunks.add(index)
headers = await self.get_block_headers(start_height=index * CHUNK_SIZE, count=size)
finally:
self._requested_chunks.discard(index)
size = min(size, tip - index * CHUNK_SIZE + 1)
size = max(size, 0)
headers = await self.get_block_headers(start_height=index * CHUNK_SIZE, count=size)
conn = self.blockchain.connect_chunk(index, data=b"".join(headers))
if not conn:
return conn, 0
@@ -1021,7 +1036,8 @@ class Interface(Logger):
# It is more efficient to process headers in large batches (CPU/disk_usage/logging).
# (but this wastes a little bandwidth, if we are not on a chunk boundary)
# TODO we should request (some) chunks concurrently. would help when we are many chunks behind
could_connect, num_headers = await self.request_chunk(height, tip=next_height)
could_connect, num_headers = await self._fast_forward_chain(
height=height, tip=next_height)
if not could_connect:
if height <= constants.net.max_checkpoint():
raise GracefulDisconnect('server chain conflicts with checkpoints or genesis')