Merge branch 'develop' into fix_unittest_fork

Author: Yrp

src/main/java/org/tron/core/Constant.java

@@ -27,11 +27,12 @@ public class Constant {
   public static final String BLOCK_DB_NAME = "block_data";
   public static final String TRANSACTION_DB_NAME = "transaction_data";
 
-  //config
-  public static final String NORMAL = "normal";
-  public static final String TEST = "test";
-  public static final String NORMAL_CONF = "config.conf";
+  //config for testnet, mainnet, beta
+  public static final String TESTNET_CONF = "config.conf";
+
+  //config for junit test
   public static final String TEST_CONF = "config-test.conf";
+  
   public static final String DATABASE_DIR = "storage.directory";
 
   public static final byte ADD_PRE_FIX_BYTE_MAINNET = (byte) 0xa1;   //a1 + address  ,a1 is version

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

@@ -19,10 +19,15 @@
 package org.tron.core.config;
 
 import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isNoneBlank;
 
 import com.typesafe.config.ConfigFactory;
+
 import java.io.File;
+import java.io.FileNotFoundException;
+
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.ResourceUtils;
 
 @Slf4j
 public class Configuration {
@@ -32,29 +37,36 @@ public class Configuration {
   /**
    * Get configuration by a given path.
    *
-   * @param configurationPath path to configuration file
+   * @param confFileName path to configuration file
    * @return loaded configuration
    */
-  public static com.typesafe.config.Config getByPath(final String configurationPath) {
-    if (isBlank(configurationPath)) {
-      throw new IllegalArgumentException("Configuration path is required!");
+  public static com.typesafe.config.Config getByFileName(final String shellConfFileName, final String confFileName) {
+    if (isNoneBlank(shellConfFileName)) {
+      File shellConfFile = new File(shellConfFileName);
+      resolveConfigFile(shellConfFileName, shellConfFile);
+      return config;
     }
 
-    File confFile = new File(configurationPath);
-    if (confFile.exists()) {
-      config = ConfigFactory.parseFile(new File(configurationPath));
+    if (isBlank(confFileName)) {
+      throw new IllegalArgumentException("Configuration path is required!");
     } else {
-      config = ConfigFactory.load(configurationPath);
+      File confFile = new File(confFileName);
+      resolveConfigFile(confFileName, confFile);
+      return config;
     }
-    return config;
   }
 
-  public static com.typesafe.config.Config getByFile(final File confFile) {
-    if (!confFile.exists()) {
-      throw new IllegalArgumentException("Configuration path is required!");
+  private static void resolveConfigFile(String fileName, File confFile) {
+    if (confFile.exists()) {
+      config = ConfigFactory.parseFile(confFile);
+    } else {
+      try {
+        ResourceUtils.getFile("classpath:" + fileName);
+      } catch (FileNotFoundException e) {
+        throw new IllegalArgumentException("Configuration path is required! No Such file " + fileName);
+      }
+      config = ConfigFactory.load(fileName);
     }
-    config = ConfigFactory.parseFile(confFile);
-    return config;
   }
 }
 

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

@@ -49,7 +49,7 @@ public class Args {
   private static final Args INSTANCE = new Args();
 
   @Parameter(names = {"-c", "--config"}, description = "Config File")
-  private String confFile = "";
+  private String shellConfFileName = "";
 
   @Parameter(names = {"-d", "--output-directory"}, description = "Directory")
   private String outputDirectory = "output-directory";
@@ -198,15 +198,9 @@ public static void clearParam() {
   /**
    * set parameters.
    */
-  public static void setParam(final String[] args, final String configFilePath) {
-    Config config;
+  public static void setParam(final String[] args, final String confFileName) {
     JCommander.newBuilder().addObject(INSTANCE).build().parse(args);
-    File confFile = new File(INSTANCE.confFile);
-    if (confFile.exists()) {
-      config = Configuration.getByFile(confFile);
-    } else {
-      config = Configuration.getByPath(configFilePath);
-    }
+    Config config = Configuration.getByFileName(INSTANCE.shellConfFileName, confFileName);
     if (StringUtils.isNoneBlank(INSTANCE.privateKey)) {
       INSTANCE.setLocalWitnesses(new LocalWitnesses(INSTANCE.privateKey));
       logger.debug("Got privateKey from cmd");

src/main/java/org/tron/program/FullNode.java

@@ -19,7 +19,7 @@ public class FullNode {
    */
   public static void main(String[] args) throws InterruptedException {
     logger.info("Full node running.");
-    Args.setParam(args, Constant.NORMAL_CONF);
+    Args.setParam(args, Constant.TESTNET_CONF);
     Args cfgArgs = Args.getInstance();
 
     ApplicationContext context = new AnnotationConfigApplicationContext(DefaultConfig.class);

src/main/java/org/tron/program/SolidityNode.java

@@ -90,7 +90,7 @@ private void start(Args cfgArgs) {
    */
   public static void main(String[] args) throws InterruptedException {
     logger.info("Solidity node running.");
-    Args.setParam(args, Constant.NORMAL_CONF);
+    Args.setParam(args, Constant.TESTNET_CONF);
     Args cfgArgs = Args.getInstance();
 
     if (StringUtils.isEmpty(cfgArgs.getTrustNodeAddr())) {

src/main/resources/config-beta.conf

@@ -0,0 +1,137 @@
+net {
+  # type = mainnet
+  type = testnet
+}
+
+storage {
+  # Directory for storing persistent data
+  directory = "database"
+}
+
+node.discovery = {
+  enable = true
+  persist = true
+  bind.ip = ""
+  external.ip = null
+}
+
+node {
+  # trust node for solidity node
+  trustNode = "47.93.9.236:50051"
+
+  listen.port = 18888
+
+  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
+
+  p2p {
+    version = 102 # 47: testnet; 101: debug
+  }
+
+}
+
+sync {
+  node.count = 30
+}
+
+seed.node = {
+  # List of the seed nodes
+  # Seed nodes are stable full nodes
+  # example:
+  # ip.list = [
+  #   "ip:port",
+  #   "ip:port"
+  # ]
+  ip.list = [
+    "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"
+  ]
+}
+
+genesis.block = {
+# Reserve balance
+  assets = [
+    # the account of foundation.
+    {
+      accountName = "Zion"
+      accountType = "AssetIssue"
+      address = "a055ddae14564f82d5b94c7a131b5fcfd31ad6515a"
+      balance = "25000000000000000"
+    },
+
+    # the account of payment
+    {
+      accountName = "Sun"
+      accountType = "AssetIssue"
+      address = "a04948c2e8a756d9437037dcd8c7e0c73d560ca38d"
+      balance = "10000000000000000"
+    },
+
+    # the account of coin burn
+    {
+      accountName = "Blackhole"
+      accountType = "AssetIssue"
+      address = "a0548794500882809695a8a687866e76d4271a146a"
+      balance = "-9223372036854775808"
+    }
+  ]
+
+  witnesses = [
+    {
+      address: A00BE88A918D74D0DFD71DC84BD4ABF036D0562991
+      url = "http://Mercury.org",
+      voteCount = 105
+    },
+    {
+      address: A0BAFB56091591790E00AA05EADDCC7DC1474B5D4B
+      url = "http://Venus.org",
+      voteCount = 104
+    },
+    {
+      address: A03ED7D77D2EB807375A34E1A0043C5BA7E8926265
+      url = "http://Earth.org",
+      voteCount = 103
+    },
+    {
+     address: A0F2FB1E7E5DB5C29D6E25E1AA00F54760BD58BBAB
+     url = "http://Mars.org",
+     voteCount = 102
+    },
+    {
+     address: A0E4A9010332BF2BCDF5155841B24348D1E292CF5B
+     url = "http://Jupiter.org",
+     voteCount = 101
+    }
+  ]
+
+  timestamp = "0" #2017-8-26 12:00:00
+
+  parentHash = "0x0000000000000000000000000000000000000000000000000000000000000000"
+}
+
+localwitness = [
+
+]
+
+block = {
+  needSyncCheck = true # first node : false, other : true
+}