From 9b22fd3a1596f8d31669de8ab2cdecb723e0640e Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Wed, 8 Aug 2018 20:32:51 +0900 Subject: [PATCH 1/3] Peer verification needs to be serial... --- electrumx/server/peers.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/electrumx/server/peers.py b/electrumx/server/peers.py index 209353a..6b184de 100644 --- a/electrumx/server/peers.py +++ b/electrumx/server/peers.py @@ -290,15 +290,10 @@ class PeerManager(object): peer.features['server_version'] = server_version ptuple = protocol_tuple(protocol_version) - # Do the rest concurrently - async with TaskGroup() as group: - await group.spawn(self._send_headers_subscribe(session, peer, - ptuple)) - await group.spawn(self._send_server_features(session, peer)) - await group.spawn(self._send_peers_subscribe(session, peer)) - # If any task errors out; bail - async for task in group: - task.result() + # FIXME: Make concurrent preserving the exception + await self._send_headers_subscribe(session, peer, ptuple) + await self._send_server_features(session, peer) + await self._send_peers_subscribe(session, peer) async def _send_headers_subscribe(self, session, peer, ptuple): message = 'blockchain.headers.subscribe' From 87d55c3fc599c89f748340fe753173f2476260f7 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Wed, 8 Aug 2018 23:18:06 +0900 Subject: [PATCH 2/3] Prepare 1.8.1 --- docs/changelog.rst | 6 +++++- docs/conf.py | 2 +- electrumx/__init__.py | 2 +- setup.py | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index fd9f3a4..ddf20b9 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -11,7 +11,10 @@ Version 1.8.1 (in development) ============================== -* fix `#557`_ +* require aiorpcX 0.7.0 which fixes a bug causing silent shutdown of ElectrumX +* fix `#557`_, `#559`_ +* tweaks related to log spew (I think mostly occurring with old versions + of Python) Version 1.8 (06 Aug 2018) ========================== @@ -202,3 +205,4 @@ bitcoincash:qzxpdlt8ehu9ehftw6rqsy2jgfq4nsltxvhrdmdfpn .. _#534: https://github.com/kyuupichan/electrumx/issues/534 .. _#538: https://github.com/kyuupichan/electrumx/issues/538 .. _#557: https://github.com/kyuupichan/electrumx/issues/557 +.. _#559: https://github.com/kyuupichan/electrumx/issues/559 diff --git a/docs/conf.py b/docs/conf.py index 9822a3c..89e86bd 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -15,7 +15,7 @@ import os import sys sys.path.insert(0, os.path.abspath('..')) -VERSION="ElectrumX 1.8" +VERSION="ElectrumX 1.8.1" # -- Project information ----------------------------------------------------- diff --git a/electrumx/__init__.py b/electrumx/__init__.py index 475394d..f3b73de 100644 --- a/electrumx/__init__.py +++ b/electrumx/__init__.py @@ -1,4 +1,4 @@ -version = 'ElectrumX 1.8' +version = 'ElectrumX 1.8.1' version_short = version.split()[-1] from electrumx.server.controller import Controller diff --git a/setup.py b/setup.py index 86c94a2..f89b0c5 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ import setuptools -version = '1.8' +version = '1.8.1' setuptools.setup( name='electrumX', From ab848ed3126f60144359468048b6be29cd15185c Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Thu, 9 Aug 2018 06:25:23 +0900 Subject: [PATCH 3/3] Update aiorpcX dep in setup.py Fixes #563 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f89b0c5..e48f82f 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setuptools.setup( # "blake256" package is required to sync Decred network. # "xevan_hash" package is required to sync Xuez network. # "groestlcoin_hash" package is required to sync Groestlcoin network. - install_requires=['aiorpcX >= 0.6.2', 'aiorpcX < 0.7.0', 'attrs>=15', + install_requires=['aiorpcX>=0.7,<0.8', 'attrs', 'plyvel', 'pylru', 'aiohttp >= 2'], packages=setuptools.find_packages(include=('electrumx*',)), description='ElectrumX Server',