Merge branch 'release_v4.7.2' of https://github.com/tronprotocol/java-tron into rate-limit

Author: xxo1shine

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

@@ -241,6 +241,8 @@ public class Manager {
   @Getter
   private volatile long latestSolidityNumShutDown;
   @Getter
+  private long lastUsedSolidityNum = -1;
+  @Getter
   private int maxFlushCount;
 
   @Getter
@@ -2030,17 +2032,11 @@ private void postSolidityFilter(final long oldSolidNum, final long latestSolidif
       return;
     }
 
-    BlockCapsule blockCapsule;
-    try {
-      blockCapsule = chainBaseManager.getBlockByNum(latestSolidifiedBlockNumber);
-    } catch (Exception e) {
-      logger.error("PostSolidityFilter getBlockByNum = {} except, {}.",
-          latestSolidifiedBlockNumber, e.getMessage());
-      return;
+    List<BlockCapsule> capsuleList = getContinuousBlockCapsule(latestSolidifiedBlockNumber);
+    for (BlockCapsule blockCapsule : capsuleList) {
+      postBlockFilter(blockCapsule, true);
+      postLogsFilter(blockCapsule, true, false);
     }
-
-    postBlockFilter(blockCapsule, true);
-    postLogsFilter(blockCapsule, true, false);
   }
 
   private void postSolidityTrigger(final long oldSolidNum, final long latestSolidifiedBlockNumber) {
@@ -2057,28 +2053,23 @@ private void postSolidityTrigger(final long oldSolidNum, final long latestSolidi
     }
 
     if (eventPluginLoaded && EventPluginLoader.getInstance().isSolidityTriggerEnable()) {
-      SolidityTriggerCapsule solidityTriggerCapsule
-          = new SolidityTriggerCapsule(latestSolidifiedBlockNumber);
-
-      BlockCapsule blockCapsule;
-      try {
-        blockCapsule = chainBaseManager.getBlockByNum(latestSolidifiedBlockNumber);
+      List<BlockCapsule> capsuleList = getContinuousBlockCapsule(latestSolidifiedBlockNumber);
+      for (BlockCapsule blockCapsule : capsuleList) {
+        SolidityTriggerCapsule solidityTriggerCapsule
+            = new SolidityTriggerCapsule(blockCapsule.getNum());//unique key
         solidityTriggerCapsule.setTimeStamp(blockCapsule.getTimeStamp());
-      } catch (Exception e) {
-        logger.error("PostSolidityTrigger getBlockByNum = {} except, {}.",
-            latestSolidifiedBlockNumber, e.getMessage());
-      }
-
-      boolean result = triggerCapsuleQueue.offer(solidityTriggerCapsule);
-      if (!result) {
-        logger.info("Too many trigger, lost solidified trigger, block number: {}.",
-            latestSolidifiedBlockNumber);
+        boolean result = triggerCapsuleQueue.offer(solidityTriggerCapsule);
+        if (!result) {
+          logger.info("Too many trigger, lost solidified trigger, block number: {}.",
+              blockCapsule.getNum());
+        }
       }
     }
 
     if (CommonParameter.getInstance().isJsonRpcHttpSolidityNodeEnable()) {
       postSolidityFilter(oldSolidNum, latestSolidifiedBlockNumber);
     }
+    lastUsedSolidityNum = latestSolidifiedBlockNumber;
   }
 
   private void processTransactionTrigger(BlockCapsule newBlock) {
@@ -2189,53 +2180,63 @@ private void postLogsFilter(final BlockCapsule blockCapsule, boolean solidified,
   }
 
   private void postBlockTrigger(final BlockCapsule blockCapsule) {
-    BlockCapsule newBlock = blockCapsule;
-
     // post block and logs for jsonrpc
     if (CommonParameter.getInstance().isJsonRpcHttpFullNodeEnable()) {
       postBlockFilter(blockCapsule, false);
       postLogsFilter(blockCapsule, false, false);
     }
 
     // process block trigger
+    long solidityBlkNum = getDynamicPropertiesStore().getLatestSolidifiedBlockNum();
     if (eventPluginLoaded && EventPluginLoader.getInstance().isBlockLogTriggerEnable()) {
+      List<BlockCapsule> capsuleList = new ArrayList<>();
       if (EventPluginLoader.getInstance().isBlockLogTriggerSolidified()) {
-        long solidityBlkNum = getDynamicPropertiesStore().getLatestSolidifiedBlockNum();
-        try {
-          newBlock = chainBaseManager
-              .getBlockByNum(solidityBlkNum);
-        } catch (Exception e) {
-          logger.error("PostBlockTrigger getBlockByNum blkNum = {} except, error is {}.",
-              solidityBlkNum, e.getMessage());
-        }
+        capsuleList = getContinuousBlockCapsule(solidityBlkNum);
+      } else {
+        capsuleList.add(blockCapsule);
       }
 
-      BlockLogTriggerCapsule blockLogTriggerCapsule = new BlockLogTriggerCapsule(newBlock);
-      blockLogTriggerCapsule.setLatestSolidifiedBlockNumber(getDynamicPropertiesStore()
-          .getLatestSolidifiedBlockNum());
-      if (!triggerCapsuleQueue.offer(blockLogTriggerCapsule)) {
-        logger.info("Too many triggers, block trigger lost: {}.", newBlock.getBlockId());
+      for (BlockCapsule capsule : capsuleList) {
+        BlockLogTriggerCapsule blockLogTriggerCapsule = new BlockLogTriggerCapsule(capsule);
+        blockLogTriggerCapsule.setLatestSolidifiedBlockNumber(solidityBlkNum);
+        if (!triggerCapsuleQueue.offer(blockLogTriggerCapsule)) {
+          logger.info("Too many triggers, block trigger lost: {}.", capsule.getBlockId());
+        }
       }
     }
 
     // process transaction trigger
     if (eventPluginLoaded && EventPluginLoader.getInstance().isTransactionLogTriggerEnable()) {
-      // set newBlock
+      List<BlockCapsule> capsuleList = new ArrayList<>();
       if (EventPluginLoader.getInstance().isTransactionLogTriggerSolidified()) {
-        long solidityBlkNum = getDynamicPropertiesStore().getLatestSolidifiedBlockNum();
-        try {
-          newBlock = chainBaseManager.getBlockByNum(solidityBlkNum);
-        } catch (Exception e) {
-          logger.error("PostBlockTrigger getBlockByNum blkNum = {} except, error is {}.",
-              solidityBlkNum, e.getMessage());
-        }
+        capsuleList = getContinuousBlockCapsule(solidityBlkNum);
       } else {
         // need to reset block
-        newBlock = blockCapsule;
+        capsuleList.add(blockCapsule);
       }
 
-      processTransactionTrigger(newBlock);
+      for (BlockCapsule capsule : capsuleList) {
+        processTransactionTrigger(capsule);
+      }
+    }
+  }
+
+  private List<BlockCapsule> getContinuousBlockCapsule(long solidityBlkNum) {
+    List<BlockCapsule> capsuleList = new ArrayList<>();
+    long start = lastUsedSolidityNum < 0 ? solidityBlkNum : (lastUsedSolidityNum + 1);
+    if (solidityBlkNum > start) {
+      logger.info("Continuous block start:{}, end:{}", start, solidityBlkNum);
+    }
+    for (long blockNum = start; blockNum <= solidityBlkNum; blockNum++) {
+      try {
+        BlockCapsule capsule = chainBaseManager.getBlockByNum(blockNum);
+        capsuleList.add(capsule);
+      } catch (Exception e) {
+        logger.error("GetContinuousBlockCapsule getBlockByNum blkNum = {} except, error is {}.",
+            solidityBlkNum, e.getMessage());
+      }
     }
+    return capsuleList;
   }
 
   // return energyUsageTotal of the current transaction