work on torgossip

src/blockio/subprocvalidate.py

@@ -16,5 +16,4 @@ def vdf_block(block_hash: bytes, block_data: bytes):
             b85encode(block_hash)], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
     result = p.communicate(block_data)
     if result[1]:
-        print(result[1])
         raise anonvdf.InvalidID()

static-data/default-plugins/torgossip/bootstrap.txt

@@ -0,0 +1 @@
+wfslzt6nxjjhoslqhgw7qxxet5pkkqb2nedbc44y2577ub2zl32t7tid

static-data/default-plugins/torgossip/client.py

@@ -12,6 +12,7 @@ from typing import TYPE_CHECKING
 from random import SystemRandom
 
 import socks as socket
+from stem import SocketClosed
 
 from netcontroller.torcontrol.onionserviceonline import service_online_recently
 from netcontroller.torcontrol import torcontroller
@@ -25,6 +26,7 @@ sys.path.insert(0, path.dirname(path.realpath(__file__)))
 from commands import GossipCommands
 
 from clientfuncs import download_blocks
+from constants import HOSTNAME_FILE
 """
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -52,16 +54,19 @@ def client_funcs(shared_state, socket_pool):
         SystemRandom().shuffle(peers)
 
         for peer in peers:
+            peer = peer[0]
             if peer in socket_pool:
                 continue
-            if not service_online_recently(controller, peer):
+            p_encoded = b32encode(peer).decode().lower() + ".onion"
+            if not service_online_recently(controller, p_encoded):
                 continue
             s = socket.socksocket()
             s.set_proxy(
                 socket.SOCKS5, '127.0.0.1', socks_port, rdns=True)
             try:
                 socket_pool[peer] = s.connect(
-                    (b32encode(peer).decode().lower() + ".onion", 2021))
+                    (p_encoded, 2021))
+                logger.info(f"Connected to {p_encoded}", terminal=True)
 
             except socket.GeneralProxyError:
                 s.close()
@@ -74,7 +79,11 @@ def client_funcs(shared_state, socket_pool):
 
         while True:
             if not socket_pool:
-                _client_pool(shared_state, socket_pool)
+                try:
+                    _client_pool(shared_state, socket_pool)
+                except SocketClosed:  # Probably shutting down, or tor crashed
+                    sleep(1)
+                    continue
             peers = list(socket_pool)
             SystemRandom().shuffle(peers)
             try:
@@ -82,7 +91,7 @@ def client_funcs(shared_state, socket_pool):
             except IndexError:
                 logger.error(
                     "There are no known TorGossip peers." +
-                    f"Sleeping for {sleep_t}s",
+                    f" Sleeping for {sleep_t}s",
                     terminal=True)
                 sleep(sleep_t)
                 continue
@@ -93,11 +102,15 @@ def client_funcs(shared_state, socket_pool):
 
 
 def _add_bootstrap_peers(peer_db: 'TorGossipPeers'):
-    if len(peer_db.db.db_conn.keys()):
+    # If we have peers, ignore encrypt mark in db
+    if len(peer_db.db.db_conn.keys()) > 1:
         return
+    with open(HOSTNAME_FILE, "rb") as hf:
+        our_host = b32encode(hf.read()).decode().lower()
     bootstap_peers = path.dirname(path.realpath(__file__)) + "/bootstrap.txt"
     with open(bootstap_peers, 'r') as bs_peers:
         peers = bs_peers.read().split(',')
+        peers.remove(our_host)
         for peer in peers:
             try:
                 peer_db.db.get(peer)

static-data/default-plugins/torgossip/main.py

@@ -64,7 +64,7 @@ def on_init(api, data=None):
                     c, onionservice.OnionServiceTarget(
                         GOSSIP_PORT, SERVER_SOCKET))
             except Exception:
-                print(traceback.format_exc())
+                logger.error(traceback.format_exc(), terminal=True)
                 raise
 
         with open(HOSTNAME_FILE, "wb") as hf:

static-data/default-plugins/torgossip/peerdb.py

@@ -6,6 +6,7 @@ from base64 import b32decode
 from struct import unpack, pack
 from time import time
 from typing import List
+import binascii
 
 from utils.identifyhome import identify_home
 import safedb
@@ -37,6 +38,11 @@ class TorGossipPeers:  # name it this way to avoid collisions in SharedState
         # strip .onion and b32decode peer address for lower database mem usage
         if len(peer) == 62:  # constant time
             return b32decode(peer[:-6])  # O(N)
+        else:
+            try:
+                return b32decode(peer.upper())
+            except binascii.Error:
+                pass
         return peer
 
     def _pack_and_store_info(self, peer, new_score=None, new_seen=None):
@@ -62,7 +68,8 @@ class TorGossipPeers:  # name it this way to avoid collisions in SharedState
 
         if not peer:
             return []
-        assert len(peer) == 34
+
+        assert len(peer) == 35
 
         top = [(peer, self.db.get(peer))]
 
@@ -72,6 +79,7 @@ class TorGossipPeers:  # name it this way to avoid collisions in SharedState
                 break
             if peer == b"enc":
                 continue
+            # score, seen is data
             peer_data = self.db.get(peer)
             overwrite = None