Merge branch 'develop' of github.com:tronprotocol/sun-network into develop

Author: CodeNinjaEvan

documentation/configs/dapp_chain_config.conf

@@ -200,7 +200,7 @@ genesis.block = {
     }
   ]
 
-  
+
   witnesses = [
     {
       address: TGwWqYprTVzrHKPppbWh2ygRxenzaVd1n8,
@@ -225,117 +225,117 @@ genesis.block = {
     {
       address: TGwVggQ9g1WCmSmqfTA7ZjkPs1Y4DUBNCc,
       url = "http://GR5.com",
-      voteCount = 100000005
+      voteCount = 100000000
     },
-        {
+    {
       address: TGwyP5HpSkgpvswaAH42EEK7TAEywvpnbz,
       url = "http://GR6.com",
-      voteCount = 100000006
+      voteCount = 100000005
     },
     {
       address: TGwtVjz1q4LjwPt8tBPAp2bmcQ24QUuoD3,
       url = "http://GR7.com",
-      voteCount = 100000007
+      voteCount = 100000006
     },
     {
       address: TGwpV8exJ6KRDh1bGutiK4zqX3YUgx84fY,
       url = "http://GR8.com",
-      voteCount = 100000008
+      voteCount = 100000007
     },
     {
       address: TGw2DDmN4pFTZZH19YUws6zjSxtAjF1J1Z,
       url = "http://GR9.com",
-      voteCount = 100000009
+      voteCount = 100000008
     },
     {
       address: TGwdzvWgtFtWfokztmm2C8gKZ6Wy5LS1QM,
       url = "http://GR10.com",
-      voteCount = 100000010
+      voteCount = 100000009
     },
     {
       address: TGwakxa5dYJnUEe61NBfVeJjrfdSLdBnmS,
       url = "http://GR11.com",
-      voteCount = 100000011
+      voteCount = 100000010
     },
     {
       address: TGw2FiPghKpcA4jFSJ9xuTvokjd2XMU84A,
       url = "http://GR12.com",
-      voteCount = 100000012
+      voteCount = 100000011
     },
     {
       address: TGwrDBzHbPPEfuFDjyTCXdApKkPP1PFvt1,
       url = "http://GR13.com",
-      voteCount = 100000013
+      voteCount = 100000012
     },
     {
       address: TGwpJX4ZBNN3yhbr6pZcSybyHE3GF5MTvR,
       url = "http://GR14.com",
-      voteCount = 100000014
+      voteCount = 100000013
     },
     {
       address: TGwJLJPCyCWD9fz2iZnJdJ9ngKPgYNnf8z,
       url = "http://GR15.com",
-      voteCount = 100000015
+      voteCount = 100000014
     },
     {
       address: TGwAsyoraydBMyw4UrbzbhTTtJDSiDfyDF,
       url = "http://GR16.com",
-      voteCount = 100000016
+      voteCount = 100000015
     },
     {
       address: TGwsdeL94NehAtQWZghTHUDZR6Z7NeoKu9,
       url = "http://GR17.com",
-      voteCount = 100000017
+      voteCount = 100000016
     },
     {
       address: TGwaFna84yuCF1k3poegzZasnnLRYpdLbw,
       url = "http://GR18.com",
-      voteCount = 100000018
+      voteCount = 100000017
     },
     {
       address: TGw79qBZMweZWFtNvzbib2UMnAgcxXpz5h,
       url = "http://GR19.com",
-      voteCount = 100000019
+      voteCount = 100000018
     },
     {
       address: TGwq2Vib3p9FQmGasxw8pHKsYx5xGnuC2b,
       url = "http://GR20.com",
-      voteCount = 100000020
+      voteCount = 100000019
     },
     {
       address: TGwr5e716rm2LC4KBAcZhP8ScaZJ8Wf1v2,
       url = "http://GR21.com",
-      voteCount = 100000021
+      voteCount = 100000020
     },
     {
       address: TGwLbzvMTrEQwEAorAWEEVbYcJ2A6VXbjB,
       url = "http://GR22.com",
-      voteCount = 100000022
+      voteCount = 100000021
     },
     {
       address: TGwcrJ4i4izNpCqFDceDGB5qFuaFBzVnmx,
       url = "http://GR23.com",
-      voteCount = 100000023
+      voteCount = 100000022
     },
     {
       address: TGw8ntNZ6h1urtVLMYdPyS7HFT6egAgDGv,
       url = "http://GR24.com",
-      voteCount = 100000024
+      voteCount = 100000023
     },
     {
       address: TGwUJvgHUvHAQHt6TX4ruY33zDCmeTNJaP,
       url = "http://GR25.com",
-      voteCount = 100000025
+      voteCount = 100000024
     },
     {
       address: TGwdnDTUfkbDWZdGKsFBFyNdz6NcURZzX9,
       url = "http://GR26.com",
-      voteCount = 100000026
+      voteCount = 100000025
     },
     {
       address: TGwiUsm2NcG27kDwNkQ7d5EkBprrtAfMxE,
       url = "http://GR27.com",
-      voteCount = 100000027
+      voteCount = 100000026
     }
   ]