feat(API): refactor merge http servlets

common/src/main/resources/reference.conf

@@ -454,22 +454,56 @@ rate.limiter = {
   # If no strategy is configured for an endpoint, QpsRateLimiterAdapter with
   # qps=1000 is applied automatically.
 
-  # Per-servlet HTTP rate limits. component is the servlet class simple name.
+  # Per-servlet HTTP rate limits. Each port limits an endpoint separately, and component names the
+  # endpoint on one port:
+  #   fullnode port (/wallet/*)          the servlet class simple name, e.g. GetAccountServlet
+  #   solidity port (/walletsolidity/*)  <Name>OnSolidityServlet, e.g. GetAccountOnSolidityServlet
+  #   pbft port (/walletpbft/*)          <Name>OnPBFTServlet, e.g. GetAccountOnPBFTServlet
+  #   standalone SolidityNode            the servlet class simple name as fullnode port, except
+  #                                      GetTransactionByIdSolidityServlet and
+  #                                      GetTransactionInfoByIdSolidityServlet
   http = [
+    # fullnode port, /wallet/getnowblock
     # {
     #   component = "GetNowBlockServlet",
     #   strategy = "GlobalPreemptibleAdapter",
     #   paramString = "permit=1"
     # },
+    # fullnode port, /wallet/getaccount
     # {
     #   component = "GetAccountServlet",
     #   strategy = "IPQPSRateLimiterAdapter",
     #   paramString = "qps=1"
     # },
+    # fullnode port, /wallet/listwitnesses
     # {
     #   component = "ListWitnessesServlet",
     #   strategy = "QpsRateLimiterAdapter",
     #   paramString = "qps=1"
+    # },
+    # solidity port, /walletsolidity/getaccount
+    # {
+    #   component = "GetAccountOnSolidityServlet",
+    #   strategy = "IPQPSRateLimiterAdapter",
+    #   paramString = "qps=1"
+    # },
+    # solidity port, /walletsolidity/triggerconstantcontract
+    # {
+    #   component = "TriggerConstantContractOnSolidityServlet",
+    #   strategy = "GlobalPreemptibleAdapter",
+    #   paramString = "permit=2"
+    # },
+    # standalone SolidityNode, /walletsolidity/getaccount
+    # {
+    #   component = "GetAccountServlet",
+    #   strategy = "IPQPSRateLimiterAdapter",
+    #   paramString = "qps=5"
+    # }
+    # standalone SolidityNode, /walletsolidity/gettransactionbyid
+    # {
+    #   component = "GetTransactionByIdSolidityServlet",
+    #   strategy = "IPQPSRateLimiterAdapter",
+    #   paramString = "qps=5"
     # }
   ]
 

framework/src/main/java/org/tron/core/config/DefaultConfig.java

@@ -11,10 +11,10 @@
 import org.tron.core.config.args.Args;
 import org.tron.core.db.RevokingDatabase;
 import org.tron.core.db2.core.SnapshotManager;
+import org.tron.core.services.interfaceOnPBFT.HttpApiOnPBFTService;
 import org.tron.core.services.interfaceOnPBFT.RpcApiServiceOnPBFT;
-import org.tron.core.services.interfaceOnPBFT.http.PBFT.HttpApiOnPBFTService;
+import org.tron.core.services.interfaceOnSolidity.HttpApiOnSolidityService;
 import org.tron.core.services.interfaceOnSolidity.RpcApiServiceOnSolidity;
-import org.tron.core.services.interfaceOnSolidity.http.solidity.HttpApiOnSolidityService;
 
 @Slf4j(topic = "app")
 @Configuration

framework/src/main/java/org/tron/core/services/RpcApiService.java

@@ -92,7 +92,7 @@
 import org.tron.core.exception.VMIllegalException;
 import org.tron.core.exception.ZksnarkException;
 import org.tron.core.metrics.MetricsApiService;
-import org.tron.core.services.http.Util;
+import org.tron.core.services.http.servlets.Util;
 import org.tron.core.utils.TransactionUtil;
 import org.tron.core.zen.address.DiversifierT;
 import org.tron.core.zen.address.IncomingViewingKey;

framework/src/main/java/org/tron/core/services/WalletOnCursor.java

@@ -31,6 +31,22 @@ public void futureGet(Runnable runnable) {
     }
   }
 
