Revert "Added validators for transaction and transaction receipt in P…

…endingState"

This reverts commit 2b1db0f.

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

@@ -17,12 +17,14 @@
  */
 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;
@@ -79,6 +81,12 @@ public WorldManager worldManager() {
         return new CasperWorldManager(systemProperties(), repository(), blockchain());
     }
 
+    @Bean
+    @Override
+    public PendingState pendingState() {
+        return new CasperPendingStateImpl(ethereumListener);
+    }
+
     @Bean
     @Override
     public BlockMiner blockMiner() {

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

@@ -1,7 +1,13 @@
 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;

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

@@ -33,14 +33,6 @@
 import org.ethereum.db.ByteArrayWrapper;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.util.RLP;
-import org.ethereum.validator.transaction.ReceiptCasperVoteRule;
-import org.ethereum.validator.transaction.ReceiptValidityRule;
-import org.ethereum.validator.transaction.TransactionCasperVoteRule;
-import org.ethereum.validator.transaction.TransactionFieldsRule;
-import org.ethereum.validator.transaction.TransactionMineGasPriceRule;
-import org.ethereum.validator.transaction.TransactionReceiptValidator;
-import org.ethereum.validator.transaction.TransactionRule;
-import org.ethereum.validator.transaction.TransactionValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.spongycastle.util.Arrays;
@@ -49,7 +41,6 @@
 
 import java.math.BigInteger;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -68,12 +59,6 @@ public class CasperBlockchain extends BlockchainImpl {
     @Autowired
     private CasperFacade casper;
 
-    @Autowired
-    private TransactionValidator transactionValidator;
-
-    @Autowired
-    private TransactionReceiptValidator receiptValidator;
-
     private static final Logger logger = LoggerFactory.getLogger("blockchain");
     private static final Logger stateLogger = LoggerFactory.getLogger("state");
 
@@ -379,22 +364,6 @@ coinbase, txTrack, blockStore, getProgramInvokeFactory(), block, listener, 0)
             track.addBalance(casperAddress, track.getBalance(casperAddress).negate());
             track.addBalance(casperAddress, BigInteger.valueOf(10).pow(25));
         });
