Merge pull request tronprotocol#1076 from tronprotocol/m_p2p3

p2p: modify trust node cfg

Author: zhaohong

src/main/java/org/tron/common/overlay/server/ChannelManager.java

@@ -66,7 +66,7 @@ private ChannelManager(final PeerServer peerServer, final PeerClient peerClient)
           "PeerServerThread").start();
     }
 
-    for (Node node : args.getTrustNodes()){
+    for (Node node : args.getPassiveNodes()){
       trustPeers.put(new InetSocketAddress(node.getHost(), node.getPort()).getAddress() , node);
     }
     logger.info("Trust peer size {}", trustPeers.size());

src/main/java/org/tron/common/utils/Sha256Hash.java

@@ -45,9 +45,6 @@ public class Sha256Hash implements Serializable, Comparable<Sha256Hash> {
 
   private final byte[] bytes;
 
-  private long blockNum;
-
-
   private byte[] generateBlockId(long blockNum, Sha256Hash blockHash) {
     byte[] numBytes = Longs.toByteArray(blockNum);
     byte[] hash = blockHash.getBytes();
@@ -62,22 +59,16 @@ private byte[] generateBlockId(long blockNum, byte[] blockHash) {
     return hash;
   }
 
-  public long getBlockNum(){
-    return blockNum;
-  }
-
   public Sha256Hash(long num, byte[] hash) {
     byte[] rawHashBytes = this.generateBlockId(num, hash);
     checkArgument(rawHashBytes.length == LENGTH);
     this.bytes = rawHashBytes;
-    this.blockNum = num;
   }
 
   public Sha256Hash(long num, Sha256Hash hash) {
     byte[] rawHashBytes = this.generateBlockId(num, hash);
     checkArgument(rawHashBytes.length == LENGTH);
     this.bytes = rawHashBytes;
-    this.blockNum = num;
   }
 
   /**

src/main/java/org/tron/core/config/args/Args.java

@@ -125,7 +125,7 @@ public class Args {
 
   @Getter
   @Setter
-  private List<Node> trustNodes;
+  private List<Node> passiveNodes;
 
   @Getter
   @Setter
@@ -277,7 +277,7 @@ public static void clearParam() {
     INSTANCE.nodeDiscoveryPersist = false;
     INSTANCE.nodeConnectionTimeout = 0;
     INSTANCE.activeNodes = Collections.emptyList();
-    INSTANCE.trustNodes = Collections.emptyList();
+    INSTANCE.passiveNodes = Collections.emptyList();
     INSTANCE.nodeChannelReadTimeout = 0;
     INSTANCE.nodeMaxActiveNodes = 30;
     INSTANCE.nodeMaxActiveNodesWithSameIp = 2;
@@ -414,7 +414,7 @@ public static void setParam(final String[] args, final String confFileName) {
 
     INSTANCE.activeNodes = getNodes(config, "active.node");
 
-    INSTANCE.trustNodes = getNodes(config, "trust.node");
+    INSTANCE.passiveNodes = getNodes(config, "passive.node");
 
     INSTANCE.nodeChannelReadTimeout =
         config.hasPath("node.channel.read.timeout") ? config.getInt("node.channel.read.timeout")

src/main/java/org/tron/core/net/node/NodeImpl.java

@@ -180,7 +180,7 @@ void sendInv() {
       send.forEach((peer, ids) ->
           ids.forEach((key, value) -> {
             if (key.equals(InventoryType.BLOCK)) {
-              value.sort(Comparator.comparingDouble(value1 -> value1.getBlockNum()));
+              value.sort(Comparator.comparingLong(value1 -> new BlockId(value1).getNum()));
             }
             peer.sendMessage(new InventoryMessage(value, key));
           }));
@@ -190,7 +190,7 @@ void sendFetch() {
       send.forEach((peer, ids) ->
           ids.forEach((key, value) -> {
             if (key.equals(InventoryType.BLOCK)) {
-              value.sort(Comparator.comparingDouble(value1 -> value1.getBlockNum()));
+              value.sort(Comparator.comparingLong(value1 -> new BlockId(value1).getNum()));
             }
             peer.sendMessage(new FetchInvDataMessage(value, key));
           }));

src/main/resources/config-backup.conf

@@ -81,13 +81,6 @@ node {
   # Number of validate sign thread, default availableProcessors / 2
   # validateSignThreadNum = 16
 
-  active = [
-    # Initial active peers
-    # Sample entries:
-    # "ip:port",
-    # "ip:port"
-  ]
-
   maxActiveNodes = 30
 
   minParticipationRate = 33

src/main/resources/config-beta.conf

@@ -63,20 +63,6 @@ node {
 
   connection.timeout = 2
 
-  active = [
-    # Sample entries:
-    # { url = "enode://<hex nodeID>@hostname.com:30303" }
-    # {
-    #    ip = hostname.com
-    #    port = 30303
-    #    nodeId = e437a4836b77ad9d9ffe73ee782ef2614e6d8370fcf62191a6e488276e23717147073a7ce0b444d485fff5a0c34c4577251a7a990cf80d8542e21b95aa8c5e6c
-    # }
-    "47.93.9.236:18888",
-    "47.93.33.201:18888",
-    "123.56.10.6:18888",
-    "39.107.80.135:18888",
-    "47.93.184.2:18888"
-  ]
 
   maxActiveNodes = 30
 
@@ -115,6 +101,14 @@ sync {
   node.count = 30
 }
 
+active.node = [
+   "47.93.9.236:18888",
+   "47.93.33.201:18888",
+   "123.56.10.6:18888",
+   "39.107.80.135:18888",
+   "47.93.184.2:18888"
+]
+
 seed.node = {
   # List of the seed nodes
   # Seed nodes are stable full nodes

src/main/resources/config-localtest.conf

@@ -70,13 +70,6 @@ node {
   # Number of validate sign thread, default availableProcessors / 2
   # validateSignThreadNum = 16
 
-  active = [
-    # Initial active peers
-    # Sample entries:
-    # "ip:port",
-    # "ip:port"
-  ]
-
   maxActiveNodes = 30
 
   minParticipationRate = 33

src/main/resources/config.conf

@@ -125,7 +125,7 @@ active.node = [
   # "ip:port"
 ]
 
-trust.node = [
+passive.node = [
   # Passive accept connection in any case
   # Sample entries:
   # "ip:port",