From 9c919e6478a97b10352d4324d9323da0cbec3ac3 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Sun, 16 Sep 2018 09:01:53 +0200 Subject: [PATCH] interface: fix off-by-one in request_chunk was harmless; usually we just downloaded an extra individual header after the chunk --- electrum/interface.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/electrum/interface.py b/electrum/interface.py index 17d66a234..efc6ce494 100644 --- a/electrum/interface.py +++ b/electrum/interface.py @@ -326,7 +326,7 @@ class Interface(PrintError): self.print_error("requesting chunk from height {}".format(height)) size = 2016 if tip is not None: - size = min(size, tip - index * 2016) + size = min(size, tip - index * 2016 + 1) size = max(size, 0) try: self._requested_chunks.add(index) @@ -411,8 +411,7 @@ class Interface(PrintError): continue self.network.notify('updated') height = (height // 2016 * 2016) + num_headers - if height > next_height: - assert False, (height, self.tip) + assert height <= next_height+1, (height, self.tip) last = 'catchup' else: last, height = await self.step(height)