Merge branch 'master' into develop

Author: zhaohong

README.md

@@ -276,6 +276,7 @@ For private test net, the IPs are allocated by yourself.
 ## Running a local node and connecting to the public testnet 
 
 * Ensure that the version number is consistent with the version number of the test network. If it is not consistent, Please modify the node.p2p.version in the config.conf file, and delete the out-directory directory (if it exists)
+* The current p2p.version is **61**
 
 ### Running a Full Node
 

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

@@ -757,9 +757,13 @@ public synchronized void pushBlock(final BlockCapsule block)
           applyBlock(newBlock);
           tmpDialog.commit();
         } catch (RevokingStoreIllegalStateException e) {
-          logger.debug(e.getMessage(), e);
-        }
+          logger.error(e.getMessage(), e);
+        } catch (Throwable throwable) {
+        logger.error(throwable.getMessage(), throwable);
+        khaosDb.removeBlk(block.getBlockId());
+        throw throwable;
       }
+    }
       logger.info("save block: " + newBlock);
     }
   }