feat(db): enrich fullNode command-line-options

 1. support the --solidity for SolidityNode

Author: halibobo1205

common/src/main/java/org/tron/common/parameter/CommonParameter.java

@@ -205,6 +205,7 @@ public class CommonParameter {
   //If you are running a solidity node for java tron, this flag is set to true
   @Getter
   @Setter
+  @Parameter(names = {"--solidity"}, description = "running a solidity node for java tron")
   public boolean solidityNode = false;
   @Getter
   @Setter

framework/build.gradle

@@ -219,13 +219,11 @@ startScripts.enabled = false
 run.enabled = false
 tasks.distTar.enabled = false
 
-createScript(project, 'org.tron.program.SolidityNode', 'SolidityNode')
 createScript(project, 'org.tron.program.FullNode', 'FullNode')
 createScript(project, 'org.tron.program.KeystoreFactory', 'KeystoreFactory')
 createScript(project, 'org.tron.program.DBConvert', 'DBConvert')
 
 def releaseBinary = hasProperty('binaryRelease') ? getProperty('binaryRelease') : 'true'
-def skipSolidity = hasProperty('skipSolidity') ? true : false
 def skipKeystore = hasProperty('skipKeystore') ? true : false
 def skipConvert = hasProperty('skipConvert') ? true : false
 def skipAll = hasProperty('skipAll') ? true : false
@@ -234,10 +232,6 @@ if (releaseBinary == 'true') {
         archives(binaryRelease('buildFullNodeJar', 'FullNode', 'org.tron.program.FullNode'))
     }
     if (!skipAll) {
-        if (!skipSolidity) {
-            artifacts {
-                archives(binaryRelease('buildSolidityNodeJar', 'SolidityNode', 'org.tron.program.SolidityNode'))}
-        }
         if (!skipKeystore) {
             artifacts {
                 archives(binaryRelease('buildKeystoreFactoryJar', 'KeystoreFactory', 'org.tron.program.KeystoreFactory'))}

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

@@ -342,7 +342,7 @@ private static String getCommitIdAbbrev() {
 
   private static Map<String, String[]> getOptionGroup() {
     String[] tronOption = new String[] {"version", "help", "shellConfFileName", "logbackPath",
-        "eventSubscribe"};
+        "eventSubscribe", "solidityNode"};
     String[] dbOption = new String[] {"outputDirectory"};
     String[] witnessOption = new String[] {"witness", "privateKey"};
     String[] vmOption = new String[] {"debug"};

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

@@ -21,12 +21,16 @@ public class FullNode {
    */
   public static void main(String[] args) {
     ExitManager.initExceptionHandler();
-    logger.info("Full node running.");
     Args.setParam(args, Constant.TESTNET_CONF);
     CommonParameter parameter = Args.getInstance();
 
     LogService.load(parameter.getLogbackPath());
 
+    if (parameter.isSolidityNode()) {
+      SolidityNode.run();
+      return;
+    }
+    logger.info("Full node running.");
     if (Args.getInstance().isDebug()) {
       logger.info("in debug mode, it won't check energy time");
     } else {

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

@@ -5,21 +5,17 @@
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.atomic.AtomicLong;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.util.ObjectUtils;
 import org.tron.common.application.Application;
 import org.tron.common.application.ApplicationFactory;
 import org.tron.common.application.TronApplicationContext;
 import org.tron.common.client.DatabaseGrpcClient;
-import org.tron.common.exit.ExitManager;
 import org.tron.common.parameter.CommonParameter;
 import org.tron.common.prometheus.Metrics;
 import org.tron.core.ChainBaseManager;
-import org.tron.core.Constant;
 import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.config.DefaultConfig;
-import org.tron.core.config.args.Args;
 import org.tron.core.db.Manager;
 import org.tron.core.exception.TronError;
 import org.tron.protos.Protocol.Block;
@@ -55,25 +51,12 @@ public SolidityNode(Manager dbManager) {
   /**
    * Start the SolidityNode.
    */
-  public static void main(String[] args) {
-    ExitManager.initExceptionHandler();
+  public static void run() {
     logger.info("Solidity node is running.");
-    Args.setParam(args, Constant.TESTNET_CONF);
     CommonParameter parameter = CommonParameter.getInstance();
-
-    logger.info("index switch is {}",
-        BooleanUtils.toStringOnOff(BooleanUtils
-            .toBoolean(parameter.getStorage().getIndexSwitch())));
-
     if (ObjectUtils.isEmpty(parameter.getTrustNodeAddr())) {
-      logger.error("Trust node is not set.");
-      return;
-    }
-    parameter.setSolidityNode(true);
-
-    if (parameter.isHelp()) {
-      logger.info("Here is the help message.");
-      return;
+      throw new TronError(new IllegalArgumentException("Trust node is not set."),
+          TronError.ErrCode.SOLID_NODE_INIT);
     }
     // init metrics first
     Metrics.init();

framework/src/test/java/org/tron/core/config/args/ArgsTest.java

@@ -57,7 +57,7 @@ public void destroy() {
 
   @Test
   public void get() {
-    Args.setParam(new String[] {"-c", Constant.TEST_CONF}, Constant.TESTNET_CONF);
+    Args.setParam(new String[] {"-c", Constant.TEST_CONF, "--solidity"}, Constant.TESTNET_CONF);
 
     CommonParameter parameter = Args.getInstance();
 
@@ -127,6 +127,8 @@ public void get() {
     Assert.assertEquals(address,
         ByteArray.toHexString(Args.getLocalWitnesses()
             .getWitnessAccountAddress(CommonParameter.getInstance().isECKeyCryptoEngine())));
+
+    Assert.assertTrue(parameter.isSolidityNode());
   }
 
   @Test