Maintain more than one self-identity

Rather than just retaining our clearnet identity from the environment,
maintain any tor one as well.  This is a little cleaner and avoids
confusion over port assignment when converting to real names.

Fixes #136

lib/peer.py

@@ -243,7 +243,7 @@ class Peer(object):
         details = self.real_name().split()[1:]
         return (self.ip_addr or self.host, self.host, details)
 
-    def real_name(self, host_override=None):
+    def real_name(self):
         '''Real name of this peer as used on IRC.'''
         def port_text(letter, port):
             if port == self.DEFAULT_PORTS.get(letter):
@@ -251,7 +251,7 @@ class Peer(object):
             else:
                 return letter + str(port)
 
-        parts = [host_override or self.host, 'v' + self.protocol_max]
+        parts = [self.host, 'v' + self.protocol_max]
         if self.pruning:
             parts.append('p{:d}'.format(self.pruning))
         for letter, port in (('s', self.ssl_port), ('t', self.tcp_port)):

server/peers.py

@@ -29,9 +29,8 @@ STALE_SECS = 86400
 WAKEUP_SECS = 300
 
 
-def peer_from_env(env):
+def peers_from_env(env):
-    '''Return ourself as a peer from the environment settings.'''
+    '''Return a list of peers from the environment settings.'''
-    main_identity = env.identities[0]
     hosts = {identity.host: {'tcp_port': identity.tcp_port,
                              'ssl_port': identity.ssl_port}
              for identity in env.identities}
@@ -44,7 +43,7 @@ def peer_from_env(env):
         'genesis_hash': env.coin.GENESIS_HASH,
     }
 
-    return Peer(main_identity.host, features, 'env')
+    return [Peer(ident.host, features, 'env') for ident in env.identities]
 
 
 class PeerSession(JSONSession):
@@ -117,7 +116,7 @@ class PeerSession(JSONSession):
             return
 
         # Announce ourself if not present
-        my = self.peer_mgr.myself
+        my = self.peer_mgr.my_clearnet_peer()
         for peer in my.matches(peers):
             if peer.tcp_port == my.tcp_port and peer.ssl_port == my.ssl_port:
                 return
@@ -214,7 +213,7 @@ class PeerManager(util.LoggedClass):
         self.controller = controller
         self.loop = controller.loop
         self.irc = IRC(env, self)
-        self.myself = peer_from_env(env)
+        self.myselves = peers_from_env(env)
         # value is max outgoing connections at a time
         self.semaphore = asyncio.BoundedSemaphore(value=8)
         self.retry_event = asyncio.Event()
@@ -229,6 +228,10 @@ class PeerManager(util.LoggedClass):
                                     loop=self.loop)
         self.import_peers()
 
+    def my_clearnet_peer(self):
+        '''Returns the clearnet peer representing this server.'''
+        return [peer for peer in self.myselves if not peer.is_tor][0]
+
     def info(self):
         '''The number of peers.'''
         self.set_peer_statuses()
@@ -322,9 +325,8 @@ class PeerManager(util.LoggedClass):
         onion_peers = []
 
         # Always report ourselves if valid (even if not public)
-        peers = set()
+        peers = set(myself for myself in self.myselves
-        if self.myself.last_connect > cutoff:
+                    if myself.last_connect > cutoff)
-            peers.add(self.myself)
 
         # Bucket the clearnet peers and select one from each
         buckets = defaultdict(list)
@@ -370,7 +372,7 @@ class PeerManager(util.LoggedClass):
 
     def import_peers(self):
         '''Import hard-coded peers from a file or the coin defaults.'''
-        self.add_peers([self.myself])
+        self.add_peers(self.myselves)
         coin_peers = self.env.coin.PEERS
         self.onion_peers = [Peer.from_real_name(rn, 'coins.py')
                             for rn in coin_peers if '.onion ' in rn]
@@ -386,8 +388,8 @@ class PeerManager(util.LoggedClass):
     def connect_to_irc(self):
         '''Connect to IRC if not disabled.'''
         if self.env.irc and self.env.coin.IRC_PREFIX:
-            pairs = [(self.myself.real_name(ident.host), ident.nick_suffix)
+            pairs = [(peer.real_name(), ident.nick_suffix) for peer, ident
-                     for ident in self.env.identities]
+                     in zip(self.myselves, self.env.identities)]
             self.ensure_future(self.irc.start(pairs))
         else:
             self.logger.info('IRC is disabled')

server/session.py

@@ -261,7 +261,7 @@ class ElectrumX(SessionBase):
 
     def server_features(self):
         '''Returns a dictionary of server features.'''
-        return self.controller.peer_mgr.myself.features
+        return self.controller.peer_mgr.my_clearnet_peer().features
 
     def block_get_chunk(self, index):
         '''Return a chunk of block headers as a hexadecimal string.