Merge branch 'master' of github.com:snowblossomcoin/snowblossom

snowblossomcoin · May 23, 2018 · 35d5768 · 35d5768
2 parents 32b0e9e + 55e27f6
commit 35d5768
Show file tree

Hide file tree

Showing 13 changed files with 163 additions and 34 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/AddressUtil.java b/src/AddressUtil.java
@@ -15,6 +15,9 @@
 import com.google.common.collect.ImmutableSet;
 
 
+import org.junit.Assert;
+import java.util.List;
+
 public class AddressUtil
 {
   public static AddressSpecHash getHashForSpec(AddressSpec spec)
@@ -58,6 +61,22 @@ public static AddressSpec getSimpleSpecForKey(ByteString key_data, int sig_type)
         .build())
       .build();
   }
+
+  public static AddressSpec getMultiSig(int required, List<WalletKeyPair> wkp_list)
+  {
+    AddressSpec.Builder addrspec = AddressSpec.newBuilder();
+    addrspec.setRequiredSigners(required);
+
+    Assert.assertTrue(required >= wkp_list.size());
+    for(WalletKeyPair wkp : wkp_list)
+    {
+      addrspec.addSigSpecs ( SigSpec.newBuilder()
+        .setSignatureType( wkp.getSignatureType() )
+        .setPublicKey ( wkp.getPublicKey() )
+        .build() );
+    }
+    return addrspec.build();
+  }
 
   public static AddressSpec getSimpleSpecForKey(WalletKeyPair wkp)
   {

diff --git a/src/BlockIngestor.java b/src/BlockIngestor.java
@@ -12,7 +12,7 @@
 import snowblossom.db.DB;
 import org.junit.Assert;
 
-
+import java.util.HashMap;
 import java.util.logging.Logger;
 import java.util.logging.Level;
 
@@ -41,6 +41,8 @@ public class BlockIngestor
 
   private PrintStream block_log;
 
+  private boolean tx_index=false;
+
 
   public BlockIngestor(SnowBlossomNode node)
     throws Exception
@@ -62,6 +64,8 @@ public BlockIngestor(SnowBlossomNode node)
         new ChainHash(chainhead.getHeader().getSnowHash())));
     }
 
+    tx_index = node.getConfig().getBoolean("tx_index");
+
   }
 
   public boolean ingestBlock(Block blk)
@@ -99,6 +103,17 @@ public boolean ingestBlock(Block blk)
 
     Validation.deepBlockValidation(node, blk, prev_summary);
 
+    if (tx_index)
+    {
+      HashMap<ByteString, Transaction> tx_map = new HashMap<>();
+      for(Transaction tx : blk.getTransactionsList())
+      {
+        tx_map.put(tx.getTxHash(), tx);
+      }
+      db.getTransactionMap().putAll(tx_map);
+    }
+
+
     db.getBlockMap().put( blockhash.getBytes(), blk);
     db.getBlockSummaryMap().put( blockhash.getBytes(), summary);
 

diff --git a/src/Config.java b/src/Config.java
@@ -12,6 +12,15 @@ public abstract class Config
 
     public abstract String get(String key);
 
