check if the AVM is enabled inside the BulkExecutor

aionnetwork · Feb 14, 2019 · aa2cfb4 · aa2cfb4
1 parent 6cbf05f
commit aa2cfb4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/modAionImpl/src/org/aion/zero/impl/AionBlockchainImpl.java b/modAionImpl/src/org/aion/zero/impl/AionBlockchainImpl.java
@@ -220,6 +220,7 @@ protected AionBlockchainImpl(
          */
         this.chainConfiguration = chainConfig;
         TransactionTypeValidator.enableAvmCheck(config.isAvmEnabled());
+        BulkExecutor.enabledAvmCheck(config.isAvmEnabled());
 
         this.grandParentBlockHeaderValidator =
                 this.chainConfiguration.createGrandParentHeaderValidator();

diff --git a/modVM/src/org/aion/vm/BulkExecutor.java b/modVM/src/org/aion/vm/BulkExecutor.java
@@ -55,6 +55,12 @@
 public class BulkExecutor {
     private static final Object LOCK = new Object();
 
+    private static boolean avmEnabled = false;
+
+    public static void enabledAvmCheck(boolean isEnabled) {
+        avmEnabled = isEnabled;
+    }
+
     private IRepository repository;
     private IRepositoryCache<AccountState, IBlockStoreBase<?, ?>> repositoryChild;
     private PostExecutionWork postExecutionWork;
@@ -394,11 +400,16 @@ private ExecutionBatch fetchNextBatchOfTransactionsForAionVirtualMachine(int sta
      * future.
      */
     private boolean transactionIsForFastVirtualMachine(AionTransaction transaction) {
-        if (transaction.isContractCreationTransaction()) {
-            return transaction.getTargetVM() != VirtualMachineSpecs.AVM_CREATE_CODE;
+        // first verify that the AVM is enabled
+        if (avmEnabled) {
+            if (transaction.isContractCreationTransaction()) {
+                return transaction.getTargetVM() != VirtualMachineSpecs.AVM_CREATE_CODE;
+            } else {
+                return transaction.getDestinationAddress().toBytes()[0]
+                        != NodeEnvironment.CONTRACT_PREFIX;
+            }
         } else {
-            return transaction.getDestinationAddress().toBytes()[0]
-                    != NodeEnvironment.CONTRACT_PREFIX;
+            return true;
         }
     }
 
@@ -409,11 +420,16 @@ private boolean transactionIsForFastVirtualMachine(AionTransaction transaction)
      * the destination is an AVM contract address
      */
     private boolean transactionIsForAionVirtualMachine(AionTransaction transaction) {
-        if (transaction.isContractCreationTransaction()) {
-            return transaction.getTargetVM() == VirtualMachineSpecs.AVM_CREATE_CODE;
+        // first verify that the AVM is enabled
+        if (avmEnabled) {
+            if (transaction.isContractCreationTransaction()) {
+                return transaction.getTargetVM() == VirtualMachineSpecs.AVM_CREATE_CODE;
+            } else {
+                return transaction.getDestinationAddress().toBytes()[0]
+                        == NodeEnvironment.CONTRACT_PREFIX;
+            }
         } else {
-            return transaction.getDestinationAddress().toBytes()[0]
-                    == NodeEnvironment.CONTRACT_PREFIX;
+            return false;
         }
     }
 }