feat(tvm): add allowTvmBlob proposal for TVM blob related ops and precompiles

Author: textml

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

@@ -824,6 +824,21 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
         }
         break;
       }
+      case ALLOW_TVM_BLOB: {
+        if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_8_0)) {
+          throw new ContractValidateException(
+              "Bad chain parameter id [ALLOW_TVM_BLOB]");
+        }
+        if (dynamicPropertiesStore.getAllowTvmBlob() == 1) {
+          throw new ContractValidateException(
+              "[ALLOW_TVM_BLOB] has been valid, no need to propose again");
+        }
+        if (value != 1) {
+          throw new ContractValidateException(
+              "This value[ALLOW_TVM_BLOB] is only allowed to be 1");
+        }
+        break;
+      }
       default:
         break;
     }
@@ -905,7 +920,8 @@ public enum ProposalType {         // current value, value range
     MAX_CREATE_ACCOUNT_TX_SIZE(82), // [500, 10000]
     ALLOW_TVM_CANCUN(83), // 0, 1
     ALLOW_STRICT_MATH(87), // 0, 1
-    CONSENSUS_LOGIC_OPTIMIZATION(88); // 0, 1
+    CONSENSUS_LOGIC_OPTIMIZATION(88), // 0, 1
+    ALLOW_TVM_BLOB(89); // 0, 1
 
     private long code;
 

actuator/src/main/java/org/tron/core/vm/Op.java

@@ -121,7 +121,7 @@ public class Op {
   // (0x48) Get block's basefee
   public static final int BASEFEE = 0x48;
   // (0x49) Get blob hash
-  public static final int BLOBAHASH = 0x49;
+  public static final int BLOBHASH = 0x49;
   // (0x4a) Get block's blob basefee
   public static final int BLOBBASEFEE = 0x4a;
 

actuator/src/main/java/org/tron/core/vm/OperationActions.java

@@ -678,6 +678,7 @@ public static void mCopyAction(Program program) {
   }
 
   public static void blobHashAction(Program program) {
+    program.stackPop();
     program.stackPush(DataWord.ZERO());
     program.step();
   }

actuator/src/main/java/org/tron/core/vm/OperationRegistry.java

@@ -663,6 +663,7 @@ public static void adjustForFairEnergy(JumpTable table) {
 
   public static void appendCancunOperations(JumpTable table) {
     BooleanSupplier proposal = VMConfig::allowTvmCancun;
+    BooleanSupplier tvmBlobProposal = VMConfig::allowTvmBlob;
 
     table.set(new Operation(
         Op.TLOAD, 1, 1,
@@ -683,15 +684,15 @@ public static void appendCancunOperations(JumpTable table) {
         proposal));
 
     table.set(new Operation(
-        Op.BLOBAHASH, 1, 1,
+        Op.BLOBHASH, 1, 1,
         EnergyCost::getVeryLowTierCost,
         OperationActions::blobHashAction,
-        proposal));
+        tvmBlobProposal));
 
     table.set(new Operation(
         Op.BLOBBASEFEE, 0, 1,
         EnergyCost::getBaseTierCost,
         OperationActions::blobBaseFeeAction,
-        proposal));
+        tvmBlobProposal));
   }
 }

actuator/src/main/java/org/tron/core/vm/PrecompiledContracts.java

@@ -285,7 +285,7 @@ public static PrecompiledContract getContractForAddress(DataWord address) {
     if (VMConfig.allowTvmCompatibleEvm() && address.equals(blake2FAddr)) {
       return blake2F;
     }
-    if (VMConfig.allowTvmCancun() && address.equals(kzgPointEvaluationAddr)) {
+    if (VMConfig.allowTvmBlob() && address.equals(kzgPointEvaluationAddr)) {
       return kzgPointEvaluation;
     }
 

actuator/src/main/java/org/tron/core/vm/config/ConfigLoader.java

@@ -43,6 +43,7 @@ public static void load(StoreFactory storeFactory) {
         VMConfig.initAllowStrictMath(ds.getAllowStrictMath());
         VMConfig.initAllowTvmCancun(ds.getAllowTvmCancun());
         VMConfig.initDisableJavaLangMath(ds.getConsensusLogicOptimization());
+        VMConfig.initAllowTvmBlob(ds.getAllowTvmBlob());
       }
     }
   }

chainbase/src/main/java/org/tron/core/store/DynamicPropertiesStore.java

@@ -230,6 +230,8 @@ public class DynamicPropertiesStore extends TronStoreWithRevoking<BytesCapsule>
 
   private static final byte[] ALLOW_TVM_CANCUN = "ALLOW_TVM_CANCUN".getBytes();
 
+  private static final byte[] ALLOW_TVM_BLOB = "ALLOW_TVM_BLOB".getBytes();
+
   @Autowired
   private DynamicPropertiesStore(@Value("properties") String dbName) {
     super(dbName);
@@ -2933,6 +2935,17 @@ public long getAllowTvmCancun() {
         .orElse(CommonParameter.getInstance().getAllowTvmCancun());
   }
 
+  public void saveAllowTvmBlob(long allowTvmBlob) {
+    this.put(ALLOW_TVM_BLOB, new BytesCapsule(ByteArray.fromLong(allowTvmBlob)));
+  }
+
+  public long getAllowTvmBlob() {
+    return Optional.ofNullable(getUnchecked(ALLOW_TVM_BLOB))
+        .map(BytesCapsule::getData)
+        .map(ByteArray::toLong)
+        .orElse(CommonParameter.getInstance().getAllowTvmBlob());
+  }
+
   private static class DynamicResourceProperties {
 
     private static final byte[] ONE_DAY_NET_LIMIT = "ONE_DAY_NET_LIMIT".getBytes();

common/src/main/java/org/tron/common/parameter/CommonParameter.java

@@ -713,6 +713,10 @@ public class CommonParameter {
   @Setter
   public long allowTvmCancun;
 
+  @Getter
+  @Setter
+  public long allowTvmBlob;
+
   private static double calcMaxTimeRatio() {
     //return max(2.0, min(5.0, 5 * 4.0 / max(Runtime.getRuntime().availableProcessors(), 1)));
     return 5.0;

common/src/main/java/org/tron/core/Constant.java

@@ -401,4 +401,6 @@ public class Constant {
       = "committee.consensusLogicOptimization";
 
   public static final String COMMITTEE_ALLOW_TVM_CANCUN = "committee.allowTvmCancun";
+
+  public static final String COMMITTEE_ALLOW_TVM_BLOB = "committee.allowTvmBlob";
 }

common/src/main/java/org/tron/core/vm/config/VMConfig.java

@@ -57,6 +57,8 @@ public class VMConfig {
 
   private static Boolean DISABLE_JAVA_LANG_MATH = false;
 
+  private static boolean ALLOW_TVM_BLOB = false;
+
   private VMConfig() {
   }
 
@@ -160,6 +162,10 @@ public static void initDisableJavaLangMath(long allow) {
     DISABLE_JAVA_LANG_MATH = allow == 1;
   }
 
+  public static void initAllowTvmBlob(long allow) {
+    ALLOW_TVM_BLOB = allow == 1;
+  }
+
   public static boolean getEnergyLimitHardFork() {
     return CommonParameter.ENERGY_LIMIT_HARD_FORK;
   }
@@ -251,4 +257,8 @@ public static boolean allowTvmCancun() {
   public static boolean disableJavaLangMath() {
     return DISABLE_JAVA_LANG_MATH;
   }
+
+  public static boolean allowTvmBlob() {
+    return ALLOW_TVM_BLOB;
+  }
 }