From 142aa48dbbeb0db98dbe05bf087fa656883d58bf Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Mon, 9 Apr 2018 14:41:50 +0900 Subject: [PATCH] Release 1.4.2 Requires aiorpcX 0.5.5 --- docs/changelog.rst | 8 ++++++++ server/controller.py | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 1f8ad78..2c25d9d 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,13 @@ ChangeLog ========= +Version 1.4.2 +------------- + +* proxy remote IP reported properly if :envvar:`FORCE_PROXY` is set. + Fixes `#301`_. +* requires aiorpcx 0.5.5 + Version 1.4.1 ------------- @@ -128,4 +135,5 @@ LKaFk4KkVpw9pYoUpbckQSKKgCVC4oj78b .. _#277: https://github.com/kyuupichan/electrumx/issues/277 .. _#287: https://github.com/kyuupichan/electrumx/issues/287 +.. _#301: https://github.com/kyuupichan/electrumx/issues/301 .. _#302: https://github.com/kyuupichan/electrumx/issues/302 diff --git a/server/controller.py b/server/controller.py index 1445305..c8146b0 100644 --- a/server/controller.py +++ b/server/controller.py @@ -19,7 +19,7 @@ from functools import partial import pylru -from aiorpcx import RPCError, TaskSet +from aiorpcx import RPCError, TaskSet, _version from lib.hash import double_sha256, hash_to_str, hex_str_to_hash from lib.peer import Peer from lib.server_base import ServerBase @@ -48,11 +48,14 @@ class Controller(ServerBase): CATCHING_UP, LISTENING, PAUSED, SHUTTING_DOWN = range(4) PROTOCOL_MIN = '1.0' PROTOCOL_MAX = '1.2' - VERSION = 'ElectrumX 1.4.1' + VERSION = 'ElectrumX 1.4.2' def __init__(self, env): '''Initialize everything that doesn't require the event loop.''' super().__init__(env) + if _version < (0, 5, 5): + raise RuntimeError('ElectrumX requires aiorpcX 0.5.5') + self.logger.info(f'software version: {self.VERSION}') self.logger.info(f'supported protocol versions: ' f'{self.PROTOCOL_MIN}-{self.PROTOCOL_MAX}')