Merge branch 'release-0.4.3'

docs/RELEASE-NOTES

@@ -1,3 +1,8 @@
+version 0.4.3
+-------------
+
+- fix exception introduced in 0.4.2
+
 version 0.4.2
 -------------
 

lib/jsonrpc.py

@@ -79,16 +79,12 @@ class JSONRPC(asyncio.Protocol, LoggedClass):
         self.send_count = 0
         self.send_size = 0
         self.error_count = 0
+        self.peer_info = None
 
     def connection_made(self, transport):
         '''Handle an incoming client connection.'''
         self.transport = transport
-
+        self.peer_info = transport.get_extra_info('peername')
-    def peer_info(self):
-        '''Return peer info.'''
-        if self.transport:
-            return self.transport.get_extra_info('peername')
-        return None
 
     def connection_lost(self, exc):
         '''Handle client disconnection.'''

server/block_processor.py

@@ -84,7 +84,7 @@ class Prefetcher(LoggedClass):
 
     async def main_loop(self):
         '''Loop forever polling for more blocks.'''
-        self.logger.info('starting daemon poll loop...')
+        self.logger.info('starting daemon poll loop')
         while True:
             try:
                 if await self._caught_up():
@@ -201,7 +201,7 @@ class MemPool(LoggedClass):
         hex_hashes.difference_update(self.txs)
         raw_txs = await self.bp.daemon.getrawtransactions(hex_hashes)
         if initial:
-            self.logger.info('analysing {:,d} mempool txs...'
+            self.logger.info('analysing {:,d} mempool txs'
                              .format(len(raw_txs)))
         new_txs = {hex_hash: Deserializer(raw_tx).read_tx()
                    for hex_hash, raw_tx in zip(hex_hashes, raw_txs) if raw_tx}

server/irc.py

@@ -134,6 +134,5 @@ class IRC(LoggedClass):
                 ip_addr = line[1]
             peer = self.Peer(ip_addr, line[1], line[2:])
             self.peers[nick] = peer
-            self.logger.info('new {}'.format(peer))
         except IndexError:
             pass

server/protocol.py

@@ -224,7 +224,7 @@ class Session(JSONRPC):
         self.manager.add_task(self, self.handle_json_request(request))
 
     def peername(self):
-        info = self.peer_info()
+        info = self.peer_info
         return 'unknown' if not info else '{}:{}'.format(info[0], info[1])
 
     def tx_hash_from_param(self, param):

server/version.py

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