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

Fix peer discovery for protocol >= 1.4

Browse Source
This commit is contained in:
Neil Booth 2018-07-17 22:34:27 +08:00
parent c7f6f3ede6
commit 60435c0c06
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
electrumx/server/peers.py
View File

@ -156,12 +156,31 @@ class PeerSession(ClientSession):
return return
# Check prior header too in case of hard fork. # Check prior header too in case of hard fork.
check_height = min(our_height, their_height) check_height = min(our_height, their_height)
expected_header = controller.electrum_header(check_height) raw_header = controller.raw_header(check_height)
self.send_request('blockchain.block.get_header', [check_height], if self.ptuple >= (1, 4):
partial(self.on_header, expected_header), self.send_request('blockchain.block.header', [check_height],
timeout=self.timeout) partial(self.on_header, raw_header.hex()),
timeout=self.timeout)
else:
expected_header = self.peer_mgr.env.coin.electrum_header(
raw_header, check_height)
self.send_request('blockchain.block.get_header', [check_height],
partial(self.on_legacy_header, expected_header),
timeout=self.timeout)
def on_header(self, expected_header, request): def on_header(self, ours, request):
'''Handle the response to blockchain.block.get_header message.
Compare hashes of prior header in attempt to determine if forked.'''
if not self.is_good(request, str):
return
theirs = request.result()
if ours == theirs:
self.maybe_close()
else:
self.bad('our header {} and theirs {} differ'.format(ours, theirs))
def on_legacy_header(self, expected_header, request):
'''Handle the response to blockchain.block.get_header message. '''Handle the response to blockchain.block.get_header message.
Compare hashes of prior header in attempt to determine if forked.''' Compare hashes of prior header in attempt to determine if forked.'''
if not self.is_good(request, dict): if not self.is_good(request, dict):