Merge pull request #805 from aionnetwork/fvm-tx-types

Allowing 0 as a transaction type for the FVM
aionnetwork · Feb 5, 2019 · c19de42 · c19de42
2 parents 877e4e8 + d9d391a
commit c19de42
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/modAionBase/src/org/aion/base/vm/VirtualMachineSpecs.java b/modAionBase/src/org/aion/base/vm/VirtualMachineSpecs.java
@@ -3,5 +3,6 @@
 public final class VirtualMachineSpecs {
 
     public static final byte AVM_CREATE_CODE = 0x0f;
+    public static final byte FVM_ALLOWED_TX_TYPE = 0x00;
     public static final byte FVM_DEFAULT_TX_TYPE = 0x01;
 }
diff --git a/modMcf/src/org/aion/mcf/valid/TransactionTypeRule.java b/modMcf/src/org/aion/mcf/valid/TransactionTypeRule.java
@@ -10,7 +10,8 @@
 public class TransactionTypeRule {
 
     public static boolean isValidFVMTransactionType(byte type) {
-        return type == VirtualMachineSpecs.FVM_DEFAULT_TX_TYPE;
+        return type == VirtualMachineSpecs.FVM_DEFAULT_TX_TYPE
+                || type == VirtualMachineSpecs.FVM_ALLOWED_TX_TYPE;
     }
 
     public static boolean isValidAVMTransactionType(byte type) {