Merge pull request tronprotocol#1091 from tronprotocol/switch_back_when_switch_fork_failed

there is not the most recent common ancestor, need to remove all bloc…

Author: nanfengpo

src/main/java/org/tron/core/db/KhaosDatabase.java

@@ -350,6 +350,7 @@ public BlockCapsule getParentBlock(Sha256Hash hash) {
         .map(KhaosBlock::getParent)
         .map(khaosBlock -> khaosBlock == null ? null : khaosBlock.blk)
         .filter(Objects::nonNull)
+        .filter(b -> containBlock(b.getBlockId()))
         .findFirst()
         .orElse(null);
   }

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

@@ -585,9 +585,21 @@ private void switchFork(BlockCapsule newHead)
       ValidateScheduleException, AccountResourceInsufficientException, TaposException,
       TooBigTransactionException, DupTransactionException, TransactionExpirationException,
       NonCommonBlockException {
-    Pair<LinkedList<KhaosBlock>, LinkedList<KhaosBlock>> binaryTree =
-        khaosDb.getBranch(
-            newHead.getBlockId(), getDynamicPropertiesStore().getLatestBlockHeaderHash());
+    Pair<LinkedList<KhaosBlock>, LinkedList<KhaosBlock>> binaryTree;
+    try {
+      binaryTree =
+          khaosDb.getBranch(
+              newHead.getBlockId(), getDynamicPropertiesStore().getLatestBlockHeaderHash());
+    } catch (NonCommonBlockException e) {
+      logger.info("there is not the most recent common ancestor, need to remove all blocks in the fork chain.");
+      BlockCapsule tmp = newHead;
+      while (tmp != null) {
+        khaosDb.removeBlk(tmp.getBlockId());
+        tmp = khaosDb.getBlock(tmp.getParentHash());
+      }
+
+      throw e;
+    }
 
     if (CollectionUtils.isNotEmpty(binaryTree.getValue())) {
       while (!getDynamicPropertiesStore()

src/test/java/org/tron/core/db/ManagerTest.java

@@ -312,6 +312,10 @@ public void doNotSwitch()
         createTestBlockCapsule(
             num + 2, blockCapsule1.getBlockId().getByteString(), addressToProvateKeys);
 
+    logger.info("******block0:" + blockCapsule0);
+    logger.info("******block1:" + blockCapsule1);
+    logger.info("******block2:" + blockCapsule2);
+
     dbManager.pushBlock(blockCapsule0);
     dbManager.pushBlock(blockCapsule1);
     context.getBean(KhaosDatabase.class).removeBlk(dbManager.getBlockIdByNum(num));
@@ -323,12 +327,38 @@ public void doNotSwitch()
       Assert.assertNotNull(dbManager.getBlockStore().get(blockCapsule0.getBlockId().getBytes()));
       Assert.assertEquals(blockCapsule0.getBlockId(),
           dbManager.getBlockStore().get(blockCapsule0.getBlockId().getBytes()).getBlockId());
+      Assert.assertEquals(blockCapsule0.getBlockId(),
+          dbManager.getDynamicPropertiesStore().getLatestBlockHeaderHash());
       exception = e;
     }
 
     if (exception == null) {
       throw new IllegalStateException();
     }
+
+    BlockCapsule blockCapsule3 =
+        createTestBlockCapsule(
+            dbManager.getDynamicPropertiesStore().getLatestBlockHeaderNumber() + 1,
+            dbManager.getDynamicPropertiesStore().getLatestBlockHeaderHash().getByteString(), addressToProvateKeys);
+    logger.info("******block3:" + blockCapsule3);
+    dbManager.pushBlock(blockCapsule3);
+
+    Assert.assertEquals(blockCapsule3.getBlockId(),
+        dbManager.getDynamicPropertiesStore().getLatestBlockHeaderHash());
+    Assert.assertEquals(blockCapsule3.getBlockId(),
+        dbManager.getBlockStore().get(dbManager.getDynamicPropertiesStore().getLatestBlockHeaderHash().getBytes()).getBlockId());
+
+    BlockCapsule blockCapsule4 =
+        createTestBlockCapsule(
+            dbManager.getDynamicPropertiesStore().getLatestBlockHeaderNumber() + 1,
+            blockCapsule3.getBlockId().getByteString(), addressToProvateKeys);
+    logger.info("******block4:" + blockCapsule4);
+    dbManager.pushBlock(blockCapsule4);
+
+    Assert.assertEquals(blockCapsule4.getBlockId(),
+        dbManager.getDynamicPropertiesStore().getLatestBlockHeaderHash());
+    Assert.assertEquals(blockCapsule4.getBlockId(),
+        dbManager.getBlockStore().get(dbManager.getDynamicPropertiesStore().getLatestBlockHeaderHash().getBytes()).getBlockId());
   }
 
   @Test
@@ -380,6 +410,28 @@ public void switchBack()
     Assert.assertNotNull(dbManager.getBlockStore().get(blockCapsule0.getBlockId().getBytes()));
     Assert.assertEquals(blockCapsule0.getBlockId(),
         dbManager.getBlockStore().get(blockCapsule0.getBlockId().getBytes()).getBlockId());
+
+    BlockCapsule blockCapsule3 =
+        createTestBlockCapsule(
+            dbManager.getDynamicPropertiesStore().getLatestBlockHeaderNumber() + 1,
+            blockCapsule0.getBlockId().getByteString(), addressToProvateKeys);
+    dbManager.pushBlock(blockCapsule3);
+
+    Assert.assertEquals(blockCapsule3.getBlockId(),
+        dbManager.getDynamicPropertiesStore().getLatestBlockHeaderHash());
+    Assert.assertEquals(blockCapsule3.getBlockId(),
+        dbManager.getBlockStore().get(dbManager.getDynamicPropertiesStore().getLatestBlockHeaderHash().getBytes()).getBlockId());
+
+    BlockCapsule blockCapsule4 =
+        createTestBlockCapsule(
+            dbManager.getDynamicPropertiesStore().getLatestBlockHeaderNumber() + 1,
+            blockCapsule3.getBlockId().getByteString(), addressToProvateKeys);
+    dbManager.pushBlock(blockCapsule4);
+
+    Assert.assertEquals(blockCapsule4.getBlockId(),
+        dbManager.getDynamicPropertiesStore().getLatestBlockHeaderHash());
+    Assert.assertEquals(blockCapsule4.getBlockId(),
+        dbManager.getBlockStore().get(dbManager.getDynamicPropertiesStore().getLatestBlockHeaderHash().getBytes()).getBlockId());
   }
 
   private Map<ByteString, String> addTestWitnessAndAccount() {