fix(net): use khaosdb to judge if beginBlockId exists

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/messagehandler/ChainInventoryMsgHandler.java

@@ -72,7 +72,7 @@ public void processMessage(PeerConnection peer, TronMessage msg) throws P2pExcep
       try {
         BlockId blockId = null;
         while (!peer.getSyncBlockToFetch().isEmpty() && tronNetDelegate
-                .containBlockInMainChain(peer.getSyncBlockToFetch().peek())) {
+                .containBlock(peer.getSyncBlockToFetch().peek())) {
           blockId = peer.getSyncBlockToFetch().pop();
           peer.setBlockBothHave(blockId);
         }

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().compareTo(beginBlockId) == 0
+          || tronNetDelegate.containBlockInMainChain(beginBlockId)) {
         highNoFork = high = beginBlockId.getNum();
       } else {
         forkList = tronNetDelegate.getBlockChainHashesOnFork(beginBlockId);