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,22 @@ private void closeFileInputStream(final FileInputStream fis) {
         }
     }
 
+    public void setForkProperties() {
+        Properties properties = new Properties();
+        FileInputStream fis = null;
+        try {
+            fis = new FileInputStream(getBasePath() + CfgFork.FORK_PROPERTIES_PATH);
+            properties.load(fis);
+        } catch (IOException e) {
+            System.out.println(
+                    "<error on-parsing-fork-properties msg=" + e.getLocalizedMessage() + ">");
+            System.exit(1);
+        } finally {
+            closeFileInputStream(fis);
+        }
+        this.getFork().setProperties(properties);
+    }
+
     public void dbFromXML() {
         File cfgFile = getInitialConfigFile();
         XMLInputFactory input = XMLInputFactory.newInstance();

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

@@ -85,6 +85,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 +103,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 +123,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 +133,7 @@ public void setup() {
             }
             Cli.copyRecursively(config, mainnetConfig);
             Cli.copyRecursively(genesis, testnetGenesis);
+            Cli.copyRecursively(fork, testnetFork);
         }
 
         cfg.resetInternal();

modBoot/resource/mainnet/fork.properties

@@ -0,0 +1 @@
+fork1=2000000

modBoot/resource/mastery/fork.properties

@@ -0,0 +1 @@
+fork1=2000000

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

