Improve Remasc storage before 0.5.0 activation

rskj-core/src/main/java/co/rsk/FullNodeRunner.java

@@ -19,8 +19,6 @@
 
 import co.rsk.config.RskSystemProperties;
 import co.rsk.core.Rsk;
-import co.rsk.db.PruneConfiguration;
-import co.rsk.db.PruneService;
 import co.rsk.mine.MinerClient;
 import co.rsk.mine.MinerServer;
 import co.rsk.mine.TxBuilder;
@@ -40,7 +38,6 @@
 import org.ethereum.rpc.Web3;
 import org.ethereum.sync.SyncPool;
 import org.ethereum.util.BuildInfo;
-import org.ethereum.vm.PrecompiledContracts;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,8 +70,6 @@ public class FullNodeRunner implements NodeRunner {
     private final TransactionGateway transactionGateway;
     private final BuildInfo buildInfo;
 
-    private final PruneService pruneService;
-
     @Autowired
     public FullNodeRunner(
             Rsk rsk,
@@ -115,9 +110,6 @@ public FullNodeRunner(
         this.peerClientFactory = peerClientFactory;
         this.transactionGateway = transactionGateway;
         this.buildInfo = buildInfo;
-
-        PruneConfiguration pruneConfiguration = rskSystemProperties.getPruneConfiguration();
-        this.pruneService = new PruneService(pruneConfiguration, rskSystemProperties, blockchain, PrecompiledContracts.REMASC_ADDR);
     }
 
     @Override
@@ -179,10 +171,6 @@ public void run() throws Exception {
             }
         }
 
-        if (rskSystemProperties.isPruneEnabled()) {
-            pruneService.start();
-        }
-
         logger.info("done");
     }
 
