fix(pbft):optimize pbft logic

Author: jwrct

consensus/src/main/java/org/tron/consensus/pbft/PbftManager.java

@@ -44,7 +44,7 @@ public void blockPrePrepare(BlockCapsule block, long epoch) {
     }
     if (!pbftMessageHandle.isSyncing()) {
       if (Param.getInstance().isEnable()) {
-        for (Miner miner : pbftMessageHandle.getSrMinerList()) {
+        for (Miner miner : pbftMessageHandle.getSrMinerList(epoch)) {
           doAction(PbftMessage.prePrepareBlockMsg(block, epoch, miner));
         }
       } else {
@@ -59,7 +59,7 @@ public void srPrePrepare(BlockCapsule block, List<ByteString> currentWitness, lo
     }
     if (!pbftMessageHandle.isSyncing()) {
       if (Param.getInstance().isEnable()) {
-        for (Miner miner : pbftMessageHandle.getSrMinerList()) {
+        for (Miner miner : pbftMessageHandle.getSrMinerList(epoch)) {
           doAction(PbftMessage.prePrepareSRLMsg(block, currentWitness, epoch, miner));
         }
       } else {

consensus/src/main/java/org/tron/consensus/pbft/PbftMessageHandle.java

@@ -91,9 +91,15 @@ public void close() {
     }
   }
 
-  public List<Miner> getSrMinerList() {
+  public List<Miner> getSrMinerList(long epoch) {
+    List<ByteString> compareList;
+    if (epoch > maintenanceManager.getBeforeMaintenanceTime()) {
+      compareList = maintenanceManager.getCurrentWitness();
+    } else {
+      compareList = maintenanceManager.getBeforeWitness();
+    }
     return Param.getInstance().getMiners().stream()
-        .filter(miner -> chainBaseManager.getWitnesses().contains(miner.getWitnessAddress()))
+        .filter(miner -> compareList.contains(miner.getWitnessAddress()))
         .collect(Collectors.toList());
   }
 
@@ -115,10 +121,11 @@ public void onPrePrepare(PbftMessage message) {
     //
     checkPrepareMsgCache(key);
     //Into the preparation phase, if not the sr node does not need to be prepared
-    if (!checkIsCanSendMsg(message)) {
+    long epoch = message.getPbftMessage().getRawData().getEpoch();
+    if (!checkIsCanSendMsg(epoch)) {
       return;
     }
-    for (Miner miner : getSrMinerList()) {
+    for (Miner miner : getSrMinerList(epoch)) {
       PbftMessage paMessage = message.buildPrePareMessage(miner);
       forwardMessage(paMessage);
       try {
@@ -153,7 +160,8 @@ public synchronized void onPrepare(PbftMessage message) {
     pareVoteMap.put(key, message);
     //
     checkCommitMsgCache(message.getNo());
-    if (!checkIsCanSendMsg(message)) {
+    long epoch = message.getPbftMessage().getRawData().getEpoch();
+    if (!checkIsCanSendMsg(epoch)) {
       return;
     }
     //The number of votes plus 1
@@ -162,7 +170,7 @@ public synchronized void onPrepare(PbftMessage message) {
       if (agCou >= Param.getInstance().getAgreeNodeCount()) {
         agreePare.remove(message.getDataKey());
         //Entering the submission stage
-        for (Miner miner : getSrMinerList()) {
+        for (Miner miner : getSrMinerList(epoch)) {
           PbftMessage cmMessage = message.buildCommitMessage(miner);
           doneMsg.put(message.getNo(), cmMessage);
           forwardMessage(cmMessage);
@@ -239,19 +247,11 @@ private void checkCommitMsgCache(String key) {
     }
   }
 
-  public boolean checkIsCanSendMsg(PbftMessage msg) {
+  public boolean checkIsCanSendMsg(long epoch) {
     if (!Param.getInstance().isEnable()) {//is witness
       return false;
     }
-    ByteString publicKey = Param.getInstance().getMiner().getPrivateKeyAddress();
-    List<ByteString> compareList;
-    long epoch = msg.getPbftMessage().getRawData().getEpoch();
-    if (epoch > maintenanceManager.getBeforeMaintenanceTime()) {
-      compareList = maintenanceManager.getCurrentWitness();
-    } else {
-      compareList = maintenanceManager.getBeforeWitness();
-    }
-    if (!compareList.contains(publicKey)) {
+    if (getSrMinerList(epoch).isEmpty()) {
       return false;
     }
     return !isSyncing();