add config item node.jsonrpc.maxFilterNum

Author: 317787106

common/src/main/java/org/tron/common/parameter/CommonParameter.java

@@ -527,6 +527,9 @@ public class CommonParameter {
   @Getter
   @Setter
   public int jsonRpcMaxSubTopics = 1000;
+  @Getter
+  @Setter
+  public int jsonRpcMaxFilterNum = 50000;
 
   @Getter
   @Setter

common/src/main/java/org/tron/core/Constant.java

@@ -154,6 +154,7 @@ public class Constant {
   public static final String NODE_JSONRPC_HTTP_PBFT_PORT = "node.jsonrpc.httpPBFTPort";
   public static final String NODE_JSONRPC_MAX_BLOCK_RANGE = "node.jsonrpc.maxBlockRange";
   public static final String NODE_JSONRPC_MAX_SUB_TOPICS = "node.jsonrpc.maxSubTopics";
+  public static final String NODE_JSONRPC_MAX_FILTER_NUM = "node.jsonrpc.maxFilterNum";
 
   public static final String NODE_DISABLED_API_LIST = "node.disabledApi";
 

framework/src/main/java/org/tron/core/config/args/Args.java

@@ -207,6 +207,7 @@ public static void clearParam() {
     PARAMETER.jsonRpcHttpPBFTNodeEnable = false;
     PARAMETER.jsonRpcMaxBlockRange = 5000;
     PARAMETER.jsonRpcMaxSubTopics = 1000;
+    PARAMETER.jsonRpcMaxFilterNum = 50000;
     PARAMETER.nodeMetricsEnable = false;
     PARAMETER.metricsStorageEnable = false;
     PARAMETER.metricsPrometheusEnable = false;
@@ -491,6 +492,11 @@ public static void setParam(final Config config) {
           config.getInt(Constant.NODE_JSONRPC_MAX_SUB_TOPICS);
     }
 
+    if (config.hasPath(Constant.NODE_JSONRPC_MAX_FILTER_NUM)) {
+      PARAMETER.jsonRpcMaxFilterNum =
+          config.getInt(Constant.NODE_JSONRPC_MAX_FILTER_NUM);
+    }
+
     if (config.hasPath(Constant.VM_MIN_TIME_RATIO)) {
       PARAMETER.minTimeRatio = config.getDouble(Constant.VM_MIN_TIME_RATIO);
     }

framework/src/main/java/org/tron/core/services/jsonrpc/TronJsonRpcImpl.java

@@ -53,6 +53,7 @@
 import org.tron.core.Wallet;
 import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.capsule.TransactionCapsule;
+import org.tron.core.config.args.Args;
 import org.tron.core.db.Manager;
 import org.tron.core.db2.core.Chainbase;
 import org.tron.core.exception.BadItemException;
@@ -113,7 +114,7 @@ public enum RequestSource {
 
   private static final String FILTER_NOT_FOUND = "filter not found";
   public static final int EXPIRE_SECONDS = 5 * 60;
-  private static final int MAX_FILTER_NUM = 50000;
+  private static final int maxFilterNum = Args.getInstance().getJsonRpcMaxFilterNum();
   private static final Cache<LogFilterElement, LogFilterElement> logElementCache =
       CacheBuilder.newBuilder()
           .maximumSize(300_000L) // 300s * tps(1000) * 1 log/tx ≈ 300_000
@@ -1436,8 +1437,8 @@ public String newBlockFilter() throws JsonRpcMethodNotFoundException,
     } else {
       blockFilter2Result = blockFilter2ResultSolidity;
     }
-    if (blockFilter2Result.size() >= MAX_FILTER_NUM) {
-      throw new JsonRpcTooManyFilterException("Block filter's num exceeds " + MAX_FILTER_NUM);
+    if (blockFilter2Result.size() >= maxFilterNum) {
+      throw new JsonRpcTooManyFilterException("exceed max block filters:  " + maxFilterNum);
     }
 
     BlockFilterAndResult filterAndResult = new BlockFilterAndResult();

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

@@ -163,6 +163,7 @@ node {
     # httpPBFTPort = 8565
     # maxBlockRange = 5000
     # maxSubTopics = 1000
+    # maxFilterNum = 50000
   }
 
 }

framework/src/main/resources/config.conf

@@ -375,6 +375,8 @@ node {
     # The maximum number of allowed topics within a topic criteria, default value is 1000,
     # should be > 0, otherwise means no limit.
     maxSubTopics = 1000
+    # Allowed maximum number for blockFilter
+    maxFilterNum = 50000
   }
 
   # Disabled api list, it will work for http, rpc and pbft, both FullNode and SolidityNode,

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

@@ -167,6 +167,7 @@ node {
     # httpPBFTPort = 8565
     # maxBlockRange = 5000
     # maxSubTopics = 1000
+    # maxFilterNum = 50000
   }
 
 }

framework/src/test/resources/config-test-index.conf

@@ -88,6 +88,7 @@ node {
     httpPBFTEnable = false
     # maxBlockRange = 5000
     # maxSubTopics = 1000
+    # maxFilterNum = 50000
   }
 
   rpc {

framework/src/test/resources/config-test-mainnet.conf

@@ -94,6 +94,7 @@ node {
     httpPBFTEnable = false
     # maxBlockRange = 5000
     # maxSubTopics = 1000
+    # maxFilterNum = 50000
   }
 
   rpc {

framework/src/test/resources/config-test.conf

@@ -118,6 +118,7 @@ node {
     httpPBFTEnable = false
     # maxBlockRange = 5000
     # maxSubTopics = 1000
+    # maxFilterNum = 50000
   }
 
   # use your ipv6 address for node discovery and tcp connection, default false