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

Merge branch 'master' into devel

Browse Source
This commit is contained in:
Neil Booth 2018-08-09 06:36:24 +09:00
commit 9a2dfa9ab0
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/changelog.rst
View File

@ -11,7 +11,10 @@
Version 1.8.1 (in development) 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) Version 1.8 (06 Aug 2018)
========================== ==========================
@ -202,3 +205,4 @@ bitcoincash:qzxpdlt8ehu9ehftw6rqsy2jgfq4nsltxvhrdmdfpn
.. _#534: https://github.com/kyuupichan/electrumx/issues/534 .. _#534: https://github.com/kyuupichan/electrumx/issues/534
.. _#538: https://github.com/kyuupichan/electrumx/issues/538 .. _#538: https://github.com/kyuupichan/electrumx/issues/538
.. _#557: https://github.com/kyuupichan/electrumx/issues/557 .. _#557: https://github.com/kyuupichan/electrumx/issues/557
.. _#559: https://github.com/kyuupichan/electrumx/issues/559

2
docs/conf.py
View File

@ -15,7 +15,7 @@
import os import os
import sys import sys
sys.path.insert(0, os.path.abspath('..')) sys.path.insert(0, os.path.abspath('..'))
VERSION="ElectrumX 1.8" VERSION="ElectrumX 1.8.1"
# -- Project information ----------------------------------------------------- # -- Project information -----------------------------------------------------

2
electrumx/__init__.py
View File

@ -1,4 +1,4 @@
version = 'ElectrumX 1.8.1-dev' version = 'ElectrumX 1.8.2-dev'
version_short = version.split()[-1] version_short = version.split()[-1]
from electrumx.server.controller import Controller from electrumx.server.controller import Controller

13
electrumx/server/peers.py
View File

@ -290,15 +290,10 @@ class PeerManager(object):
peer.features['server_version'] = server_version peer.features['server_version'] = server_version
ptuple = protocol_tuple(protocol_version) ptuple = protocol_tuple(protocol_version)
# Do the rest concurrently # FIXME: Make concurrent preserving the exception
async with TaskGroup() as group: await self._send_headers_subscribe(session, peer, ptuple)
await group.spawn(self._send_headers_subscribe(session, peer, await self._send_server_features(session, peer)
ptuple)) await self._send_peers_subscribe(session, peer)
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()
async def _send_headers_subscribe(self, session, peer, ptuple): async def _send_headers_subscribe(self, session, peer, ptuple):
message = 'blockchain.headers.subscribe' message = 'blockchain.headers.subscribe'

4
setup.py
View File

@ -1,5 +1,5 @@
import setuptools import setuptools
version = '1.8' version = '1.8.1'
setuptools.setup( setuptools.setup(
name='electrumX', name='electrumX',
@ -12,7 +12,7 @@ setuptools.setup(
# "blake256" package is required to sync Decred network. # "blake256" package is required to sync Decred network.
# "xevan_hash" package is required to sync Xuez network. # "xevan_hash" package is required to sync Xuez network.
# "groestlcoin_hash" package is required to sync Groestlcoin 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'], 'plyvel', 'pylru', 'aiohttp >= 2'],
packages=setuptools.find_packages(include=('electrumx*',)), packages=setuptools.find_packages(include=('electrumx*',)),
description='ElectrumX Server', description='ElectrumX Server',