Merge branch 'release-0.4.1'

docs/HOWTO.rst

@@ -11,6 +11,10 @@ small - patches welcome.
 + aiohttp:  Python library for asynchronous HTTP.  ElectrumX uses it for
             communication with the daemon.  Version >= 1.0 required; I am
             using 1.0.5.
++ irc:      Python IRC package.  Only required if you enable IRC; ElectrumX
+            will happily serve clients that try to connect directly.
+            I use 15.0.4 but older versions likely are fine.
+
 
 While not requirements for running ElectrumX, it is intended to be run
 with supervisor software such as Daniel Bernstein's daemontools,

docs/RELEASE-NOTES

@@ -1,3 +1,9 @@
+version 0.4.1
+-------------
+
+- tweak IRC version reporting so we appear in the Electrum client's
+  network dialog box
+
 version 0.4
 -----------
 

server/irc.py

@@ -18,7 +18,7 @@ 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):
     if not port:
@@ -40,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

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):

server/version.py

@@ -1 +1 @@
-VERSION = "ElectrumX 0.4"
+VERSION = "ElectrumX 0.4.1"