fix(LiteTool): fix data issue of snapshot generating when crash

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

@@ -733,6 +733,10 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
           throw new ContractValidateException(
               "Bad chain parameter id [ALLOW_OLD_REWARD_OPT]");
         }
+        if (dynamicPropertiesStore.allowOldRewardOpt()) {
+          throw new ContractValidateException(
+              "[ALLOW_OLD_REWARD_OPT] has been valid, no need to propose again");
+        }
         if (value != 1) {
           throw new ContractValidateException(
               "This value[ALLOW_OLD_REWARD_OPT] is only allowed to be 1");

build.gradle

@@ -55,7 +55,7 @@ subprojects {
         testAnnotationProcessor 'org.projectlombok:lombok:1.18.12'
 
         testImplementation group: 'junit', name: 'junit', version: '4.13.2'
-        testImplementation "org.mockito:mockito-core:2.1.0"
+        testImplementation "org.mockito:mockito-core:2.13.0"
     }
 
     task sourcesJar(type: Jar, dependsOn: classes) {

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

@@ -78,7 +78,7 @@ private boolean passOld(int version) {
   private boolean passNew(int version) {
     ForkBlockVersionEnum versionEnum = ForkBlockVersionEnum.getForkBlockVersionEnum(version);
     if (versionEnum == null) {
-      logger.error("Not exist block version: {}.", version);
+      logger.warn("Not exist block version: {}.", version);
       return false;
     }
     long latestBlockTime = manager.getDynamicPropertiesStore().getLatestBlockHeaderTimestamp();

chainbase/src/main/java/org/tron/core/capsule/TransactionCapsule.java

@@ -102,7 +102,6 @@ public class TransactionCapsule implements ProtoCapsule<Transaction> {
   @Setter
   private TransactionTrace trxTrace;
 
-  private StringBuilder toStringBuff = new StringBuilder();
   @Getter
   @Setter
   private long time;
@@ -738,7 +737,7 @@ public Transaction getInstance() {
 
   @Override
   public String toString() {
-
+    StringBuilder toStringBuff = new StringBuilder();
     toStringBuff.setLength(0);
     toStringBuff.append("TransactionCapsule \n[ ");
 

chainbase/src/main/java/org/tron/core/service/RewardViCalService.java

@@ -17,7 +17,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.LongStream;
-import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -75,8 +74,14 @@ public RewardViCalService(@Autowired  DynamicPropertiesStore propertiesStore,
     this.witnessStore = witnessStore.getDb();
   }
 
-  @PostConstruct
-  private void init() {
+  public void init() {
+    // after init, we can get the latest block header number from db
+    this.newRewardCalStartCycle = this.getNewRewardAlgorithmEffectiveCycle();
+    boolean ret = this.newRewardCalStartCycle != Long.MAX_VALUE;
+    if (ret) {
+      // checkpoint is flushed to db, we can start rewardViCalService immediately
+      lastBlockNumber = Long.MAX_VALUE;
+    }
     es.scheduleWithFixedDelay(this::maybeRun, 0, 3, TimeUnit.SECONDS);
   }
 
@@ -100,7 +105,8 @@ private void maybeRun() {
           this.clearUp(true);
           logger.info("rewardViCalService is already done");
         } else {
-          if (this.getLatestBlockHeaderNumber() > lastBlockNumber) {
+          if (lastBlockNumber ==  Long.MAX_VALUE // start rewardViCalService immediately
+              || this.getLatestBlockHeaderNumber() > lastBlockNumber) {
             // checkpoint is flushed to db, so we can start rewardViCalService
             startRewardCal();
             clearUp(true);
@@ -170,7 +176,7 @@ private void calcMerkleRoot() {
 
     Sha256Hash rewardViRootLocal = MerkleTree.getInstance().createTree(ids).getRoot().getHash();
     if (!Objects.equals(rewardViRoot, rewardViRootLocal)) {
-      logger.error("merkle root mismatch, expect: {}, actual: {}",
+      logger.warn("merkle root mismatch, expect: {}, actual: {}",
           rewardViRoot, rewardViRootLocal);
     }
     logger.info("calcMerkleRoot: {}", rewardViRootLocal);

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

@@ -11,25 +11,17 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.tron.common.cache.CacheManager;
-import org.tron.common.cache.CacheStrategies;
-import org.tron.common.cache.CacheType;
-import org.tron.common.cache.TronCache;
 import org.tron.core.capsule.WitnessCapsule;
 import org.tron.core.config.Parameter;
 import org.tron.core.db.TronStoreWithRevoking;
 
 @Slf4j(topic = "DB")
 @Component
 public class WitnessStore extends TronStoreWithRevoking<WitnessCapsule> {
- // cache for 127 SR
-  private final TronCache<Integer, List<WitnessCapsule>> witnessStandbyCache;
 
   @Autowired
   protected WitnessStore(@Value("witness") String dbName) {
     super(dbName);
-    String strategy =  String.format(CacheStrategies.PATTERNS, 1, 1, "30s", 1);
-    witnessStandbyCache = CacheManager.allocate(CacheType.witnessStandby, strategy);
   }
 
   /**
@@ -48,19 +40,8 @@ public WitnessCapsule get(byte[] key) {
   }
 
   public List<WitnessCapsule> getWitnessStandby() {
-    List<WitnessCapsule> list =
-        witnessStandbyCache.getIfPresent(Parameter.ChainConstant.WITNESS_STANDBY_LENGTH);
-    if (list != null) {
-      return list;
-    }
-    return updateWitnessStandby(null);
-  }
-
-  public List<WitnessCapsule> updateWitnessStandby(List<WitnessCapsule> all) {
     List<WitnessCapsule> ret;
-    if (all == null) {
-      all = getAllWitnesses();
-    }
+    List<WitnessCapsule> all = getAllWitnesses();
     all.sort(Comparator.comparingLong(WitnessCapsule::getVoteCount)
         .reversed().thenComparing(Comparator.comparingInt(
             (WitnessCapsule w) -> w.getAddress().hashCode()).reversed()));
@@ -71,7 +52,6 @@ public List<WitnessCapsule> updateWitnessStandby(List<WitnessCapsule> all) {
     }
     // trim voteCount = 0
     ret.removeIf(w -> w.getVoteCount() < 1);
-    witnessStandbyCache.put(Parameter.ChainConstant.WITNESS_STANDBY_LENGTH, ret);
     return ret;
   }
 

common/build.gradle

@@ -46,7 +46,7 @@ dependencies {
     compile 'org.aspectj:aspectjrt:1.8.13'
     compile 'org.aspectj:aspectjweaver:1.8.13'
     compile 'org.aspectj:aspectjtools:1.8.13'
-    compile group: 'com.github.tronprotocol', name: 'libp2p', version: 'test-v2.2.1',{
+    compile group: 'io.github.tronprotocol', name: 'libp2p', version: '2.2.1',{
         exclude group: 'io.grpc', module: 'grpc-context'
         exclude group: 'io.grpc', module: 'grpc-core'
         exclude group: 'io.grpc', module: 'grpc-netty'

consensus/src/main/java/org/tron/consensus/ConsensusDelegate.java

@@ -108,10 +108,6 @@ public List<WitnessCapsule> getAllWitnesses() {
     return witnessStore.getAllWitnesses();
   }
 
-  public List<WitnessCapsule> updateWitnessStandby(List<WitnessCapsule> all) {
-    return witnessStore.updateWitnessStandby(all);
-  }
-
   public void saveStateFlag(int flag) {
     dynamicPropertiesStore.saveStateFlag(flag);
   }

consensus/src/main/java/org/tron/consensus/dpos/MaintenanceManager.java

@@ -151,13 +151,11 @@ public void doMaintenance() {
     if (dynamicPropertiesStore.allowChangeDelegation()) {
       long nextCycle = dynamicPropertiesStore.getCurrentCycleNumber() + 1;
       dynamicPropertiesStore.saveCurrentCycleNumber(nextCycle);
-      List<WitnessCapsule> all = consensusDelegate.getAllWitnesses();
-      all.forEach(witness -> {
+      consensusDelegate.getAllWitnesses().forEach(witness -> {
         delegationStore.setBrokerage(nextCycle, witness.createDbKey(),
             delegationStore.getBrokerage(witness.createDbKey()));
         delegationStore.setWitnessVote(nextCycle, witness.createDbKey(), witness.getVoteCount());
       });
-      consensusDelegate.updateWitnessStandby(all);
     }
   }
 

framework/build.gradle

@@ -216,13 +216,11 @@ createScript(project, 'org.tron.program.SolidityNode', 'SolidityNode')
 createScript(project, 'org.tron.program.FullNode', 'FullNode')
 createScript(project, 'org.tron.program.KeystoreFactory', 'KeystoreFactory')
 createScript(project, 'org.tron.program.DBConvert', 'DBConvert')
-createScript(project, 'org.tron.tool.litefullnode.LiteFullNodeTool', 'LiteFullNodeTool')
 
 def releaseBinary = hasProperty('binaryRelease') ? getProperty('binaryRelease') : 'true'
 def skipSolidity = hasProperty('skipSolidity') ? true : false
 def skipKeystore = hasProperty('skipKeystore') ? true : false
 def skipConvert = hasProperty('skipConvert') ? true : false
-def skipLite = hasProperty('skipLite') ? true : false
 def skipAll = hasProperty('skipAll') ? true : false
 if (releaseBinary == 'true') {
     artifacts {
@@ -241,10 +239,6 @@ if (releaseBinary == 'true') {
             artifacts {
                 archives(binaryRelease('buildDBConvertJar', 'DBConvert', 'org.tron.program.DBConvert'))}
         }
-        if (!skipLite) {
-            artifacts {
-                archives(binaryRelease('buildLiteFullNodeToolJar', 'LiteFullNodeTool', 'org.tron.tool.litefullnode.LiteFullNodeTool'))}
-        }
     }
 
 }

framework/src/main/java/org/tron/core/Wallet.java

@@ -3862,11 +3862,12 @@ private boolean isShieldedTRC20NoteSpent(GrpcAPI.Note note, long pos, byte[] ak,
     TransactionExtention.Builder trxExtBuilder = TransactionExtention.newBuilder();
     Return.Builder retBuilder = Return.newBuilder();
     TransactionExtention trxExt;
+    Transaction trx;
 
     try {
       TransactionCapsule trxCap = createTransactionCapsule(trigger,
           ContractType.TriggerSmartContract);
-      Transaction trx = triggerConstantContract(trigger, trxCap, trxExtBuilder, retBuilder);
+      trx = triggerConstantContract(trigger, trxCap, trxExtBuilder, retBuilder);
 
       retBuilder.setResult(true).setCode(response_code.SUCCESS);
       trxExtBuilder.setTransaction(trx);
@@ -3889,10 +3890,10 @@ private boolean isShieldedTRC20NoteSpent(GrpcAPI.Note note, long pos, byte[] ak,
       logger.warn("unknown exception caught: " + e.getMessage(), e);
     } finally {
       trxExt = trxExtBuilder.build();
+      trx = trxExt.getTransaction();
     }
 
-    String code = trxExt.getResult().getCode().toString();
-    if ("SUCCESS".equals(code)) {
+    if (code.SUCESS == trx.getRet(0).getRet()) {
       List<ByteString> list = trxExt.getConstantResultList();
       byte[] listBytes = new byte[0];
       for (ByteString bs : list) {
@@ -4126,11 +4127,12 @@ public byte[] getShieldedContractScalingFactor(byte[] contractAddress)
     TransactionExtention.Builder trxExtBuilder = TransactionExtention.newBuilder();
     Return.Builder retBuilder = Return.newBuilder();
     TransactionExtention trxExt;
+    Transaction trx;
 
     try {
       TransactionCapsule trxCap = createTransactionCapsule(trigger,
           ContractType.TriggerSmartContract);
-      Transaction trx = triggerConstantContract(trigger, trxCap, trxExtBuilder, retBuilder);
+      trx = triggerConstantContract(trigger, trxCap, trxExtBuilder, retBuilder);
 
       retBuilder.setResult(true).setCode(response_code.SUCCESS);
       trxExtBuilder.setTransaction(trx);
@@ -4153,10 +4155,10 @@ public byte[] getShieldedContractScalingFactor(byte[] contractAddress)
       logger.warn("Unknown exception caught: " + e.getMessage(), e);
     } finally {
       trxExt = trxExtBuilder.build();
+      trx = trxExt.getTransaction();
     }
 
-    String code = trxExt.getResult().getCode().toString();
-    if ("SUCCESS".equals(code)) {
+    if (code.SUCESS == trx.getRet(0).getRet()) {
       List<ByteString> list = trxExt.getConstantResultList();
       byte[] listBytes = new byte[0];
       for (ByteString bs : list) {

framework/src/main/java/org/tron/core/db/Manager.java

@@ -130,6 +130,7 @@
 import org.tron.core.metrics.MetricsKey;
 import org.tron.core.metrics.MetricsUtil;
 import org.tron.core.service.MortgageService;
+import org.tron.core.service.RewardViCalService;
 import org.tron.core.store.AccountAssetStore;
 import org.tron.core.store.AccountIdIndexStore;
 import org.tron.core.store.AccountIndexStore;
@@ -260,6 +261,9 @@ public class Manager {
   private ExecutorService filterEs;
   private static final String filterEsName = "filter";
 
+  @Autowired
+  private RewardViCalService rewardViCalService;
+
   /**
    * Cycle thread to rePush Transactions
    */
@@ -465,6 +469,7 @@ public void init() {
     revokingStore.disable();
     revokingStore.check();
     transactionCache.initCache();
+    rewardViCalService.init();
     this.setProposalController(ProposalController.createInstance(this));
     this.setMerkleContainer(
         merkleContainer.createInstance(chainBaseManager.getMerkleTreeStore(),
@@ -1843,6 +1848,7 @@ private void postSolidityLogContractTrigger(Long blockNum, Long lastSolidityNum)
         triggerCapsule.setTriggerName(Trigger.SOLIDITYLOG_TRIGGER_NAME);
         EventPluginLoader.getInstance().postSolidityLogTrigger(triggerCapsule);
       } else {
+        // when switch fork, block will be post to triggerCapsuleQueue, transaction may be not found
         logger.error("PostSolidityLogContractTrigger txId = {} not contains transaction.",
             triggerCapsule.getTransactionId());
       }
@@ -1908,6 +1914,10 @@ public long getSyncBeginNumber() {
         chainBaseManager.getDynamicPropertiesStore().getLatestBlockHeaderNumber()
             - revokingStore.size(),
         chainBaseManager.getDynamicPropertiesStore().getLatestSolidifiedBlockNum());
+    return this.fetchSyncBeginNumber();
+  }
+
+  public long fetchSyncBeginNumber() {
     return chainBaseManager.getDynamicPropertiesStore().getLatestBlockHeaderNumber()
         - revokingStore.size();
   }

framework/src/main/java/org/tron/core/net/message/handshake/HelloMessage.java

@@ -4,6 +4,7 @@
 import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
 import org.tron.common.utils.ByteArray;
+import org.tron.common.utils.DecodeUtil;
 import org.tron.common.utils.StringUtil;
 import org.tron.core.ChainBaseManager;
 import org.tron.core.capsule.BlockCapsule;
@@ -169,6 +170,22 @@ public boolean valid() {
       return false;
     }
 
+    int maxByteSize = 200;
+    ByteString address = this.helloMessage.getAddress();
+    if (!address.isEmpty() && address.toByteArray().length > maxByteSize) {
+      return false;
+    }
+
+    ByteString sig = this.helloMessage.getSignature();
+    if (!sig.isEmpty() && sig.toByteArray().length > maxByteSize) {
+      return false;
+    }
+
+    ByteString codeVersion = this.helloMessage.getCodeVersion();
+    if (!codeVersion.isEmpty() && codeVersion.toByteArray().length > maxByteSize) {
+      return false;
+    }
+
     return true;
   }
 

framework/src/main/java/org/tron/core/net/service/handshake/HandshakeService.java

@@ -48,12 +48,15 @@ public void processHelloMessage(PeerConnection peer, HelloMessage msg) {
     }
 
     if (!msg.valid()) {
-      logger.warn("Peer {} invalid hello message parameters, "
-                      + "GenesisBlockId: {}, SolidBlockId: {}, HeadBlockId: {}",
-              peer.getInetSocketAddress(),
-              ByteArray.toHexString(msg.getInstance().getGenesisBlockId().getHash().toByteArray()),
-              ByteArray.toHexString(msg.getInstance().getSolidBlockId().getHash().toByteArray()),
-              ByteArray.toHexString(msg.getInstance().getHeadBlockId().getHash().toByteArray()));
+      logger.warn("Peer {} invalid hello message parameters, GenesisBlockId: {}, SolidBlockId: {}, "
+              + "HeadBlockId: {}, address: {}, sig: {}, codeVersion: {}",
+          peer.getInetSocketAddress(),
+          ByteArray.toHexString(msg.getInstance().getGenesisBlockId().getHash().toByteArray()),
+          ByteArray.toHexString(msg.getInstance().getSolidBlockId().getHash().toByteArray()),
+          ByteArray.toHexString(msg.getInstance().getHeadBlockId().getHash().toByteArray()),
+          msg.getInstance().getAddress().toByteArray().length,
+          msg.getInstance().getSignature().toByteArray().length,
+          msg.getInstance().getCodeVersion().toByteArray().length);
       peer.disconnect(ReasonCode.UNEXPECTED_IDENTITY);
       return;
     }

framework/src/main/java/org/tron/core/services/NodeInfoService.java

@@ -195,7 +195,7 @@ private void setConfigNodeInfo(NodeInfo nodeInfo) {
   }
 
   protected void setBlockInfo(NodeInfo nodeInfo) {
-    nodeInfo.setBeginSyncNum(dbManager.getSyncBeginNumber());
+    nodeInfo.setBeginSyncNum(dbManager.fetchSyncBeginNumber());
     nodeInfo.setBlock(chainBaseManager.getHeadBlockId().getString());
     nodeInfo.setSolidityBlock(chainBaseManager.getSolidBlockId().getString());
   }

framework/src/main/java/org/tron/core/services/RpcApiService.java

@@ -89,6 +89,7 @@
 import org.tron.core.config.args.Args;
 import org.tron.core.db.Manager;
 import org.tron.core.exception.BadItemException;
+import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
 import org.tron.core.exception.ItemNotFoundException;
 import org.tron.core.exception.NonUniqueObjectException;
@@ -2475,7 +2476,7 @@ public void createShieldedContractParameters(
         ShieldedTRC20Parameters shieldedTRC20Parameters = wallet
             .createShieldedContractParameters(request);
         responseObserver.onNext(shieldedTRC20Parameters);
-      } catch (ZksnarkException | ContractValidateException e) {
+      } catch (ZksnarkException | ContractValidateException | ContractExeException e) {
         responseObserver.onError(getRunTimeException(e));
         logger.info("createShieldedContractParameters: {}", e.getMessage());
         return;

framework/src/main/java/org/tron/program/Version.java

@@ -2,9 +2,9 @@
 
 public class Version {
 
-  public static final String VERSION_NAME = "GreatVoyage-v4.7.2-140-g9d13f9cb69";
-  public static final String VERSION_CODE = "18173";
-  private static final String VERSION = "4.7.3";
+  public static final String VERSION_NAME = "GreatVoyage-v4.7.3-5-g788136ebe";
+  public static final String VERSION_CODE = "18180";
+  private static final String VERSION = "4.7.4";
 
   public static String getVersion() {
     return VERSION;