Merge pull request #774 from tronprotocol/set_witness_count

Set max active witness number to 27

Author: renchenchang

src/main/java/org/tron/core/config/Parameter.java

@@ -9,9 +9,9 @@ interface ChainConstant {
     long VOTE_WITNESS_FEE = 10000; // 10000 drop
     long CREATE_ACCOUNT_FEE = 10000; // 10000 drop
     long WITNESS_PAY_PER_BLOCK = 32000000;  // 32trx
-    double SOLIDIFIED_THRESHOLD = 0.6;
+    double SOLIDIFIED_THRESHOLD = 0.7;
     int PRIVATE_KEY_LENGTH = 64;
-    int MAX_ACTIVE_WITNESS_NUM = 15;
+    int MAX_ACTIVE_WITNESS_NUM = 27;
     int TRXS_SIZE = 2_000_000; // < 2MiB
     int BLOCK_PRODUCED_INTERVAL = 3000; //ms,produce block period, must be divisible by 60. millisecond
     long CLOCK_MAX_DELAY = 3600 * 1000; //ms

src/main/resources/config.conf

@@ -42,12 +42,12 @@ node {
     # "ip:port"
   ]
 
-  maxActiveNodes = 20
+  maxActiveNodes = 30
 
   minParticipationRate = 33
 
   p2p {
-    version = 64 # 64: testnet; 101: debug
+    version = 65 # 65: testnet; 101: debug
   }
 
 }
