Merge branch 'release_v4.8.1' into release_v4.8.1_witness_vote_now

Author: Sunny Jiao

actuator/src/main/java/org/tron/core/actuator/AbstractActuator.java

@@ -122,7 +122,7 @@ public void adjustBalance(AccountStore accountStore, AccountCapsule account, lon
     Commons.adjustBalance(accountStore, account, amount, this.disableJavaLangMath());
   }
 
-  private boolean disableJavaLangMath() {
+  boolean disableJavaLangMath() {
     return chainBaseManager.getDynamicPropertiesStore().disableJavaLangMath();
   }
 }

actuator/src/main/java/org/tron/core/actuator/DelegateResourceActuator.java

@@ -162,7 +162,7 @@ public boolean validate() throws ContractValidateException {
         long netUsage = (long) (accountNetUsage * TRX_PRECISION * ((double)
             (dynamicStore.getTotalNetWeight()) / dynamicStore.getTotalNetLimit()));
         long v2NetUsage = getV2NetUsage(ownerCapsule, netUsage,
-            dynamicStore.disableJavaLangMath());
+            this.disableJavaLangMath());
         if (ownerCapsule.getFrozenV2BalanceForBandwidth() - v2NetUsage < delegateBalance) {
           throw new ContractValidateException(
               "delegateBalance must be less than or equal to available FreezeBandwidthV2 balance");
@@ -176,7 +176,7 @@ public boolean validate() throws ContractValidateException {
         long energyUsage = (long) (ownerCapsule.getEnergyUsage() * TRX_PRECISION * ((double)
             (dynamicStore.getTotalEnergyWeight()) / dynamicStore.getTotalEnergyCurrentLimit()));
         long v2EnergyUsage = getV2EnergyUsage(ownerCapsule, energyUsage,
-            dynamicStore.disableJavaLangMath());
+            this.disableJavaLangMath());
         if (ownerCapsule.getFrozenV2BalanceForEnergy() - v2EnergyUsage < delegateBalance) {
           throw new ContractValidateException(
                   "delegateBalance must be less than or equal to available FreezeEnergyV2 balance");

actuator/src/main/java/org/tron/core/actuator/MarketSellAssetActuator.java

@@ -400,10 +400,9 @@ private void matchSingleOrder(MarketOrderCapsule takerOrderCapsule,
     // => takerBuyTokenQuantityCurrent_A = takerSellTokenQuantityRemain_TRX *
     //   makerSellTokenQuantity_A/makerBuyTokenQuantity_TRX
 
-    boolean disableMath = dynamicStore.disableJavaLangMath();
     long takerBuyTokenQuantityRemain = MarketUtils
         .multiplyAndDivide(takerSellRemainQuantity, makerSellQuantity, makerBuyQuantity,
-            disableMath);
+            this.disableJavaLangMath());
 
     if (takerBuyTokenQuantityRemain == 0) {
       // quantity too small, return sellToken to user
@@ -427,7 +426,7 @@ private void matchSingleOrder(MarketOrderCapsule takerOrderCapsule,
 
       makerBuyTokenQuantityReceive = MarketUtils
           .multiplyAndDivide(makerSellRemainQuantity, makerBuyQuantity, makerSellQuantity,
-              chainBaseManager.getDynamicPropertiesStore().disableJavaLangMath());
+              this.disableJavaLangMath());
       takerBuyTokenQuantityReceive = makerOrderCapsule.getSellTokenQuantityRemain();
 
       long takerSellTokenLeft =
@@ -462,7 +461,7 @@ private void matchSingleOrder(MarketOrderCapsule takerOrderCapsule,
       //   makerSellTokenQuantity_A/makerBuyTokenQuantity_TRX
       makerBuyTokenQuantityReceive = MarketUtils
           .multiplyAndDivide(makerSellRemainQuantity, makerBuyQuantity, makerSellQuantity,
-              chainBaseManager.getDynamicPropertiesStore().disableJavaLangMath());
+              this.disableJavaLangMath());
 
       MarketUtils.updateOrderState(makerOrderCapsule, State.INACTIVE, marketAccountStore);
       if (makerBuyTokenQuantityReceive == 0) {

actuator/src/main/java/org/tron/core/actuator/VMActuator.java

@@ -603,10 +603,10 @@ private long getAccountEnergyLimitWithFloatRatio(AccountCapsule account, long fe
     }
     // can change the calc way
     long leftEnergyFromFreeze = rootRepository.getAccountLeftEnergyFromFreeze(account);
-    boolean isStrict2 = VMConfig.disableJavaLangMath();
-    callValue = max(callValue, 0, isStrict2);
+    callValue = max(callValue, 0, VMConfig.disableJavaLangMath());
     long energyFromBalance = floorDiv(max(
-        account.getBalance() - callValue, 0, isStrict2), sunPerEnergy, isStrict2);
+        account.getBalance() - callValue, 0, VMConfig.disableJavaLangMath()), sunPerEnergy,
+        VMConfig.disableJavaLangMath());
 
     long energyFromFeeLimit;
     long totalBalanceForEnergyFreeze = account.getAllFrozenBalanceForEnergy();

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

@@ -120,6 +120,10 @@ public class Op {
   public static final int SELFBALANCE = 0x47;
   // (0x48) Get block's basefee
   public static final int BASEFEE = 0x48;
+  // (0x49) Get blob hash
+  public static final int BLOBHASH = 0x49;
+  // (0x4a) Get block's blob basefee
+  public static final int BLOBBASEFEE = 0x4a;
 
   /*  Memory, Storage and Flow Operations */
   // (0x50) Remove item from stack

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

@@ -656,6 +656,9 @@ public static void tLoadAction(Program program) {
   }
 
   public static void tStoreAction(Program program) {
+    if (program.isStaticCall()) {
+      throw new Program.StaticCallModificationException();
+    }
     DataWord key = program.stackPop();
     DataWord value = program.stackPop();
     DataWord address = program.getContractAddress();
@@ -674,6 +677,17 @@ public static void mCopyAction(Program program) {
     program.step();
   }
 
+  public static void blobHashAction(Program program) {
+    program.stackPop();
+    program.stackPush(DataWord.ZERO());
+    program.step();
+  }
+
+  public static void blobBaseFeeAction(Program program) {
+    program.stackPush(DataWord.ZERO());
+    program.step();
+  }
+
   public static void push0Action(Program program) {
     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,
@@ -681,5 +682,17 @@ public static void appendCancunOperations(JumpTable table) {
         EnergyCost::getMCopyCost,
         OperationActions::mCopyAction,
         proposal));
+
+    table.set(new Operation(
+        Op.BLOBHASH, 1, 1,
+        EnergyCost::getVeryLowTierCost,
+        OperationActions::blobHashAction,
+        tvmBlobProposal));
+
+    table.set(new Operation(
+        Op.BLOBBASEFEE, 0, 1,
+        EnergyCost::getBaseTierCost,
+        OperationActions::blobBaseFeeAction,
+        tvmBlobProposal));
   }
 }

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

@@ -626,17 +626,16 @@ public long getEnergyForData(byte[] data) {
       int expLen = parseLen(data, 1);
       int modLen = parseLen(data, 2);
 
-      boolean allowStrictMath2 = VMConfig.disableJavaLangMath();
 
       byte[] expHighBytes = parseBytes(data, addSafely(ARGS_OFFSET, baseLen), min(expLen, 32,
-          allowStrictMath2));
+          VMConfig.disableJavaLangMath()));
 
-      long multComplexity = getMultComplexity(max(baseLen, modLen, allowStrictMath2));
+      long multComplexity = getMultComplexity(max(baseLen, modLen, VMConfig.disableJavaLangMath()));
       long adjExpLen = getAdjustedExponentLength(expHighBytes, expLen);
 
       // use big numbers to stay safe in case of overflow
       BigInteger energy = BigInteger.valueOf(multComplexity)
-          .multiply(BigInteger.valueOf(max(adjExpLen, 1, allowStrictMath2)))
+          .multiply(BigInteger.valueOf(max(adjExpLen, 1, VMConfig.disableJavaLangMath())))
           .divide(GQUAD_DIVISOR);
 
       return isLessThan(energy, BigInteger.valueOf(Long.MAX_VALUE)) ? energy.longValueExact()

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());
       }
     }
   }