merge develop

Author: 317787106

.github/ISSUE_TEMPLATE/ask-a-question.md

@@ -1,7 +1,7 @@
 ---
 name: Ask a question
 about: Something is unclear or needs clarification
-title: '[QUESTION] '
+title: '[Question]'
 labels: 'type:docs'
 assignees: ''
 
@@ -46,6 +46,6 @@ These channels provide faster responses for general inquiries.
 - Operating System: <!-- e.g., Ubuntu 20.04 -->
 - Java version: <!-- e.g., java version "1.8.0_391" -->
 
-## Additional Information
+## Additional Information (Optional)
 
 <!-- Any other details that might be helpful -->

.github/ISSUE_TEMPLATE/report-a-bug.md

@@ -1,7 +1,7 @@
 ---
 name: Report a bug
 about: Create a report to help us improve
-title: '[BUG] '
+title: '[Bug]'
 labels: 'type:bug'
 assignees: ''
 
@@ -72,7 +72,7 @@ Include relevant logs from FullNode.jar or other components
 [Paste error messages, stack traces, or relevant logs here]
 ```
 
-## Additional Context
+## Additional Context (Optional)
 
 <!-- Add any other context about the problem -->
 

.github/ISSUE_TEMPLATE/request-a-feature.md

@@ -1,7 +1,7 @@
 ---
 name: Request a feature
 about: Suggest an idea for this project
-title: '[FEATURE] '
+title: '[Feature]'
 labels: 'type:feature'
 assignees: ''
 
@@ -12,28 +12,9 @@ Thank you for contributing to java-tron!
 Please provide as much detail as possible to help us evaluate your feature request.
 -->
 
-## Background
-
-<!-- Describe the context and motivation for this feature request -->
-
 ## Problem Statement
 
-<!-- What problem does this feature solve? What pain points does it address? -->
-
-## Rationale
-
-**Why should this feature exist?**
-<!-- Explain the benefits and value this feature would provide -->
-
-**What are the use cases?**
-<!-- Describe specific scenarios where this feature would be useful -->
-
-1. 
-2. 
-3. 
-
-**Who would benefit from this feature?**
-<!-- e.g., node operators, developers, end users, validators -->
+<!-- Describe the problem this feature solves, the context/motivation, and who would benefit -->
 
 ## Proposed Solution
 
@@ -52,30 +33,17 @@ Please provide as much detail as possible to help us evaluate your feature reque
 **Protocol Changes** (if applicable)
 <!-- Describe any changes to the TRON protocol -->
 
-## Testing Strategy
-
-<!-- How should this feature be tested? -->
-
-**Test Scenarios**
-
-1. 
-2. 
-3. 
-
-**Performance Considerations**
-<!-- Describe any performance implications -->
-
 ## Scope of Impact
 
-<!-- What parts of the system will be affected? -->
-
-- [ ] Core protocol
-- [ ] API/RPC
-- [ ] Database
-- [ ] Network layer
-- [ ] Smart contracts
-- [ ] Documentation
-- [ ] Other: <!-- specify -->
+<!-- Select the system components that will be affected by this feature:  
+- Core protocol
+- API/RPC
+- Database
+- Network layer
+- Smart contracts
+- Documentation
+- Others, please specify
+-->
 
 **Breaking Changes**
 <!-- Will this feature introduce any breaking changes? -->
@@ -90,23 +58,29 @@ Please provide as much detail as possible to help us evaluate your feature reque
 
 **Are you willing to implement this feature?**
 <!-- Let us know if you'd like to contribute the implementation -->
-- [ ] Yes, I can implement this feature
-- [ ] I can help with implementation
-- [ ] I need help with implementation
-- [ ] I'm just suggesting the idea
 
 **Estimated Complexity**
-<!-- Your assessment of implementation complexity -->
-- [ ] Low (minor changes)
-- [ ] Medium (moderate changes)
-- [ ] High (significant changes)
-- [ ] Unknown
+<!-- Your assessment of implementation complexity, choose among
+- Low (minor changes)
+- Medium (moderate changes)
+- High (significant changes)
+- Unknown
+-->
+
+## Testing Strategy
+
+<!-- How should this feature be tested? -->
+
+**Test Scenarios**
+
+**Performance Considerations**
+<!-- Describe any performance implications -->
 
-## Alternatives Considered
+## Alternatives Considered (Optional)
 
 <!-- Describe any alternative solutions or features you've considered -->
 
-## Additional Context
+## Additional Context (Optional)
 
 <!-- Add any other context, mockups, diagrams, or examples -->
 

.github/workflows/pr-build.yml

@@ -130,6 +130,9 @@ jobs:
       - name: Build
         run: ./gradlew clean build --no-daemon
 
+      - name: Test with RocksDB engine
+        run: ./gradlew :framework:testWithRocksDb --no-daemon
+
   docker-build-debian11:
     name: Build debian11 (JDK 8 / x86_64)
     if: ${{ github.event_name == 'pull_request' || inputs.job == 'all' || inputs.job == 'debian11' }}
@@ -171,3 +174,6 @@ jobs:
 
       - name: Build
         run: ./gradlew clean build --no-daemon
+
+      - name: Test with RocksDB engine
+        run: ./gradlew :framework:testWithRocksDb --no-daemon

common/src/main/java/org/tron/core/config/args/Storage.java

@@ -29,7 +29,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.iq80.leveldb.CompressionType;
 import org.iq80.leveldb.Options;
-import org.tron.common.arch.Arch;
 import org.tron.common.cache.CacheStrategies;
 import org.tron.common.cache.CacheType;
 import org.tron.common.utils.DbOptionalsUtils;
@@ -90,7 +89,6 @@ public class Storage {
    * Default values of directory
    */
   private static final String DEFAULT_DB_ENGINE = "LEVELDB";
-  private static final String ROCKS_DB_ENGINE = "ROCKSDB";
   private static final boolean DEFAULT_DB_SYNC = false;
   private static final boolean DEFAULT_EVENT_SUBSCRIBE_CONTRACT_PARSE = true;
   private static final String DEFAULT_DB_DIRECTORY = "database";
@@ -175,10 +173,6 @@ public class Storage {
   private final Map<String, Sha256Hash> dbRoots = Maps.newConcurrentMap();
 
   public static String getDbEngineFromConfig(final Config config) {
-    if (Arch.isArm64()) {
-      logger.warn("Arm64 architecture detected, using RocksDB as db engine, ignore config.");
-      return ROCKS_DB_ENGINE;
-    }
     return config.hasPath(DB_ENGINE_CONFIG_KEY)
         ? config.getString(DB_ENGINE_CONFIG_KEY) : DEFAULT_DB_ENGINE;
   }

framework/build.gradle

@@ -106,19 +106,38 @@ run {
     }
 }
 
-test {
-    retry {
+def configureTestTask = { Task t ->
+    t.retry {
         maxRetries = 5
         maxFailures = 20
     }
-    testLogging {
+    t.testLogging {
         exceptionFormat = 'full'
     }
+    if (isWindows()) {
+        t.exclude '**/ShieldedTransferActuatorTest.class'
+        t.exclude '**/BackupDbUtilTest.class'
+        t.exclude '**/ManagerTest.class'
+        t.exclude 'org/tron/core/zksnark/**'
+        t.exclude 'org/tron/common/runtime/vm/PrecompiledContractsVerifyProofTest.class'
+        t.exclude 'org/tron/core/ShieldedTRC20BuilderTest.class'
+        t.exclude 'org/tron/common/runtime/vm/WithdrawRewardTest.class'
+    }
+    t.maxHeapSize = "1024m"
+    t.doFirst {
+        t.forkEvery = 100
+        t.jvmArgs "-XX:MetaspaceSize=128m", "-XX:MaxMetaspaceSize=256m", "-XX:+UseG1GC"
+    }
+}
+
+test {
+    configureTestTask(it)
     jacoco {
         destinationFile = file("$buildDir/jacoco/jacocoTest.exec")
         classDumpDir = file("$buildDir/jacoco/classpathdumps")
     }
     if (rootProject.archInfo.isArm64) {
+        systemProperty 'storage.db.engine', 'ROCKSDB'
         exclude { element ->
             element.file.name.toLowerCase().contains('leveldb')
         }
@@ -129,21 +148,14 @@ test {
             excludeTestsMatching '*.*LevelDb*'
         }
     }
-    if (isWindows()) {
-        exclude '**/ShieldedTransferActuatorTest.class'
-        exclude '**/BackupDbUtilTest.class'
-        exclude '**/ManagerTest.class'
-        exclude 'org/tron/core/zksnark/**'
-        exclude 'org/tron/common/runtime/vm/PrecompiledContractsVerifyProofTest.class'
-        exclude 'org/tron/core/ShieldedTRC20BuilderTest.class'
-        exclude 'org/tron/common/runtime/vm/WithdrawRewardTest.class'
-    }
-    maxHeapSize = "1024m"
-    doFirst {
-        // Restart the JVM after every 100 tests to avoid memory leaks and ensure test isolation
-        forkEvery = 100
-        jvmArgs "-XX:MetaspaceSize=128m","-XX:MaxMetaspaceSize=256m", "-XX:+UseG1GC"
-    }
+}
+
+task testWithRocksDb(type: Test) {
+    description = 'Run tests with RocksDB engine'
+    group = 'verification'
+    configureTestTask(it)
+    systemProperty 'storage.db.engine', 'ROCKSDB'
+    exclude '**/LevelDbDataSourceImplTest.class'
 }
 
 jacocoTestReport {

framework/src/main/java/org/tron/common/logsfilter/nativequeue/NativeMessageQueue.java

@@ -51,10 +51,15 @@ public boolean start(int bindPort, int sendQueueLength) {
   public void stop() {
     if (Objects.nonNull(publisher)) {
       publisher.close();
+      publisher = null;
     }
 
     if (Objects.nonNull(context)) {
       context.close();
+      context = null;
+    }
+    synchronized (NativeMessageQueue.class) {
+      instance = null;
     }
   }
 

framework/src/main/java/org/tron/core/config/args/Args.java

@@ -130,10 +130,27 @@ public static void setParam(final String[] args, final String confFileName) {
     // 3. CLI overrides Config (highest priority)
     applyCLIParams(cmd, jc);
 
-    // 4. Init witness (depends on CLI witness flag)
+    // 4. Apply platform constraints (e.g. ARM64 forces RocksDB)
+    applyPlatformConstraints();
+
+    // 5. Init witness (depends on CLI witness flag)
     initLocalWitnesses(config, cmd);
   }
 
+  /**
+   * Apply platform-specific constraints after all config sources are resolved.
+   * ARM64 does not support LevelDB (native JNI library unavailable),
+   * so db.engine is forced to RocksDB regardless of config or CLI settings.
+   */
+  private static void applyPlatformConstraints() {
+    if (Arch.isArm64()
+        && !Constant.ROCKSDB.equalsIgnoreCase(PARAMETER.storage.getDbEngine())) {
+      logger.warn("ARM64 only supports RocksDB, ignoring db.engine='{}'",
+          PARAMETER.storage.getDbEngine());
+      PARAMETER.storage.setDbEngine(Constant.ROCKSDB);
+    }
+  }
+
   /**
    * Apply parameters from config file.
    */
@@ -784,11 +801,8 @@ public static void applyConfigParams(
             .getInt(ConfigKey.COMMITTEE_ALLOW_OPTIMIZED_RETURN_VALUE_OF_CHAIN_ID) : 0;
 
     initBackupProperty(config);
-    if (Constant.ROCKSDB.equalsIgnoreCase(CommonParameter
-        .getInstance().getStorage().getDbEngine())) {
-      initRocksDbBackupProperty(config);
-      initRocksDbSettings(config);
-    }
+    initRocksDbBackupProperty(config);
+    initRocksDbSettings(config);
 
     PARAMETER.actuatorSet =
         config.hasPath(ConfigKey.ACTUATOR_WHITELIST)

framework/src/main/java/org/tron/core/db/backup/NeedBeanCondition.java

@@ -9,7 +9,12 @@ public class NeedBeanCondition implements Condition {
 
   @Override
   public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
-    return ("ROCKSDB".equals(Args.getInstance().getStorage().getDbEngine().toUpperCase()))
+    if (Args.getInstance() == null || Args.getInstance().getStorage() == null
+        || Args.getInstance().getStorage().getDbEngine() == null
+        || Args.getInstance().getDbBackupConfig() == null) {
+      return false;
+    }
+    return "ROCKSDB".equalsIgnoreCase(Args.getInstance().getStorage().getDbEngine())
         && Args.getInstance().getDbBackupConfig().isEnable() && !Args.getInstance().isWitness();
   }
 }