feat(*): disable market transaction

Author: halibobo1205

actuator/src/main/java/org/tron/core/utils/ProposalUtil.java

@@ -356,7 +356,8 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
         break;
       }
       case ALLOW_MARKET_TRANSACTION: {
-        if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_1)) {
+        if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_1)
+            || forkController.pass(ForkBlockVersionEnum.VERSION_4_8_1)) {
           throw new ContractValidateException(
               "Bad chain parameter id [ALLOW_MARKET_TRANSACTION]");
         }

framework/src/test/java/org/tron/core/actuator/utils/ProposalUtilTest.java

@@ -1,5 +1,8 @@
 package org.tron.core.actuator.utils;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+
 import com.google.protobuf.ByteString;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -11,6 +14,7 @@
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.function.ThrowingRunnable;
 import org.tron.common.BaseTest;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.ForkController;
@@ -438,9 +442,28 @@ public void validateCheck() {
     testAllowTvmCancunProposal();
 
     testAllowTvmBlobProposal();
-
+    ThrowingRunnable r0 = () -> ProposalUtil.validator(dynamicPropertiesStore, forkUtils,
+        ProposalType.ALLOW_MARKET_TRANSACTION.getCode(), 0);
+    ThrowingRunnable r1 = () -> ProposalUtil.validator(dynamicPropertiesStore, forkUtils,
+        ProposalType.ALLOW_MARKET_TRANSACTION.getCode(), 1);
+    ContractValidateException thrown = assertThrows(ContractValidateException.class, r1);
+    assertEquals("Bad chain parameter id [ALLOW_MARKET_TRANSACTION]", thrown.getMessage());
+
+    forkUtils.getManager().getDynamicPropertiesStore().statsByVersion(
+        ForkBlockVersionEnum.VERSION_4_1.getValue(), stats);
+    try {
+      r1.run();
+    } catch (Throwable e) {
+      Assert.fail(e.getMessage());
+    }
+    thrown = assertThrows(ContractValidateException.class, r0);
+    assertEquals("This value[ALLOW_MARKET_TRANSACTION] is only allowed to be 1",
+        thrown.getMessage());
     testAllowTvmSelfdestructRestrictionProposal();
 
+    thrown = assertThrows(ContractValidateException.class, r1);
+    assertEquals("Bad chain parameter id [ALLOW_MARKET_TRANSACTION]", thrown.getMessage());
+
     forkUtils.getManager().getDynamicPropertiesStore()
         .statsByVersion(ForkBlockVersionEnum.ENERGY_LIMIT.getValue(), stats);
     forkUtils.reset();
@@ -710,7 +733,6 @@ private void testAllowTvmSelfdestructRestrictionProposal() {
           "[ALLOW_TVM_SELFDESTRUCT_RESTRICTION] has been valid, no need to propose again",
           e.getMessage());
     }
-
   }
 
   @Test