Merge pull request #3246 from tronprotocol/release_vm_shielded_4.0

Release vm shielded 4.0
tronprotocol · Jul 7, 2020 · b01d5c7 · b01d5c7
2 parents d73ac95 + b836c72
commit b01d5c7
Show file tree

Hide file tree

Showing 97 changed files with 21,349 additions and 2,192 deletions.
diff --git a/actuator/src/main/java/org/tron/core/utils/ProposalUtil.java b/actuator/src/main/java/org/tron/core/utils/ProposalUtil.java
@@ -301,6 +301,17 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore, Fork
         }
         break;
       }
+      case ALLOW_SHIELDED_TRC20_TRANSACTION: {
+        if (!forkUtils.pass(ForkBlockVersionEnum.VERSION_4_0)) {
+          throw new ContractValidateException(
+              "Bad chain parameter id [ALLOW_SHIELDED_TRC20_TRANSACTION]");
+        }
+        if (value != 1 && value != 0) {
+          throw new ContractValidateException(
+              "This value[ALLOW_SHIELDED_TRC20_TRANSACTION] is only allowed to be 1 or 0");
+        }
+        break;
+      }
       default:
         break;
     }
@@ -341,8 +352,9 @@ public enum ProposalType {
     WITNESS_127_PAY_PER_BLOCK(31), //drop, 31
     ALLOW_TVM_SOLIDITY_059(32), // 1, 32
     ADAPTIVE_RESOURCE_LIMIT_TARGET_RATIO(33), // 10, 33
-//    SHIELDED_TRANSACTION_CREATE_ACCOUNT_FEE(34); // 34
-    FORBID_TRANSFER_TO_CONTRACT(35); // 1, 35
+    //    SHIELDED_TRANSACTION_CREATE_ACCOUNT_FEE(34); // 34
+    FORBID_TRANSFER_TO_CONTRACT(35), // 1, 35
+    ALLOW_SHIELDED_TRC20_TRANSACTION(39); // 1, 39
 
     private long code;