Merge pull request #5262 from 317787106/hotfix/block_chain_failed

fix(net):  fix the fail generating SyncBlockChain issue

Author: 317787106

chainbase/src/main/java/org/tron/core/ChainBaseManager.java

@@ -362,6 +362,9 @@ public boolean containBlockInMainChain(BlockId blockId) {
     }
   }
 
+  public BlockCapsule getKhaosDbHead(){
+    return this.khaosDb.getHead();
+  }
 
   /**
    * Get a BlockCapsule by id.

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

@@ -146,6 +146,10 @@ public BlockId getHeadBlockId() {
     return chainBaseManager.getHeadBlockId();
   }
 
+  public BlockId getKhaosDbHeadBlockId() {
+    return chainBaseManager.getKhaosDbHead().getBlockId();
+  }
+
   public BlockId getSolidBlockId() {
     return chainBaseManager.getSolidBlockId();
   }

framework/src/main/java/org/tron/core/net/service/sync/SyncService.java

@@ -169,7 +169,8 @@ private LinkedList<BlockId> getBlockChainSummary(PeerConnection peer) throws P2p
     if (beginBlockId.getNum() == 0) {
       highNoFork = high = tronNetDelegate.getHeadBlockId().getNum();
     } else {
-      if (tronNetDelegate.containBlockInMainChain(beginBlockId)) {
+      if (tronNetDelegate.getKhaosDbHeadBlockId().equals(beginBlockId)
+          || tronNetDelegate.containBlockInMainChain(beginBlockId)) {
         highNoFork = high = beginBlockId.getNum();
       } else {
         forkList = tronNetDelegate.getBlockChainHashesOnFork(beginBlockId);