Adding node ids and counting them

snowblossomcoin · May 23, 2018 · 55e27f6 · 55e27f6
1 parent ed66714
commit 55e27f6
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 5 deletions.
diff --git a/proto/snowblossom.proto b/proto/snowblossom.proto
@@ -179,6 +179,7 @@ message PeerInfo {
   int64 last_passed = 4;
   int64 learned = 5;
   string version = 6;
+  bytes node_id = 7;
 }
 
 message RequestBlock {
@@ -243,8 +244,8 @@ message NullRequest {
 message NodeStatus {
   int32 mem_pool_size = 1;
   int32 connected_peers = 2;
-
   BlockSummary head_summary = 3;
+  int32 estimated_nodes = 4;
 }
 
 // -------------------------------------------------------------------

diff --git a/src/Globals.java b/src/Globals.java
@@ -38,6 +38,8 @@ public class Globals
   public static final int MAX_BLOCK_SIZE = 3800000;
   public static final int MAX_TX_SIZE    = 1000000;
 
+  public static final int MAX_NODE_ID_SIZE = 8;
+
 
   public static void addCryptoProvider()
   {

diff --git a/src/PeerUtil.java b/src/PeerUtil.java
@@ -15,8 +15,8 @@ public static PeerInfo mergePeers(PeerInfo a, PeerInfo b)
 
     if (a.getLearned() > b.getLearned())
     {
-    n.mergeFrom(b);
-    n.mergeFrom(a);
+      n.mergeFrom(b);
+      n.mergeFrom(a);
     }
     else
     {
@@ -35,4 +35,5 @@ public static String getString(PeerInfo a)
   {
     return a.getHost() + ":" + a.getPort();
   }
+
 }
diff --git a/src/Peerage.java b/src/Peerage.java
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.LinkedList;
 import java.net.URL;
+import java.util.HashSet;
 import java.util.Random;
 import java.net.InetAddress;
 
@@ -52,6 +53,7 @@ public class Peerage
   private Map<String, PeerInfo> peer_rumor_list;
 
   private ImmutableSet<String> self_peer_names;
+  private ImmutableList<PeerInfo> self_peer_info;
 
   public Peerage(SnowBlossomNode node)
   {
@@ -121,14 +123,14 @@ private PeerChainTip getTip()
       }
     }
 
-    for(int i=0; i<8; i++)
+    tip.addAllPeers(self_peer_info);
+    for(int i=0; i<4; i++)
     {
       if (peer_map.size() > 0)
       {
         tip.addPeers(peer_map.pollFirstEntry().getValue());
       }
     }
-
 
     return tip.build();
   }
@@ -141,6 +143,20 @@ public int getConnectedPeerCount()
     }
   }
 
+  public int getEstimateUniqueNodes()
+  {
+    HashSet<ByteString> set = new HashSet<>();
+    synchronized(peer_rumor_list)
+    {
+      for(PeerInfo info : peer_rumor_list.values())
+      {
+        set.add(info.getNodeId());
+      }
+    }
+    return set.size();
+
+  }
+
   private ImmutableList<PeerLink> getLinkList()
   {
     synchronized(links)
@@ -219,6 +235,7 @@ public void learnSelfAndSeed()
   public void learnPeer(PeerInfo info)
   {
     if (info.getLearned() + PEER_EXPIRE_TIME < System.currentTimeMillis()) return;
+    if (info.getNodeId().size() > Globals.MAX_NODE_ID_SIZE) return; 
 
     synchronized(peer_rumor_list)
     {
@@ -339,6 +356,21 @@ private void runPrune()
     }
   }
 
+  private ByteString getNodeId()
+  {
+    ByteString id = node.getDB().getSpecialMap().get("node_id");
+    if (id == null)
+    {
+      Random rnd = new Random();
+      byte[] b = new byte[Globals.MAX_NODE_ID_SIZE];
+      rnd.nextBytes(b);
+      id = ByteString.copyFrom(b);
+      node.getDB().getSpecialMap().put("node_id", id);
+    }
+
+    return id;
+  }
+
   private List<PeerInfo> getSelfPeers()
   {
     List<String> advertise_hosts= new LinkedList<>();
@@ -362,6 +394,8 @@ private List<PeerInfo> getSelfPeers()
       }
       catch(Throwable t){}
 
+      ByteString node_id = getNodeId();
+
       int port = node.getConfig().getInt("service_port");
       for(String host : advertise_hosts)
       {
@@ -370,6 +404,7 @@ private List<PeerInfo> getSelfPeers()
           .setPort(port)
           .setLearned(System.currentTimeMillis())
           .setVersion(Globals.VERSION)
+          .setNodeId(node_id)
           .build();
 
         self_peers.add(pi);
@@ -380,6 +415,7 @@ private List<PeerInfo> getSelfPeers()
 
 		}
     self_peer_names = ImmutableSet.copyOf(self_names);
+    self_peer_info = ImmutableList.copyOf(self_peers);
 
     return self_peers;
 

diff --git a/src/SnowUserService.java b/src/SnowUserService.java
@@ -222,6 +222,7 @@ public void getNodeStatus(NullRequest null_request, StreamObserver<NodeStatus> r
       .setMemPoolSize(node.getMemPool().getMemPoolSize())
       .setConnectedPeers(node.getPeerage().getConnectedPeerCount())
       .setHeadSummary(node.getBlockIngestor().getHead())
+      .setEstimatedNodes(node.getPeerage().getEstimateUniqueNodes())
       .build();
 
     responseObserver.onNext(ns);

diff --git a/src/shackleton/WebServer.java b/src/shackleton/WebServer.java
@@ -137,6 +137,7 @@ private void displayStatus(PrintStream out)
     out.println("<pre>");
     out.println("mem_pool_size: " + node_status.getMemPoolSize());
     out.println("connected_peers: " + node_status.getConnectedPeers());
+    out.println("estimated_nodes: " + node_status.getEstimatedNodes());
     out.println("</pre>");
 
     BlockSummary summary = node_status.getHeadSummary();