From 370a4345a9772b1e1839b21229cfa56b2ff1a49e Mon Sep 17 00:00:00 2001
From: olivier <olenheim@hotmail.com>
Date: Mon, 3 Sep 2018 20:50:07 +0800
Subject: [PATCH] opt solidty

---
 src/main/java/org/tron/core/db/Manager.java      |  9 +++++++++
 src/main/java/org/tron/program/SolidityNode.java | 16 +++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/tron/core/db/Manager.java b/src/main/java/org/tron/core/db/Manager.java
index b5b3dd1d643..909d2c91b90 100644
--- a/src/main/java/org/tron/core/db/Manager.java
+++ b/src/main/java/org/tron/core/db/Manager.java
@@ -676,6 +676,15 @@ public void eraseBlock() {
     }
   }
 
+  public void pushVerifiedBlock(BlockCapsule block) throws ContractValidateException,
+      ContractExeException, ValidateSignatureException, AccountResourceInsufficientException,
+      TransactionExpirationException, TooBigTransactionException, DupTransactionException, ReceiptException,
+      TaposException, ValidateScheduleException, TransactionTraceException, ReceiptCheckErrException,
+      UnsupportVMException, TooBigTransactionResultException {
+    block.generatedByMyself = true;
+    applyBlock(block);
+  }
+
   private void applyBlock(BlockCapsule block) throws ContractValidateException,
       ContractExeException, ValidateSignatureException, AccountResourceInsufficientException,
       TransactionExpirationException, TooBigTransactionException, DupTransactionException, ReceiptException,
diff --git a/src/main/java/org/tron/program/SolidityNode.java b/src/main/java/org/tron/program/SolidityNode.java
index 60f98b8f476..94dc48d95a7 100644
--- a/src/main/java/org/tron/program/SolidityNode.java
+++ b/src/main/java/org/tron/program/SolidityNode.java
@@ -23,11 +23,9 @@
 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.ReceiptException;
 import org.tron.core.exception.TaposException;
@@ -35,7 +33,6 @@
 import org.tron.core.exception.TooBigTransactionResultException;
 import org.tron.core.exception.TransactionExpirationException;
 import org.tron.core.exception.TransactionTraceException;
-import org.tron.core.exception.UnLinkedBlockException;
 import org.tron.core.exception.UnsupportVMException;
 import org.tron.core.exception.ValidateScheduleException;
 import org.tron.core.exception.ValidateSignatureException;
@@ -107,7 +104,8 @@ private void syncSolidityBlock() throws BadBlockException {
         Block block = databaseGrpcClient.getBlock(lastSolidityBlockNum + 1);
         try {
           BlockCapsule blockCapsule = new BlockCapsule(block);
-          dbManager.pushBlock(blockCapsule);
+          dbManager.pushVerifiedBlock(blockCapsule);
+          //dbManager.pushBlock(blockCapsule);
           for (TransactionCapsule trx : blockCapsule.getTransactions()) {
             TransactionInfoCapsule ret;
             try {
@@ -130,7 +128,7 @@ private void syncSolidityBlock() throws BadBlockException {
           throw new BadBlockException("validate signature exception");
         } catch (ContractValidateException e) {
           throw new BadBlockException("ContractValidate exception");
-        } catch (ContractExeException | UnLinkedBlockException e) {
+        } catch (ContractExeException e) {
           throw new BadBlockException("Contract Execute exception");
         } catch (TaposException e) {
           throw new BadBlockException("tapos exception");
@@ -142,12 +140,12 @@ 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 (BadNumberBlockException e) {
+//          throw new BadBlockException("bad number exception");
         } catch (ReceiptException e) {
           throw new BadBlockException("Receipt exception");
-        } catch (NonCommonBlockException e) {
-          throw new BadBlockException("non common exception");
+//        } catch (NonCommonBlockException e) {
+//          throw new BadBlockException("non common exception");
         } catch (TransactionTraceException e) {
           throw new BadBlockException("TransactionTrace Exception");
         } catch (ReceiptCheckErrException e) {