-        updateValidators();  // as casper contract is in place
-    }
-
-    private void updateValidators() {
-        // Update transaction validator as casper txs are applied
-        transactionValidator.reInit(
-                new ArrayList<TransactionRule>() {{
-                    add(new TransactionFieldsRule());
-                    add(new TransactionCasperVoteRule((CasperProperties) config, new TransactionMineGasPriceRule(config)));
-                }}
-        );
-
-        // Update transaction receipts validator
-        receiptValidator.reInit(Collections.singletonList(
-                new ReceiptCasperVoteRule((CasperProperties) config, new ReceiptValidityRule()))
-        );
     }
 
     /**
@@ -478,12 +447,4 @@ private BigInteger getPoWDifficulty(final Block block) {
     public void setCasper(CasperFacade casper) {
         this.casper = casper;
     }
-
-    public void setTransactionValidator(TransactionValidator transactionValidator) {
-        this.transactionValidator = transactionValidator;
-    }
-
-    public void setReceiptValidator(TransactionReceiptValidator receiptValidator) {
-        this.receiptValidator = receiptValidator;
-    }
 }

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

@@ -0,0 +1,63 @@
+/*
+ * 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.core;
+
+import org.ethereum.casper.config.CasperProperties;
+import org.ethereum.core.PendingStateImpl;
+import org.ethereum.core.Transaction;
+import org.ethereum.core.TransactionReceipt;
+import org.ethereum.listener.EthereumListener;
+import org.ethereum.util.ByteUtil;
+
+public class CasperPendingStateImpl extends PendingStateImpl {
+
+    public CasperPendingStateImpl(EthereumListener listener) {
+        super(listener);
+    }
+
+    @Override
+    protected boolean receiptIsValid(TransactionReceipt receipt) {
+        boolean isValid = super.receiptIsValid(receipt);
+        if (isValid) {
+            return true;
+        } else if (CasperFacade.isVote(receipt.getTransaction(), ((CasperProperties) config).getCasperAddress())) {
+            return receipt.isSuccessful();
+        }
+
+        return false;
+    }
+
+    @Override
+    protected String validate(Transaction tx) {
+        try {
+            tx.verify();
+        } catch (Exception e) {
+            return String.format("Invalid transaction: %s", e.getMessage());
+        }
+
+        if (CasperFacade.isVote(tx, ((CasperProperties) config).getCasperAddress())) {
+            return null;  // Doesn't require more checks
+        }
+
+        if (config.getMineMinGasPrice().compareTo(ByteUtil.bytesToBigInteger(tx.getGasPrice())) > 0) {
+            return "Too low gas price for transaction: " + ByteUtil.bytesToBigInteger(tx.getGasPrice());
+        }
+
+        return null;
+    }
+}

ethereumj-core/src/main/java/org/ethereum/config/BlockchainConfig.java

@@ -21,7 +21,7 @@
 import org.ethereum.core.*;
 import org.ethereum.db.BlockStore;
 import org.ethereum.mine.MinerIfc;
-import org.ethereum.validator.block.BlockHeaderValidator;
+import org.ethereum.validator.BlockHeaderValidator;
 import org.ethereum.vm.DataWord;
 import org.ethereum.vm.GasCost;
 import org.ethereum.vm.OpCode;

ethereumj-core/src/main/java/org/ethereum/config/CommonConfig.java

@@ -28,25 +28,18 @@
 import org.ethereum.manager.WorldManager;
 import org.ethereum.mine.BlockMiner;
 import org.ethereum.sync.FastSyncManager;
-import org.ethereum.validator.block.BlockHashRule;
-import org.ethereum.validator.block.BlockHeaderRule;
-import org.ethereum.validator.block.BlockHeaderValidator;
-import org.ethereum.validator.block.DependentBlockHeaderRule;
-import org.ethereum.validator.block.DifficultyRule;
-import org.ethereum.validator.block.ExtraDataRule;
-import org.ethereum.validator.block.GasLimitRule;
-import org.ethereum.validator.block.GasValueRule;
-import org.ethereum.validator.block.ParentBlockHeaderValidator;
-import org.ethereum.validator.block.ParentGasLimitRule;
-import org.ethereum.validator.block.ParentNumberRule;
-import org.ethereum.validator.block.ProofOfWorkRule;
-import org.ethereum.validator.transaction.ReceiptValidityRule;
-import org.ethereum.validator.transaction.TransactionFieldsRule;
-import org.ethereum.validator.transaction.TransactionMineGasPriceRule;
-import org.ethereum.validator.transaction.TransactionReceiptRule;
-import org.ethereum.validator.transaction.TransactionReceiptValidator;
-import org.ethereum.validator.transaction.TransactionRule;
-import org.ethereum.validator.transaction.TransactionValidator;
+import org.ethereum.validator.BlockHashRule;
+import org.ethereum.validator.BlockHeaderRule;
+import org.ethereum.validator.BlockHeaderValidator;
+import org.ethereum.validator.DependentBlockHeaderRule;
+import org.ethereum.validator.DifficultyRule;
+import org.ethereum.validator.ExtraDataRule;
+import org.ethereum.validator.GasLimitRule;
+import org.ethereum.validator.GasValueRule;
+import org.ethereum.validator.ParentBlockHeaderValidator;
+import org.ethereum.validator.ParentGasLimitRule;
+import org.ethereum.validator.ParentNumberRule;
+import org.ethereum.validator.ProofOfWorkRule;
 import org.ethereum.vm.DataWord;
 import org.ethereum.vm.program.ProgramPrecompile;
 import org.ethereum.vm.program.invoke.ProgramInvokeFactory;
@@ -59,7 +52,6 @@
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -287,27 +279,6 @@ public ParentBlockHeaderValidator parentHeaderValidator() {
         return new ParentBlockHeaderValidator(rules);
     }
 
-    @Bean
-    public TransactionValidator transactionValidator() {
-
-        List<TransactionRule> rules = new ArrayList<>(asList(
-                new TransactionFieldsRule(),
-                new TransactionMineGasPriceRule(systemProperties())
-        ));
-
-        return new TransactionValidator(rules);
-    }
-
-    @Bean
-    public TransactionReceiptValidator transactionReceiptValidator() {
-
-        List<TransactionReceiptRule> rules = Collections.singletonList(
-                new ReceiptValidityRule()
-        );
-
-        return new TransactionReceiptValidator(rules);
-    }
-
     @Bean
     @Lazy
     public PeerSource peerSource() {

ethereumj-core/src/main/java/org/ethereum/config/SystemProperties.java

@@ -35,8 +35,8 @@
 import org.ethereum.net.rlpx.Node;
 import org.ethereum.util.BuildInfo;
 import org.ethereum.util.ByteUtil;
-import org.ethereum.validator.block.BlockCustomHashRule;
-import org.ethereum.validator.block.BlockHeaderValidator;
+import org.ethereum.validator.BlockCustomHashRule;
+import org.ethereum.validator.BlockHeaderValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.spongycastle.util.encoders.Hex;

ethereumj-core/src/main/java/org/ethereum/config/blockchain/AbstractConfig.java

@@ -26,7 +26,7 @@
 import org.ethereum.db.BlockStore;
 import org.ethereum.mine.EthashMiner;
 import org.ethereum.mine.MinerIfc;
-import org.ethereum.validator.block.BlockHeaderValidator;
+import org.ethereum.validator.BlockHeaderValidator;
 import org.ethereum.vm.DataWord;
 import org.ethereum.vm.GasCost;
 import org.ethereum.vm.OpCode;

ethereumj-core/src/main/java/org/ethereum/config/blockchain/AbstractDaoConfig.java

@@ -17,16 +17,19 @@
  */
 package org.ethereum.config.blockchain;
 
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.ethereum.config.BlockchainConfig;
 import org.ethereum.core.BlockHeader;
 import org.ethereum.core.Transaction;
