CLI refactoring

modAionImpl/build.gradle

@@ -18,6 +18,7 @@ dependencies {
     compile project(':aion_api')
     compile project(':aion_fastvm/modFastVM')
     compile files('../lib/libJson.jar')
+    compile 'info.picocli:picocli:3.6.1'
 
     testCompile project(path: ':modDbImpl', configuration: 'testClassesOut')
     testCompile 'junit:junit:4.12'

modAionImpl/build.xml

@@ -32,6 +32,7 @@
         <pathelement location="${dir.lib}/logback-core-1.2.3.jar"/>
         <pathelement location="${dir.lib}/commons-collections4-4.0.jar"/>
         <pathelement location="${dir.lib}/libJson.jar"/>
+        <pathelement location="${dir.lib}/picocli-3.5.1.jar"/>
         <pathelement location="${dir.mod}/modAionImpl.jar"/>
         <pathelement location="${dir.mod}/modMcf.jar"/>
         <pathelement location="${dir.mod}/modCrypto.jar"/>
@@ -95,7 +96,7 @@
             <fileset dir="../native/linux/equihash"/>
         </copy>
 
-        <junit printsummary="on" haltonfailure="yes" fork="true">
+        <junit printsummary="on" haltonfailure="yes" fork="true" showoutput="yes">
             <classpath>
                 <path refid="classpath.test"/>
                 <path refid="classpath.dependency"/>
@@ -124,7 +125,7 @@
             <fileset dir="../native/linux/equihash"/>
         </copy>
 
-        <junit printsummary="on" haltonfailure="no" fork="true">
+        <junit printsummary="on" haltonfailure="no" fork="true" showoutput="yes">
             <classpath>
                 <path refid="classpath.test"/>
                 <path refid="classpath.dependency"/>
@@ -162,7 +163,7 @@
                 <pathelement location="${dir.mod}/modDbImpl.jar"/>
                 <pathelement location="${dir.mod}/modAion.jar"/>
                 <pathelement location="${dir.mod}/modTxPool.jar"/>
-	        <pathelement location="${dir.mod}/modVM.jar"/>
+                <pathelement location="${dir.mod}/modVM.jar"/>
                 <pathelement location="${dir.mod}/modFastVM.jar"/>
                 <pathelement location="${dir.mod}/modPrecompiled.jar"/>
                 <pathelement location="${dir.lib}/libJson.jar"/>
@@ -171,6 +172,7 @@
                 <pathelement location="${dir.lib}/guava-25.1-jre.jar"/>
                 <pathelement location="${dir.lib}/libnsc.jar"/>
                 <pathelement location="${dir.lib}/slf4j-api-1.7.25.jar"/>
+                <pathelement location="${dir.lib}/picocli-3.5.1.jar"/>
             </modulepath>
         </javac>
 

modAionImpl/src/org/aion/zero/impl/cli/Arguments.java

@@ -0,0 +1,261 @@
+/*
+ * Copyright (c) 2017-2018 Aion foundation.
+ *
+ *     This file is part of the aion network project.
+ *
+ *     The aion network project is free software: you can redistribute it
+ *     and/or modify it under the terms of the GNU General Public License
+ *     as published by the Free Software Foundation, either version 3 of
+ *     the License, or any later version.
+ *
+ *     The aion network project is distributed in the hope that it will
+ *     be useful, but WITHOUT ANY WARRANTY; without even the implied
+ *     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *     See the GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with the aion network project source files.
+ *     If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Contributors:
+ *     Aion foundation.
+ */
+package org.aion.zero.impl.cli;
+
+import java.util.ArrayList;
+import java.util.List;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+
+/**
+ * Command line arguments for the Aion kernel.
+ *
+ * @author Alexandra Roatis
+ */
+@Command(name = "./aion.sh", separator = " ", sortOptions = false, abbreviateSynopsis = true)
+public class Arguments {
+
+    // usage information
+    @Option(
+            names = {"-h", "--help"},
+            usageHelp = true,
+            description = "display help information")
+    private boolean help = false;
+
+    // account management
+    @Option(
+            names = {"ac", "-a create", "--account create"},
+            description = "create a new account")
+    private boolean createAccount = false;
+
+    @Option(
+            names = {"al", "-a list", "--account list"},
+            description = "list all existing accounts")
+    private boolean listAccounts = false;
+
+    @Option(
+            names = {"ae", "-a export", "--account export"},
+            paramLabel = "<account>",
+            description = "export private key of an account")
+    private String exportAccount = null;
+
+    @Option(
+            names = {"ai", "-a import", "--account import"},
+            paramLabel = "<key>",
+            description = "import private key")
+    private String importAccount = null;
+
+    // config generation
+    @Option(
+            names = {"-c", "--config"},
+            arity = "0..1",
+            paramLabel = "<network>",
+            description =
+                    "create config for the selected network\noptions: mainnet, conquest, mastery")
+    private String config = null;
+
+    // get information and version
+    @Option(
+            names = {"-i", "--info"},
+            description = "display information")
+    private boolean info = false;
+
+    @Option(
+            names = {"-v"},
+            description = "display version")
+    private boolean version = false;
+
+    @Option(
+            names = {"--version"},
+            description = "display version tag")
+    private boolean versionTag = false;
+
+    // create ssl certificate
+    @Option(
+            names = {"sc", "-s create"},
+            arity = "0..2",
+            paramLabel = "<hostname> <ip>",
+            description =
+                    "create a ssl certificate for:\n - localhost (when no parameters are given), or"
+                            + "\n - the given hostname and ip")
+    private String[] ssl = null;
+
+    // offline block management
+    @Option(
+            names = {"pb", "--prune-blocks"},
+            description = "remove blocks on side chains and update block info")
+    private boolean rebuildBlockInfo = false;
+
+    @Option(
+            names = {"-r", "--revert"},
+            arity = "1",
+            paramLabel = "<block_number>",
+            description = "revert database state to given block number")
+    private String revertToBlock = null;
+
+    // network and directory setup
+    @Option(
+            names = {"-n", "--network"},
+            description =
+                    "execute kernel with selected network\noptions: mainnet, conquest, mastery")
+    private String network = null;
+
+    @Option(
+            names = {"-d", "--datadir"},
+            description = "execute kernel with selected database directory")
+    private String directory = null;
+
+    // offline database query and update
+    @Option(
+            names = {"ps", "--state"},
+            paramLabel = "<prune_mode>",
+            description = "reorganize the state storage\noptions: FULL, TOP, SPREAD")
+    private String pruntStateOption = null;
+
+    // print info from db
+    @Option(
+            names = {"--dump-blocks"},
+            arity = "0..1",
+            paramLabel = "<block_count>",
+            description = "print top blocks from database")
+    private String dumpBlocksCount = null;
+
+    @Option(
+            names = {"--dump-state-size"},
+            arity = "0..1",
+            paramLabel = "<block_count>",
+            description = "retrieves the state size (node count) for the top blocks")
+    private String dumpStateSizeCount = null;
+
+    @Option(
+            names = {"--dump-state"},
+            arity = "0..1",
+            paramLabel = "<block_count>",
+            description = "retrieves the state for the top main chain blocks")
+    private String dumpStateCount = null;
+
+    @Option(
+            names = {"--db-compact"},
+            description = "if using leveldb, it triggers its database compaction processes")
+    private boolean dbCompact;
+
+    /** Compacts the account options into specific commands. */
+    public static String[] preProcess(String[] arguments) {
+        List<String> list = new ArrayList<>();
+
+        int i = 0;
+        while (i < arguments.length) {
+            if (arguments[i].equals("-a")
+                    || arguments[i].equals("--account")
+                    || arguments[i].equals("-s")) {
+                if (i + 1 < arguments.length) {
+                    list.add(arguments[i] + " " + arguments[i + 1]);
+                } else {
+                    list.add(arguments[i]);
+                }
+                i++;
+            } else {
+                list.add(arguments[i]);
+            }
+            i++;
+        }
+
+        return list.toArray(new String[list.size()]);
+    }
+
+    public boolean isHelp() {
+        return help;
+    }
+
+    public boolean isCreateAccount() {
+        return createAccount;
+    }
+
+    public boolean isListAccounts() {
+        return listAccounts;
+    }
+
+    public String getExportAccount() {
+        return exportAccount;
+    }
+
+    public String getImportAccount() {
+        return importAccount;
+    }
+
+    public String getConfig() {
+        return config;
+    }
+
+    public boolean isInfo() {
+        return info;
+    }
+
+    public boolean isVersion() {
+        return version;
+    }
+
+    public boolean isVersionTag() {
+        return versionTag;
+    }
+
+    public String[] getSsl() {
+        return ssl;
+    }
+
+    public boolean isRebuildBlockInfo() {
+        return rebuildBlockInfo;
+    }
+
+    public String getRevertToBlock() {
+        return revertToBlock;
+    }
+
+    public String getNetwork() {
+        return network;
+    }
+
+    public String getDirectory() {
+        return directory;
+    }
+
+    public String getPruneStateOption() {
+        return pruntStateOption;
+    }
+
+    public String getDumpBlocksCount() {
+        return dumpBlocksCount;
+    }
+
+    public String getDumpStateSizeCount() {
+        return dumpStateSizeCount;
+    }
+
+    public String getDumpStateCount() {
+        return dumpStateCount;
+    }
+
+    public boolean isDbCompact() {
+        return dbCompact;
+    }
+}