validator for transactions ensuring AVM tx can be used only when the …

…AVM is enabled
aionnetwork · Jan 29, 2019 · 9a30633 · 9a30633
1 parent 1acc164
commit 9a30633
Show file tree

Hide file tree

Showing 11 changed files with 94 additions and 6 deletions.
diff --git a/modAionBase/src/org/aion/base/vm/VirtualMachineSpecs.java b/modAionBase/src/org/aion/base/vm/VirtualMachineSpecs.java
@@ -0,0 +1,7 @@
+package org.aion.base.vm;
+
+public final class VirtualMachineSpecs {
+
+    public static final byte AVM_VM_CODE = 0xf;
+    public static final byte FVM_DEFAULT_TX_TYPE = 0x01;
+}
diff --git a/modAionImpl/src/org/aion/zero/impl/A0BCConfig.java b/modAionImpl/src/org/aion/zero/impl/A0BCConfig.java
@@ -35,4 +35,7 @@ public interface A0BCConfig {
 
     /** Retrieves the selected energy strategy algorithm */
     AbstractEnergyStrategyLimit getEnergyLimitStrategy();
+
+    /** Flag for enabling AVM use. */
+    boolean isAvmEnabled();
 }
diff --git a/modAionImpl/src/org/aion/zero/impl/AionBlockchainImpl.java b/modAionImpl/src/org/aion/zero/impl/AionBlockchainImpl.java
@@ -70,6 +70,7 @@
 import org.aion.zero.impl.types.AionTxInfo;
 import org.aion.zero.impl.types.RetValidPreBlock;
 import org.aion.zero.impl.valid.TXValidator;
+import org.aion.zero.impl.valid.TransactionTypeValidator;
 import org.aion.zero.types.A0BlockHeader;
 import org.aion.zero.types.AionTransaction;
 import org.aion.zero.types.AionTxExecSummary;
@@ -102,6 +103,7 @@ public class AionBlockchainImpl implements IAionBlockchain {
 
     private A0BCConfig config;
     private long exitOn = Long.MAX_VALUE;
+    private TransactionTypeValidator vmValidator;
 
     private AionRepositoryImpl repository;
     private IRepositoryCache track;
@@ -192,6 +194,11 @@ public AbstractEnergyStrategyLimit getEnergyLimitStrategy() {
                         cfgAion.getConsensus().getEnergyStrategy(),
                         config);
             }
+
+            @Override
+            public boolean isAvmEnabled() {
+                return cfgAion.getVm().isAvmEnabled();
+            }
         };
     }
 