@@ -53,6 +53,8 @@ public abstract class Cfg {
 
     protected CfgGui gui;
 
+    protected CfgFork fork;
+
     public void setId(final String _id) {
         this.id = _id;
     }
@@ -117,6 +119,10 @@ public CfgGui getGui() {
         return this.gui;
     }
 
+    public CfgFork getFork() {
+        return this.fork;
+    }
+
     public String[] getNodes() {
         return this.net.getNodes();
     }
@@ -201,6 +207,7 @@ protected void initializeConfiguration() {
             execGenesisFile = baseGenesisFile;
             updateStoragePaths();
         }
+        setForkProperties();
     }
 
     /**
@@ -428,6 +435,8 @@ 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 setGenesis();
 
     public abstract AbstractBlock<?, ?> getGenesis();

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

@@ -0,0 +1,41 @@
+/*
+ * 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 static final String FORK_PROPERTIES_PATH = "/fork.properties";
+
+    private static Properties forkProperties;
+
+    public void setProperties(Properties properties) {
+        this.forkProperties = properties;
+    }
+
+    public String getForkPropertyByNumber(final int forkNum) {
+        if (forkProperties == null) return null;
+        return forkProperties.getProperty("fork" + String.valueOf(forkNum));
+    }
+}

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

@@ -0,0 +1,39 @@
+/*
+ * 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 org.aion.zero.impl.config.CfgAion;
+import org.junit.Test;
+
+public class CfgForkTest {
+
+    @Test
+    public void getForkPropertyTest() {
+        CfgAion cfg = CfgAion.inst();
+        cfg.setForkProperties();
+        String forkProperty = cfg.getFork().getForkPropertyByNumber(1);
+        assertEquals("2000000", forkProperty);
+    }
+}

modPrecompiled/src/org/aion/precompiled/ContractFactory.java

@@ -25,6 +25,7 @@
 import org.aion.base.db.IRepositoryCache;
 import org.aion.base.type.Address;
 import org.aion.base.vm.IDataWord;
+import org.aion.mcf.config.CfgFork;
 import org.aion.mcf.core.AccountState;
 import org.aion.mcf.db.IBlockStoreBase;
 import org.aion.precompiled.contracts.ATB.TokenBridgeContract;
@@ -78,30 +79,60 @@ public IPrecompiledContract getPrecompiledContract(
             ExecutionContext context,
             IRepositoryCache<AccountState, IDataWord, IBlockStoreBase<?, ?>> track) {
 
-        switch (context.address().toString()) {
-            case ADDR_TOKEN_BRIDGE:
-                TokenBridgeContract contract =
-                        new TokenBridgeContract(
-                                context,
-                                track,
-                                Address.wrap(ADDR_TOKEN_BRIDGE_INITIAL_OWNER),
-                                Address.wrap(ADDR_TOKEN_BRIDGE));
-
-                if (!context.origin().equals(Address.wrap(ADDR_TOKEN_BRIDGE_INITIAL_OWNER))
-                        && !contract.isInitialized()) {
+        CfgFork cfg = new CfgFork();
+        String forkProperty = cfg.getForkPropertyByNumber(1);
+        boolean firstFork =
+                (forkProperty != null) && (context.blockNumber() > Long.valueOf(forkProperty));
+
+        if (firstFork) {
+            switch (context.address().toString()) {
+                case ADDR_TOKEN_BRIDGE:
+                    TokenBridgeContract contract =
+                            new TokenBridgeContract(
+                                    context,
+                                    track,
+                                    Address.wrap(ADDR_TOKEN_BRIDGE_INITIAL_OWNER),
+                                    Address.wrap(ADDR_TOKEN_BRIDGE));
+
+                    if (!context.origin().equals(Address.wrap(ADDR_TOKEN_BRIDGE_INITIAL_OWNER))
+                            && !contract.isInitialized()) {
+                        return null;
+                    }
+
+                    return contract;
+                case ADDR_ED_VERIFY:
+                    return PC_ED_VERIFY;
+                case ADDR_BLAKE2B_HASH:
+                    return PC_BLAKE2B_HASH;
+                case ADDR_TX_HASH:
+                    return new TXHashContract(context);
+                case ADDR_TOTAL_CURRENCY:
+                default:
                     return null;
-                }
-
-                return contract;
-            case ADDR_ED_VERIFY:
-                return PC_ED_VERIFY;
-            case ADDR_BLAKE2B_HASH:
-                return PC_BLAKE2B_HASH;
-            case ADDR_TX_HASH:
-                return new TXHashContract(context);
-            case ADDR_TOTAL_CURRENCY:
-            default:
-                return null;
+            }
+        } else {
+            switch (context.address().toString()) {
+                case ADDR_TOTAL_CURRENCY:
+                    // return new TotalCurrencyContract(track, context.sender(),
+                    // Address.wrap(OWNER));
+                    return null;
+                case ADDR_TOKEN_BRIDGE:
+                    TokenBridgeContract contract =
+                            new TokenBridgeContract(
+                                    context,
+                                    track,
+                                    Address.wrap(ADDR_TOKEN_BRIDGE_INITIAL_OWNER),
+                                    Address.wrap(ADDR_TOKEN_BRIDGE));
+
+                    if (!context.origin().equals(Address.wrap(ADDR_TOKEN_BRIDGE_INITIAL_OWNER))
+                            && !contract.isInitialized()) {
+                        return null;
+                    }
+
+                    return contract;
+                default:
+                    return null;
+            }
         }
     }
 

modPrecompiled/test/org/aion/precompiled/BenchmarkTest.java

@@ -27,6 +27,7 @@
 import org.aion.mcf.vm.types.DataWord;
 import org.aion.vm.ExecutionContext;
 import org.aion.vm.IPrecompiledContract;
+import org.aion.zero.impl.config.CfgAion;
 import org.apache.commons.lang3.RandomUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -48,12 +49,12 @@ public class BenchmarkTest {
     @Before
     public void setup() {
         cf = new ContractFactory();
-
+        CfgAion.inst().setForkProperties();
         txHash = RandomUtils.nextBytes(32);
         origin = Address.wrap(RandomUtils.nextBytes(32));
         caller = origin;
         blockCoinbase = Address.wrap(RandomUtils.nextBytes(32));
-        blockNumber = 1;
+        blockNumber = 2000001;
         blockTimestamp = System.currentTimeMillis() / 1000;
         blockNrgLimit = 5000000;
         blockDifficulty = new DataWord(0x100000000L);

modPrecompiled/test/org/aion/precompiled/TXHashTest.java

@@ -31,6 +31,7 @@
 import org.aion.vm.ExecutionContext;
 import org.aion.vm.ExecutionResult;
 import org.aion.vm.IPrecompiledContract;
+import org.aion.zero.impl.config.CfgAion;
 import org.apache.commons.lang3.RandomUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -44,10 +45,11 @@ public class TXHashTest {
 
     @Before
     public void setUp() {
+        CfgAion.inst().setForkProperties();
         ExecutionContext ctx = new ExecutionContext(txHash,
             ContractFactory.getTxHashContractAddress(), null, null, null,
             0L, null, null, 0, 0, 0, null,
-            0L, 0L, 0L,
+            2000001L, 0L, 0L,
             null);
 
         tXHashContract = new ContractFactory().getPrecompiledContract(ctx, null);

modPrecompiled/test/org/aion/precompiled/contracts/EDVerifyContractTest.java

@@ -37,6 +37,7 @@
 import org.aion.vm.ExecutionContext;
 import org.aion.vm.ExecutionResult;
 import org.aion.vm.IPrecompiledContract;
+import org.aion.zero.impl.config.CfgAion;
 import org.apache.commons.lang3.RandomUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -49,7 +50,7 @@ public class EDVerifyContractTest {
     private Address caller = origin;
 
     private Address blockCoinbase = Address.wrap(RandomUtils.nextBytes(32));
-    private long blockNumber = 1;
+    private long blockNumber = 2000001;
     private long blockTimestamp = System.currentTimeMillis() / 1000;
     private long blockNrgLimit = 5000000;
     private DataWord blockDifficulty = new DataWord(0x100000000L);
@@ -69,6 +70,7 @@ public void setup() {
         nrgLimit = 20000;
         callValue = DataWord.ZERO;
         callData = new byte[0];
+        CfgAion.inst().setForkProperties();
     }
 
     @Test