AIP forkproperties

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;
@@ -72,6 +74,7 @@ public CfgAion() {
         this.tx = new CfgTx();
         this.reports = new CfgReports();
         this.gui = new CfgGui();
+        this.fork = new CfgFork();
         initializeConfiguration();
     }
 
@@ -136,6 +139,41 @@ private void closeFileInputStream(final FileInputStream fis) {
         }
     }
 
+    public void setForkProperties() {
+        setForkProperties("mainnet");
+    }
+
+    public void setForkProperties(String networkName) {
+        Properties properties = new Properties();
+
+        // old kernel doesn't support the fork feature.
+        if (networkName.equals("config")) {
+            return;
+        }
+
+        FileInputStream fis = null;
+        try {
+            fis =
+                    new FileInputStream(
+                            System.getProperty("user.dir")
+                                    + "/"
+                                    + networkName
+                                    + "/config"
+                                    + CfgFork.FORK_PROPERTIES_PATH);
+            properties.load(fis);
+
+            this.getFork().setProperties(properties);
+        } catch (IOException e) {
+            System.out.println(
+                    "<error on-parsing-fork-properties msg="
+                            + e.getLocalizedMessage()
+                            + ">, no protocol been updated.");
+
+        } finally {
+            closeFileInputStream(fis);
+        }
+    }
+
     public void dbFromXML() {
         File cfgFile = getInitialConfigFile();
         XMLInputFactory input = XMLInputFactory.newInstance();

modAionImpl/test/org/aion/zero/impl/cli/CliTest.java

@@ -28,7 +28,6 @@
 import static org.aion.zero.impl.cli.Cli.ReturnType.EXIT;
 import static org.aion.zero.impl.cli.Cli.ReturnType.RUN;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.doReturn;
@@ -85,6 +84,7 @@ public class CliTest {
 
     private static final String configFileName = "config.xml";
     private static final String genesisFileName = "genesis.json";
+    private static final String forkFileName = "fork.properties";
 
     private static final String dataDirectory = "datadir";
     private static final String alternativeDirectory = "random";
@@ -102,6 +102,11 @@ public class CliTest {
     private static final File mainnetGenesis = new File(MAIN_CONFIG_PATH, genesisFileName);
     private static final File testnetGenesis = new File(TEST_CONFIG_PATH, genesisFileName);
 
+    private static final File fork = new File(TEST_RESOURCE_DIR, forkFileName);
+    private static final File oldFork = new File(CONFIG_PATH, forkFileName);
+    private static final File mainnetFork = new File(MAIN_CONFIG_PATH, forkFileName);
+    private static final File testnetFork = new File(TEST_CONFIG_PATH, forkFileName);
+
     /** @implNote set this to true to enable printing */
     private static final boolean verbose = false;
 
@@ -117,6 +122,7 @@ public void setup() {
             }
             Cli.copyRecursively(config, mainnetConfig);
             Cli.copyRecursively(genesis, mainnetGenesis);
+            Cli.copyRecursively(fork, mainnetFork);
         }
 
         if (BASE_PATH.contains(module) && !testnetConfig.exists()) {
@@ -126,6 +132,7 @@ public void setup() {
             }
             Cli.copyRecursively(config, mainnetConfig);
             Cli.copyRecursively(genesis, testnetGenesis);
+            Cli.copyRecursively(fork, testnetFork);
         }
 
         cfg.resetInternal();
@@ -1158,7 +1165,10 @@ private Object parametersForArgumentCheck() {
         skippedTasks.add("--db-compact");
         parameters.add(new Object[] {input, TaskPriority.REVERT, skippedTasks});
 
-        input = new String[] {"--state", "FULL", "--db-compact", "--dump-state-size", "--dump-state"};
+        input =
+                new String[] {
+                    "--state", "FULL", "--db-compact", "--dump-state-size", "--dump-state"
+                };
         skippedTasks = new HashSet<String>();
         skippedTasks.add("--db-compact");
         skippedTasks.add("--dump-state-size");
@@ -1186,7 +1196,7 @@ private Object parametersForArgumentCheck() {
     @Test
     @Parameters(method = "parametersForArgumentCheck")
     public void testCheckArguments(
-        String[] input, TaskPriority expectedPriority, Set<String> expectedTasks) {
+            String[] input, TaskPriority expectedPriority, Set<String> expectedTasks) {
         Arguments options = new Arguments();
         CommandLine parser = new CommandLine(options);
         parser.parse(input);

modBoot/resource/custom/fork.properties

@@ -0,0 +1 @@
+fork0.3.2=1132000

modBoot/resource/mainnet/fork.properties

@@ -0,0 +1 @@
+fork0.3.2=1902000

modBoot/resource/mastery/fork.properties

@@ -0,0 +1 @@
+fork0.3.2=1132000

modBoot/src/org/aion/Aion.java

@@ -42,6 +42,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Properties;
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.TimeZone;
@@ -98,11 +99,23 @@ public static void main(String args[]) {
 
         CfgAion cfg = CfgAion.inst();
 
+
         ReturnType ret = new Cli().call(args, cfg);
         if (ret != ReturnType.RUN) {
             exit(ret.getValue());
         }
 
+        Properties p = cfg.getFork().getProperties();
+        p.forEach(
+            (k, v) -> {
+                System.out.println(
+                    "<Protocol name: "
+                        + k.toString()
+                        + " block#: "
+                        + v.toString()
+                        + " updated!");
+            });
+
         // Check ZMQ server secure connect settings, generate keypair when the settings enabled and
         // can't find the keypair.
         if (cfg.getApi().getZmq().getActive()

modGui/test/org/aion/gui/model/ConfigManipulatorTest.java

@@ -51,7 +51,6 @@ public class ConfigManipulatorTest {
     @Before
     public void before() {
         jmxCaller = mock(ConfigManipulator.JmxCaller.class);
-        ;
         fileLoaderSaver = mock(ConfigManipulator.FileLoaderSaver.class);
         cfg = new CfgAion();
         kernelLauncher = mock(KernelLauncher.class);

modMcf/src/org/aion/mcf/config/Cfg.java

@@ -24,6 +24,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import java.io.File;
+import java.io.IOException;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import org.aion.mcf.types.AbstractBlock;
@@ -53,6 +54,8 @@ public abstract class Cfg {
 
     protected CfgGui gui;
 
+    protected CfgFork fork;
+
     public void setId(final String _id) {
         this.id = _id;
     }
@@ -117,6 +120,10 @@ public CfgGui getGui() {
         return this.gui;
     }
 
+    public CfgFork getFork() {
+        return this.fork;
+    }
+
     public String[] getNodes() {
         return this.net.getNodes();
     }
@@ -136,6 +143,7 @@ public void setConsensus(CfgConsensus _consensus) {
     private final String configFileName = "config.xml";
     private final String genesisFileName = "genesis.json";
     private final String keystoreDirName = "keystore";
+    private final String forkFileName = "fork.properties";
 
     // base path
     private final File INITIAL_PATH = new File(System.getProperty("user.dir"));
@@ -147,6 +155,8 @@ public void setConsensus(CfgConsensus _consensus) {
     // base configuration: old kernel OR using network config
     private File baseConfigFile = null;
     private File baseGenesisFile = null;
+    private File baseForkFile = null;
+
 
     // can be absolute in config file OR depend on execution path
     private File logDir = null;
@@ -164,13 +174,15 @@ public void setConsensus(CfgConsensus _consensus) {
     private File execConfigDir = null;
     private File execConfigFile = null;
     private File execGenesisFile = null;
+    private File execForkFile = null;
 
     /** Resets internal data containing network and path. */
     @VisibleForTesting
     public void resetInternal() {
         networkConfigDir = null;
         baseConfigFile = null;
         baseGenesisFile = null;
+        baseForkFile = null;
         logDir = null;
         databaseDir = null;
         absoluteLogDir = false;
@@ -181,6 +193,7 @@ public void resetInternal() {
         execConfigDir = null;
         execConfigFile = null;
         execGenesisFile = null;
+        execForkFile = null;
     }
 
     /**
@@ -214,6 +227,7 @@ private void updateNetworkExecPaths() {
         networkConfigDir = new File(CONFIG_DIR, network);
         baseConfigFile = new File(networkConfigDir, configFileName);
         baseGenesisFile = new File(networkConfigDir, genesisFileName);
+        baseForkFile = new File(networkConfigDir, forkFileName);
 
         if (dataDir == null) {
             dataDir = INITIAL_PATH;
@@ -222,8 +236,10 @@ private void updateNetworkExecPaths() {
         execConfigDir = new File(execDir, configDirName);
         execConfigFile = new File(execConfigDir, configFileName);
         execGenesisFile = new File(execConfigDir, genesisFileName);
+        execForkFile = new File(execConfigDir, forkFileName);
 
         updateStoragePaths();
+        setForkProperties(network);
     }
 
     /** Updates the path to the log, database directories. */
@@ -428,6 +444,10 @@ public static void skipElement(final XMLStreamReader sr) throws XMLStreamExcepti
 
     public abstract void toXML(final String[] args, File file);
 
+    public abstract void setForkProperties();
+
+    public abstract void setForkProperties(String network);
+
     public abstract void setGenesis();
 
     public abstract AbstractBlock<?, ?> getGenesis();

modMcf/src/org/aion/mcf/config/CfgFork.java

@@ -0,0 +1,42 @@
+/*
+ * 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.mcf.config;
+
+import java.util.Properties;
+
+public class CfgFork {
+
+    public CfgFork() {}
+
+    public static final String FORK_PROPERTIES_PATH = "/fork.properties";
+
+    private static Properties forkProperties = new Properties();
+
+    public void setProperties(Properties properties) {
+        forkProperties = properties;
+    }
+
+    public Properties getProperties() {
+        return forkProperties;
+    }
+}

modMcf/test/org/aion/mcf/config/CfgForkTest.java

@@ -0,0 +1,80 @@
+/*
+ * 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.mcf.config;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNull;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import org.aion.zero.impl.config.CfgAion;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class CfgForkTest {
+
+    private CfgAion cfg;
+    private File forkFile;
+
+    @Before
+    public void setup() throws IOException {
+        new File(System.getProperty("user.dir") + "/mainnet/config").mkdirs();
+        forkFile =
+                new File(
+                        System.getProperty("user.dir")
+                                + "/mainnet/config"
+                                + CfgFork.FORK_PROPERTIES_PATH);
+        forkFile.createNewFile();
+
+        // Open given file in append mode.
+        BufferedWriter out = new BufferedWriter(
+            new FileWriter(forkFile, true));
+        out.write("fork0.3.2=2000000");
+        out.close();
+
+        cfg = CfgAion.inst();
+    }
+
+    @After
+    public void teardown() {
+        forkFile.delete();
+        forkFile.getParentFile().delete();
+        forkFile.getParentFile().getParentFile().delete();
+    }
+
+    @Test
+    public void getForkPropertyTest() {
+
+        String forkProperty = cfg.getFork().getProperties().getProperty("fork0.3.2");
+        assertEquals("2000000", forkProperty);
+    }
+
+    @Test
+    public void getForkPropertyTest2() {
+        String forkProperty = cfg.getFork().getProperties().getProperty("fork0.3.1");
+        assertNull(forkProperty);
+    }
+}