Merge branch 'feature/change_fee' into develop

Author: CodeNinjaEvan

Dockerfile

@@ -0,0 +1,11 @@
+FROM tronprotocol/tron-gradle
+
+RUN set -o errexit -o nounset \
+    && echo "git clone" \
+    && git clone https://github.com/tronprotocol/java-tron.git \
+    && cd java-tron \
+    && gradle build
+
+WORKDIR /java-tron
+
+EXPOSE 18888

docker/Dockerfile

@@ -1,11 +1,15 @@
-FROM tronprotocol/centos7-jdk8
-MAINTAINER tronprotocol
+FROM tronprotocol/tron-gradle
 
-# Install dependencies && Download java-tron
-RUN yum update -y && \
-	yum install -y git && \
-	git clone https://github.com/tronprotocol/java-tron.git /home/java-tron
+RUN set -o errexit -o nounset \
+#  Download and build java-tron
+    && echo "git clone" \
+    && git clone https://github.com/tronprotocol/java-tron.git \
+    && cd java-tron \
+    && gradle build
 
 # Change work directory
-WORKDIR /home/java-tron
+WORKDIR /java-tron
+
+# open port 18888
+EXPOSE 18888
 

docker/README.md

@@ -6,12 +6,12 @@
 
 ```shell
 > cd java-tron/docker
-> docker build -t tron-test .
+> docker image build -t tron-node .
 ```
 
 **Run built image（refer to the home page）**
 
 ```shell
-> docker run -it tron-test
-> ./gradlew run -Pserver=true
+> docker container run -p 18888:18888 -p 50051:50051 -it tronprotocol/tron-node /bin/bash
+> ./gradlew run -Pwitness
 ```

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

@@ -21,6 +21,7 @@
 import static org.apache.commons.lang3.StringUtils.isBlank;
 
 import com.typesafe.config.ConfigFactory;
+import java.io.File;
 
 public class Configuration {
 
@@ -38,9 +39,13 @@ public static com.typesafe.config.Config getByPath(final String configurationPat
     }
 
     if (config == null) {
-      config = ConfigFactory.load(configurationPath);
+      File confFile = new File(configurationPath);
+      if (confFile.exists()) {
+        config = ConfigFactory.parseFile(new File(configurationPath));
+      } else {
+        config = ConfigFactory.load(configurationPath);
+      }
     }
-
     return config;
   }
 }

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

@@ -4,6 +4,7 @@
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
+import com.typesafe.config.Config;
 import com.typesafe.config.ConfigObject;
 import java.io.BufferedReader;
 import java.io.File;
@@ -32,6 +33,7 @@
 import org.springframework.stereotype.Component;
 import org.tron.common.crypto.ECKey;
 import org.tron.common.overlay.discover.Node;
+import org.tron.core.config.Configuration;
 
 @Slf4j
 @NoArgsConstructor
