Merge pull request #4594 from tronprotocol/release_v4.5.2

Release v4.5.2 merge to master

Author: lvs007

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

@@ -1,13 +1,28 @@
-<!-- Please answer these questions before submitting your issue. Thanks! -->
-
-### 1. What did you do?
-<!--If possible, provide a recipe for reproducing the error. -->
-
-
-### 2. What did you expect to see?
-
-
-
-### 3. What did you see instead?
-
-
+---
+name: Ask a question
+about: Something is unclear
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- Please answer these questions before submitting your issue. Thanks! -->
+
+### System information
+
+java-tron version: `java -jar FullNode.jar -v`
+OS & Version: Windows/Linux/OSX
+
+
+### 1. What did you do?
+<!--If possible, provide a recipe for reproducing the error. -->
+
+
+### 2. What did you expect to see?
+
+
+
+### 3. What did you see instead?
+
+

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

@@ -0,0 +1,31 @@
+---
+name: Report a bug
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+#### System information
+
+java-tron version: `java -jar FullNode.jar -v`
+OS & Version: Windows/Linux/OSX
+Commit hash : (if `develop`)
+
+#### Expected behaviour
+
+
+#### Actual behaviour
+
+
+#### Steps to reproduce the behaviour
+
+
+#### Backtrace
+
+````
+[backtrace]
+````
+
+When submitting logs: please submit them as text and not screenshots.

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

@@ -0,0 +1,18 @@
+---
+name: Request a feature
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+# Rationale
+
+Why should this feature exist?
+What are the use-cases?
+
+# Implementation
+
+Do you have ideas regarding the implementation of this feature?
+Are you willing to implement this feature?

README.md

@@ -63,48 +63,73 @@ 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 java-tron requires `git` and `Oracle JDK 1.8` to be installed, other JDK versions are not supported yet. It is recommended to operate on `Linux` and `OSX` operating systems.
+Building java-tron requires `git` and `Oracle JDK 1.8` to be installed, other JDK versions are not supported yet. Make sure you operate on `Linux` and `MacOS` operating systems.
 
-## Getting the Source Code
+Clone the repo and switch to the `master` branch
 
   ```bash
   $ git clone https://github.com/tronprotocol/java-tron.git
+  $ cd java-tron
   $ git checkout -t origin/master
   ```
-
-## Build
-
+then run the following command to build java-tron, the `FullNode.jar` file can be found in `java-tron/build/libs/` after build successful.
 ```bash
-$ cd java-tron
 $ ./gradlew clean build -x test
 ```
 
-The `FullNode.jar` file can be found in `java-tron/build/libs/FullNode.jar` after build successful.
 
 # Running java-tron
