Merge branch 'develop' of github.com:tronprotocol/java-tron into discard-inv-below-solid-block

Author: zeusoo001

CONTRIBUTING.md

@@ -151,7 +151,7 @@ Please make sure your submission meets the following code style:
 
 ### Commit Messages
 
-Commit messages should follow the rule below, we provide a template corresponding instructions.
+Commit messages should follow the rule below, we provide a template with corresponding instructions.
 
 Template:
 ```
@@ -182,7 +182,7 @@ The subject contains a succinct description of the change:
 4. Do not end the subject line with a period.
 5. Avoid meaningless commits. It is recommended to use the git rebase command.
 
-Message body use the imperative, present tense: "change" not "changed" nor "changes". The body should include the motivation for the change and contrast this with previous behavior.
+Message body uses the imperative, present tense: "change" not "changed" nor "changes". The body should include the motivation for the change and contrast this with previous behavior.
 
 Here is an example:
 ```
@@ -217,7 +217,7 @@ If the purpose of this submission is to modify one issue, you need to refer to t
 
 
 ### Special Situations And How To Deal With Them
-As a reviewer, you may find yourself in one of the sitations below. Here’s how to deal with those:
+As a reviewer, you may find yourself in one of the situations below. Here’s how to deal with those:
 
 The author doesn’t follow up: ping them after a while (i.e. after a few days). If there is no further response, close the PR or complete the work yourself.
 

README.md

