Merge branch 'tronprotocol:develop' into develop

Author: 317787106

.github/CODEOWNERS

@@ -0,0 +1,96 @@
+# CODEOWNERS — java-tron PR Review assignments
+#
+# Rule: when multiple rules match the same file, the last one takes precedence.
+# Recommendation: put more specific paths further down.
+
+# Default owner — applies to any file not matched by a more specific rule below.
+*                                   @zeusoo001 @317787106
+
+# ────────────────────────────────────────────────────────────────
+# 1. Top-level Gradle modules (corresponds to the "Level-1/Level-2 module" column)
+# ────────────────────────────────────────────────────────────────
+
+/framework/                         @xxo1shine @bladehan1
+/chainbase/                         @halibobo1205 @bladehan1
+/actuator/                          @Sunny6889 @lxcmyf
+/consensus/                         @kuny0707 @xxo1shine
+/protocol/                          @lvs0075 @waynercheung
+/common/                            @lvs0075 @lxcmyf
+/crypto/                            @Federico2014 @3for
+/plugins/                           @halibobo1205 @warku123
+/docker/                            @3for @kuny0707
+
+# ────────────────────────────────────────────────────────────────
+# 2. CI / Build configuration
+# ────────────────────────────────────────────────────────────────
+
+/.github/                           @317787106 @halibobo1205
+*.gradle                            @317787106 @halibobo1205
+/gradle/                            @317787106 @halibobo1205
+
+# ────────────────────────────────────────────────────────────────
+# 3. Sub-module paths (more specific than top-level; placed later to override rules above)
+# ────────────────────────────────────────────────────────────────
+
+# db — covers the db, db2, and storage packages inside chainbase
+/chainbase/src/main/java/org/tron/core/db/              @halibobo1205 @bladehan1
+/chainbase/src/main/java/org/tron/core/db2/             @halibobo1205 @bladehan1
+/chainbase/src/main/java/org/tron/common/storage/       @halibobo1205 @bladehan1
+
+# trie
+/framework/src/main/java/org/tron/core/trie/            @halibobo1205 @317787106
+
+# net
+/framework/src/main/java/org/tron/core/net/             @317787106 @xxo1shine
+
+# vm / tvm
+/actuator/src/main/java/org/tron/core/vm/               @yanghang8612 @CodeNinjaEvan
+
+# jsonrpc
+/framework/src/main/java/org/tron/core/services/jsonrpc/                    @0xbigapple @waynercheung
+/framework/src/main/java/org/tron/core/services/interfaceJsonRpcOnSolidity/ @0xbigapple @waynercheung
+
+# rpc (gRPC) — non-HTTP parts of interfaceOnPBFT / interfaceOnSolidity + RpcService
+/framework/src/main/java/org/tron/core/services/interfaceOnSolidity/        @317787106 @waynercheung
+/framework/src/main/java/org/tron/common/application/                       @317787106 @waynercheung
+
+# http (REST) — overrides the rpc rule above for the http sub-directories inside interfaceOnXxx
+/framework/src/main/java/org/tron/core/services/http/                       @Sunny6889 @waynercheung
+/framework/src/main/java/org/tron/core/services/interfaceOnSolidity/http/   @Sunny6889 @waynercheung
+
+# event
+/framework/src/main/java/org/tron/core/services/event/  @xxo1shine @0xbigapple
+/framework/src/main/java/org/tron/common/logsfilter/    @xxo1shine @0xbigapple
+
+# config
+/framework/src/main/java/org/tron/core/config/          @317787106 @kuny0707
+/chainbase/src/main/java/org/tron/core/config/          @317787106 @kuny0707
+
+# backup
+/framework/src/main/java/org/tron/common/backup/        @xxo1shine @317787106
+/framework/src/main/java/org/tron/core/db/backup/       @xxo1shine @317787106
+
+# metrics
+/framework/src/main/java/org/tron/core/metrics/         @halibobo1205 @Sunny6889
+
+# rewards — logic is spread across chainbase service/store
+/chainbase/src/main/java/org/tron/core/service/         @Sunny6889 @kuny0707
+/chainbase/src/main/java/org/tron/core/store/           @Sunny6889 @kuny0707
+
+# lite — DbLite in plugins module; lite-related filters in framework
+/plugins/src/main/java/common/org/tron/plugins/DbLite.java   @bladehan1 @halibobo1205
+/plugins/src/main/java/common/org/tron/plugins/DbCopy.java   @bladehan1 @halibobo1205
+/framework/src/main/java/org/tron/core/services/filter/      @bladehan1 @halibobo1205
+
+# ────────────────────────────────────────────────────────────────
+# 4. Test code — mirrors the module ownership above
+# ────────────────────────────────────────────────────────────────
+
+/framework/src/test/                @xxo1shine @bladehan1
+/chainbase/src/test/                @halibobo1205 @bladehan1
+/actuator/src/test/                 @Sunny6889 @lxcmyf
+/consensus/src/test/                @kuny0707 @xxo1shine
+/protocol/src/test/                 @lvs0075 @waynercheung
+/common/src/test/                   @lvs0075 @lxcmyf
+/crypto/src/test/                   @Federico2014 @3for
+/plugins/src/test/                  @halibobo1205 @warku123

