RanchiMall/electrumx
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix discovery of base of reorgs

Browse Source
This commit is contained in:
Neil Booth 2017-03-21 22:16:19 +09:00
parent 5f56689e9c
commit 294212d421
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/block_processor.py
View File

@ -291,11 +291,13 @@ class BlockProcessor(server.db.DB):
The hashes are returned in order of increasing height.''' The hashes are returned in order of increasing height.'''
def match_pos(hashes1, hashes2): def diff_pos(hashes1, hashes2):
'''Returns the index of the first difference in the hash lists.
If both lists match returns their length.'''
for n, (hash1, hash2) in enumerate(zip(hashes1, hashes2)): for n, (hash1, hash2) in enumerate(zip(hashes1, hashes2)):
if hash1 == hash2: if hash1 != hash2:
return n return n
return -1 return len(hashes)
if count is None: if count is None:
# A real reorg # A real reorg
@ -305,9 +307,9 @@ class BlockProcessor(server.db.DB):
hashes = self.fs_block_hashes(start, count) hashes = self.fs_block_hashes(start, count)
hex_hashes = [hash_to_str(hash) for hash in hashes] hex_hashes = [hash_to_str(hash) for hash in hashes]
d_hex_hashes = await self.daemon.block_hex_hashes(start, count) d_hex_hashes = await self.daemon.block_hex_hashes(start, count)
n = match_pos(hex_hashes, d_hex_hashes) n = diff_pos(hex_hashes, d_hex_hashes)
if n >= 0: if n > 0:
start += n + 1 start += n
break break
count = min(count * 2, start) count = min(count * 2, start)
start -= count start -= count