Merge remote-tracking branch 'upstream/release_v4.8.1' into fix/optimize_exception_by_tron_error

lxcmyf · lxcmyf · commit e1faa2001983 · 2025-09-28T12:13:37.000+08:00
# Conflicts:
#	common/src/main/java/org/tron/core/exception/TronError.java
diff --git a/README.md b/README.md
@@ -72,7 +72,7 @@ Make sure you operate on `Linux` or `MacOS` operating systems, other operating s
 ### ARM64
 64-bit version of `JDK 17` to be installed, other JDK versions are not supported yet.
 
-### build
+## Build
 Clone the repo and switch to the `master` branch
 
 ```bash
@@ -141,7 +141,7 @@ $ nohup java -Xms9G -Xmx9G -XX:ReservedCodeCacheSize=256m \
 ### ARM64 JDK 17
 ```bash
 $ nohup java -Xms9G -Xmx9G -XX:+UseZGC \
-             -Xlog:gc*:file=gc.log:time,uptime,level,tags:filecount=50,filesize=100M \
+             -Xlog:gc,gc+heap:file=gc.log:time,tags,level:filecount=10,filesize=100M \
              -XX:ReservedCodeCacheSize=256m \
              -XX:+UseCodeCacheFlushing \
              -XX:MetaspaceSize=256m \