+Running java-tron requires `Oracle JDK 1.8` to be installed, other JDK versions are not supported yet. Make sure you operate on `Linux` and `MacOS` operating systems.
 
 Get the mainnet configurate file: [main_net_config.conf](https://github.com/tronprotocol/tron-deployment/blob/master/main_net_config.conf), other network configuration files can be find [here](https://github.com/tronprotocol/tron-deployment).
+## Hardware Requirements
+Minimum:
+* CPU with 8 cores
+* 16GB RAM
+* 1TB 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 1.5TB 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:
+
+## 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:
    ```bash
-   $ java -jar FullNode.jar -c main_net_config.conf
+   $ nohup java -Xms9G -Xmx9G -XX:ReservedCodeCacheSize=256m \
+                -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=512m \
+                -XX:MaxDirectMemorySize=1G -XX:+PrintGCDetails \
+                -XX:+PrintGCDateStamps  -Xloggc:gc.log \
+                -XX:+UseConcMarkSweepGC -XX:NewRatio=2 \
+                -XX:+CMSScavengeBeforeRemark -XX:+ParallelRefProcEnabled \
+                -XX:+HeapDumpOnOutOfMemoryError \
+                -XX:+UseCMSInitiatingOccupancyOnly  -XX:CMSInitiatingOccupancyFraction=70 \
+                -jar FullNode.jar -c main_net_config.conf >> start.log 2>&1 &
    ```
-* **Running a super representative node for mainnet**  
-  Adding the `--witness` parameter to the startup command, full node will run as a super representative node. The super representative node supports all the functions of the full node and also supports block production. Before running, make sure you have a super representative account and get votes from others，once the number of obtained votes ranks in the top 27, your super representative node will participate in block production.
+## Running a super representative node for mainnet
+Adding the `--witness` parameter to the startup command, full node will run as a super representative node. The super representative node supports all the functions of the full node and also supports block production. Before running, make sure you have a super representative account and get votes from others，once the number of obtained votes ranks in the top 27, your super representative node will participate in block production.
 
-  Fill in the private key of super representative address into the `localwitness` list in the `main_net_config.conf`, here is an example:
+Fill in the private key of super representative address into the `localwitness` list in the `main_net_config.conf`, here is an example:
    ```
     localwitness = [
         650950B193DDDDB35B6E48912DD28F7AB0E7140C1BFDEFD493348F02295BD812
     ]
    ```
 
-  then run the following command to start the node:
-    ```bash
-    $ java -jar FullNode.jar --witness -c main_net_config.conf
-    ```
+then run the following command to start the node:
+  ```bash
+  $ nohup java -Xms9G -Xmx9G -XX:ReservedCodeCacheSize=256m \
+               -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=512m \
+               -XX:MaxDirectMemorySize=1G -XX:+PrintGCDetails \
+               -XX:+PrintGCDateStamps  -Xloggc:gc.log \
+               -XX:+UseConcMarkSweepGC -XX:NewRatio=2 \
+               -XX:+CMSScavengeBeforeRemark -XX:+ParallelRefProcEnabled \
+               -XX:+HeapDumpOnOutOfMemoryError \
+               -XX:+UseCMSInitiatingOccupancyOnly  -XX:CMSInitiatingOccupancyFraction=70 \
+               -jar FullNode.jar --witness -c main_net_config.conf >> start.log 2>&1 &
+   ```
 
 ## Quick Start Tool
 An easier way to build and run java-tron is to use `start.sh`, `start.sh` is a quick start script written in shell language, you can use it to build and run java-tron quickly and easily.
@@ -116,16 +141,16 @@ Here are some common use cases of the scripting tool
 
 For more details, please refer to the tool [guide](./shell.md).
 
-## Run inside Docker container 
+## Run inside Docker container
 
 One of the quickest ways to get `java-tron` up and running on your machine is by using Docker:
 ```shell
 $ docker run -d --name="java-tron" \
-              -v /your_path/output-directory:/java-tron/output-directory \
-              -v /your_path/logs:/java-tron/logs \
-              -p 8090:8090 -p 18888:18888 -p 50051:50051 \
-              tronprotocol/java-tron \
-              -c /java-tron/config/main_net_config.conf
+             -v /your_path/output-directory:/java-tron/output-directory \
+             -v /your_path/logs:/java-tron/logs \
+             -p 8090:8090 -p 18888:18888 -p 50051:50051 \
+             tronprotocol/java-tron \
+             -c /java-tron/config/main_net_config.conf
 ```
 
 This will mount the `output-directory` and `logs` directories on the host, the docker.sh tool can also be used to simplify the use of docker, see more [here](docker/docker.md).
@@ -138,9 +163,8 @@ This will mount the `output-directory` and `logs` directories on the host, the d
 [tronprotocol/allcoredev](https://gitter.im/tronprotocol/allcoredev) is the official Gitter channel for developers.
 
 # Contribution
-If you'd like to contribute to java-tron, please read the following instructions.
+Thank you for considering to help out with the source code! If you'd like to contribute to java-tron, please see the [Contribution Guide](./CONTRIBUTING.md) for more details.
 
-- [Contribution](./CONTRIBUTING.md)
 
 # Resources
 * [Medium](https://medium.com/@coredevs) java-tron's official technical articles are published there.
@@ -153,3 +177,11 @@ If you'd like to contribute to java-tron, please read the following instructions
 
 # License
 java-tron is released under the [LGPLv3 license](https://github.com/tronprotocol/java-tron/blob/master/LICENSE).
+
+
+
+The minimum hardware requirements are `CPU with 8 cores`,`16GB RAM` and `1TB free storage space` to sync the Mainnet, the recommended hardware requirements:
+* CPU with 16+ cores(32+ cores for a super representative)
+* 32+ GB RAM(64+ GB for a super representative)
+* High Performance SSD with at least 1.5TB free space
+* 100+ MB/s download Internet service

Tron protobuf protocol document.md

@@ -2019,7 +2019,7 @@ message `SmartContract` has mutiple attributes and nested message `ABI`
       TOO_MANY_PEERS = 0x04;
       DUPLICATE_PEER = 0x05;
       INCOMPATIBLE_PROTOCOL = 0x06;
-      NULL_IDENTITY = 0x07;
+      RANDOM_ELIMINATION = 0x07;
       PEER_QUITING = 0x08;
       UNEXPECTED_IDENTITY = 0x09;
       LOCAL_IDENTITY = 0x0A;

chainbase/src/main/java/org/tron/common/storage/leveldb/LevelDbDataSourceImpl.java

@@ -352,6 +352,7 @@ public Map<byte[], byte[]> getNext(byte[] key, long limit) {
     }
   }
 
+  @Override
   public Map<WrappedByteArray, byte[]> prefixQuery(byte[] key) {
     resetDbLock.readLock().lock();
     try (DBIterator iterator = getDBIterator()) {

chainbase/src/main/java/org/tron/common/storage/rocksdb/RocksDbDataSourceImpl.java

@@ -431,6 +431,7 @@ public Map<byte[], byte[]> getNext(byte[] key, long limit) {
     }
   }
 
+  @Override
   public Map<WrappedByteArray, byte[]> prefixQuery(byte[] key) {
     if (quitIfNotAlive()) {
       return null;

chainbase/src/main/java/org/tron/common/utils/WalletUtil.java

@@ -131,4 +131,12 @@ public static byte[] getSelector(byte[] data) {
     return ret;
   }
 
+  public static Long isLong(String s) {
+    try {
+      return Long.parseLong(s);
+    } catch (NumberFormatException ignored) {
+      return null;
+    }
+  }
+
 }

chainbase/src/main/java/org/tron/core/db/TransactionStore.java

@@ -52,6 +52,9 @@ private TransactionCapsule getTransactionFromBlockStore(byte[] key, long blockNu
 
   private TransactionCapsule getTransactionFromKhaosDatabase(byte[] key, long high) {
     List<KhaosBlock> khaosBlocks = khaosDatabase.getMiniStore().getBlockByNum(high);
+    if (khaosBlocks == null) {
+      return null;
+    }
     for (KhaosBlock bl : khaosBlocks) {
       for (TransactionCapsule e : bl.getBlk().getTransactions()) {
         if (e.getTransactionId().equals(Sha256Hash.wrap(key))) {

chainbase/src/main/java/org/tron/core/db/TronDatabase.java

@@ -110,13 +110,7 @@ public T getUnchecked(byte[] key) {
   }
 
   public Map<WrappedByteArray, byte[]> prefixQuery(byte[] key) {
-    Map<WrappedByteArray, byte[]> result = new HashMap<>();
-    if (dbSource.getClass() == LevelDbDataSourceImpl.class) {
-      result = ((LevelDbDataSourceImpl) dbSource).prefixQuery(key);
-    } else if (dbSource.getClass() == RocksDbDataSourceImpl.class) {
-      result = ((RocksDbDataSourceImpl) dbSource).prefixQuery(key);
-    }
-    return result;
+    return dbSource.prefixQuery(key);
   }
 
   public abstract boolean has(byte[] key);