Merge pull request #710 from aionnetwork/AIP_forkproperties

AIP forkproperties
aionnetwork · Nov 23, 2018 · 0394a42 · 0394a42
2 parents 6178ceb + 1774aa7
commit 0394a42
Show file tree

Hide file tree

Showing 27 changed files with 731 additions and 103 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,8 @@
 # aion
-/config/
-/database/
-/keystore/
 /pack/
 /reports/
 /cache/
 /ssl_keystore/
-/log/
 /rt/
 /web3/
 /zmq_keystore/
@@ -61,3 +57,13 @@ tmp/
 
 # gradle
 .gradle/**
+
+# network data
+/mainnet/
+/conquest/
+/mastery/
+/custom/
+
+# openjdk artifacts
+openjdk*.tar.gz
+openjfx*.zip
diff --git a/modBoot/resource/conquest/config.xml → config/conquest/config.xml b/modBoot/resource/conquest/config.xml → config/conquest/config.xml
diff --git a/modBoot/resource/conquest/genesis.json → config/conquest/genesis.json b/modBoot/resource/conquest/genesis.json → config/conquest/genesis.json
diff --git a/modBoot/resource/custom/config.xml → config/custom/config.xml b/modBoot/resource/custom/config.xml → config/custom/config.xml
diff --git a/config/custom/fork.properties b/config/custom/fork.properties
@@ -0,0 +1 @@
+fork0.3.2=0
diff --git a/modBoot/resource/custom/genesis.json → config/custom/genesis.json b/modBoot/resource/custom/genesis.json → config/custom/genesis.json
diff --git a/modBoot/resource/mainnet/config.xml → config/mainnet/config.xml b/modBoot/resource/mainnet/config.xml → config/mainnet/config.xml
diff --git a/config/mainnet/fork.properties b/config/mainnet/fork.properties
@@ -0,0 +1 @@
+fork0.3.2=1902000
diff --git a/modBoot/resource/mainnet/genesis.json → config/mainnet/genesis.json b/modBoot/resource/mainnet/genesis.json → config/mainnet/genesis.json
diff --git a/modBoot/resource/mastery/config.xml → config/mastery/config.xml b/modBoot/resource/mastery/config.xml → config/mastery/config.xml
diff --git a/config/mastery/fork.properties b/config/mastery/fork.properties
@@ -0,0 +1 @@
+fork0.3.2=1132000
diff --git a/modBoot/resource/mastery/genesis.json → config/mastery/genesis.json b/modBoot/resource/mastery/genesis.json → config/mastery/genesis.json
diff --git a/modAionImpl/src/org/aion/zero/impl/cli/Cli.java b/modAionImpl/src/org/aion/zero/impl/cli/Cli.java
@@ -36,7 +36,11 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import org.aion.base.util.Hex;
 import org.aion.crypto.ECKey;
 import org.aion.crypto.ECKeyFac;
@@ -170,6 +174,15 @@ public ReturnType call(final String[] args, Cfg cfg) {
                 cfg.setReadConfigFiles(configFile, cfg.getExecGenesisFile());
             }
 
+            // reading from correct fork file
+            File forkFile = cfg.getExecForkFile();
+            if (forkFile == null || !forkFile.exists()) {
+                forkFile = cfg.getInitialForkFile();
+            }
+
+            if (forkFile != null && forkFile.exists()) {
+                cfg.setForkProperties(cfg.getNetwork(), forkFile);
+            }
             // true means the UUID must be set
             boolean overwrite = cfg.fromXML(configFile);
 
@@ -226,7 +239,7 @@ public ReturnType call(final String[] args, Cfg cfg) {
             }
 
             // make directories for kernel execution
-            makeDirs(configFile, cfg);
+            makeDirs(configFile, forkFile, cfg);
 
             if (overwrite) {
                 // only updating the file in case the user id was not set
@@ -535,10 +548,11 @@ private void printInvalidNetwork() {
      * Creates the directories for persistence of the kernel data. Copies the config and genesis
      * files from the initial path for the execution directory.
      *
+     * @param forkFile
      * @param cfg the configuration for the runtime kernel environment
      */
     @SuppressWarnings("ResultOfMethodCallIgnored")
