Merge pull request #5554 from tronprotocol/release_v4.7.3.1

Add block height check when processing PBFT messages (#5548)

Author: lvs007

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

@@ -518,6 +518,9 @@ public class CommonParameter {
   public int pBFTHttpPort;
   @Getter
   @Setter
+  public long pBFTExpireNum;
+  @Getter
+  @Setter
   public long oldSolidityBlockNum = -1;
 
   @Getter/**/

common/src/main/java/org/tron/core/Constant.java

@@ -303,6 +303,7 @@ public class Constant {
   public static final String SEED_NODE_IP_LIST = "seed.node.ip.list";
   public static final String NODE_METRICS_ENABLE = "node.metricsEnable";
   public static final String COMMITTEE_ALLOW_PBFT = "committee.allowPBFT";
+  public static final String COMMITTEE_PBFT_EXPIRE_NUM = "committee.pBFTExpireNum";
   public static final String NODE_AGREE_NODE_COUNT = "node.agreeNodeCount";
 
   public static final String COMMITTEE_ALLOW_TRANSACTION_FEE_POOL = "committee.allowTransactionFeePool";

framework/src/main/java/org/tron/core/config/args/Args.java

@@ -149,6 +149,7 @@ public static void clearParam() {
     PARAMETER.fullNodeHttpPort = 0;
     PARAMETER.solidityHttpPort = 0;
     PARAMETER.pBFTHttpPort = 0;
+    PARAMETER.pBFTExpireNum = 20;
     PARAMETER.jsonRpcHttpFullNodePort = 0;
     PARAMETER.jsonRpcHttpSolidityPort = 0;
     PARAMETER.jsonRpcHttpPBFTPort = 0;
@@ -974,6 +975,10 @@ public static void setParam(final String[] args, final String confFileName) {
         config.hasPath(Constant.COMMITTEE_ALLOW_PBFT) ? config
             .getLong(Constant.COMMITTEE_ALLOW_PBFT) : 0;
 
+    PARAMETER.pBFTExpireNum =
+        config.hasPath(Constant.COMMITTEE_PBFT_EXPIRE_NUM) ? config
+            .getLong(Constant.COMMITTEE_PBFT_EXPIRE_NUM) : 20;
+
     PARAMETER.agreeNodeCount = config.hasPath(Constant.NODE_AGREE_NODE_COUNT) ? config
         .getInt(Constant.NODE_AGREE_NODE_COUNT) : MAX_ACTIVE_WITNESS_NUM * 2 / 3 + 1;
     PARAMETER.agreeNodeCount = PARAMETER.agreeNodeCount > MAX_ACTIVE_WITNESS_NUM

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

@@ -357,4 +357,12 @@ public Object getForkLock() {
     return dbManager.getForkLock();
   }
 
+  public long getNextMaintenanceTime() {
+    return chainBaseManager.getDynamicPropertiesStore().getNextMaintenanceTime();
+  }
+
+  public long getMaintenanceTimeInterval() {
+    return chainBaseManager.getDynamicPropertiesStore().getMaintenanceTimeInterval();
+  }
+
 }

framework/src/main/java/org/tron/core/net/messagehandler/PbftMsgHandler.java

@@ -11,9 +11,12 @@
 import org.tron.consensus.pbft.PbftManager;
 import org.tron.consensus.pbft.message.PbftBaseMessage;
 import org.tron.consensus.pbft.message.PbftMessage;
+import org.tron.core.config.args.Args;
 import org.tron.core.exception.P2pException;
+import org.tron.core.net.TronNetDelegate;
 import org.tron.core.net.TronNetService;
 import org.tron.core.net.peer.PeerConnection;
+import org.tron.protos.Protocol.PBFTMessage.DataType;
 
 @Component
 public class PbftMsgHandler {
@@ -26,10 +29,24 @@ public class PbftMsgHandler {
   @Autowired
   private PbftManager pbftManager;
 
+  @Autowired
+  private TronNetDelegate tronNetDelegate;
+
   public void processMessage(PeerConnection peer, PbftMessage msg) throws Exception {
     if (Param.getInstance().getPbftInterface().isSyncing()) {
       return;
     }
+    if (msg.getDataType().equals(DataType.BLOCK)
+        && tronNetDelegate.getHeadBlockId().getNum() - msg.getNumber()
+        > Args.getInstance().getPBFTExpireNum()) {
+      return;
+    }
+    long currentEpoch = tronNetDelegate.getNextMaintenanceTime();
+    long expireEpoch = 2 * tronNetDelegate.getMaintenanceTimeInterval();
+    if (msg.getDataType().equals(DataType.SRL)
+        && currentEpoch - msg.getEpoch() > expireEpoch) {
+      return;
+    }
     msg.analyzeSignature();
     String key = buildKey(msg);
     Lock lock = striped.get(key);