LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stop using deprecated RPC blockchain.block.get_chunk

Browse source 
Use blockchain.block.headers instead.  It's more flexible but
that flexibility is not used here.

Port of 09798d6b20
This commit is contained in:
Neil Booth 2018-05-30 14:06:40 +08:00
parent e0a6b082d2
commit bc83fa8d68
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/network.py
View file

@ -561,8 +561,8 @@ class Network(util.DaemonThread):
if error is None: if error is None:
self.relay_fee = int(result * COIN) if result is not None else None self.relay_fee = int(result * COIN) if result is not None else None
self.print_error("relayfee", self.relay_fee) self.print_error("relayfee", self.relay_fee)
elif method == 'blockchain.block.get_chunk': elif method == 'blockchain.block.headers':
self.on_get_chunk(interface, response) self.on_block_headers(interface, response)
elif method == 'blockchain.block.get_header': elif method == 'blockchain.block.get_header':
self.on_get_header(interface, response) self.on_get_header(interface, response)
@ -766,9 +766,11 @@ class Network(util.DaemonThread):
return return
interface.print_error("requesting chunk %d" % index) interface.print_error("requesting chunk %d" % index)
self.requested_chunks.add(index) self.requested_chunks.add(index)
self.queue_request('blockchain.block.get_chunk', [index], interface) height = index * 2016
self.queue_request('blockchain.block.headers', [height, 2016],
interface)
def on_get_chunk(self, interface, response): def on_block_headers(self, interface, response):
'''Handle receiving a chunk of block headers''' '''Handle receiving a chunk of block headers'''
error = response.get('error') error = response.get('error')
result = response.get('result') result = response.get('result')
@ -777,15 +779,17 @@ class Network(util.DaemonThread):
if result is None or params is None or error is not None: if result is None or params is None or error is not None:
interface.print_error(error or 'bad response') interface.print_error(error or 'bad response')
return return
index = params[0]
# Ignore unsolicited chunks # Ignore unsolicited chunks
if index not in self.requested_chunks: height = params[0]
index = height // 2016
if index * 2016 != height or index not in self.requested_chunks:
interface.print_error("received chunk %d (unsolicited)" % index) interface.print_error("received chunk %d (unsolicited)" % index)
return return
else: else:
interface.print_error("received chunk %d" % index) interface.print_error("received chunk %d" % index)
self.requested_chunks.remove(index) self.requested_chunks.remove(index)
connect = blockchain.connect_chunk(index, result) hexdata = result['hex']
connect = blockchain.connect_chunk(index, hexdata)
if not connect: if not connect:
self.connection_down(interface.server) self.connection_down(interface.server)
return return