Merge pull request tronprotocol#3127 from tronprotocol/hotfix/solidityEventBugFix

solidity event bug fix

Author: DorianRust

common/src/main/java/org/tron/common/parameter/CommonParameter.java

@@ -390,6 +390,9 @@ public class CommonParameter {
   @Getter
   @Setter
   public int pBFTHttpPort;
+  @Getter
+  @Setter
+  public long oldSolidityBlockNum = -1;
 
   private static double calcMaxTimeRatio() {
     //return max(2.0, min(5.0, 5 * 4.0 / max(Runtime.getRuntime().availableProcessors(), 1)));

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

@@ -12,10 +12,12 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.util.Args;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.tron.common.args.GenesisBlock;
+import org.tron.common.parameter.CommonParameter;
 import org.tron.common.utils.ByteArray;
 import org.tron.consensus.ConsensusDelegate;
 import org.tron.consensus.base.BlockHandle;
@@ -154,6 +156,7 @@ private void updateSolidBlock() {
       logger.warn("Update solid block number failed, new: {} < old: {}", newSolidNum, oldSolidNum);
       return;
     }
+    CommonParameter.getInstance().setOldSolidityBlockNum(consensusDelegate.getLatestSolidifiedBlockNum());
     consensusDelegate.saveLatestSolidifiedBlockNum(newSolidNum);
     logger.info("Update solid block number to {}", newSolidNum);
   }

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

@@ -1568,10 +1568,16 @@ private void postSolidityTrigger(final long latestSolidifiedBlockNumber) {
       }
     }
     if (eventPluginLoaded && EventPluginLoader.getInstance().isSolidityLogTriggerEnable()) {
-      postSolitityLogContractTrigger(latestSolidifiedBlockNumber);
+      for (long i = Args.getInstance()
+          .getOldSolidityBlockNum() + 1; i <= latestSolidifiedBlockNumber; i++) {
+        postSolitityLogContractTrigger(i);
+      }
     }
     if (eventPluginLoaded && EventPluginLoader.getInstance().isSolidityEventTriggerEnable()) {
-      postSolitityEventContractTrigger(latestSolidifiedBlockNumber);
+      for (long i = Args.getInstance()
+          .getOldSolidityBlockNum() + 1; i <= latestSolidifiedBlockNumber; i++) {
+        postSolitityEventContractTrigger(i);
+      }
     }
   }