@@ -212,6 +219,7 @@ protected AionBlockchainImpl(
          * blockHash and number.
          */
         this.chainConfiguration = chainConfig;
+        this.vmValidator = new TransactionTypeValidator(config.isAvmEnabled());
 
         this.grandParentBlockHeaderValidator =
                 this.chainConfiguration.createGrandParentHeaderValidator();
@@ -992,7 +1000,8 @@ private boolean isValid(AionBlock block) {
 
                 Map<Address, BigInteger> nonceCache = new HashMap<>();
 
-                if (txs.parallelStream().anyMatch(tx -> !TXValidator.isValid(tx))) {
+                if (txs.parallelStream()
+                        .anyMatch(tx -> !TXValidator.isValid(tx) || !vmValidator.isValid(tx))) {
                     LOG.error("Some transactions in the block are invalid");
                     return false;
                 }

diff --git a/modAionImpl/src/org/aion/zero/impl/StandaloneBlockchain.java b/modAionImpl/src/org/aion/zero/impl/StandaloneBlockchain.java
@@ -250,6 +250,11 @@ public AbstractEnergyStrategyLimit getEnergyLimitStrategy() {
                                                     .getEnergyDivisorLimitLong(),
                                             10_000_000L);
                                 }
+
+                                @Override
+                                public boolean isAvmEnabled() {
+                                    return false;
+                                }
                             }
                             : this.a0Config;
 

diff --git a/modAionImpl/src/org/aion/zero/impl/blockchain/AionPendingStateImpl.java b/modAionImpl/src/org/aion/zero/impl/blockchain/AionPendingStateImpl.java
@@ -54,6 +54,7 @@
 import org.aion.zero.impl.types.AionBlock;
 import org.aion.zero.impl.types.AionTxInfo;
 import org.aion.zero.impl.valid.TXValidator;
+import org.aion.zero.impl.valid.TransactionTypeValidator;
 import org.aion.zero.types.AionTransaction;
 import org.aion.zero.types.AionTxExecSummary;
 import org.aion.zero.types.AionTxReceipt;
@@ -94,6 +95,8 @@ public TransactionSortedSet() {
 
     private TransactionStore<AionTransaction, AionTxReceipt, AionTxInfo> transactionStore;
 
+    private TransactionTypeValidator vmValidator;
+
     private IRepository repository;
 
     private ITxPool<AionTransaction> txPool;
@@ -281,6 +284,8 @@ public static AionPendingStateImpl createForTesting(
     }
 
     private AionPendingStateImpl(CfgAion _cfgAion, AionRepositoryImpl _repository) {
+        this.vmValidator = new TransactionTypeValidator(_cfgAion.getVm().isAvmEnabled());
+
         this.repository = _repository;
 
         this.isSeed = _cfgAion.getConsensus().isSeed();
@@ -427,6 +432,10 @@ public synchronized TxResponse addPendingTransaction(AionTransaction tx) {
         return addPendingTransactions(Collections.singletonList(tx)).get(0);
     }
 
+    public boolean isValid(AionTransaction tx) {
+        return TXValidator.isValid(tx) && vmValidator.isValid(tx);
+    }
+
     /**
      * Tries to add the given transactions to the PendingState
      *
@@ -612,7 +621,7 @@ private List<TxResponse> seedProcess(List<AionTransaction> transactions) {
         List<AionTransaction> newTx = new ArrayList<>();
         List<TxResponse> txResponses = new ArrayList<>();
         for (AionTransaction tx : transactions) {
-            if (TXValidator.isValid(tx)) {
+            if (isValid(tx)) {
                 newTx.add(tx);
                 txResponses.add(TxResponse.SUCCESS);
             } else {
@@ -670,7 +679,7 @@ private void fireTxUpdate(
      */
     private TxResponse addPendingTransactionImpl(final AionTransaction tx, BigInteger txNonce) {
 
-        if (!TXValidator.isValid(tx)) {
+        if (!isValid(tx)) {
             LOGGER_TX.error("invalid Tx [{}]", tx.toString());
             fireDroppedTx(tx, "INVALID_TX");
             return TxResponse.INVALID_TX;

diff --git a/modAionImpl/src/org/aion/zero/impl/config/CfgAion.java b/modAionImpl/src/org/aion/zero/impl/config/CfgAion.java
@@ -24,6 +24,7 @@
 import org.aion.mcf.config.CfgReports;
 import org.aion.mcf.config.CfgSync;
 import org.aion.mcf.config.CfgTx;
+import org.aion.mcf.config.CfgVm;
 import org.aion.zero.exceptions.HeaderStructureException;
 import org.aion.zero.impl.AionGenesis;
 import org.aion.zero.impl.GenesisBlockLoader;
@@ -53,6 +54,7 @@ public CfgAion() {
         this.reports = new CfgReports();
         this.gui = new CfgGui();
         this.fork = new CfgFork();
+        this.vm = new CfgVm();
         initializeConfiguration();
     }
 

diff --git a/modAionImpl/src/org/aion/zero/impl/sync/handler/BroadcastTxHandler.java b/modAionImpl/src/org/aion/zero/impl/sync/handler/BroadcastTxHandler.java
@@ -123,7 +123,7 @@ private List<AionTransaction> castRawTx(List<byte[]> broadCastTx) {
                 AionTransaction tx = new AionTransaction(raw);
                 if (tx.getTransactionHash() != null) {
                     if (!TXValidator.isInCache(ByteArrayWrapper.wrap(tx.getTransactionHash()))) {
-                        if (TXValidator.isValid(tx)) {
+                        if (pendingState.isValid(tx)) {
                             rtn.add(tx);
                         }
                     }

diff --git a/modAionImpl/src/org/aion/zero/impl/valid/TransactionTypeValidator.java b/modAionImpl/src/org/aion/zero/impl/valid/TransactionTypeValidator.java
@@ -0,0 +1,32 @@
+package org.aion.zero.impl.valid;
+
+import static org.aion.mcf.valid.TransactionTypeRule.isValidAVMTransactionType;
+import static org.aion.mcf.valid.TransactionTypeRule.isValidFVMTransactionType;
+
+import org.aion.zero.types.AionTransaction;
+
+/**
+ * Validator for the type field of transactions allowed by the network. The transaction types
+ * currently correlate with which virtual machines are enabled. This field mainly impacts contract
+ * creation. Contracts created using the default transaction type should be deployed on the FastVM.
+ * AVM contracts creations/transactions are declared valid only if the AVM is enabled from the
+ * configuration and the transaction has the correct type associated with the AVM.
+ *
+ * @author Alexandra Roatis
+ */
+public class TransactionTypeValidator {
+
+    private boolean avmEnabled;
+
+    public TransactionTypeValidator(boolean enableAVM) {
+        this.avmEnabled = enableAVM;
+    }
+
+    public boolean isValid(AionTransaction tx) {
+        // verify transaction type
+        byte type = tx.getTransactionType();
+        // the type must be either valid for the FVM
+        // or for the AVM when the AVM is enabled
+        return isValidFVMTransactionType(type) || (avmEnabled && isValidAVMTransactionType(type));
+    }
+}
diff --git a/modMcf/src/org/aion/mcf/blockchain/IPendingState.java b/modMcf/src/org/aion/mcf/blockchain/IPendingState.java
@@ -12,6 +12,8 @@ public interface IPendingState<TX extends ITransaction> {
 
     TxResponse addPendingTransaction(TX tx);
 
+    boolean isValid(TX tx);
+
     IRepositoryCache<?, ?> getRepository();
 
     List<TX> getPendingTransactions();

diff --git a/modMcf/src/org/aion/mcf/types/AbstractTransaction.java b/modMcf/src/org/aion/mcf/types/AbstractTransaction.java
@@ -1,8 +1,8 @@
 package org.aion.mcf.types;
 
 import java.math.BigInteger;
-import org.aion.base.type.AionAddress;
 import org.aion.base.type.ITransaction;
+import org.aion.base.vm.VirtualMachineSpecs;
 import org.aion.crypto.ISignature;
 import org.aion.log.AionLoggerFactory;
 import org.aion.log.LogEnum;
@@ -55,7 +55,7 @@ public AbstractTransaction(byte[] nonce, Address receiveAddress, byte[] value, b
         this.value = value;
         this.data = data;
         // default type 0x01; reserve date for multi-type transaction
-        this.type = 0x01;
+        this.type = VirtualMachineSpecs.FVM_DEFAULT_TX_TYPE;
     }
 
     public AbstractTransaction(

diff --git a/modMcf/src/org/aion/mcf/valid/TransactionTypeRule.java b/modMcf/src/org/aion/mcf/valid/TransactionTypeRule.java
@@ -0,0 +1,19 @@
+package org.aion.mcf.valid;
+
+import org.aion.base.vm.VirtualMachineSpecs;
+
+/**
+ * Rules for validating transactions based on allowed types.
+ *
+ * @author Alexandra Roatis
+ */
+public class TransactionTypeRule {
+
+    public static boolean isValidFVMTransactionType(byte type) {
+        return type == VirtualMachineSpecs.FVM_DEFAULT_TX_TYPE;
+    }
+
+    public static boolean isValidAVMTransactionType(byte type) {
+        return type == VirtualMachineSpecs.AVM_VM_CODE;
+    }
+}