Casper FFG test net compatibility

build.gradle

@@ -26,7 +26,8 @@ subprojects {
 
     group = 'org.ethereum'
 
-    version = config.versionNumber + ("master" == gitCurBranch() ? "-RELEASE" : "-SNAPSHOT")
+    version = config.versionNumber + ("master" == gitCurBranch() ? "-RELEASE" :
+            "research/casper" == gitCurBranch() ? "-casper-SNAPSHOT" : "-SNAPSHOT")
 
     println("Building version: " + version + " (from branch " + gitCurBranch() + ")")
 

ethereumj-core/build.gradle

@@ -63,6 +63,12 @@ task runTest (type: JavaExec) {
     jvmArgs = applicationDefaultJvmArgs + '-Dethereumj.conf.res=test.conf'
 }
 
+task runCasper (type: JavaExec) {
+    main = 'org.ethereum.casper.Start'
+    classpath = sourceSets.main.runtimeClasspath
+    jvmArgs = applicationDefaultJvmArgs + '-Dethereumj.conf.res=casper.conf'
+}
+
 /**
  *  This is TCK test command line option,
  *  to run the test:
@@ -217,7 +223,8 @@ artifactoryPublish.onlyIf {
             project.version.endsWith('-SNAPSHOT') &&
             (branchName.startsWith('master') ||
                     branchName.startsWith('develop') ||
-                    branchName.startsWith('stage'))
+                    branchName.startsWith('stage') ||
+                    branchName.startsWith('research/casper'))
 }
 
 bintray {

ethereumj-core/src/main/java/org/ethereum/casper/Start.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) [2016] [ <ether.camp> ]
+ * This file is part of the ethereumJ library.
+ *
+ * The ethereumJ library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The ethereumJ library 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with the ethereumJ library. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.ethereum.casper;
+
+import org.apache.commons.lang3.StringUtils;
+import org.ethereum.casper.config.CasperConfig;
+import org.ethereum.cli.CLIInterface;
+import org.ethereum.config.SystemProperties;
+import org.ethereum.facade.Ethereum;
+import org.ethereum.facade.EthereumFactory;
+import org.ethereum.mine.Ethash;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+public class Start {
+
+    private static final Logger logger = LoggerFactory.getLogger("general");
+
+    public static void main(String args[]) throws IOException, URISyntaxException {
+        logger.info("EthereumJ Casper edition");
+        CLIInterface.call(args);
+
+        final SystemProperties config = SystemProperties.getDefault();
+        final boolean actionBlocksLoader = !config.blocksLoader().equals("");
+        final boolean actionGenerateDag = !StringUtils.isEmpty(System.getProperty("ethash.blockNumber"));
+
+        if (actionBlocksLoader || actionGenerateDag) {
+            config.setSyncEnabled(false);
+            config.setDiscoveryEnabled(false);
+        }
+
+        if (actionGenerateDag) {
+            new Ethash(config, Long.parseLong(System.getProperty("ethash.blockNumber"))).getFullDataset();
+            // DAG file has been created, lets exit
+            System.exit(0);
+        } else {
+            Ethereum ethereum = EthereumFactory.createEthereum(new Class[] {CasperConfig.class});
+
+            if (actionBlocksLoader) {
+                ethereum.getBlockLoader().loadBlocks();
+            }
+        }
+    }
+}

ethereumj-core/src/main/java/org/ethereum/casper/config/CasperBeanConfig.java

@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) [2016] [ <ether.camp> ]
+ * This file is part of the ethereumJ library.
+ *
+ * The ethereumJ library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The ethereumJ library 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with the ethereumJ library. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.ethereum.casper.config;
+
+import org.ethereum.casper.core.CasperPendingStateImpl;
+import org.ethereum.casper.manager.CasperWorldManager;
+import org.ethereum.casper.mine.CasperBlockMiner;
+import org.ethereum.config.CommonConfig;
+import org.ethereum.config.SystemProperties;
+import org.ethereum.core.Block;
+import org.ethereum.core.Blockchain;
+import org.ethereum.core.PendingState;
+import org.ethereum.core.Repository;
+import org.ethereum.core.Transaction;
+import org.ethereum.core.TransactionExecutor;
+import org.ethereum.core.TransactionExecutorFactory;
+import org.ethereum.casper.core.CasperBlockchain;
+import org.ethereum.casper.core.CasperTransactionExecutor;
+import org.ethereum.db.BlockStore;
+import org.ethereum.listener.CompositeEthereumListener;
+import org.ethereum.listener.EthereumListener;
+import org.ethereum.manager.WorldManager;
+import org.ethereum.mine.BlockMiner;
+import org.ethereum.vm.program.invoke.ProgramInvokeFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@Configuration
+@EnableTransactionManagement
+public class CasperBeanConfig extends CommonConfig {
+
+    @Override
+    @Bean
+    public Blockchain blockchain() {
+        return new CasperBlockchain(systemProperties());
+    }
+
+    @Override
+    @Bean
+    public TransactionExecutorFactory transactionExecutorFactory() {
+        return new CasperTransactionExecutorFactory();
+    }
+
+    class CasperTransactionExecutorFactory implements TransactionExecutorFactory {
+
+        @Override
+        public TransactionExecutor createTransactionExecutor(Transaction tx, byte[] coinbase, Repository track,
+                                                             BlockStore blockStore, ProgramInvokeFactory programInvokeFactory,
+                                                             Block currentBlock) {
+            return new CasperTransactionExecutor(tx, coinbase, track, blockStore, programInvokeFactory, currentBlock);
+        }
+
+        @Override
+        public TransactionExecutor createTransactionExecutor(Transaction tx, byte[] coinbase, Repository track,
+                                                             BlockStore blockStore, ProgramInvokeFactory programInvokeFactory,
+                                                             Block currentBlock, EthereumListener listener, long gasUsedInTheBlock) {
+            return new CasperTransactionExecutor(tx, coinbase, track, blockStore, programInvokeFactory, currentBlock,
+                    listener, gasUsedInTheBlock);
+        }
+    }
+
+    @Bean
+    @Override
+    public WorldManager worldManager() {
+        return new CasperWorldManager(systemProperties(), repository(), blockchain());
+    }
+
+    @Bean
+    @Override
+    public PendingState pendingState() {
+        return new CasperPendingStateImpl(ethereumListener);
+    }
+
+    @Bean
+    @Override
+    public BlockMiner blockMiner() {
+        return new CasperBlockMiner(systemProperties(), (CompositeEthereumListener) ethereumListener,
+                blockchain(), pendingState());
+    }
+
+    @Bean
+    @Override
+    public SystemProperties systemProperties() {
+        return CasperProperties.getDefault();
+    }
+}

ethereumj-core/src/main/java/org/ethereum/casper/config/CasperConfig.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) [2016] [ <ether.camp> ]
+ * This file is part of the ethereumJ library.
+ *
+ * The ethereumJ library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The ethereumJ library 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with the ethereumJ library. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.ethereum.casper.config;
+
+import org.ethereum.config.CommonConfig;
+import org.ethereum.config.DefaultConfig;
+import org.ethereum.config.NoAutoscan;
+import org.ethereum.config.SystemProperties;
+import org.ethereum.datasource.Source;
+import org.ethereum.db.BlockStore;
+import org.ethereum.db.IndexedBlockStore;
+import org.ethereum.db.PruneManager;
+import org.ethereum.db.TransactionStore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@ComponentScan(
+        basePackages = "org.ethereum",
+        excludeFilters = {@ComponentScan.Filter(NoAutoscan.class),
+                @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = {CommonConfig.class, DefaultConfig.class})},
+        includeFilters = {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = {CasperBeanConfig.class})}
+)
+@Import(CasperBeanConfig.class)
+public class CasperConfig {
+    private static Logger logger = LoggerFactory.getLogger("general");
+
+    @Autowired
+    ApplicationContext appCtx;
+
+    @Autowired
+    CasperBeanConfig beanConfig;
+
+    @Autowired
+    SystemProperties config;
+
+    public CasperConfig() {
+        Thread.setDefaultUncaughtExceptionHandler((t, e) -> logger.error("Uncaught exception", e));
+    }
+
+    @Bean
+    public BlockStore blockStore(){
+        beanConfig.fastSyncCleanUp();
+        IndexedBlockStore indexedBlockStore = new IndexedBlockStore();
+        Source<byte[], byte[]> block = beanConfig.cachedDbSource("block");
+        Source<byte[], byte[]> index = beanConfig.cachedDbSource("index");
+        indexedBlockStore.init(index, block);
+
+        return indexedBlockStore;
+    }
+
+    @Bean
+    public TransactionStore transactionStore() {
+        beanConfig.fastSyncCleanUp();
+        return new TransactionStore(beanConfig.cachedDbSource("transactions"));
+    }
+
+    @Bean
+    public PruneManager pruneManager() {
+        if (config.databasePruneDepth() >= 0) {
+            return new PruneManager((IndexedBlockStore) blockStore(), beanConfig.stateSource().getJournalSource(),
+                    config.databasePruneDepth());
+        } else {
+            return new PruneManager(null, null, -1); // dummy
+        }
+    }
+}

ethereumj-core/src/main/java/org/ethereum/casper/config/CasperProperties.java

@@ -0,0 +1,91 @@
+package org.ethereum.casper.config;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.ethereum.casper.config.net.CasperTestNetConfig;
+import org.ethereum.config.BlockchainNetConfig;
+import org.ethereum.config.SystemProperties;
+import org.ethereum.core.genesis.GenesisConfig;
+import org.ethereum.util.ByteUtil;
+import org.ethereum.validator.BlockCustomHashRule;
+import org.ethereum.validator.BlockHeaderValidator;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.stream.Collectors;
+
+import static org.ethereum.casper.config.net.CasperTestNetConfig.EPOCH_LENGTH;
+
+public class CasperProperties extends SystemProperties {
+
+    private static CasperProperties CONFIG;
+
+    private byte[] casperAddress = null;
+
+    public static SystemProperties getDefault() {
+        if (CONFIG == null) {
+            CONFIG = new CasperProperties();
+        }
+        return CONFIG;
+    }
+
+    public byte[] getCasperAddress() {
+        return casperAddress;
+    }
+
+    public void setCasperAddress(byte[] casperAddress) {
+        this.casperAddress = casperAddress;
+    }
+
+    public int getCasperEpochLength() {
+        return EPOCH_LENGTH;
+    }
+
+    public byte[] getCasperValidatorPrivateKey() {
+        String key = config.getString("casper.validator.privateKey");
+        if (key == null) return null;
+        return ByteUtil.hexStringToBytes(key);
+    }
+
+    public long getCasperValidatorDeposit() {
+        return config.getLong("casper.validator.deposit");
+    }
+
+    public Boolean getCasperValidatorEnabled() {
+        return config.getBoolean("casper.validator.enabled");
+    }
+
+    public String getCasperAbi() {
+        final String abiLocation = config.getString("casper.contractAbi");
+        return readFile(abiLocation);
+    }
+
+    public String getCasperBin() {
+        final String binLocation = config.getString("casper.contractBin");
+        return readFile(binLocation);
+    }
+
+    private static String readFile(final String location) {
+        try {
+            InputStream is = SystemProperties.class.getResourceAsStream(location);
+
+            if (is != null) {
+                return readStream(is);
+            } else {
+                logger.error("File not found `{}`", location);
+                throw new RuntimeException(String.format("File not found `%s`", location));
+            }
+        } catch (Exception ex) {
+            String errorMsg = String.format("Error while reading file from %s", location);
+            logger.error(errorMsg, ex);
+            throw new RuntimeException(errorMsg, ex);
+        }
+    }
+
+    private static String readStream(InputStream input) throws IOException {
+        try (BufferedReader buffer = new BufferedReader(new InputStreamReader(input))) {
+            return buffer.lines().collect(Collectors.joining("\n"));
+        }
+    }
+}