Merge pull request #1541 from tronprotocol/soliditynodedup

Soliditynodedup

Author: huzhenyuan

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

@@ -603,9 +603,10 @@ public void pushVerifiedBlock(BlockCapsule block) throws ContractValidateExcepti
       ContractExeException, ValidateSignatureException, AccountResourceInsufficientException,
       TransactionExpirationException, TooBigTransactionException, DupTransactionException,
       TaposException, ValidateScheduleException, ReceiptCheckErrException,
-      VMIllegalException, TooBigTransactionResultException {
+      VMIllegalException, TooBigTransactionResultException, UnLinkedBlockException,
+      NonCommonBlockException, BadNumberBlockException, BadBlockException {
     block.generatedByMyself = true;
-    applyBlock(block);
+    pushBlock(block);
   }
 
   private void applyBlock(BlockCapsule block) throws ContractValidateException,

src/main/java/org/tron/program/SolidityNode.java

@@ -26,14 +26,17 @@
 import org.tron.core.exception.AccountResourceInsufficientException;
 import org.tron.core.exception.BadBlockException;
 import org.tron.core.exception.BadItemException;
+import org.tron.core.exception.BadNumberBlockException;
 import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
 import org.tron.core.exception.DupTransactionException;
+import org.tron.core.exception.NonCommonBlockException;
 import org.tron.core.exception.ReceiptCheckErrException;
 import org.tron.core.exception.TaposException;
 import org.tron.core.exception.TooBigTransactionException;
 import org.tron.core.exception.TooBigTransactionResultException;
 import org.tron.core.exception.TransactionExpirationException;
+import org.tron.core.exception.UnLinkedBlockException;
 import org.tron.core.exception.VMIllegalException;
 import org.tron.core.exception.ValidateScheduleException;
 import org.tron.core.exception.ValidateSignatureException;
@@ -141,14 +144,16 @@ private void syncSolidityBlock() throws BadBlockException {
           throw new BadBlockException("too big exception result");
         } catch (TransactionExpirationException e) {
           throw new BadBlockException("expiration exception");
-//        } catch (BadNumberBlockException e) {
-//          throw new BadBlockException("bad number exception");
-//        } catch (NonCommonBlockException e) {
-//          throw new BadBlockException("non common exception");
+        } catch (BadNumberBlockException e) {
+          throw new BadBlockException("bad number exception");
+        } catch (NonCommonBlockException e) {
+          throw new BadBlockException("non common exception");
         } catch (ReceiptCheckErrException e) {
           throw new BadBlockException("OutOfSlotTime Exception");
         } catch (VMIllegalException e) {
           throw new BadBlockException(e.getMessage());
+        } catch (UnLinkedBlockException e) {
+          throw new BadBlockException("unLink exception");
         }
 
       } else {