@@ -43,15 +43,15 @@
 ## Table of Contents
 
 - [What’s TRON?](#whats-tron)
-- [Building the Source Code](#building-the-source)
+- [Building the Source Code](#building-the-source-code)
 - [Running java-tron](#running-java-tron)
 - [Community](#community)
 - [Contribution](#contribution)
 - [Resources](#resources)
 - [Integrity Check](#integrity-check)
 - [License](#license)
 
-## What's TRON?
+# What's TRON?
 
 TRON is a project dedicated to building the infrastructure for a truly decentralized Internet.
 
@@ -61,7 +61,7 @@ TRON is a project dedicated to building the infrastructure for a truly decentral
 
 TRON enables large-scale development and engagement. With over 2000 transactions per second (TPS), high concurrency, low latency, and massive data transmission. It is ideal for building decentralized entertainment applications. Free features and incentive systems allow developers to create premium app experiences for users.
 
-# Building the source
+# Building the Source Code
 
 Building java-tron requires `git` package and 64-bit version of `Oracle JDK 1.8` to be installed, other JDK versions are not supported yet. Make sure you operate on `Linux` and `MacOS` operating systems.
 
@@ -91,18 +91,18 @@ Minimum:
 
 - CPU with 8 cores
 - 16GB RAM
-- 2TB free storage space to sync the Mainnet
+- 3TB free storage space to sync the Mainnet
 
 Recommended:
 
 - CPU with 16+ cores(32+ cores for a super representative)
 - 32GB+ RAM(64GB+ for a super representative)
-- High Performance SSD with at least 2.5TB free space
+- High Performance SSD with at least 4TB free space
 - 100+ MB/s download Internet service
 
 ## Running a full node for mainnet
 
-Full node has full historical data, it is the entry point into the TRON network , it can be used by other processes as a gateway into the TRON network via HTTP and GRPC endpoints. You can interact with the TRON network through full node：transfer assets, deploy contracts, interact with contracts and so on. `-c` parameter specifies a configuration file to run a full node:
+Full node has full historical data, it is the entry point into the TRON network, it can be used by other processes as a gateway into the TRON network via HTTP and GRPC endpoints. You can interact with the TRON network through full node：transfer assets, deploy contracts, interact with contracts and so on. `-c` parameter specifies a configuration file to run a full node:
 
 ```bash
 $ nohup java -Xms9G -Xmx9G -XX:ReservedCodeCacheSize=256m \

Tron protobuf protocol document.md

@@ -975,7 +975,7 @@ Contract and contract-related messages.
 
   - message `VoteAssetContract`
 
-    `owner_address`: assress of contract owner.
+    `owner_address`: address of contract owner.
 
     `vote_address`: voted address of asset.
 
@@ -1059,7 +1059,7 @@ Contract and contract-related messages.
 
       `total_supply`: maximum of asset.
 
-      `frozen_supply`: frozen supplt of asset.
+      `frozen_supply`: frozen supply of asset.
 
       `trx_num`: trx num defines token price.
 
@@ -1079,11 +1079,11 @@ Contract and contract-related messages.
 
       `free_asset_net_limit`: free bandwidth limit each account owns when transfers asset.
 
-      `public_free_asset_net_limit`: free bandwidth limit for all acoounts.
+      `public_free_asset_net_limit`: free bandwidth limit for all accounts.
 
       `public_free_asset_net_usage`: free bandwidth usage of all accounts.
 
-      `public_latest_free_net_time`: the latest bandwidth consumption time fo token transfer.
+      `public_latest_free_net_time`: the latest bandwidth consumption time for token transfer.
 
       ```java
       message AssetIssueContract {
@@ -1131,7 +1131,7 @@ Contract and contract-related messages.
 
       `owner_address`: owner address.
 
-      `to_address`: reveiver address.
+      `to_address`: receiver address.
 
       `asset_name`: target asset name.
 
@@ -1461,7 +1461,7 @@ Contract and contract-related messages.
     
        `owner_address`: address of owner.
     
-       `owner`: autuority to execute all contracts.
+       `owner`: authority to execute all contracts.
     
        `witness`: used by SR for generating blocks.
     
@@ -1514,7 +1514,7 @@ Contract and contract-related messages.
     
        `binding_signature`: signature to verify transaction.
     
-       `transparent_to_address`: transparent address of reveiver.
+       `transparent_to_address`: transparent address of receiver.
     
        `to_amount`: amount to transparent to_address
     
@@ -1536,7 +1536,7 @@ Contract and contract-related messages.
 
 ### <span id="smartc">Smart Contract</span>
 
-message `SmartContract` has mutiple attributes and nested message `ABI`
+message `SmartContract` has multiple attributes and nested message `ABI`
 
 - message `SmartContract`
 
@@ -1559,7 +1559,7 @@ message `SmartContract` has mutiple attributes and nested message `ABI`
 
       - message `Param`
 
-        `indexed`: `true` if the field is part of the log’s topics, `false` if it one of the log’s data segment.
+        `indexed`: `true` if the field is part of the log’s topics, `false` if it is one of the log’s data segment.
 
         `name`: name of the parameter.
 
@@ -1757,7 +1757,7 @@ message `SmartContract` has mutiple attributes and nested message `ABI`
 
     `tree`: incremental merkle tree.
 
-    `filled`: this is a array, it contains the root of the subtree which can be combined with the param tree to be a new merkle tree.
+    `filled`: this is an array, it contains the root of the subtree which can be combined with the param tree to be a new merkle tree.
 
     `cursor`: the node that can be combined to a subtree, when they are combined to a subtree, compute its root and put it into the filled.
 
@@ -1782,7 +1782,7 @@ message `SmartContract` has mutiple attributes and nested message `ABI`
 
     `vouchers`: this is an array, each items represents the merklevoucher of the outputpoint.
 
-    `paths`: his is an array each items represents the path of the outputpoint.
+    `paths`: this is an array each items represents the path of the outputpoint.
 
    ```java
   message IncrementalMerkleVoucherInfo {
@@ -2124,13 +2124,13 @@ message `SmartContract` has mutiple attributes and nested message `ABI`
 
 - #### Node Information
 
-  Node information is separaed into several parts and implemented by nested messages.
+  Node information is separated into several parts and implemented by nested messages.
 
 
 
   - message `NodeInfo`
 
-    `beginSyncNum`: beginning block height for synchornize.
+    `beginSyncNum`: beginning block height for synchronize.
 
     `block`: head block id.
 
@@ -2154,13 +2154,13 @@ message `SmartContract` has mutiple attributes and nested message `ABI`
 
     - message `PeerInfo`:
 
-      `lastSyncBlock`: last block id for synchornize.
+      `lastSyncBlock`: last block id for synchronize.
 
       `remainNum`: number of remaining blocks.
 
       `lastBlockUpdateTime`: latest block update time .
 
-      `syncFlag`: is synchroniing or not.
+      `syncFlag`: is synchronizing or not.
 
       `headBlockTimeWeBothHave`: timestamp of common head block.
 
@@ -2172,7 +2172,7 @@ message `SmartContract` has mutiple attributes and nested message `ABI`
 
       `port`: listening port.
 
-      `nodeId`: ramdomly generated node ID
+      `nodeId`: randomly generated node ID
 
       `connectTime`: connection time period from established.
 

actuator/build.gradle

@@ -1,9 +1,9 @@
 description = "actuator – a series of transactions for blockchain."
 
 dependencies {
-    compile project(":chainbase")
-    compile project(":protocol")
-    compile project(":crypto")
+    api project(":chainbase")
+    api project(":protocol")
+    api project(":crypto")
 }
 
 test {

actuator/src/main/java/org/tron/core/actuator/ExchangeTransactionActuator.java

@@ -66,7 +66,8 @@ public boolean execute(Object object) throws ContractExeException {
       long tokenQuant = exchangeTransactionContract.getQuant();
 
       byte[] anotherTokenID;
-      long anotherTokenQuant = exchangeCapsule.transaction(tokenID, tokenQuant);
+      long anotherTokenQuant = exchangeCapsule.transaction(tokenID, tokenQuant,
+          dynamicStore.allowStrictMath());
 
       if (Arrays.equals(tokenID, firstTokenID)) {
         anotherTokenID = secondTokenID;
@@ -205,7 +206,8 @@ public boolean validate() throws ContractValidateException {
       }
     }
 
-    long anotherTokenQuant = exchangeCapsule.transaction(tokenID, tokenQuant);
+    long anotherTokenQuant = exchangeCapsule.transaction(tokenID, tokenQuant,
+        dynamicStore.allowStrictMath());
     if (anotherTokenQuant < tokenExpected) {
       throw new ContractValidateException("token required must greater than expected");
     }

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

@@ -779,6 +779,36 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
         }
         break;
       }
+      case ALLOW_STRICT_MATH: {
+        if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_7_7)) {
+          throw new ContractValidateException(
+              "Bad chain parameter id [ALLOW_STRICT_MATH]");
+        }
+        if (dynamicPropertiesStore.allowStrictMath()) {
+          throw new ContractValidateException(
+              "[ALLOW_STRICT_MATH] has been valid, no need to propose again");
+        }
+        if (value != 1) {
+          throw new ContractValidateException(
+              "This value[ALLOW_STRICT_MATH] is only allowed to be 1");
+        }
+        break;
+      }
+      case CONSENSUS_LOGIC_OPTIMIZATION: {
+        if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_8_0)) {
+          throw new ContractValidateException(
+              "Bad chain parameter id [CONSENSUS_LOGIC_OPTIMIZATION]");
+        }
+        if (dynamicPropertiesStore.getConsensusLogicOptimization() == 1) {
+          throw new ContractValidateException(
+              "[CONSENSUS_LOGIC_OPTIMIZATION] has been valid, no need to propose again");
+        }
+        if (value != 1) {
+          throw new ContractValidateException(
+              "This value[CONSENSUS_LOGIC_OPTIMIZATION] is only allowed to be 1");
+        }
+        break;
+      }
       default:
         break;
     }
@@ -857,7 +887,9 @@ public enum ProposalType {         // current value, value range
     MAX_DELEGATE_LOCK_PERIOD(78), // (86400, 10512000]
     ALLOW_OLD_REWARD_OPT(79), // 0, 1
     ALLOW_ENERGY_ADJUSTMENT(81), // 0, 1
-    MAX_CREATE_ACCOUNT_TX_SIZE(82); // [500, 10000]
+    MAX_CREATE_ACCOUNT_TX_SIZE(82), // [500, 10000]
+    ALLOW_STRICT_MATH(87), // 0, 1
+    CONSENSUS_LOGIC_OPTIMIZATION(88); // 0, 1
 
     private long code;
 

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

@@ -989,6 +989,9 @@ public static void exeCall(Program program, DataWord adjustedCallEnergy,
     PrecompiledContracts.PrecompiledContract contract =
         PrecompiledContracts.getContractForAddress(codeAddress);
     if (contract != null) {
+      if (program.isConstantCall()) {
+        contract =  PrecompiledContracts.getOptimizedContractForConstant(contract);
+      }
       program.callToPrecompiledAddress(msg, contract);
     } else {
       program.callToAddress(msg);

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

@@ -16,6 +16,8 @@
 import static org.tron.core.config.Parameter.ChainConstant.TRX_PRECISION;
 
 import com.google.protobuf.ByteString;
+
+import java.lang.reflect.Constructor;
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.util.ArrayList;
@@ -194,6 +196,14 @@ public class PrecompiledContracts {
   private static final DataWord blake2FAddr = new DataWord(
       "0000000000000000000000000000000000000000000000000000000000020009");
 
+  public static PrecompiledContract getOptimizedContractForConstant(PrecompiledContract contract) {
+    try {
+      Constructor<?> constructor = contract.getClass().getDeclaredConstructor();
+      return  (PrecompiledContracts.PrecompiledContract) constructor.newInstance();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
 
   public static PrecompiledContract getContractForAddress(DataWord address) {
 

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

@@ -40,6 +40,7 @@ public static void load(StoreFactory storeFactory) {
         VMConfig.initDynamicEnergyMaxFactor(ds.getDynamicEnergyMaxFactor());
         VMConfig.initAllowTvmShangHai(ds.getAllowTvmShangHai());
         VMConfig.initAllowEnergyAdjustment(ds.getAllowEnergyAdjustment());
+        VMConfig.initAllowStrictMath(ds.getAllowStrictMath());
       }
     }
   }

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

@@ -51,6 +51,8 @@ public class VMConfig {
 
   private static boolean ALLOW_ENERGY_ADJUSTMENT = false;
 
+  private static boolean ALLOW_STRICT_MATH = false;
+
   private VMConfig() {
   }
 
@@ -142,6 +144,10 @@ public static void initAllowEnergyAdjustment(long allow) {
     ALLOW_ENERGY_ADJUSTMENT = allow == 1;
   }
 
+  public static void initAllowStrictMath(long allow) {
+    ALLOW_STRICT_MATH = allow == 1;
+  }
+
   public static boolean getEnergyLimitHardFork() {
     return CommonParameter.ENERGY_LIMIT_HARD_FORK;
   }
@@ -221,4 +227,8 @@ public static boolean allowTvmShanghai() {
   public static boolean allowEnergyAdjustment() {
     return ALLOW_ENERGY_ADJUSTMENT;
   }
+
+  public static boolean allowStrictMath() {
+    return ALLOW_STRICT_MATH;
+  }
 }