+  /**
+   * Selects this view's cursor on the current thread until the returned scope is closed, for a
+   * body that throws checked exceptions and so cannot run through {@link #futureGet}.
+   */
+  public CursorScope selectCursor() {
+    dbManager.setCursor(cursor);
+    return dbManager::resetCursor;
+  }
+
+  /** Resets the current thread's cursor to HEAD when closed. */
+  public interface CursorScope extends AutoCloseable {
+
+    @Override
+    void close();
+  }
+
   public interface TronCallable<T> extends Callable<T> {
 
     @Override

framework/src/main/java/org/tron/core/services/filter/LiteFnQueryHttpFilter.java

@@ -36,15 +36,10 @@ public static Set<String> getFilterPaths() {
     filterPaths.add("/wallet/getblockbylatestnum");
     filterPaths.add("/wallet/getblockbylimitnext");
     filterPaths.add("/wallet/getblockbynum");
-    filterPaths.add("/wallet/getmerkletreevoucherinfo");
     filterPaths.add("/wallet/gettransactionbyid");
     filterPaths.add("/wallet/gettransactioncountbyblocknum");
     filterPaths.add("/wallet/gettransactioninfobyid");
     filterPaths.add("/wallet/gettransactionreceiptbyid");
-    filterPaths.add("/wallet/isspend");
-    filterPaths.add("/wallet/scanandmarknotebyivk");
-    filterPaths.add("/wallet/scannotebyivk");
-    filterPaths.add("/wallet/scannotebyovk");
     filterPaths.add("/wallet/totaltransaction");
     filterPaths.add("/wallet/gettransactioninfobyblocknum");
     filterPaths.add("/wallet/getmarketorderbyaccount");
@@ -61,14 +56,9 @@ public static Set<String> getFilterPaths() {
     filterPaths.add("/walletsolidity/getblockbylatestnum");
     filterPaths.add("/walletsolidity/getblockbylimitnext");
     filterPaths.add("/walletsolidity/getblockbynum");
-    filterPaths.add("/walletsolidity/getmerkletreevoucherinfo");
     filterPaths.add("/walletsolidity/gettransactionbyid");
     filterPaths.add("/walletsolidity/gettransactioncountbyblocknum");
     filterPaths.add("/walletsolidity/gettransactioninfobyid");
-    filterPaths.add("/walletsolidity/isspend");
-    filterPaths.add("/walletsolidity/scanandmarknotebyivk");
-    filterPaths.add("/walletsolidity/scannotebyivk");
-    filterPaths.add("/walletsolidity/scannotebyovk");
     filterPaths.add("/walletsolidity/gettransactioninfobyblocknum");
     filterPaths.add("/walletsolidity/getmarketorderbyaccount");
     filterPaths.add("/walletsolidity/getmarketorderbyid");
@@ -84,14 +74,10 @@ public static Set<String> getFilterPaths() {
     filterPaths.add("/walletpbft/getblockbylatestnum");
     filterPaths.add("/walletpbft/getblockbylimitnext");
     filterPaths.add("/walletpbft/getblockbynum");
-    filterPaths.add("/walletpbft/getmerkletreevoucherinfo");
     filterPaths.add("/walletpbft/gettransactionbyid");
     filterPaths.add("/walletpbft/gettransactioncountbyblocknum");
     filterPaths.add("/walletpbft/gettransactioninfobyid");
-    filterPaths.add("/walletpbft/isspend");
-    filterPaths.add("/walletpbft/scanandmarknotebyivk");
-    filterPaths.add("/walletpbft/scannotebyivk");
-    filterPaths.add("/walletpbft/scannotebyovk");
+    filterPaths.add("/walletpbft/gettransactioninfobyblocknum");
     filterPaths.add("/walletpbft/getmarketorderbyaccount");
     filterPaths.add("/walletpbft/getmarketorderbyid");
     filterPaths.add("/walletpbft/getmarketpricebypair");

framework/src/main/java/org/tron/core/services/filter/SolidityCursorFilter.java

@@ -0,0 +1,15 @@
+package org.tron.core.services.filter;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.tron.core.db.Manager;
+import org.tron.core.db2.core.Chainbase;
+
+@Component
+public class SolidityCursorFilter extends WalletCursorFilter {
+
+  @Autowired
+  public SolidityCursorFilter(Manager dbManager) {
+    super(dbManager, Chainbase.Cursor.SOLIDITY);
+  }
+}

framework/src/main/java/org/tron/core/services/filter/WalletCursorFilter.java

@@ -0,0 +1,58 @@
+package org.tron.core.services.filter;
+
+import java.io.IOException;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import org.tron.core.db.Manager;
+import org.tron.core.db2.core.Chainbase;
+
+/**
+ * Selects which state view the http servlets on this port read from.
+ *
+ * <p>The read cursor is a per-thread setting ({@code ThreadLocal} in {@code Chainbase}): it only
+ * decides from which snapshot the current thread starts its reads, and has no effect on any
+ * other thread. This filter sets the cursor before the servlet runs, so the same stateless
+ * servlet beans can serve {@code /wallet} (HEAD) and {@code /walletsolidity} (SOLIDITY) without
+ * per-port subclasses. The SOLIDITY view is resolved from the live head on every read, so it can
+ * be selected before rate limiting; the PBFT view is an offset from the head and is selected by
+ * {@code RateLimiterServlet} once the request is admitted.
+ *
+ * <p>The cursor is always reset to HEAD in a finally block: jetty pools its worker threads, and
+ * a leftover cursor would leak into the next request served by the same thread. Only read-only
+ * endpoints may be mounted behind this filter — write paths must run with the HEAD cursor.
+ */
+public abstract class WalletCursorFilter implements Filter {
+
+  private final Manager dbManager;
+  private final Chainbase.Cursor cursor;
+
+  protected WalletCursorFilter(Manager dbManager, Chainbase.Cursor cursor) {
+    this.dbManager = dbManager;
+    this.cursor = cursor;
+  }
+
+  @Override
+  public void init(FilterConfig filterConfig) throws ServletException {
+    // do nothing
+  }
+
+  @Override
+  public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse,
+                       FilterChain filterChain) throws IOException, ServletException {
+    try {
+      dbManager.setCursor(cursor);
+      filterChain.doFilter(servletRequest, servletResponse);
+    } finally {
+      dbManager.resetCursor();
+    }
+  }
+
+  @Override
+  public void destroy() {
+    // do nothing
+  }
+}