Merge remote-tracking branch 'upstream/develop' into develop

Author: 317787106

.github/workflows/docker-publish.yml

@@ -31,7 +31,6 @@ shareddata.*
 
 # protobuf generated classes
 src/main/gen
-
 src/main/java/org/tron/core/bftconsensus
 src/test/java/org/tron/consensus2
 src/main/java/META-INF/

.gitignore

@@ -103,12 +103,12 @@ If you want to contribute codes to java-tron, please follow the following steps:
 
   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.
-  ![](https://codimd.s3.shivering-isles.com/demo/uploads/e24435ab42e4287d9369a2136.png)
+  ![image](https://raw.githubusercontent.com/tronprotocol/documentation-en/master/images/javatron_pr.png)
 
 
 
 ## Code Review Guidelines
-The only way to get code into java-tron is to send a pull request. Those pull requests need to be reviewed by someone. there a guide that explains our expectations around PRs for both authors and reviewers.
+The only way to get code into java-tron is to send a pull request. Those pull requests need to be reviewed by someone. The following guide explains our expectations around PRs for both authors and reviewers.
 
 ### Terminology
 - The author of a pull request is the entity who wrote the diff and submitted it to GitHub.
@@ -186,10 +186,10 @@ Message body use the imperative, present tense: "change" not "changed" nor "chan
 
 Here is an example:
 ```
-feat(block): optimize product block
+feat(block): optimize the block-producing logic
 
-1. optimize the block production threads
-2. improve transaction entry speed
+1. increase the priority that block producing thread acquires synchronization lock
+2. add the interruption exception handling in block-producing thread
 
 Closes #1234
 ```

CONTRIBUTING.md

@@ -81,17 +81,17 @@ $ ./gradlew clean build -x test
 # 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).
+Get the mainnet configuration 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
+* 2TB 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
+* High Performance SSD with at least 2.5TB free space
 * 100+ MB/s download Internet service
 
 
@@ -174,14 +174,11 @@ Thank you for considering to help out with the source code! If you'd like to con
 * [Wallet-cli](https://github.com/tronprotocol/wallet-cli) TRON network wallet using command line.
 * [TIP](https://github.com/tronprotocol/tips) TRON Improvement Proposal (TIP) describes standards for the TRON network.
 * [TP](https://github.com/tronprotocol/tips/tree/master/tp) TRON Protocol (TP) describes standards already implemented in TRON network but not published as a TIP.
-
+# Integrity Check
+* After January 3, 2023， releases are signed the gpg key:
+  ```
+  pub: 1254 F859 D2B1 BD9F 66E7 107D F859 BCB4 4A28 290B
+  uid: build@tron.network
+  ```
 # 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

README.md

@@ -620,6 +620,13 @@ Transaction and transaction-related messages.
           ClearABIContract = 48;
           UpdateBrokerageContract = 49;
           ShieldedTransferContract = 51;
+          MarketSellAssetContract = 52;
+          MarketCancelOrderContract = 53;
+          FreezeBalanceV2Contract = 54;
+          UnfreezeBalanceV2Contract = 55;
+          WithdrawExpireUnfreezeContract = 56;
+          DelegateResourceContract = 57;
+          UnDelegateResourceContract = 58;
         }
         ContractType type = 1;
         google.protobuf.Any parameter = 2;
@@ -873,6 +880,13 @@ Contract and contract-related messages.
       ClearABIContract = 48;
       UpdateBrokerageContract = 49;
       ShieldedTransferContract = 51;
+      MarketSellAssetContract = 52;
+      MarketCancelOrderContract = 53;
+      FreezeBalanceV2Contract = 54;
+      UnfreezeBalanceV2Contract = 55;
+      WithdrawExpireUnfreezeContract = 56;
+      DelegateResourceContract = 57;
+      UnDelegateResourceContract = 58;
     }
     ContractType type = 1;
     google.protobuf.Any parameter = 2;
@@ -2019,7 +2033,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;

Tron protobuf protocol document.md

@@ -20,7 +20,6 @@ dependencies {
 
     compile "org.slf4j:jcl-over-slf4j:$slf4jVersion"
     compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'
-    compile 'com.github.tronprotocol:zksnark-java-sdk:master-SNAPSHOT'
     compile group: 'commons-codec', name: 'commons-codec', version: '1.11'
     compile 'org.reflections:reflections:0.9.11'
 }

actuator/build.gradle

@@ -1,5 +1,7 @@
 package org.tron.core.actuator;
 
+import static org.tron.core.actuator.ActuatorConstant.NOT_EXIST_STR;
+
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Arrays;
@@ -16,13 +18,10 @@
 import org.tron.core.store.AbiStore;
 import org.tron.core.store.AccountStore;
 import org.tron.core.store.ContractStore;
-import org.tron.core.vm.config.VMConfig;
 import org.tron.protos.Protocol.Transaction.Contract.ContractType;
 import org.tron.protos.Protocol.Transaction.Result.code;
-import org.tron.protos.contract.SmartContractOuterClass.SmartContract.ABI;
 import org.tron.protos.contract.SmartContractOuterClass.ClearABIContract;
-
-import static org.tron.core.actuator.ActuatorConstant.NOT_EXIST_STR;
+import org.tron.protos.contract.SmartContractOuterClass.SmartContract.ABI;
 
 @Slf4j(topic = "actuator")
 public class ClearABIContractActuator extends AbstractActuator {
@@ -57,17 +56,16 @@ public boolean execute(Object result) throws ContractExeException {
 
   @Override
   public boolean validate() throws ContractValidateException {
-    if (!VMConfig.allowTvmConstantinople()) {
-      throw new ContractValidateException(
-          "contract type error,unexpected type [ClearABIContract]");
-    }
-
     if (this.any == null) {
       throw new ContractValidateException(ActuatorConstant.CONTRACT_NOT_EXIST);
     }
     if (chainBaseManager == null) {
       throw new ContractValidateException("No account store or contract store!");
     }
+    if (chainBaseManager.getDynamicPropertiesStore().getAllowTvmConstantinople() == 0) {
+      throw new ContractValidateException(
+          "contract type error,unexpected type [ClearABIContract]");
+    }
     AccountStore accountStore = chainBaseManager.getAccountStore();
     ContractStore contractStore = chainBaseManager.getContractStore();
     if (!this.any.is(ClearABIContract.class)) {