@@ -40,6 +42,9 @@ public class Args {
 
   private static final Args INSTANCE = new Args();
 
+  @Parameter(names = {"-c", "--config"}, description = "Config File")
+  private String confFile = "";
+
   @Parameter(names = {"-d", "--output-directory"}, description = "Directory")
   private String outputDirectory = "output-directory";
 
@@ -175,10 +180,14 @@ public static void clearParam() {
   /**
    * set parameters.
    */
-  public static void setParam(final String[] args, final com.typesafe.config.Config config) {
-
+  public static void setParam(final String[] args, final String configFile) {
+    Config config;
     JCommander.newBuilder().addObject(INSTANCE).build().parse(args);
-
+    if ("" == INSTANCE.confFile) {
+      config = Configuration.getByPath(configFile);
+    } else {
+      config = Configuration.getByPath(INSTANCE.confFile);
+    }
     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

@@ -6,19 +6,20 @@
 import org.tron.common.application.Application;
 import org.tron.common.application.ApplicationFactory;
 import org.tron.core.Constant;
-import org.tron.core.config.Configuration;
 import org.tron.core.config.DefaultConfig;
 import org.tron.core.config.args.Args;
 import org.tron.core.services.RpcApiService;
 import org.tron.core.services.WitnessService;
 
 @Slf4j
 public class FullNode {
+
   /**
    * Start the FullNode.
    */
   public static void main(String[] args) throws InterruptedException {
-    Args.setParam(args, Configuration.getByPath(Constant.NORMAL_CONF));
+
+    Args.setParam(args, Constant.NORMAL_CONF);
     Args cfgArgs = Args.getInstance();
 
     ApplicationContext context = new AnnotationConfigApplicationContext(DefaultConfig.class);
@@ -27,7 +28,6 @@ public static void main(String[] args) throws InterruptedException {
       logger.info("Here is the help message.");
       return;
     }
-    logger.info("Here is the help message." + cfgArgs.getOutputDirectory());
     Application appT = ApplicationFactory.create(context);
     //appT.init(cfgArgs);
     RpcApiService rpcApiService = new RpcApiService(appT);
@@ -39,7 +39,6 @@ public static void main(String[] args) throws InterruptedException {
     appT.startServices();
     appT.startup();
 
-
     rpcApiService.blockUntilShutdown();
   }
 }

src/test/java/org/tron/common/storage/leveldb/LevelDbDataSourceImplTest.java

@@ -32,18 +32,18 @@
 import org.junit.Test;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.FileUtil;
-import org.tron.core.config.Configuration;
 import org.tron.core.config.args.Args;
 
 @Slf4j
 public class LevelDbDataSourceImplTest {
+
   private static final String dbPath = "output-levelDb-test";
   LevelDbDataSourceImpl dataSourceTest;
 
   @Before
   public void initDb() {
     Args.setParam(new String[]{"--output-directory", dbPath},
-        Configuration.getByPath("config-junit.conf"));
+        "config-junit.conf");
     dataSourceTest = new LevelDbDataSourceImpl(dbPath + File.separator,
         "test_levelDb");
   }

src/test/java/org/tron/core/BlockUtilTest.java

@@ -25,17 +25,17 @@
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.capsule.utils.BlockUtil;
-import org.tron.core.config.Configuration;
 import org.tron.core.config.args.Args;
 import org.tron.protos.Protocol.Block;
 import org.tron.protos.Protocol.BlockHeader;
 import org.tron.protos.Protocol.BlockHeader.raw;
 
 @Slf4j
 public class BlockUtilTest {
+
   @Before
   public void initConfiguration() {
-    Args.setParam(new String[]{}, Configuration.getByPath(Constant.TEST_CONF));
+    Args.setParam(new String[]{}, Constant.TEST_CONF);
   }
 
   @After

src/test/java/org/tron/core/actuator/AssetIssueActuatorTest.java

@@ -16,7 +16,6 @@
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.AssetIssueCapsule;
 import org.tron.core.capsule.TransactionResultCapsule;
-import org.tron.core.config.Configuration;
 import org.tron.core.config.Parameter.ChainConstant;
 import org.tron.core.config.args.Args;
 import org.tron.core.db.Manager;
@@ -49,7 +48,7 @@ public class AssetIssueActuatorTest {
   @BeforeClass
   public static void init() {
     Args.setParam(new String[]{"--output-directory", dbPath},
-        Configuration.getByPath("config-junit.conf"));
+        "config-junit.conf");
     dbManager = new Manager();
     dbManager.init();
   }

src/test/java/org/tron/core/actuator/CreateAccountActuatorTest.java

@@ -13,7 +13,6 @@
 import org.tron.common.utils.FileUtil;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.TransactionResultCapsule;
-import org.tron.core.config.Configuration;
 import org.tron.core.config.args.Args;
 import org.tron.core.db.Manager;
 import org.tron.core.exception.ContractExeException;
@@ -24,6 +23,7 @@
 
 @Slf4j
 public class CreateAccountActuatorTest {
+
   private static Manager dbManager;
   private static Any contract;
   private static final String dbPath = "output_CreateAccountTest";
@@ -39,7 +39,7 @@ public class CreateAccountActuatorTest {
   @BeforeClass
   public static void init() {
     Args.setParam(new String[]{"--output-directory", dbPath},
-        Configuration.getByPath("config-junit.conf"));
+        "config-junit.conf");
     dbManager = new Manager();
     dbManager.init();
   }