-import org.ethereum.validator.block.BlockHeaderRule;
-import org.ethereum.validator.block.BlockHeaderValidator;
-import org.ethereum.validator.block.ExtraDataPresenceRule;
+import org.ethereum.validator.BlockHeaderRule;
+import org.ethereum.validator.BlockHeaderValidator;
+import org.ethereum.validator.ExtraDataPresenceRule;
 import org.spongycastle.util.encoders.Hex;
 
 import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * Created by Stan Reshetnyk on 26.12.16.

ethereumj-core/src/main/java/org/ethereum/config/blockchain/Eip150HFConfig.java

@@ -29,7 +29,7 @@
 import org.ethereum.db.BlockStore;
 import org.ethereum.mine.MinerIfc;
 import org.ethereum.util.Utils;
-import org.ethereum.validator.block.BlockHeaderValidator;
+import org.ethereum.validator.BlockHeaderValidator;
 import org.ethereum.vm.DataWord;
 import org.ethereum.vm.GasCost;
 import org.ethereum.vm.OpCode;

ethereumj-core/src/main/java/org/ethereum/config/blockchain/RopstenConfig.java

@@ -19,10 +19,14 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.ethereum.config.BlockchainConfig;
-import org.ethereum.validator.block.BlockCustomHashRule;
-import org.ethereum.validator.block.BlockHeaderValidator;
+import org.ethereum.validator.BlockCustomHashRule;
+import org.ethereum.validator.BlockHeaderRule;
+import org.ethereum.validator.BlockHeaderValidator;
 import org.spongycastle.util.encoders.Hex;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * Created by Anton Nashatyrev on 21.11.2016.
  */

ethereumj-core/src/main/java/org/ethereum/core/BlockchainImpl.java

@@ -29,8 +29,8 @@
 import org.ethereum.listener.EthereumListenerAdapter;
 import org.ethereum.manager.AdminInfo;
 import org.ethereum.util.*;
-import org.ethereum.validator.block.DependentBlockHeaderRule;
-import org.ethereum.validator.block.ParentBlockHeaderValidator;
+import org.ethereum.validator.DependentBlockHeaderRule;
+import org.ethereum.validator.ParentBlockHeaderValidator;
 import org.ethereum.vm.program.invoke.ProgramInvokeFactory;
 import org.ethereum.vm.program.invoke.ProgramInvokeFactoryImpl;
 import org.slf4j.Logger;