feat(framework): support solidity conditional shutdown

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

@@ -1033,23 +1033,6 @@ public void eraseBlock() {
     }
   }
 
-  public void pushVerifiedBlock(BlockCapsule block) throws ContractValidateException,
-      ContractExeException, ValidateSignatureException, AccountResourceInsufficientException,
-      TransactionExpirationException, TooBigTransactionException, DupTransactionException,
-      TaposException, ValidateScheduleException, ReceiptCheckErrException,
-      VMIllegalException, TooBigTransactionResultException, UnLinkedBlockException,
-      NonCommonBlockException, BadNumberBlockException, BadBlockException, ZksnarkException,
-      EventBloomException {
-    block.generatedByMyself = true;
-    long start = System.currentTimeMillis();
-    pushBlock(block);
-    logger.info("Push block cost: {} ms, blockNum: {}, blockHash: {}, trx count: {}.",
-        System.currentTimeMillis() - start,
-        block.getNum(),
-        block.getBlockId(),
-        block.getTransactions().size());
-  }
-
   private void applyBlock(BlockCapsule block) throws ContractValidateException,
       ContractExeException, ValidateSignatureException, AccountResourceInsufficientException,
       TransactionExpirationException, TooBigTransactionException, DupTransactionException,

framework/src/main/java/org/tron/core/net/TronNetDelegate.java

@@ -233,9 +233,25 @@ public Message getData(Sha256Hash hash, InventoryType type) throws P2pException
     }
   }
 
+  public void pushVerifiedBlock(BlockCapsule block) throws P2pException {
+    block.generatedByMyself = true;
+    long start = System.currentTimeMillis();
+    processBlock(block, true);
+    if (!hitDown) {
+      logger.info("Push block cost: {} ms, blockNum: {}, blockHash: {}, trx count: {}.",
+          System.currentTimeMillis() - start,
+          block.getNum(),
+          block.getBlockId(),
+          block.getTransactions().size());
+    }
+  }
+
   public void processBlock(BlockCapsule block, boolean isSync) throws P2pException {
+    // Use <= rather than == because pushBlock may commit multiple blocks in a single
+    // batch write, causing the DB header number to jump past the target block number
+    // and never equal it exactly.
     if (!hitDown && dbManager.getLatestSolidityNumShutDown() > 0
-        && dbManager.getLatestSolidityNumShutDown() == dbManager.getDynamicPropertiesStore()
+        && dbManager.getLatestSolidityNumShutDown() <= dbManager.getDynamicPropertiesStore()
         .getLatestBlockHeaderNumberFromDB()) {
 
       logger.info("Begin shutdown, currentBlockNum:{}, DbBlockNum:{}, solidifiedBlockNum:{}",

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

@@ -2,6 +2,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.util.ObjectUtils;
 import org.tron.common.application.Application;
 import org.tron.common.application.ApplicationFactory;
 import org.tron.common.application.TronApplicationContext;
@@ -28,19 +29,24 @@ public static void main(String[] args) {
 
     LogService.load(parameter.getLogbackPath());
 
-    if (parameter.isSolidityNode()) {
-      SolidityNode.start();
-      return;
-    }
     if (parameter.isKeystoreFactory()) {
       KeystoreFactory.start();
       return;
     }
-    logger.info("Full node running.");
-    if (Args.getInstance().isDebug()) {
-      logger.info("in debug mode, it won't check energy time");
+    if (parameter.isSolidityNode()) {
+      logger.info("Solidity node is running.");
+      if (ObjectUtils.isEmpty(parameter.getTrustNodeAddr())) {
+        throw new TronError(new IllegalArgumentException("Trust node is not set."),
+            TronError.ErrCode.SOLID_NODE_INIT);
+      }
+      parameter.setP2pDisable(true);
     } else {
-      logger.info("not in debug mode, it will check energy time");
+      logger.info("Full node running.");
+      if (Args.getInstance().isDebug()) {
+        logger.info("in debug mode, it won't check energy time");
+      } else {
+        logger.info("not in debug mode, it will check energy time");
+      }
     }
 
     // init metrics first
@@ -55,6 +61,10 @@ public static void main(String[] args) {
     Application appT = ApplicationFactory.create(context);
     context.registerShutdownHook();
     appT.startup();
+    if (parameter.isSolidityNode()) {
+      SolidityNode node = context.getBean(SolidityNode.class);
+      node.run();
+    }
     appT.blockUntilShutdown();
   }