Merge branch 'tronprotocol:develop' into feature/add_grpc_api

Author: lxcmyf

.gitignore

@@ -56,3 +56,4 @@ Wallet
 /vm_trace/
 
 /framework/propPath
+.cache

framework/src/main/java/org/tron/core/net/messagehandler/TransactionsMsgHandler.java

@@ -116,8 +116,8 @@ private void handleSmartContract() {
   }
 
   private void handleTransaction(PeerConnection peer, TransactionMessage trx) {
-    if (peer.isDisconnect()) {
-      logger.warn("Drop trx {} from {}, peer is disconnect", trx.getMessageId(),
+    if (peer.isBadPeer()) {
+      logger.warn("Drop trx {} from {}, peer is bad peer", trx.getMessageId(),
           peer.getInetAddress());
       return;
     }
@@ -133,6 +133,7 @@ private void handleTransaction(PeerConnection peer, TransactionMessage trx) {
       logger.warn("Trx {} from peer {} process failed. type: {}, reason: {}",
           trx.getMessageId(), peer.getInetAddress(), e.getType(), e.getMessage());
       if (e.getType().equals(TypeEnum.BAD_TRX)) {
+        peer.setBadPeer(true);
         peer.disconnect(ReasonCode.BAD_TX);
       }
     } catch (Exception e) {

framework/src/main/java/org/tron/core/net/peer/PeerConnection.java

@@ -71,6 +71,10 @@ public class PeerConnection {
   @Getter
   private volatile boolean fetchAble;
 
+  @Setter
+  @Getter
+  private volatile boolean isBadPeer;
+
   @Getter
   @Setter
   private ByteString address;

framework/src/main/java/org/tron/core/services/interfaceOnPBFT/http/GetBandwidthPricesOnPBFTServlet.java

@@ -0,0 +1,27 @@
+package org.tron.core.services.interfaceOnPBFT.http;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.tron.core.services.http.GetBandwidthPricesServlet;
+import org.tron.core.services.interfaceOnPBFT.WalletOnPBFT;
+
+@Component
+@Slf4j(topic = "API")
+public class GetBandwidthPricesOnPBFTServlet extends GetBandwidthPricesServlet {
+
+  @Autowired
+  private WalletOnPBFT walletOnPBFT;
+
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response) {
+    walletOnPBFT.futureGet(() -> super.doGet(request, response));
+  }
+
+  @Override
+  protected void doPost(HttpServletRequest request, HttpServletResponse response) {
+    walletOnPBFT.futureGet(() -> super.doPost(request, response));
+  }
+}

framework/src/main/java/org/tron/core/services/interfaceOnPBFT/http/GetEnergyPricesOnPBFTServlet.java

@@ -8,18 +8,19 @@
 import org.tron.core.services.http.GetEnergyPricesServlet;
 import org.tron.core.services.interfaceOnPBFT.WalletOnPBFT;
 
-
 @Component
 @Slf4j(topic = "API")
 public class GetEnergyPricesOnPBFTServlet extends GetEnergyPricesServlet {
 
   @Autowired
   private WalletOnPBFT walletOnPBFT;
 
+  @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse response) {
     walletOnPBFT.futureGet(() -> super.doGet(request, response));
   }
 
+  @Override
   protected void doPost(HttpServletRequest request, HttpServletResponse response) {
     walletOnPBFT.futureGet(() -> super.doPost(request, response));
   }

framework/src/main/java/org/tron/core/services/interfaceOnPBFT/http/PBFT/HttpApiOnPBFTService.java

@@ -22,6 +22,7 @@
 import org.tron.core.services.interfaceOnPBFT.http.GetAssetIssueListByNameOnPBFTServlet;
 import org.tron.core.services.interfaceOnPBFT.http.GetAssetIssueListOnPBFTServlet;
 import org.tron.core.services.interfaceOnPBFT.http.GetAvailableUnfreezeCountOnPBFTServlet;
+import org.tron.core.services.interfaceOnPBFT.http.GetBandwidthPricesOnPBFTServlet;
 import org.tron.core.services.interfaceOnPBFT.http.GetBlockByIdOnPBFTServlet;
 import org.tron.core.services.interfaceOnPBFT.http.GetBlockByLatestNumOnPBFTServlet;
 import org.tron.core.services.interfaceOnPBFT.http.GetBlockByLimitNextOnPBFTServlet;
@@ -156,6 +157,8 @@ public class HttpApiOnPBFTService implements Service {
   @Autowired
   private GetBurnTrxOnPBFTServlet getBurnTrxOnPBFTServlet;
   @Autowired
+  private GetBandwidthPricesOnPBFTServlet getBandwidthPricesOnPBFTServlet;
+  @Autowired
   private GetEnergyPricesOnPBFTServlet getEnergyPricesOnPBFTServlet;
 
   @Autowired
@@ -258,6 +261,8 @@ public void start() {
           "/isshieldedtrc20contractnotespent");
       context.addServlet(new ServletHolder(getBurnTrxOnPBFTServlet),
           "/getburntrx");
+      context.addServlet(new ServletHolder(getBandwidthPricesOnPBFTServlet),
+          "/getbandwidthprices");
       context.addServlet(new ServletHolder(getEnergyPricesOnPBFTServlet),
           "/getenergyprices");
       context.addServlet(new ServletHolder(getBlockOnPBFTServlet),

framework/src/main/java/org/tron/core/services/interfaceOnSolidity/http/GetBandwidthPricesOnSolidityServlet.java

@@ -0,0 +1,28 @@
+package org.tron.core.services.interfaceOnSolidity.http;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.tron.core.services.http.GetBandwidthPricesServlet;
+import org.tron.core.services.interfaceOnSolidity.WalletOnSolidity;
+
+@Component
+@Slf4j(topic = "API")
+public class GetBandwidthPricesOnSolidityServlet extends GetBandwidthPricesServlet {
+
+  @Autowired
+  private WalletOnSolidity walletOnSolidity;
+
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response) {
+    walletOnSolidity.futureGet(() -> super.doGet(request, response));
+  }
+
+  @Override
+  protected void doPost(HttpServletRequest request, HttpServletResponse response) {
+    walletOnSolidity.futureGet(() -> super.doPost(request, response));
+  }
+}
+

framework/src/main/java/org/tron/core/services/interfaceOnSolidity/http/GetEnergyPricesOnSolidityServlet.java

@@ -8,18 +8,19 @@
 import org.tron.core.services.http.GetEnergyPricesServlet;
 import org.tron.core.services.interfaceOnSolidity.WalletOnSolidity;
 
-
 @Component
 @Slf4j(topic = "API")
 public class GetEnergyPricesOnSolidityServlet extends GetEnergyPricesServlet {
 
   @Autowired
   private WalletOnSolidity walletOnSolidity;
 
+  @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse response) {
     walletOnSolidity.futureGet(() -> super.doGet(request, response));
   }
 
+  @Override
   protected void doPost(HttpServletRequest request, HttpServletResponse response) {
     walletOnSolidity.futureGet(() -> super.doPost(request, response));
   }

framework/src/main/java/org/tron/core/services/interfaceOnSolidity/http/solidity/HttpApiOnSolidityService.java

@@ -22,6 +22,7 @@
 import org.tron.core.services.interfaceOnSolidity.http.GetAssetIssueListByNameOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetAssetIssueListOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetAvailableUnfreezeCountOnSolidityServlet;
+import org.tron.core.services.interfaceOnSolidity.http.GetBandwidthPricesOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetBlockByIdOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetBlockByLatestNumOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetBlockByLimitNextOnSolidityServlet;
@@ -168,6 +169,8 @@ public class HttpApiOnSolidityService implements Service {
   @Autowired
   private GetMarketPairListOnSolidityServlet getMarketPairListOnSolidityServlet;
   @Autowired
+  private GetBandwidthPricesOnSolidityServlet getBandwidthPricesOnSolidityServlet;
+  @Autowired
   private GetEnergyPricesOnSolidityServlet getEnergyPricesOnSolidityServlet;
 
   @Autowired
@@ -290,6 +293,8 @@ public void start() {
       context.addServlet(new ServletHolder(getRewardServlet), "/walletsolidity/getReward");
       context
           .addServlet(new ServletHolder(getBurnTrxOnSolidityServlet), "/walletsolidity/getburntrx");
+      context.addServlet(new ServletHolder(getBandwidthPricesOnSolidityServlet),
+          "/walletsolidity/getbandwidthprices");
       context.addServlet(new ServletHolder(getEnergyPricesOnSolidityServlet),
           "/walletsolidity/getenergyprices");
 

framework/src/test/java/org/tron/common/BaseTest.java

@@ -37,10 +37,12 @@ public abstract class BaseTest {
   @AfterClass
   public static void destroy() {
     Args.clearParam();
-    if (StringUtils.isNotEmpty(dbPath) && FileUtil.deleteDir(new File(dbPath))) {
-      logger.info("Release resources successful.");
-    } else {
-      logger.info("Release resources failure.");
+    if (StringUtils.isNotEmpty(dbPath)) {
+      if (FileUtil.deleteDir(new File(dbPath))) {
+        logger.info("Release resources successful.");
+      } else {
+        logger.info("Release resources failure.");
+      }
     }
   }