CONTRIBUTING.md

@@ -23,20 +23,20 @@ Here are some guidelines to get started quickly and easily:
 - [Conduct](#Conduct)
 
 
-### Reporting An Issue
+## Reporting An Issue
 
-If you're about to raise an issue because you think you've found a problem or bug with java-tron, please respect the following restrictions:
+If you have any question about java-tron, please search [existing issues](https://github.com/tronprotocol/java-tron/issues?q=is%3Aissue%20state%3Aclosed%20OR%20state%3Aopen) first to avoid duplicates. Your questions might already be under discussion or part of our roadmap. Checking first helps us streamline efforts and focus on new contributions.
 
-- Please search for existing issues. Help us keep duplicate issues to a minimum by checking to see if someone has already reported your problem or requested your idea.
+### Ask a question
+Feel free to ask any java-tron related question to solve your doubt. Please click **Ask a question** in GitHub Issues, using [Ask a question](.github/ISSUE_TEMPLATE/ask-a-question.md) template.
 
-- Use the Issue Report Template below.
-    ```
-    1.What did you do? 
+### Report a bug
 
-    2.What did you expect to see? 
+If you think you've found a bug with java-tron, please click **Report a bug** in GitHub Issues, using [Report a bug](.github/ISSUE_TEMPLATE/report-a-bug.md) template.
 
-    3.What did you see instead?
-    ```
+### Request a feature
+
+If you have any good feature suggestions for java-tron, please click **Request a feature** in GitHub Issues, using [Request a feature](.github/ISSUE_TEMPLATE/request-a-feature.md) template.
 
 
 ## Working on java-tron
@@ -69,43 +69,56 @@ java-tron only has `master`, `develop`, `release-*`, `feature-*`, and `hotfix-*`
 
 ### Submitting Code
 
-If you want to contribute codes to java-tron, please follow the following steps:
+If you want to contribute code to java-tron, please follow the following steps.
+
+* Fork the Repository
+
+  Visit [tronprotocol/java-tron](https://github.com/tronprotocol/java-tron/) and click **Fork** to create a fork repository under your GitHub account.
 
-* Fork code repository
-  Fork a new repository from tronprotocol/java-tron to your personal code repository
+* Setup Local Environment
 
-* Edit the code in the fork repository
+  Clone your fork repository to local and add the official repository as **upstream**.
     ```
     git clone https://github.com/yourname/java-tron.git
 
-    git remote add upstream https://github.com/tronprotocol/java-tron.git     ("upstream" refers to upstream projects repositories, namely tronprotocol's repositories, and can be named as you like it. We usually call it "upstream" for convenience) 
+    cd java-tron
+
+    git remote add upstream https://github.com/tronprotocol/java-tron.git
     ```
-  Before developing new features, please synchronize your fork repository with the upstream repository.
+
+* Synchronize and Develop
+
+  Before developing new features, please synchronize your local `develop` branch with the upstream repository and update to your fork repository.
     ```
-    git fetch upstream 
-    git checkout develop 
-    git merge upstream/develop --no-ff (Add --no-ff to turn off the default fast merge mode)
+    git fetch upstream
+    git checkout develop
+    # `--no-ff` means to turn off the default fast merge mode
+    git merge upstream/develop --no-ff
+    git push origin develop
     ```
 
-  Pull a new branch from the develop branch of your repository for local development. Please refer to [Branch Naming Conventions](#Branch-Naming-Conventions),
+  Create a new branch for development. Please refer to [Branch Naming Conventions](#Branch-Naming-Conventions).
     ```
     git checkout -b feature/branch_name develop
     ```
 
-  Write and commit the new code when it is completed. Please refer to [Commit Messages](#Commit-Messages)
+* Commit and Push
+
+  Write and commit the new code when it is completed. Please refer to [Commit Messages](#Commit-Messages).
      ```
      git add .
      git commit -m 'commit message'
      ```
-  Commit the new branch to your personal remote repository
+
+  Push the new branch to your fork repository
      ```
      git push origin feature/branch_name
      ```
 
-* Push code
+* Submit a pull request
 
-  Submit a pull request (PR) from your repository to `tronprotocol/java-tron`.
-  Please be sure to click on the link in the red box shown below. Select the base branch for tronprotocol and the compare branch for your personal fork repository.
+  Submit a pull request (PR) from your fork repository to `tronprotocol/java-tron`.
+  Please be sure to click on the link in the red box shown below. Select the base branch for `tronprotocol/java-tron` and the compare branch for your fork repository.
   ![image](https://raw.githubusercontent.com/tronprotocol/documentation-en/master/images/javatron_pr.png)
 
 

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

@@ -871,6 +871,21 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
         }
         break;
       }
+      case ALLOW_TVM_OSAKA: {
+        if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_8_2)) {
+          throw new ContractValidateException(
+              "Bad chain parameter id [ALLOW_TVM_OSAKA]");
+        }
+        if (dynamicPropertiesStore.getAllowTvmOsaka() == 1) {
+          throw new ContractValidateException(
+              "[ALLOW_TVM_OSAKA] has been valid, no need to propose again");
+        }
+        if (value != 1) {
+          throw new ContractValidateException(
+              "This value[ALLOW_TVM_OSAKA] is only allowed to be 1");
+        }
+        break;
+      }
       default:
         break;
     }
@@ -955,7 +970,8 @@ public enum ProposalType {         // current value, value range
     CONSENSUS_LOGIC_OPTIMIZATION(88), // 0, 1
     ALLOW_TVM_BLOB(89), // 0, 1
     PROPOSAL_EXPIRE_TIME(92), // (0, 31536003000)
-    ALLOW_TVM_SELFDESTRUCT_RESTRICTION(94); // 0, 1
+    ALLOW_TVM_SELFDESTRUCT_RESTRICTION(94), // 0, 1
+    ALLOW_TVM_OSAKA(96); // 0, 1
 
     private long code;
 

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

@@ -1,24 +1,58 @@
 package org.tron.core.utils;
 
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 import lombok.extern.slf4j.Slf4j;
 import org.reflections.Reflections;
 import org.tron.core.actuator.AbstractActuator;
+import org.tron.core.exception.TronError;
 
 @Slf4j(topic = "TransactionRegister")
 public class TransactionRegister {
 
+  private static final AtomicBoolean REGISTERED = new AtomicBoolean(false);
+  private static final String PACKAGE_NAME = "org.tron.core.actuator";
+
   public static void registerActuator() {
-    Reflections reflections = new Reflections("org.tron");
-    Set<Class<? extends AbstractActuator>> subTypes = reflections
-        .getSubTypesOf(AbstractActuator.class);
-    for (Class _class : subTypes) {
-      try {
-        _class.newInstance();
-      } catch (Exception e) {
-        logger.error("{} contract actuator register fail!", _class, e);
+    if (REGISTERED.get()) {
+      logger.debug("Actuator already registered.");
+      return;
+    }
+
+    synchronized (TransactionRegister.class) {
+      if (REGISTERED.get()) {
+        logger.debug("Actuator already registered.");
+        return;
+      }
+      logger.debug("Register actuator start.");
+      Reflections reflections = new Reflections(PACKAGE_NAME);
+      Set<Class<? extends AbstractActuator>> subTypes = reflections
+          .getSubTypesOf(AbstractActuator.class);
+
+      for (Class<? extends AbstractActuator>  clazz : subTypes) {
+        try {
+          logger.debug("Registering actuator: {} start", clazz.getName());
+          clazz.getDeclaredConstructor().newInstance();
+          logger.debug("Registering actuator: {} done", clazz.getName());
+        } catch (Exception e) {
+          Throwable cause = e.getCause() != null ? e.getCause() : e;
+          String detail = cause.getMessage() != null ? cause.getMessage() : cause.toString();
+          throw new TronError(clazz.getName() + ": " + detail,
+              e, TronError.ErrCode.ACTUATOR_REGISTER);
+        }
       }
+
+      REGISTERED.set(true);
+      logger.debug("Register actuator done, total {}.", subTypes.size());
     }
   }
 
+  static boolean isRegistered() {
+    return REGISTERED.get();
+  }
+
+  // For testing only — resets registration state between tests.
+  static void resetForTesting() {
+    REGISTERED.set(false);
+  }
 }

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

@@ -622,6 +622,8 @@ public static class ModExp extends PrecompiledContract {
 
     private static final int ARGS_OFFSET = 32 * 3; // addresses length part
 
+    private static final int UPPER_BOUND = 1024;
+
     @Override
     public long getEnergyForData(byte[] data) {
 
@@ -660,6 +662,11 @@ public Pair<Boolean, byte[]> execute(byte[] data) {
       int expLen = parseLen(data, 1);
       int modLen = parseLen(data, 2);
 
+      if (VMConfig.allowTvmOsaka()
+          && (baseLen > UPPER_BOUND || expLen > UPPER_BOUND || modLen > UPPER_BOUND)) {
+        return Pair.of(false, EMPTY_BYTE_ARRAY);
+      }
+
       BigInteger base = parseArg(data, ARGS_OFFSET, baseLen);
       BigInteger exp = parseArg(data, addSafely(ARGS_OFFSET, baseLen), expLen);
       BigInteger mod = parseArg(data, addSafely(addSafely(ARGS_OFFSET, baseLen), expLen), modLen);

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

@@ -45,6 +45,7 @@ public static void load(StoreFactory storeFactory) {
         VMConfig.initDisableJavaLangMath(ds.getConsensusLogicOptimization());
         VMConfig.initAllowTvmBlob(ds.getAllowTvmBlob());
         VMConfig.initAllowTvmSelfdestructRestriction(ds.getAllowTvmSelfdestructRestriction());
+        VMConfig.initAllowTvmOsaka(ds.getAllowTvmOsaka());
       }
     }
   }

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

@@ -238,6 +238,8 @@ public class DynamicPropertiesStore extends TronStoreWithRevoking<BytesCapsule>
   private static final byte[] ALLOW_TVM_SELFDESTRUCT_RESTRICTION =
       "ALLOW_TVM_SELFDESTRUCT_RESTRICTION".getBytes();
 
+  private static final byte[] ALLOW_TVM_OSAKA = "ALLOW_TVM_OSAKA".getBytes();
+
   @Autowired
   private DynamicPropertiesStore(@Value("properties") String dbName) {
     super(dbName);
@@ -2980,6 +2982,17 @@ public long getProposalExpireTime() {
         .orElse(CommonParameter.getInstance().getProposalExpireTime());
   }
 
+  public long getAllowTvmOsaka() {
+    return Optional.ofNullable(getUnchecked(ALLOW_TVM_OSAKA))
+        .map(BytesCapsule::getData)
+        .map(ByteArray::toLong)
+        .orElse(CommonParameter.getInstance().getAllowTvmOsaka());
+  }
+
+  public void saveAllowTvmOsaka(long value) {
+    this.put(ALLOW_TVM_OSAKA, new BytesCapsule(ByteArray.fromLong(value)));
+  }
+
   private static class DynamicResourceProperties {
 
     private static final byte[] ONE_DAY_NET_LIMIT = "ONE_DAY_NET_LIMIT".getBytes();

common/src/main/java/org/tron/common/args/GenesisBlock.java

@@ -61,18 +61,17 @@ public void setAssets(final List<Account> assets) {
    */
   public void setTimestamp(final String timestamp) {
     this.timestamp = timestamp;
-
     if (this.timestamp == null) {
       this.timestamp = DEFAULT_TIMESTAMP;
-    }
-
-    try {
-      long l = Long.parseLong(this.timestamp);
-      if (l < 0) {
+    } else {
+      try {
+        long l = Long.parseLong(this.timestamp);
+        if (l < 0) {
+          throw new IllegalArgumentException("Timestamp(" + timestamp + ") must be greater than or equal to 0.");
+        }
+      } catch (NumberFormatException e) {
         throw new IllegalArgumentException("Timestamp(" + timestamp + ") must be a Long type.");
       }
-    } catch (NumberFormatException e) {
-      throw new IllegalArgumentException("Timestamp(" + timestamp + ") must be a Long type.");
     }
   }
 

common/src/main/java/org/tron/common/parameter/CommonParameter.java

@@ -633,6 +633,10 @@ public class CommonParameter {
   @Setter
   public long allowTvmBlob;
 
+  @Getter
+  @Setter
+  public long allowTvmOsaka;
+
   private static double calcMaxTimeRatio() {
     return 5.0;
   }