Merge pull request tronprotocol#3617 from tronprotocol/remove-blackho…

…le-account

add the solidity and pbft interafce

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

@@ -24,6 +24,7 @@
 import org.tron.core.services.interfaceOnPBFT.http.GetBlockByLimitNextOnPBFTServlet;
 import org.tron.core.services.interfaceOnPBFT.http.GetBlockByNumOnPBFTServlet;
 import org.tron.core.services.interfaceOnPBFT.http.GetBrokerageOnPBFTServlet;
+import org.tron.core.services.interfaceOnPBFT.http.GetBurnTrxOnPBFTServlet;
 import org.tron.core.services.interfaceOnPBFT.http.GetDelegatedResourceAccountIndexOnPBFTServlet;
 import org.tron.core.services.interfaceOnPBFT.http.GetDelegatedResourceOnPBFTServlet;
 import org.tron.core.services.interfaceOnPBFT.http.GetExchangeByIdOnPBFTServlet;
@@ -141,6 +142,8 @@ public class HttpApiOnPBFTService implements Service {
   @Autowired
   private IsShieldedTRC20ContractNoteSpentOnPBFTServlet
       isShieldedTRC20ContractNoteSpentOnPBFTServlet;
+  @Autowired
+  private GetBurnTrxOnPBFTServlet getBurnTrxOnPBFTServlet;
 
   @Override
   public void init() {
@@ -224,6 +227,8 @@ public void start() {
           "/scanshieldedtrc20notesbyovk");
       context.addServlet(new ServletHolder(isShieldedTRC20ContractNoteSpentOnPBFTServlet),
           "/isshieldedtrc20contractnotespent");
+      context.addServlet(new ServletHolder(getBurnTrxOnPBFTServlet),
+          "/getburntrx");
 
       int maxHttpConnectNumber = Args.getInstance().getMaxHttpConnectNumber();
       if (maxHttpConnectNumber > 0) {

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

@@ -13,7 +13,6 @@
 import org.tron.common.parameter.CommonParameter;
 import org.tron.core.config.args.Args;
 import org.tron.core.services.filter.LiteFnQueryHttpFilter;
-import org.tron.core.services.http.GetBurnTrxServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetAccountByIdOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetAccountOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetAssetIssueByIdOnSolidityServlet;
@@ -25,6 +24,7 @@
 import org.tron.core.services.interfaceOnSolidity.http.GetBlockByLimitNextOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetBlockByNumOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetBrokerageOnSolidityServlet;
+import org.tron.core.services.interfaceOnSolidity.http.GetBurnTrxOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetDelegatedResourceAccountIndexOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetDelegatedResourceOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetExchangeByIdOnSolidityServlet;
@@ -127,6 +127,8 @@ public class HttpApiOnSolidityService implements Service {
   @Autowired
   private GetRewardOnSolidityServlet getRewardServlet;
   @Autowired
+  private GetBurnTrxOnSolidityServlet getBurnTrxOnSolidityServlet;
+  @Autowired
   private TriggerConstantContractOnSolidityServlet triggerConstantContractOnSolidityServlet;
   @Autowired
   private GetTransactionInfoByBlockNumOnSolidityServlet
@@ -145,9 +147,6 @@ public class HttpApiOnSolidityService implements Service {
   @Autowired
   private LiteFnQueryHttpFilter liteFnQueryHttpFilter;
 
-  @Autowired
-  private GetBurnTrxServlet getBurnTrxServlet;
-
   @Override
   public void init() {
 
@@ -243,12 +242,13 @@ public void start() {
       context.addServlet(new ServletHolder(getNodeInfoOnSolidityServlet), "/wallet/getnodeinfo");
       context.addServlet(new ServletHolder(getBrokerageServlet), "/walletsolidity/getBrokerage");
       context.addServlet(new ServletHolder(getRewardServlet), "/walletsolidity/getReward");
-      context.addServlet(new ServletHolder(getBurnTrxServlet), "/walletsolidity/getburntrx");
+      context
+          .addServlet(new ServletHolder(getBurnTrxOnSolidityServlet), "/walletsolidity/getburntrx");
 
       // filters the specified APIs
       // when node is lite fullnode and openHistoryQueryWhenLiteFN is false
       context.addFilter(new FilterHolder(liteFnQueryHttpFilter), "/*",
-              EnumSet.allOf(DispatcherType.class));
+          EnumSet.allOf(DispatcherType.class));
 
       int maxHttpConnectNumber = Args.getInstance().getMaxHttpConnectNumber();
       if (maxHttpConnectNumber > 0) {

framework/src/main/resources/config-localtest.conf

@@ -5,7 +5,7 @@ net {
 
 storage {
   # Directory for storing persistent data
-  db.version = 1,
+  db.version = 2,
   db.directory = "database",
   index.directory = "index",