+    public String getWithDefault(String key, String def)
+    {
+      if (isSet(key))
+      {
+        return get(key);
+      }
+      return def;
+    }
+
     public void require(String key)
     {
       if(get(key) == null)

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/PeerLink.java b/src/PeerLink.java
@@ -119,7 +119,7 @@ else if (msg.hasTip())
         PeerChainTip tip = msg.getTip();
         if (!node.getParams().getNetworkName().equals(tip.getNetworkName()))
         {
-          logger.log(Level.INFO, String.format("Peer has wrong name: %s", tip.getNetworkName()));
+          logger.log(Level.FINE, String.format("Peer has wrong name: %s", tip.getNetworkName()));
           close();
           return;
         }

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/TransactionUtil.java b/src/TransactionUtil.java
@@ -272,7 +272,7 @@ public static void prettyDisplayTx(Transaction tx, PrintStream out, NetworkParam
     throws ValidationException
   {
     ChainHash tx_hash = new ChainHash(tx.getTxHash());
-    out.println("Transaction: " + tx_hash);
+    out.println("Transaction: " + tx_hash + " size: " + tx.toByteString().size());
     TreeSet<String> sign_set=new TreeSet<>();
     DecimalFormat df = new DecimalFormat("0.000000");
 

diff --git a/src/client/SnowBlossomClient.java b/src/client/SnowBlossomClient.java
@@ -147,9 +147,11 @@ else if (command.equals("loadtest"))
 
   private File wallet_path;
   private WalletDatabase wallet_database;
+  private Config config;
 
   public SnowBlossomClient(Config config) throws Exception
   {
+    this.config = config;
     config.require("node_host");
 
     String host = config.get("node_host");
@@ -201,7 +203,7 @@ public void loadWallet()
     else
     {
       logger.log(Level.WARNING, String.format("File %s does not exist, creating new wallet", db_file.getPath()));
-      wallet_database = makeNewDatabase();
+      wallet_database = WalletUtil.makeNewDatabase(config);
       saveWallet();
     }
 
@@ -247,31 +249,6 @@ public void saveWallet()
 
   }
 
-  public WalletDatabase makeNewDatabase()
-  {
-    WalletDatabase.Builder builder = WalletDatabase.newBuilder();
-
-    for(int i=0;i<8; i++)
-    {
-      genNewKey(builder);
-    }
-
-    return builder.build();
-  }
-
-  public void genNewKey(WalletDatabase.Builder wallet_builder)
-  {
-
-    WalletKeyPair wkp = KeyUtil.generateWalletStandardECKey();
-
-    wallet_builder.addKeys(wkp);
-
-    AddressSpec claim = AddressUtil.getSimpleSpecForKey(wkp);
-
-    wallet_builder.addAddresses(claim);
-
-  } 
-
   public void showBalances()
   {
     long total_confirmed = 0;

diff --git a/src/client/WalletUtil.java b/src/client/WalletUtil.java
@@ -0,0 +1,67 @@
+package snowblossom.client;
+
+import snowblossom.*;
+import snowblossom.proto.*;
+import com.google.common.collect.ImmutableList;
+
+import java.util.logging.Logger;
+import java.util.logging.Level;
+
+
+public class WalletUtil
+{
+	public static final String MODE_STANDARD="standard";
+  public static final String MODE_QHARD="qhard";
+
+  private static final Logger logger = Logger.getLogger("snowblossom.client");
+
+  public static WalletDatabase makeNewDatabase(Config config)
+  {
+    WalletDatabase.Builder builder = WalletDatabase.newBuilder();
+
+    int count = config.getIntWithDefault("key_count", 8);
+    for(int i=0;i<count; i++)
+    {
+      genNewKey(builder, config);
+    }
+
+    return builder.build();
+  }
+
+  public static void genNewKey(WalletDatabase.Builder wallet_builder, Config config)
+  {
+		String key_mode = config.getWithDefault("key_mode", MODE_STANDARD).toLowerCase();
+
+		if (key_mode.equals(MODE_STANDARD))
+		{
+
+			WalletKeyPair wkp = KeyUtil.generateWalletStandardECKey();
+			wallet_builder.addKeys(wkp);
+			AddressSpec claim = AddressUtil.getSimpleSpecForKey(wkp);
+			wallet_builder.addAddresses(claim);
+    }
+		else if (key_mode.equals(MODE_QHARD))
+		{
+      logger.info("Creating QHARD key set. This takes a while.");
+			WalletKeyPair k_ec = KeyUtil.generateWalletStandardECKey();
+			WalletKeyPair k_rsa = KeyUtil.generateWalletRSAKey(8192);
+			WalletKeyPair k_dstu = KeyUtil.generateWalletDSTU4145Key(9);
+
+	    wallet_builder.addKeys(k_ec);	
+	    wallet_builder.addKeys(k_rsa);	
+	    wallet_builder.addKeys(k_dstu);
+
+      AddressSpec claim = AddressUtil.getMultiSig(3, ImmutableList.of(k_ec, k_rsa, k_dstu));
+      wallet_builder.addAddresses(claim);
+
+
+		}
+		else
+		{
+			throw new RuntimeException("Unknown key_mode: " + key_mode);
+		}
+
+  }
+
+
+}