@@ -88,7 +88,7 @@ genesis.block = {
       accountName = "Devaccount"
       accountType = "AssetIssue"
       address = "27d3byPxZXKQWfXX7sJvemJJuv5M65F3vjS"
-      balance = "10000000000000000"
+      balance = "75000000000000000"
     },
     {
       accountName = "Zion"
@@ -112,59 +112,144 @@ genesis.block = {
 
   witnesses = [
     {
-      address: 27cEZa99jVaDkujPwzZuHYgkYNqv6zzYLSP
-      url = "http://Mercury.org",
-      voteCount = 105
+      address: 27PxykS4kNvH8wAkTLmVFrjUY3XMVif1mCT,
+      url= "http://Alioth.com",
+      voteCount = 0
+    },
+    {
+      address: 27g8LmoFZqreoGA7DXMBACYUrtHJhwDtRN8,
+      url= "http://Aries.com",
+      voteCount = 0
+    },
+    {
+      address: 27gxPESdqo13bbmsUymAS56NSWBVYwRcGPD,
+      url= "http://Cancer.com",
+      voteCount = 0
+    },
+    {
+      address: 27gMPgPAqoD81px3dCGzaSskBxD2P8hnoUX,
+      url= "http://Capricorn.com",
+      voteCount = 0
+    },
+    {
+      address: 27SHRr2cEpY7sqyMqHD8aq1nkgziPZs7WPi,
+      url= "http://Cassiopeia.com",
+      voteCount = 0
+    },
+    {
+      address: 27SmZHo9VuLanV9ki3rCQUcsLM3uSAhd7Wf,
+      url= "http://Crux.com",
+      voteCount = 0
+    },
+    {
+      address: 27QPMhs5Yp7bUwm8E49As42NSTEzk2NS9RX,
+      url= "http://Delphinus.com",
+      voteCount = 0
+    },
+    {
+      address: 27YYha9VR2V2YrBxeVWESCyg5GtSsk5GRa1,
+      url= "http://Dorado.com",
+      voteCount = 0
+    },
+    {
+      address: 27ZczAb5knuHj6vdMTdkJbLFmfKLvPW7GsA,
+      url= "http://Dubhe.com",
+      voteCount = 0
+    },
+    {
+      address: 27heA398dbFCPK1Th1LZfk2qr9zQVT9ULwW,
+      url= "http://Eridanus.com",
+      voteCount = 0
+    },
+    {
+      address: 27Zu6f5dV99wqLSpz9udzn5TMG8XZPJpVog,
+      url= "http://Gemini.com",
+      voteCount = 0
+    },
+    {
+      address: 27WEvZPj4MTjgFVgftuZHwXDZ4GvERJ1EBT,
+      url= "http://Hercules.com",
+      voteCount = 0
+    },
+    {
+      address: 27fuGHVLq7d6S45UBtpUNvezHa3mzZN1ZhT,
+      url= "http://Leo.com",
+      voteCount = 0
+    },
+    {
+      address: 27gGphfLygRpiMTjwquk2hfBqYKByr1x3YF,
+      url= "http://Libra.com",
+      voteCount = 0
+    },
+    {
+      address: 27mAGvEWMHdiEg3xPyQXJZiPko4E7DaNyNW,
+      url= "http://Lupus.com",
+      voteCount = 0
+    },
+    {
+      address: 27QxTvaLoGfg6Tor9C5wYrar1Uq4nYhnA8N,
+      url= "http://Lyra.com",
+      voteCount = 0
+    },
+    {
+      address: 27Yj5prhYkM2PSWyXjhKV6MQmPD7hdsnAio,
+      url= "http://Monoceros.com",
+      voteCount = 0
+    },
+    {
+      address: 27ecHtfLXQE6J6FKG7UdDpfpAJkaKwqCdZ8,
+      url= "http://Norma.com",
+      voteCount = 0
     },
     {
-      address: 27anh4TDZJGYpsn4BjXzb7uEArNALxwiZZW
-      url = "http://Venus.org",
-      voteCount = 104
+      address: 27ULHaikTqKxmC9sYtauy3i6wuf1Rf2facG,
+      url= "http://Orion.com",
+      voteCount = 0
     },
     {
-      address: 27Wkfa5iEJtsKAKdDzSmF1b2gDm5s49kvdZ
-      url = "http://Earth.org",
-      voteCount = 103
+      address: 27ioeNwMjNNtAvqiBSWHkMSyAhDpszRWibh,
+      url= "http://Pavo.com",
+      voteCount = 0
     },
     {
-      address: 27bqKYX9Bgv7dgTY7xBw5SUHZ8EGaPSikjx
-      url = "http://Mars.org",
-      voteCount = 102
+      address: 27fuyWmVArGDfQ8TS3NvzunN19ZJjxSV1Dx,
+      url= "http://Perseus.com",
+      voteCount = 0
     },
     {
-      address: 27fASUY6qKtsaAEPz6QxhZac2KYVz2ZRTXW
-      url = "http://Jupiter.org",
-      voteCount = 101
+      address: 27RPg4Mx1MVZPpmfaJgRQWksqAgySQ3HaRU,
+      url= "http://Phecda.com",
+      voteCount = 0
     },
     {
-      address: 27Q3RSbiqm59VXcF8shQWHKbyztfso5FwvP
-      url = "http://Saturn.org",
-      voteCount = 100
+      address: 27SwT5aMxZKRoysXMLwZb9HziJZHEwu7Bpv,
+      url= "http://Phoenix.com",
+      voteCount = 0
     },
     {
-      address: 27YkUVSuvCK3K84DbnFnxYUxozpi793PTqZ
-      url = "http://Uranus.org",
-      voteCount = 99
+      address: 27Uqj6VqqasApPBZgnB9qows3GkKUZ7wJai,
+      url= "http://Pyxis.com",
+      voteCount = 0
     },
     {
-      address: 27kdTBTDJ16hK3Xqr8PpCuQJmje1b94CDJU
-      url = "http://Neptune.org",
-      voteCount = 98
+      address: 27hCKyn6oZR8EVadSximYAyeE279okY9oqp,
+      url= "http://Scutum.com",
+      voteCount = 0
     },
     {
-      address: 27mw9UpRy7inTMQ5kUzsdTc2QZ6KvtCX4uB
-      url = "http://Pluto.org",
-      voteCount = 97
+      address: 27WHVfnh7AZCzga3w8UP9psoVRd9J2Cghkd,
+      url= "http://Taurus.com",
+      voteCount = 0
     },
     {
-      address: 27QzC4PeQZJ2kFMUXiCo4S8dx3VWN5U9xcg
-      url = "http://Altair.org",
-      voteCount = 96
+      address: 27b8A6vaakeCEqQ6a6uVPLKSeyUAUsuin6i,
+      url= "http://Volans.com",
+      voteCount = 0
     },
     {
-      address: 27VZHn9PFZwNh7o2EporxmLkpe157iWZVkh
-      url = "http://AlphaLyrae.org",
-      voteCount = 95
+      address: 27fA4k6h3XLxTiC63Ke4c5YeEuwgM7d2toV,
+      url= "http://Vulpecula.com",
+      voteCount = 0
     }
   ]