Merge branch 'release_v4.7.2' into develop

Author: 317787106

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

@@ -681,6 +681,17 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
         }
         break;
       }
+      case ALLOW_TVM_SHANGHAI: {
+        if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_7_2)) {
+          throw new ContractValidateException(
+              "Bad chain parameter id [ALLOW_TVM_SHANGHAI]");
+        }
+        if (value != 1) {
+          throw new ContractValidateException(
+              "This value[ALLOW_TVM_SHANGHAI] is only allowed to be 1");
+        }
+        break;
+      }
       default:
         break;
     }
@@ -753,7 +764,8 @@ public enum ProposalType {         // current value, value range
     ALLOW_DYNAMIC_ENERGY(72), // 0, 1
     DYNAMIC_ENERGY_THRESHOLD(73), // 0, [0, LONG]
     DYNAMIC_ENERGY_INCREASE_FACTOR(74), // 0, [0, 10_000]
-    DYNAMIC_ENERGY_MAX_FACTOR(75); // 0, [0, 100_000]
+    DYNAMIC_ENERGY_MAX_FACTOR(75), // 0, [0, 100_000]
+    ALLOW_TVM_SHANGHAI(76); // 0, 1
 
     private long code;
 

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

@@ -148,6 +148,7 @@ public class Op {
 
   /*  Push Operations */
   // Place item on stack
+  public static final int PUSH0 = 0x5f;
   public static final int PUSH1 = 0x60;
   public static final int PUSH2 = 0x61;
   public static final int PUSH3 = 0x62;

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

@@ -643,6 +643,11 @@ public static void jumpDestAction(Program program) {
     program.step();
   }
 
+  public static void push0Action(Program program) {
+    program.stackPush(DataWord.ZERO());
+    program.step();
+  }
+
   public static void pushAction(Program program) {
     int n = program.getCurrentOpIntValue() - Op.PUSH1 + 1;
     program.step();

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

@@ -11,6 +11,7 @@ public enum Version {
     TRON_V1_0,
     TRON_V1_1,
     TRON_V1_2,
+    TRON_V1_3,
     // add more
     // TRON_V2,
     // ETH
@@ -22,6 +23,7 @@ public enum Version {
     tableMap.put(Version.TRON_V1_0, newTronV10OperationSet());
     tableMap.put(Version.TRON_V1_1, newTronV11OperationSet());
     tableMap.put(Version.TRON_V1_2, newTronV12OperationSet());
+    tableMap.put(Version.TRON_V1_3, newTronV13OperationSet());
   }
 
   public static JumpTable newTronV10OperationSet() {
@@ -47,12 +49,18 @@ public static JumpTable newTronV12OperationSet() {
     return table;
   }
 
+  public static JumpTable newTronV13OperationSet() {
+    JumpTable table = newTronV12OperationSet();
+    appendShangHaiOperations(table);
+    return table;
+  }
+
   // Just for warming up class to avoid out_of_time
   public static void init() {}
 
   public static JumpTable getTable() {
     // always get the table which has the newest version
-    JumpTable table = tableMap.get(Version.TRON_V1_2);
+    JumpTable table = tableMap.get(Version.TRON_V1_3);
 
     // next make the corresponding changes, exclude activating opcode
     if (VMConfig.allowHigherLimitForMaxCpuTimeOfOneTx()) {
@@ -617,4 +625,14 @@ public static void appendDelegateOperations(JumpTable table) {
         OperationActions::unDelegateResourceAction,
         proposal));
   }
+
+  public static void appendShangHaiOperations(JumpTable table) {
+    BooleanSupplier proposal = VMConfig::allowTvmShanghai;
+
+    table.set(new Operation(
+        Op.PUSH0, 0, 1,
+        EnergyCost::getBaseTierCost,
+        OperationActions::push0Action,
+        proposal));
+  }
 }

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

@@ -38,6 +38,7 @@ public static void load(StoreFactory storeFactory) {
         VMConfig.initDynamicEnergyThreshold(ds.getDynamicEnergyThreshold());
         VMConfig.initDynamicEnergyIncreaseFactor(ds.getDynamicEnergyIncreaseFactor());
         VMConfig.initDynamicEnergyMaxFactor(ds.getDynamicEnergyMaxFactor());
+        VMConfig.initAllowTvmShangHai(ds.getAllowTvmShangHai());
       }
     }
   }

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

@@ -47,6 +47,8 @@ public class VMConfig {
 
   private static long DYNAMIC_ENERGY_MAX_FACTOR = 0L;
 
+  private static boolean ALLOW_TVM_SHANGHAI = false;
+
   private VMConfig() {
   }
 
@@ -130,6 +132,10 @@ public static void initDynamicEnergyMaxFactor(long maxFactor) {
     DYNAMIC_ENERGY_MAX_FACTOR = maxFactor;
   }
 
+  public static void initAllowTvmShangHai(long allow) {
+    ALLOW_TVM_SHANGHAI = allow == 1;
+  }
+
   public static boolean getEnergyLimitHardFork() {
     return CommonParameter.ENERGY_LIMIT_HARD_FORK;
   }
@@ -201,4 +207,8 @@ public static long getDynamicEnergyIncreaseFactor() {
   public static long getDynamicEnergyMaxFactor() {
     return DYNAMIC_ENERGY_MAX_FACTOR;
   }
+
+  public static boolean allowTvmShanghai() {
+    return ALLOW_TVM_SHANGHAI;
+  }
 }

chainbase/src/main/java/org/tron/core/capsule/ReceiptCapsule.java

@@ -192,6 +192,12 @@ public void payEnergyBill(DynamicPropertiesStore dynamicPropertiesStore,
       AccountCapsule caller,
       long percent, long originEnergyLimit, EnergyProcessor energyProcessor, long now)
       throws BalanceInsufficientException {
+
+    // Reset origin energy usage here! Because after stake 2.0, this field are reused for
+    // recording pre-merge frozen energy for origin account. If total energy usage is zero, this
+    // field will be a dirty record.
+    this.setOriginEnergyUsage(0);
+
     if (receipt.getEnergyUsageTotal() <= 0) {
       return;
     }

chainbase/src/main/java/org/tron/core/db2/core/SnapshotManager.java

@@ -16,6 +16,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
@@ -122,6 +123,7 @@ public void close() {
       exitThread.interrupt();
       // help GC
       exitThread = null;
+      flushServices.values().forEach(ExecutorService::shutdown);
     } catch (Exception e) {
       logger.warn("exitThread interrupt error", e);
     }

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

@@ -206,6 +206,8 @@ public class DynamicPropertiesStore extends TronStoreWithRevoking<BytesCapsule>
   private static final byte[] ALLOW_OPTIMIZED_RETURN_VALUE_OF_CHAIN_ID =
       "ALLOW_OPTIMIZED_RETURN_VALUE_OF_CHAIN_ID".getBytes();
 
+  private static final byte[] ALLOW_TVM_SHANGHAI = "ALLOW_TVM_SHANGHAI".getBytes();
+
   @Autowired
   private DynamicPropertiesStore(@Value("properties") String dbName) {
     super(dbName);
@@ -2755,6 +2757,18 @@ public long getAllowOptimizedReturnValueOfChainId() {
             () -> new IllegalArgumentException(msg));
   }
 
+  public void saveAllowTvmShangHai(long allowTvmShangHai) {
+    this.put(DynamicPropertiesStore.ALLOW_TVM_SHANGHAI,
+        new BytesCapsule(ByteArray.fromLong(allowTvmShangHai)));
+  }
+
+  public long getAllowTvmShangHai() {
+    return Optional.ofNullable(getUnchecked(ALLOW_TVM_SHANGHAI))
+        .map(BytesCapsule::getData)
+        .map(ByteArray::toLong)
+        .orElse(CommonParameter.getInstance().getAllowTvmShangHai());
+  }
+
   private static class DynamicResourceProperties {
 
     private static final byte[] ONE_DAY_NET_LIMIT = "ONE_DAY_NET_LIMIT".getBytes();

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

@@ -14,6 +14,7 @@
 import org.tron.core.db.TransactionStore;
 import org.tron.core.db.TronStoreWithRevoking;
 import org.tron.core.exception.BadItemException;
+import org.tron.protos.Protocol;
 import org.tron.protos.Protocol.TransactionInfo;
 
 @Slf4j(topic = "DB")
@@ -54,6 +55,17 @@ public TransactionInfoCapsule getTransactionInfo(byte[] key) throws BadItemExcep
     ByteString id = ByteString.copyFrom(key);
     for (TransactionInfo transactionResultInfo : result.getInstance().getTransactioninfoList()) {
       if (transactionResultInfo.getId().equals(id)) {
+        Protocol.ResourceReceipt receipt = transactionResultInfo.getReceipt();
+        // If query a result with dirty origin usage in receipt, we just reset it.
+        if (receipt.getEnergyUsageTotal() == 0 && receipt.getOriginEnergyUsage() > 0) {
+          transactionResultInfo =
+              transactionResultInfo.toBuilder()
+                  .setReceipt(
+                      receipt.toBuilder()
+                          .clearOriginEnergyUsage()
+                          .build())
+                  .build();
+        }
         return new TransactionInfoCapsule(transactionResultInfo);
       }
     }