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

Remove raw argument to blockchain.headers.subscribe

Browse Source
This commit is contained in:
Neil Booth 2018-07-16 15:00:52 +08:00
parent 0ee27970af
commit 20884170e6
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/protocol-changes.rst
View File

@ -127,8 +127,8 @@ This version removes all support for :ref:`deserialized headers
Changes Changes
------- -------
* The only valid value for :func:`blockchain.headers.subscribe` * The argument *raw* removed from :func:`blockchain.headers.subscribe`,
argument *raw* is :const:`True` only raw headers can be subscribed to.
* Optional *cp_height* argument added to * Optional *cp_height* argument added to
:func:`blockchain.block.header` and :func:`blockchain.block.headers` :func:`blockchain.block.header` and :func:`blockchain.block.headers`

25
electrumx/server/session.py
View File

@ -218,16 +218,24 @@ class ElectrumX(SessionBase):
return {'hex': raw_header.hex(), 'height': height} return {'hex': raw_header.hex(), 'height': height}
return self.controller.electrum_header(height) return self.controller.electrum_header(height)
def headers_subscribe(self, raw=True): def _headers_subscribe(self, raw):
'''Subscribe to get headers of new blocks.''' '''Subscribe to get headers of new blocks.'''
self.subscribe_headers = True self.subscribe_headers = True
self.subscribe_headers_raw = self.assert_boolean(raw) self.subscribe_headers_raw = self.assert_boolean(raw)
self.notified_height = self.height() self.notified_height = self.height()
return self.subscribe_headers_result(self.height()) return self.subscribe_headers_result(self.height())
def headers_subscribe_old(self, raw=False): def headers_subscribe(self):
'''Subscribe to get headers of new blocks; raw defaults to False.''' '''Subscribe to get raw headers of new blocks.'''
return self.headers_subscribe(raw) return self._headers_subscribe(True)
def headers_subscribe_True(self, raw=True):
'''Subscribe to get headers of new blocks.'''
return self._headers_subscribe(raw)
def headers_subscribe_False(self, raw=False):
'''Subscribe to get headers of new blocks.'''
return self._headers_subscribe(raw)
async def add_peer(self, features): async def add_peer(self, features):
'''Add a peer (but only if the peer resolves to the source).''' '''Add a peer (but only if the peer resolves to the source).'''
@ -472,11 +480,11 @@ class ElectrumX(SessionBase):
if ptuple >= (1, 3): if ptuple >= (1, 3):
handlers.update({ handlers.update({
'blockchain.block.header': self.block_header, 'blockchain.block.header': self.block_header,
'blockchain.headers.subscribe': self.headers_subscribe, 'blockchain.headers.subscribe': self.headers_subscribe_True,
}) })
else: else:
handlers.update({ handlers.update({
'blockchain.headers.subscribe': self.headers_subscribe_old, 'blockchain.headers.subscribe': self.headers_subscribe_False,
'blockchain.address.get_balance': 'blockchain.address.get_balance':
controller.address_get_balance, controller.address_get_balance,
'blockchain.address.get_history': 'blockchain.address.get_history':
@ -488,6 +496,11 @@ class ElectrumX(SessionBase):
'blockchain.address.subscribe': self.address_subscribe, 'blockchain.address.subscribe': self.address_subscribe,
}) })
if ptuple >= (1, 4):
handlers.update({
`'blockchain.headers.subscribe': self.headers_subscribe,
})
self.electrumx_handlers = handlers self.electrumx_handlers = handlers
def request_handler(self, method): def request_handler(self, method):