@@ -232,10 +220,6 @@ private void waitRskSyncDone() throws InterruptedException {
     public void stop() {
         logger.info("Shutting down RSK node");
 
-        if (rskSystemProperties.isPruneEnabled()) {
-            pruneService.stop();
-        }
-
         syncPool.stop();
 
         boolean rpcHttpEnabled = rskSystemProperties.isRpcHttpEnabled();

rskj-core/src/main/java/co/rsk/RskContext.java

@@ -25,6 +25,7 @@
 import co.rsk.core.DifficultyCalculator;
 import co.rsk.core.RskFactory;
 import co.rsk.core.bc.BlockValidatorImpl;
+import co.rsk.db.StateRootHandler;
 import co.rsk.validators.BlockParentDependantValidationRule;
 import co.rsk.validators.BlockValidationRule;
 import co.rsk.validators.BlockValidator;
@@ -61,6 +62,7 @@ public class RskContext {
     private ReceiptStore receiptStore;
     private ProgramInvokeFactoryImpl programInvokeFactory;
     private TransactionPool transactionPool;
+    private StateRootHandler stateRootHandler;
 
     public RskContext(String[] args) {
         this(new CliArgs.Parser<>(
@@ -92,13 +94,22 @@ private BlockChainLoader getBlockChainLoader() {
                     getTransactionPool(),
                     getCompositeEthereumListener(),
                     getBlockValidator(),
-                    getGenesis()
+                    getGenesis(),
+                    getStateRootHandler()
             );
         }
 
         return blockChainLoader;
     }
 
+    public StateRootHandler getStateRootHandler() {
+        if (stateRootHandler == null) {
+            stateRootHandler = factory.getStateRootHandler(getRskSystemProperties());
+        }
+
+        return stateRootHandler;
+    }
+
     public TransactionPool getTransactionPool() {
         if (transactionPool == null) {
             transactionPool = factory.getTransactionPool(
@@ -160,7 +171,8 @@ private BlockParentDependantValidationRule getBlockParentDependantValidationRule
             blockParentDependantValidationRule = factory.blockParentDependantValidationRule(
                     getRepository(),
                     getRskSystemProperties(),
-                    getDifficultyCalculator()
+                    getDifficultyCalculator(),
+                    getStateRootHandler()
             );
         }
 

rskj-core/src/main/java/co/rsk/config/RskSystemProperties.java

@@ -19,7 +19,6 @@
 package co.rsk.config;
 
 import co.rsk.core.RskAddress;
-import co.rsk.db.PruneConfiguration;
 import co.rsk.rpc.ModuleDescription;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigObject;
@@ -319,29 +318,6 @@ public VmConfig getVmConfig() {
         return new VmConfig(vmTrace(), vmTraceInitStorageLimit(), dumpBlock(), dumpStyle());
     }
 
-    // New prune service properties
-    public boolean isPruneEnabled() {
-        return configFromFiles.getBoolean("prune.enabled");
-    }
-
-    public int getPruneNoBlocksToCopy() {
-        return configFromFiles.getInt("prune.blocks.toCopy");
-    }
-
-    public int getPruneNoBlocksToWait() {
-        return configFromFiles.getInt("prune.blocks.toWait");
-    }
-
-    public int getPruneNoBlocksToAvoidForks() {
-        return configFromFiles.getInt("prune.blocks.toAvoidForks");
-    }
-
-    public PruneConfiguration getPruneConfiguration() {
-        return new PruneConfiguration(this.getPruneNoBlocksToCopy(),
-                                      this.getPruneNoBlocksToAvoidForks(),
-                                      this.getPruneNoBlocksToWait());
-    }
-
     public long peerDiscoveryCleanPeriod() {
         return PD_DEFAULT_CLEAN_PERIOD;
     }

rskj-core/src/main/java/co/rsk/core/RskFactory.java

@@ -24,6 +24,7 @@
 import co.rsk.core.bc.TransactionPoolImpl;
 import co.rsk.crypto.Keccak256;
 import co.rsk.db.RepositoryImpl;
+import co.rsk.db.StateRootHandler;
 import co.rsk.metrics.BlockHeaderElement;
 import co.rsk.logfilter.BlocksBloomStore;
 import co.rsk.metrics.HashRateCalculator;
@@ -544,8 +545,9 @@ public Repository repository(RskSystemProperties config) {
     public BlockParentDependantValidationRule blockParentDependantValidationRule(
             Repository repository,
             RskSystemProperties config,
-            DifficultyCalculator difficultyCalculator) {
-        BlockTxsValidationRule blockTxsValidationRule = new BlockTxsValidationRule(repository);
+            DifficultyCalculator difficultyCalculator,
+            StateRootHandler stateRootHandler) {
+        BlockTxsValidationRule blockTxsValidationRule = new BlockTxsValidationRule(repository, stateRootHandler);
         BlockTxsFieldsValidationRule blockTxsFieldsValidationRule = new BlockTxsFieldsValidationRule();
         PrevMinGasPriceRule prevMinGasPriceRule = new PrevMinGasPriceRule();
         BlockParentNumberRule parentNumberRule = new BlockParentNumberRule();
@@ -681,6 +683,11 @@ public ParentBlockHeaderValidator parentHeaderValidator(RskSystemProperties conf
         return new ParentBlockHeaderValidator(rules);
     }
 
+    @Bean
+    public StateRootHandler getStateRootHandler(RskSystemProperties config) {
+        return buildStateRootHandler(config);
+    }
+
     public ReceiptStore buildReceiptStore(String databaseDir) {
         KeyValueDataSource ds = new LevelDbDataSource("receipts", databaseDir);
         ds.init();
@@ -729,6 +736,13 @@ public static org.ethereum.db.BlockStore buildBlockStore(String databaseDir) {
         return new IndexedBlockStore(indexMap, blocksDB, indexDB);
     }
 
+    public StateRootHandler buildStateRootHandler(RskSystemProperties config) {
+        KeyValueDataSource stateRootsDB = new LevelDbDataSource("stateRoots", config.databaseDir());
+        stateRootsDB.init();
+
+        return new StateRootHandler(config, stateRootsDB, new HashMap<>());
+    }
+
     private KeyValueDataSource makeDataSource(String name, String databaseDir) {
         KeyValueDataSource ds = new LevelDbDataSource(name, databaseDir);
         ds.init();