Merge branch 'release_v4.7.2' into feature/support_shanghai

Author: yanghang8612

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

common/src/main/java/org/tron/core/exception/BadBlockException.java

@@ -2,11 +2,37 @@
 
 public class BadBlockException extends TronException {
 
+  private TypeEnum type = TypeEnum.DEFAULT;
+
   public BadBlockException() {
     super();
   }
 
   public BadBlockException(String message) {
     super(message);
   }
+
+  public BadBlockException(TypeEnum type, String message) {
+    super(message);
+    this.type = type;
+  }
+
+  public TypeEnum getType() {
+    return type;
+  }
+
+  public enum TypeEnum {
+    CALC_MERKLE_ROOT_FAILED(1),
+    DEFAULT(100);
+
+    private Integer value;
+
+    TypeEnum(Integer value) {
+      this.value = value;
+    }
+
+    public Integer getValue() {
+      return value;
+    }
+  }
 }

common/src/main/java/org/tron/core/exception/P2pException.java

@@ -50,6 +50,8 @@ public enum TypeEnum {
     TRX_EXE_FAILED(12, "trx exe failed"),
     DB_ITEM_NOT_FOUND(13, "DB item not found"),
     PROTOBUF_ERROR(14, "protobuf inconsistent"),
+    BLOCK_SIGN_ERROR(15, "block sign error"),
+    BLOCK_MERKLE_ERROR(16, "block merkle error"),
 
     DEFAULT(100, "default exception");
 

framework/build.gradle

@@ -86,6 +86,8 @@ dependencies {
     compile "io.vavr:vavr:0.9.2"
     compile group: 'org.pf4j', name: 'pf4j', version: '2.5.0'
 
+    testImplementation group: 'org.springframework', name: 'spring-test', version: '5.2.0.RELEASE'
+
     compile group: 'org.zeromq', name: 'jeromq', version: '0.5.0'
     compile project(":chainbase")
     compile project(":protocol")
@@ -151,6 +153,10 @@ test {
         exclude 'org/tron/common/runtime/vm/WithdrawRewardTest.class'
     }
     maxHeapSize = "1024m"
+    doFirst {
+        forkEvery = 100
+        jvmArgs "-XX:MetaspaceSize=128m","-XX:MaxMetaspaceSize=256m", "-XX:+UseG1GC"
+    }
 }
 
 task stest(type: Test) {

framework/src/main/java/org/tron/common/client/DatabaseGrpcClient.java

@@ -15,14 +15,14 @@ public class DatabaseGrpcClient {
 
   public DatabaseGrpcClient(String host, int port) {
     channel = ManagedChannelBuilder.forAddress(host, port)
-        .usePlaintext(true)
+        .usePlaintext()
         .build();
     databaseBlockingStub = DatabaseGrpc.newBlockingStub(channel);
   }
 
   public DatabaseGrpcClient(String host) {
     channel = ManagedChannelBuilder.forTarget(host)
-        .usePlaintext(true)
+        .usePlaintext()
         .build();
     databaseBlockingStub = DatabaseGrpc.newBlockingStub(channel);
   }

framework/src/main/java/org/tron/common/client/WalletGrpcClient.java

@@ -29,14 +29,14 @@ public class WalletGrpcClient {
 
   public WalletGrpcClient(String host, int port) {
     channel = ManagedChannelBuilder.forAddress(host, port)
-        .usePlaintext(true)
+        .usePlaintext()
         .build();
     walletBlockingStub = WalletGrpc.newBlockingStub(channel);
   }
 
   public WalletGrpcClient(String host) {
     channel = ManagedChannelBuilder.forTarget(host)
-        .usePlaintext(true)
+        .usePlaintext()
         .build();
     walletBlockingStub = WalletGrpc.newBlockingStub(channel);
   }

framework/src/main/java/org/tron/core/capsule/utils/RLP.java

@@ -204,7 +204,7 @@ public static long decodeLong(byte[] data, int index) {
     return value;
   }
 
-  private static String decodeStringItem(byte[] data, int index) {
+  public static String decodeStringItem(byte[] data, int index) {
 
     final byte[] valueBytes = decodeItemBytes(data, index);
 
@@ -229,12 +229,12 @@ public static BigInteger decodeBigInteger(byte[] data, int index) {
     }
   }
 
-  private static byte[] decodeByteArray(byte[] data, int index) {
+  public static byte[] decodeByteArray(byte[] data, int index) {
 
     return decodeItemBytes(data, index);
   }
 
-  private static int nextItemLength(byte[] data, int index) {
+  public static int nextItemLength(byte[] data, int index) {
 
     if (index >= data.length) {
       return -1;

framework/src/main/java/org/tron/core/db/Manager.java

@@ -1,6 +1,7 @@
 package org.tron.core.db;
 
 import static org.tron.common.utils.Commons.adjustBalance;
+import static org.tron.core.exception.BadBlockException.TypeEnum.CALC_MERKLE_ROOT_FAILED;
 import static org.tron.protos.Protocol.Transaction.Contract.ContractType.TransferContract;
 import static org.tron.protos.Protocol.Transaction.Result.contractResult.SUCCESS;
 
@@ -192,7 +193,8 @@ public class Manager {
   @Getter
   @Setter
   private boolean isSyncMode;
-
+  @Getter
+  private Object forkLock = new Object();
   // map<Long, IncrementalMerkleTree>
   @Getter
   @Setter
@@ -1213,8 +1215,8 @@ public void pushBlock(final BlockCapsule block)
             if (!block.calcMerkleRoot().equals(block.getMerkleRoot())) {
               logger.warn("Num: {}, the merkle root doesn't match, expect is {} , actual is {}.",
                   block.getNum(), block.getMerkleRoot(), block.calcMerkleRoot());
-              throw new BadBlockException(String.format("The merkle hash is not validated for %d",
-                  block.getNum()));
+              throw new BadBlockException(CALC_MERKLE_ROOT_FAILED,
+                      String.format("The merkle hash is not validated for %d", block.getNum()));
             }
             consensus.receiveBlock(block);
           }
@@ -1268,8 +1270,9 @@ public void pushBlock(final BlockCapsule block)
                   chainBaseManager.getDynamicPropertiesStore().getLatestBlockHeaderTimestamp(),
                   khaosDb.getHead(), khaosDb.getMiniStore().size(),
                   khaosDb.getMiniUnlinkedStore().size());
-
-              switchFork(newBlock);
+              synchronized (forkLock) {
+                switchFork(newBlock);
+              }
               logger.info(SAVE_BLOCK, newBlock);
 
               logger.warn(
@@ -1912,6 +1915,7 @@ public NullifierStore getNullifierStore() {
   public void closeAllStore() {
     logger.info("******** Begin to close db. ********");
     chainBaseManager.closeAllStore();
+    validateSignService.shutdown();
     logger.info("******** End to close db. ********");
   }