-    private void makeDirs(File startConfigFile, Cfg cfg) {
+    private void makeDirs(File startConfigFile, File forkFile, Cfg cfg) {
         File file = cfg.getExecDir();
         if (!file.exists()) {
             file.mkdirs();
@@ -564,6 +578,13 @@ private void makeDirs(File startConfigFile, Cfg cfg) {
             }
         }
 
+        // copy fork file
+        initial = forkFile;
+        target = cfg.getExecForkFile();
+        if (!initial.equals(target)) {
+            copyRecursively(initial, target);
+        }
+
         // create target log directory
         file = cfg.getLogDir();
         if (!file.exists()) {
@@ -759,9 +780,10 @@ private void checkArguments(Arguments options) {
         if (skippedTasks.isEmpty()) {
             return;
         }
-        String errorMessage = String.format(
-            "Given arguments require incompatible tasks. Skipped arguments: %s.",
-            String.join(", ", skippedTasks));
+        String errorMessage =
+                String.format(
+                        "Given arguments require incompatible tasks. Skipped arguments: %s.",
+                        String.join(", ", skippedTasks));
         System.out.println(errorMessage);
     }
 
@@ -838,56 +860,53 @@ Set<String> getSkippedTasks(Arguments options, TaskPriority breakingTaskPriority
                 skippedTasks.add("--config");
             }
         }
-        if (breakingTaskPriority.compareTo(TaskPriority.INFO) < 0
-            && options.isInfo()) {
+        if (breakingTaskPriority.compareTo(TaskPriority.INFO) < 0 && options.isInfo()) {
             skippedTasks.add("--info");
         }
         if (breakingTaskPriority.compareTo(TaskPriority.CREATE_ACCOUNT) < 0
-            && options.isCreateAccount()) {
+                && options.isCreateAccount()) {
             skippedTasks.add("--account create");
         }
         if (breakingTaskPriority.compareTo(TaskPriority.LIST_ACCOUNTS) < 0
-            && options.isListAccounts()) {
+                && options.isListAccounts()) {
             skippedTasks.add("--account list");
         }
         if (breakingTaskPriority.compareTo(TaskPriority.EXPORT_ACCOUNT) < 0
-            && options.getExportAccount() != null) {
+                && options.getExportAccount() != null) {
             skippedTasks.add("--account export");
         }
         if (breakingTaskPriority.compareTo(TaskPriority.IMPORT_ACCOUNT) < 0
-            && options.getImportAccount() != null) {
+                && options.getImportAccount() != null) {
             skippedTasks.add("--account import");
         }
-        if (breakingTaskPriority.compareTo(TaskPriority.SSL) < 0
-            && options.getSsl() != null) {
+        if (breakingTaskPriority.compareTo(TaskPriority.SSL) < 0 && options.getSsl() != null) {
             skippedTasks.add("-s create");
         }
         if (breakingTaskPriority.compareTo(TaskPriority.PRUNE_BLOCKS) < 0
-            && options.isRebuildBlockInfo()) {
+                && options.isRebuildBlockInfo()) {
             skippedTasks.add("--prune-blocks");
         }
         if (breakingTaskPriority.compareTo(TaskPriority.REVERT) < 0
-            && options.getRevertToBlock() != null) {
+                && options.getRevertToBlock() != null) {
             skippedTasks.add("--revert");
         }
         if (breakingTaskPriority.compareTo(TaskPriority.PRUNE_STATE) < 0
-            && options.getPruneStateOption() != null) {
+                && options.getPruneStateOption() != null) {
             skippedTasks.add("--state");
         }
         if (breakingTaskPriority.compareTo(TaskPriority.DUMP_STATE_SIZE) < 0
-            && options.getDumpStateSizeCount() != null) {
+                && options.getDumpStateSizeCount() != null) {
             skippedTasks.add("--dump-state-size");
         }
         if (breakingTaskPriority.compareTo(TaskPriority.DUMP_STATE) < 0
-            && options.getDumpStateCount() != null) {
+                && options.getDumpStateCount() != null) {
             skippedTasks.add("--dump-state");
         }
         if (breakingTaskPriority.compareTo(TaskPriority.DUMP_BLOCKS) < 0
-            && options.getDumpBlocksCount() != null) {
+                && options.getDumpBlocksCount() != null) {
             skippedTasks.add("--dump-blocks");
         }
-        if (breakingTaskPriority.compareTo(TaskPriority.DB_COMPACT) < 0
-            && options.isDbCompact()) {
+        if (breakingTaskPriority.compareTo(TaskPriority.DB_COMPACT) < 0 && options.isDbCompact()) {
             skippedTasks.add("--db-compact");
         }
         return skippedTasks;

diff --git a/modAionImpl/src/org/aion/zero/impl/config/CfgAion.java b/modAionImpl/src/org/aion/zero/impl/config/CfgAion.java
@@ -30,6 +30,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Properties;
 import java.util.UUID;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
@@ -39,6 +40,7 @@
 import org.aion.mcf.config.Cfg;
 import org.aion.mcf.config.CfgApi;
 import org.aion.mcf.config.CfgDb;
+import org.aion.mcf.config.CfgFork;
 import org.aion.mcf.config.CfgGui;
 import org.aion.mcf.config.CfgLog;
 import org.aion.mcf.config.CfgNet;
@@ -63,6 +65,7 @@ public final class CfgAion extends Cfg {
     public CfgAion() {
         this.mode = "aion";
         this.id = UUID.randomUUID().toString();
+        this.keystorePath = null;
         this.net = new CfgNet();
         this.consensus = new CfgConsensusPow();
         this.sync = new CfgSync();
@@ -72,6 +75,7 @@ public CfgAion() {
         this.tx = new CfgTx();
         this.reports = new CfgReports();
         this.gui = new CfgGui();
+        this.fork = new CfgFork();
         initializeConfiguration();
     }
 
@@ -136,6 +140,43 @@ private void closeFileInputStream(final FileInputStream fis) {
         }
     }
 
+    //    /** @implNote the default fork settings is looking for the fork config of the mainnet. */
+    //    public void setForkProperties() {
+    //        setForkProperties("mainnet", null);
+    //    }
+
+    public void setForkProperties(String networkName, File forkFile) {
+        Properties properties = new Properties();
+
+        // old kernel doesn't support the fork feature.
+        if (networkName == null || networkName.equals("config")) {
+            return;
+        }
+
+        try (FileInputStream fis =
+                (forkFile == null)
+                        ? new FileInputStream(
+                                System.getProperty("user.dir")
+                                        + "/"
+                                        + networkName
+                                        + "/config"
+                                        + CfgFork.FORK_PROPERTIES_PATH)
+                        : new FileInputStream(forkFile)) {
+
+            properties.load(fis);
+            this.getFork().setProperties(properties);
+        } catch (Exception e) {
+            System.out.println(
+                    "<error on-parsing-fork-properties msg="
+                            + e.getLocalizedMessage()
+                            + ">, no protocol been updated.");
+        }
+    }
+
+    //    public void setForkProperties(String networkName) {
+    //        setForkProperties(networkName, null);
+    //    }
+
     public void dbFromXML() {
         File cfgFile = getInitialConfigFile();
         XMLInputFactory input = XMLInputFactory.newInstance();
@@ -267,6 +308,13 @@ public boolean fromXML(File cfgFile) {
             this.setLogDir(log);
         }
 
+        if (keystorePath != null) {
+            File ks = new File(keystorePath);
+            if (ks.isAbsolute()) {
+                this.setKeystoreDir(ks);
+            }
+        }
+
         return shouldWriteBackToFile;
     }
 
@@ -347,6 +395,13 @@ public void toXML(final String[] args, File file) {
             sw.writeCharacters(this.getId());
             sw.writeEndElement();
 
+            if (keystorePath != null) {
+                sw.writeCharacters("\r\n\t");
+                sw.writeStartElement("keystore");
+                sw.writeCharacters(keystorePath);
+                sw.writeEndElement();
+            }
+
             sw.writeCharacters(this.getApi().toXML());
             sw.writeCharacters(this.getNet().toXML());
             sw.writeCharacters(this.getSync().toXML());