From 14d8ece7c6cc3c456a31f9fe0ea1450c5cc859cc Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sat, 12 Nov 2016 23:20:20 +0900 Subject: [PATCH] Return a version the Electrum client expects If you don't do this you don't appear in the network dialog box --- server/irc.py | 5 +++-- server/protocol.py | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/irc.py b/server/irc.py index a98fea0..0f7ec98 100644 --- a/server/irc.py +++ b/server/irc.py @@ -18,7 +18,6 @@ from collections import namedtuple from lib.hash import double_sha256 from lib.util import LoggedClass -from server.version import VERSION def port_text(letter, port, default): @@ -41,7 +40,9 @@ class IRC(LoggedClass): super().__init__() tcp_text = port_text('t', env.report_tcp_port, 50001) ssl_text = port_text('s', env.report_ssl_port, 50002) - version = 'X{}'.format(VERSION.split()[1]) + # If this isn't something the client expects you won't appear + # in the client's network dialog box + version = '1.0' self.real_name = '{} v{} {} {}'.format(env.report_host, version, tcp_text, ssl_text) self.nick = 'E_{}'.format(env.irc_nick if env.irc_nick else diff --git a/server/protocol.py b/server/protocol.py index d5f2999..ab3899d 100644 --- a/server/protocol.py +++ b/server/protocol.py @@ -47,7 +47,10 @@ class BlockServer(BlockProcessor): if not self.servers: await self.start_servers() if self.env.irc: + self.logger.info('starting IRC coroutine') asyncio.ensure_future(self.irc.start()) + else: + self.logger.info('IRC disabled') ElectrumX.notify(self.height, self.touched) async def start_server(self, class_name, kind, host, port, *, ssl=None):