@@ -181,7 +181,7 @@ $ nohup java -Xms9G -Xmx9G -XX:ReservedCodeCacheSize=256m \
 ### ARM64 JDK 17
 ```bash
 $ nohup java -Xms9G -Xmx9G -XX:+UseZGC \
-             -Xlog:gc*:file=gc.log:time,uptime,level,tags:filecount=50,filesize=100M \
+             -Xlog:gc,gc+heap:file=gc.log:time,tags,level:filecount=10,filesize=100M \
              -XX:ReservedCodeCacheSize=256m \
              -XX:+UseCodeCacheFlushing \
              -XX:MetaspaceSize=256m \
diff --git a/common/src/main/java/org/tron/core/exception/TronError.java b/common/src/main/java/org/tron/core/exception/TronError.java
@@ -48,7 +48,8 @@ public enum ErrCode {
     WITNESS_INIT(1),
     RATE_LIMITER_INIT(1),
     SOLID_NODE_INIT(0),
-    PARAMETER_INIT(1);
+    PARAMETER_INIT(1),
+    JDK_VERSION(1);
 
     private final int code;
 
diff --git a/framework/src/main/java/org/tron/core/config/args/Args.java b/framework/src/main/java/org/tron/core/config/args/Args.java
@@ -1,6 +1,7 @@
 package org.tron.core.config.args;
 
 import static java.lang.System.exit;
+import static org.fusesource.jansi.Ansi.ansi;
 import static org.tron.common.math.Maths.max;
 import static org.tron.common.math.Maths.min;
 import static org.tron.core.Constant.ADD_PRE_FIX_BYTE_MAINNET;
@@ -46,6 +47,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.fusesource.jansi.AnsiConsole;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.tron.common.arch.Arch;
@@ -375,7 +377,17 @@ private static Map<String, String[]> getOptionGroup() {
    * set parameters.
    */
   public static void setParam(final String[] args, final String confFileName) {
-    Arch.throwIfUnsupportedJavaVersion();
+    try {
+      Arch.throwIfUnsupportedJavaVersion();
+    } catch (UnsupportedOperationException e) {
+      AnsiConsole.systemInstall();
+      // To avoid confusion caused by silent execution when using -h or -v flags,
+      // errors are explicitly logged to the console in this context.
+      // Console output is not required for errors in other scenarios.
+      System.out.println(ansi().fgRed().a(e.getMessage()).reset());
+      AnsiConsole.systemUninstall();
+      throw new TronError(e, TronError.ErrCode.JDK_VERSION);
+    }
     clearParam(); // reset all parameters to avoid the influence in test
     JCommander.newBuilder().addObject(PARAMETER).build().parse(args);
     if (PARAMETER.version) {
diff --git a/framework/src/main/java/org/tron/core/db/Manager.java b/framework/src/main/java/org/tron/core/db/Manager.java
@@ -48,6 +48,7 @@
 import org.bouncycastle.util.encoders.Hex;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.tron.api.GrpcAPI;
 import org.tron.api.GrpcAPI.TransactionInfoList;
 import org.tron.common.args.GenesisBlock;
 import org.tron.common.bloom.Bloom;
@@ -2158,25 +2159,7 @@ private void processTransactionTrigger(BlockCapsule newBlock) {
     // need to set eth compatible data from transactionInfoList
     if (EventPluginLoader.getInstance().isTransactionLogTriggerEthCompatible()
           && newBlock.getNum() != 0) {
-      TransactionInfoList transactionInfoList = TransactionInfoList.newBuilder().build();
-      TransactionInfoList.Builder transactionInfoListBuilder = TransactionInfoList.newBuilder();
-
-      try {
-        TransactionRetCapsule result = chainBaseManager.getTransactionRetStore()
-            .getTransactionInfoByBlockNum(ByteArray.fromLong(newBlock.getNum()));
-
-        if (!Objects.isNull(result) && !Objects.isNull(result.getInstance())) {
-          result.getInstance().getTransactioninfoList().forEach(
-              transactionInfoListBuilder::addTransactionInfo
-          );
-
-          transactionInfoList = transactionInfoListBuilder.build();
-        }
-      } catch (BadItemException e) {
-        logger.error("PostBlockTrigger getTransactionInfoList blockNum = {}, error is {}.",
-            newBlock.getNum(), e.getMessage());
-      }
-
+      TransactionInfoList transactionInfoList = getTransactionInfoByBlockNum(newBlock.getNum());
       if (transactionCapsuleList.size() == transactionInfoList.getTransactionInfoCount()) {
         long cumulativeEnergyUsed = 0;
         long cumulativeLogCount = 0;
@@ -2234,21 +2217,8 @@ private void postLogsFilter(final BlockCapsule blockCapsule, boolean solidified,
       boolean removed) {
     if (!blockCapsule.getTransactions().isEmpty()) {
       long blockNumber = blockCapsule.getNum();
-      List<TransactionInfo> transactionInfoList = new ArrayList<>();
-
-      try {
-        TransactionRetCapsule result = chainBaseManager.getTransactionRetStore()
-            .getTransactionInfoByBlockNum(ByteArray.fromLong(blockNumber));
-
-        if (!Objects.isNull(result) && !Objects.isNull(result.getInstance())) {
-          transactionInfoList.addAll(result.getInstance().getTransactioninfoList());
-        }
-      } catch (BadItemException e) {
-        logger.error("ProcessLogsFilter getTransactionInfoList blockNum = {}, error is {}.",
-            blockNumber, e.getMessage());
-        return;
-      }
-
+      List<TransactionInfo> transactionInfoList
+              = getTransactionInfoByBlockNum(blockNumber).getTransactionInfoList();
       LogsFilterCapsule logsFilterCapsule = new LogsFilterCapsule(blockNumber,
           blockCapsule.getBlockId().toString(), blockCapsule.getBloom(), transactionInfoList,
           solidified, removed);
diff --git a/framework/src/main/java/org/tron/core/services/event/BlockEventGet.java b/framework/src/main/java/org/tron/core/services/event/BlockEventGet.java
@@ -329,22 +329,10 @@ public List<TransactionLogTriggerCapsule> getTransactionLogTrigger(BlockCapsule
     if (!EventPluginLoader.getInstance().isTransactionLogTriggerEthCompatible()) {
       return getTransactionTriggers(block, solidNum);
     }
+
+    GrpcAPI.TransactionInfoList transactionInfoList
+            = manager.getTransactionInfoByBlockNum(block.getNum());
     List<TransactionCapsule> transactionCapsuleList = block.getTransactions();
-    GrpcAPI.TransactionInfoList transactionInfoList = GrpcAPI
-        .TransactionInfoList.newBuilder().build();
-    GrpcAPI.TransactionInfoList.Builder transactionInfoListBuilder = GrpcAPI
-        .TransactionInfoList.newBuilder();
-    try {
-      TransactionRetCapsule result = manager.getChainBaseManager().getTransactionRetStore()
-          .getTransactionInfoByBlockNum(ByteArray.fromLong(block.getNum()));
-      if (!Objects.isNull(result) && !Objects.isNull(result.getInstance())) {
-        result.getInstance().getTransactioninfoList()
-            .forEach(transactionInfoListBuilder::addTransactionInfo);
-        transactionInfoList = transactionInfoListBuilder.build();
-      }
-    } catch (BadItemException e) {
-      logger.error("Get TransactionInfo failed, blockNum {}, {}.", block.getNum(), e.getMessage());
-    }
     if (transactionCapsuleList.size() != transactionInfoList.getTransactionInfoCount()) {
       logger.error("Get TransactionInfo size not eq, blockNum {}, {}, {}",
           block.getNum(), transactionCapsuleList.size(),
@@ -385,22 +373,8 @@ public List<TransactionLogTriggerCapsule> getTransactionTriggers(BlockCapsule bl
       return list;
     }
 
-    GrpcAPI.TransactionInfoList transactionInfoList = GrpcAPI
-        .TransactionInfoList.newBuilder().build();
-    GrpcAPI.TransactionInfoList.Builder transactionInfoListBuilder = GrpcAPI
-        .TransactionInfoList.newBuilder();
-    try {
-      TransactionRetCapsule result = manager.getChainBaseManager().getTransactionRetStore()
-          .getTransactionInfoByBlockNum(ByteArray.fromLong(block.getNum()));
-      if (!Objects.isNull(result) && !Objects.isNull(result.getInstance())) {
-        result.getInstance().getTransactioninfoList()
-            .forEach(transactionInfoListBuilder::addTransactionInfo);
-        transactionInfoList = transactionInfoListBuilder.build();
-      }
-    } catch (Exception e) {
-      logger.warn("Get TransactionInfo failed, blockNum {}, {}.", block.getNum(), e.getMessage());
-    }
-
+    GrpcAPI.TransactionInfoList transactionInfoList
+            = manager.getTransactionInfoByBlockNum(block.getNum());
     if (block.getTransactions().size() != transactionInfoList.getTransactionInfoCount()) {
       for (TransactionCapsule t : block.getTransactions()) {
         TransactionLogTriggerCapsule triggerCapsule = new TransactionLogTriggerCapsule(t, block);
diff --git a/framework/src/main/java/org/tron/core/services/event/HistoryEventService.java b/framework/src/main/java/org/tron/core/services/event/HistoryEventService.java
@@ -45,7 +45,13 @@ public void init() {
 
   public void close() {
     if (thread != null) {
-      thread.interrupt();
+      try {
+        thread.interrupt();
+        thread.join(1000);
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+        logger.warn("Wait close timeout, {}", e.getMessage());
+      }
     }
     logger.info("History event service close.");
   }
diff --git a/framework/src/main/java/org/tron/core/services/jsonrpc/filters/LogMatch.java b/framework/src/main/java/org/tron/core/services/jsonrpc/filters/LogMatch.java
@@ -83,17 +83,13 @@ public LogFilterElement[] matchBlockOneByOne()
     List<LogFilterElement> logFilterElementList = new ArrayList<>();
 
     for (long blockNum : blockNumList) {
-      TransactionRetCapsule transactionRetCapsule =
-          manager.getTransactionRetStore()
-              .getTransactionInfoByBlockNum(ByteArray.fromLong(blockNum));
-      if (transactionRetCapsule == null) {
-        //if query condition (address and topics) is empty, we will traversal every block,
-        //include empty block
+      List<TransactionInfo> transactionInfoList =
+              manager.getTransactionInfoByBlockNum(blockNum).getTransactionInfoList();
+      //if query condition (address and topics) is empty, we will traversal every block,
+      //include empty block
+      if (transactionInfoList.isEmpty()) {
         continue;
       }
-      TransactionRet transactionRet = transactionRetCapsule.getInstance();
-      List<TransactionInfo> transactionInfoList = transactionRet.getTransactioninfoList();
-
       String blockHash = manager.getChainBaseManager().getBlockIdByNum(blockNum).toString();
       List<LogFilterElement> matchedLog = matchBlock(logFilterWrapper.getLogFilter(), blockNum,
           blockHash, transactionInfoList, false);
diff --git a/framework/src/test/java/org/tron/core/db/ManagerTest.java b/framework/src/test/java/org/tron/core/db/ManagerTest.java
@@ -1261,6 +1261,7 @@ public void testGetTransactionInfoByBlockNum() throws Exception {
     GrpcAPI.TransactionInfoList transactionInfoList = dbManager.getTransactionInfoByBlockNum(1000L);
 
     Assert.assertEquals(1, transactionInfoList.getTransactionInfoCount());
+    Assert.assertEquals(1, transactionInfoList.getTransactionInfoList().size());
 
     Protocol.TransactionRet ret = Protocol.TransactionRet.newBuilder()
             .addTransactioninfo(info)
@@ -1274,6 +1275,7 @@ public void testGetTransactionInfoByBlockNum() throws Exception {
     transactionInfoList = dbManager.getTransactionInfoByBlockNum(1000L);
 
     Assert.assertEquals(2, transactionInfoList.getTransactionInfoCount());
+    Assert.assertEquals(2, transactionInfoList.getTransactionInfoList().size());
   }
 
   @Test
diff --git a/framework/src/test/java/org/tron/core/event/BlockEventGetTest.java b/framework/src/test/java/org/tron/core/event/BlockEventGetTest.java
@@ -19,6 +19,7 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.mockito.Mockito;
+import org.tron.api.GrpcAPI;
 import org.tron.common.application.TronApplicationContext;
 import org.tron.common.logsfilter.EventPluginConfig;
 import org.tron.common.logsfilter.EventPluginLoader;
@@ -233,6 +234,11 @@ public void getTransactionTriggers() throws Exception {
 
     bc = new BlockCapsule(100, ByteString.empty(), 1, transactionList);
 
+    Manager manager = mock(Manager.class);
+    ReflectUtils.setFieldValue(blockEventGet, "manager", manager);
+    Mockito.when(manager.getTransactionInfoByBlockNum(1))
+            .thenReturn(GrpcAPI.TransactionInfoList.newBuilder().build());
+
     list = blockEventGet.getTransactionTriggers(bc, 1);
     Assert.assertEquals(1, list.size());
     Assert.assertEquals(100, list.get(0).getTransactionLogTrigger().getTimeStamp());
@@ -253,21 +259,14 @@ public void getTransactionTriggers() throws Exception {
         .addContractResult(ByteString.copyFrom(ByteArray.fromHexString("112233")))
         .setReceipt(resourceBuild.build());
 
-    Manager manager = mock(Manager.class);
-    ReflectUtils.setFieldValue(blockEventGet, "manager", manager);
-
     ChainBaseManager chainBaseManager = mock(ChainBaseManager.class);
     Mockito.when(manager.getChainBaseManager()).thenReturn(chainBaseManager);
 
-    TransactionRetStore transactionRetStore = mock(TransactionRetStore.class);
-    Mockito.when(chainBaseManager.getTransactionRetStore()).thenReturn(transactionRetStore);
-
-    Protocol.TransactionRet transactionRet = Protocol.TransactionRet.newBuilder()
-        .addTransactioninfo(infoBuild.build()).build();
 
-    TransactionRetCapsule result = new TransactionRetCapsule(transactionRet.toByteArray());
+    GrpcAPI.TransactionInfoList result = GrpcAPI.TransactionInfoList.newBuilder()
+        .addTransactionInfo(infoBuild.build()).build();
 
-    Mockito.when(transactionRetStore.getTransactionInfoByBlockNum(ByteArray.fromLong(0)))
+    Mockito.when(manager.getTransactionInfoByBlockNum(0))
         .thenReturn(result);
 
     Protocol.Block block = Protocol.Block.newBuilder()
@@ -286,8 +285,8 @@ public void getTransactionTriggers() throws Exception {
     Assert.assertEquals(2,
         list.get(0).getTransactionLogTrigger().getEnergyUsageTotal());
 
-    Mockito.when(transactionRetStore.getTransactionInfoByBlockNum(ByteArray.fromLong(0)))
-        .thenReturn(null);
+    Mockito.when(manager.getTransactionInfoByBlockNum(0))
+        .thenReturn(GrpcAPI.TransactionInfoList.newBuilder().build());
     list = blockEventGet.getTransactionTriggers(blockCapsule, 1);
     Assert.assertEquals(1, list.size());
     Assert.assertEquals(1,
diff --git a/framework/src/test/java/org/tron/core/event/HistoryEventServiceTest.java b/framework/src/test/java/org/tron/core/event/HistoryEventServiceTest.java
@@ -23,7 +23,7 @@ public class HistoryEventServiceTest {
 
   HistoryEventService historyEventService = new HistoryEventService();
 
-  @Test
+  @Test(timeout = 60_000)
   public void test() throws Exception {
     EventPluginLoader instance = mock(EventPluginLoader.class);
     Mockito.when(instance.isUseNativeQueue()).thenReturn(true);
diff --git a/framework/src/test/java/org/tron/core/exception/TronErrorTest.java b/framework/src/test/java/org/tron/core/exception/TronErrorTest.java
@@ -24,6 +24,7 @@
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.tron.common.arch.Arch;
 import org.tron.common.log.LogService;
 import org.tron.common.parameter.RateLimiterInitialization;
 import org.tron.common.utils.ReflectUtils;
@@ -41,7 +42,7 @@ public class TronErrorTest {
   public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
   @After
-  public void  clearMocks() {
+  public void clearMocks() {
     Mockito.clearAllCaches();
     Args.clearParam();
   }
@@ -115,12 +116,38 @@ public void rateLimiterServletInitTest() {
 
   @Test
   public void shutdownBlockTimeInitTest() {
-    Map<String,String> params = new HashMap<>();
+    Map<String, String> params = new HashMap<>();
     params.put(Constant.NODE_SHUTDOWN_BLOCK_TIME, "0");
     params.put("storage.db.directory", "database");
     Config config = ConfigFactory.defaultOverrides().withFallback(
         ConfigFactory.parseMap(params));
     TronError thrown = assertThrows(TronError.class, () -> Args.setParam(config));
     assertEquals(TronError.ErrCode.AUTO_STOP_PARAMS, thrown.getErrCode());
   }
+
+  @Test
+  public void testThrowIfUnsupportedJavaVersion() {
+    runArchTest(true, false, true);
+    runArchTest(true, true, false);
+    runArchTest(false, false, false);
+  }
+
+  private void runArchTest(boolean isX86, boolean isJava8, boolean expectThrow) {
+    try (MockedStatic<Arch> mocked = mockStatic(Arch.class)) {
+      mocked.when(Arch::isX86).thenReturn(isX86);
+      mocked.when(Arch::isJava8).thenReturn(isJava8);
+      mocked.when(Arch::getOsArch).thenReturn("x86_64");
+      mocked.when(Arch::javaSpecificationVersion).thenReturn("17");
+      mocked.when(Arch::withAll).thenReturn("");
+      mocked.when(Arch::throwIfUnsupportedJavaVersion).thenCallRealMethod();
+
+      if (expectThrow) {
+        assertEquals(TronError.ErrCode.JDK_VERSION, assertThrows(
+            TronError.class, () -> Args.setParam(new String[]{}, Constant.TEST_CONF)).getErrCode());
+      } else {
+        Arch.throwIfUnsupportedJavaVersion();
+      }
+    }
+  }
+
 }
diff --git a/gradle/jdk17/java-tron.vmoptions b/gradle/jdk17/java-tron.vmoptions
@@ -1,5 +1,5 @@
 -XX:+UseZGC
--Xlog:gc*:file=gc.log:time,uptime,level,tags:filecount=50,filesize=100M
+-Xlog:gc,gc+heap:file=gc.log:time,tags,level:filecount=10,filesize=100M
 -XX:ReservedCodeCacheSize=256m
 -XX:+UseCodeCacheFlushing
 -XX:MetaspaceSize=256m
diff --git a/platform/src/main/java/common/org/tron/common/arch/Arch.java b/platform/src/main/java/common/org/tron/common/arch/Arch.java
@@ -73,8 +73,8 @@ public static void throwIfUnsupportedJavaVersion() {
     if (isX86() && !isJava8()) {
       logger.info(withAll());
       throw new UnsupportedOperationException(String.format(
-          "Java %s is required for %s architecture. Detected version %s",
-          "1.8 ", getOsArch(), javaSpecificationVersion()));
+          "Java %s is required for %s architecture. Detected version %s", "1.8",
+          getOsArch(), javaSpecificationVersion()));
     }
   }
 
diff --git a/start.sh.simple b/start.sh.simple

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,13 @@ public void init() {`
`45`	`45`
`46`	`46`	`public void close() {`
`47`	`47`	`if (thread != null) {`
`48`		`- thread.interrupt();`
	`48`	`+ try {`
	`49`	`+ thread.interrupt();`
	`50`	`+ thread.join(1000);`
	`51`	`+ } catch (InterruptedException e) {`
	`52`	`+ Thread.currentThread().interrupt();`
	`53`	`+ logger.warn("Wait close timeout, {}", e.getMessage());`
	`54`	`+ }`
`49`	`55`	`}`
`50`	`56`	`logger.info("History event service close.");`
`51`	`57`	`}`