fix(jsonrpc): enforce log filter cap and improve match efficiency

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

@@ -459,6 +459,9 @@ public class CommonParameter {
   @Getter
   @Setter
   public int jsonRpcMaxBlockFilterNum = 50000;
+  @Getter
+  @Setter
+  public int jsonRpcMaxLogFilterNum = 20000;
 
   @Getter
   @Setter

common/src/main/java/org/tron/core/config/args/NodeConfig.java

@@ -302,6 +302,7 @@ public void setHttpPBFTPort(int v) {
     private int maxBlockRange = 5000;
     private int maxSubTopics = 1000;
     private int maxBlockFilterNum = 50000;
+    private int maxLogFilterNum = 20000;
   }
 
   @Getter

common/src/main/resources/reference.conf

@@ -398,8 +398,11 @@ node {
     # Maximum topics within a topic criteria, >0 otherwise no limit
     maxSubTopics = 1000
 
-    # Maximum number for blockFilter
+    # Maximum number for blockFilter. >0 otherwise no limit
     maxBlockFilterNum = 50000
+
+    # Maximum number of concurrent eth_newFilter registrations, >0 otherwise no limit
+    maxLogFilterNum = 20000
   }
 
   # Disabled API list (works for http, rpc and pbft, not jsonrpc). Case insensitive.

framework/src/main/java/org/tron/common/logsfilter/capsule/BlockFilterCapsule.java

@@ -1,12 +1,11 @@
 package org.tron.common.logsfilter.capsule;
 
-import static org.tron.core.services.jsonrpc.TronJsonRpcImpl.handleBLockFilter;
-
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.core.capsule.BlockCapsule;
+import org.tron.core.services.jsonrpc.TronJsonRpcImpl;
 
 @Slf4j(topic = "API")
 @ToString
@@ -19,19 +18,21 @@ public class BlockFilterCapsule extends FilterTriggerCapsule {
   @Setter
   private boolean solidified;
 
-  public BlockFilterCapsule(BlockCapsule block, boolean solidified) {
-    blockHash = block.getBlockId().toString();
-    this.solidified = solidified;
+  private final TronJsonRpcImpl jsonRpc;
+
+  public BlockFilterCapsule(BlockCapsule block, boolean solidified, TronJsonRpcImpl jsonRpc) {
+    this(block.getBlockId().toString(), solidified, jsonRpc);
   }
 
-  public BlockFilterCapsule(String blockHash, boolean solidified) {
+  public BlockFilterCapsule(String blockHash, boolean solidified, TronJsonRpcImpl jsonRpc) {
     this.blockHash = blockHash;
     this.solidified = solidified;
+    this.jsonRpc = jsonRpc;
   }
 
   @Override
   public void processFilterTrigger() {
-    handleBLockFilter(this);
+    jsonRpc.handleBLockFilter(this);
   }
 
 }

framework/src/main/java/org/tron/common/logsfilter/capsule/LogsFilterCapsule.java

@@ -1,13 +1,12 @@
 package org.tron.common.logsfilter.capsule;
 
-import static org.tron.core.services.jsonrpc.TronJsonRpcImpl.handleLogsFilter;
-
 import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.bloom.Bloom;
+import org.tron.core.services.jsonrpc.TronJsonRpcImpl;
 import org.tron.protos.Protocol.TransactionInfo;
 
 @Slf4j(topic = "API")
@@ -33,18 +32,22 @@ public class LogsFilterCapsule extends FilterTriggerCapsule {
   @Setter
   private boolean removed;
 
+  private final TronJsonRpcImpl jsonRpc;
+
   public LogsFilterCapsule(long blockNumber, String blockHash, Bloom bloom,
-      List<TransactionInfo> txInfoList, boolean solidified, boolean removed) {
+      List<TransactionInfo> txInfoList, boolean solidified, boolean removed,
+      TronJsonRpcImpl jsonRpc) {
     this.blockNumber = blockNumber;
     this.blockHash = blockHash;
     this.bloom = bloom;
     this.txInfoList = txInfoList;
     this.solidified = solidified;
     this.removed = removed;
+    this.jsonRpc = jsonRpc;
   }
 
   @Override
   public void processFilterTrigger() {
-    handleLogsFilter(this);
+    jsonRpc.handleLogsFilter(this);
   }
 }

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

@@ -585,6 +585,7 @@ private static void applyNodeConfig(NodeConfig nc) {
     PARAMETER.jsonRpcMaxBlockRange = jsonrpc.getMaxBlockRange();
     PARAMETER.jsonRpcMaxSubTopics = jsonrpc.getMaxSubTopics();
     PARAMETER.jsonRpcMaxBlockFilterNum = jsonrpc.getMaxBlockFilterNum();
+    PARAMETER.jsonRpcMaxLogFilterNum = jsonrpc.getMaxLogFilterNum();
 
     // ---- P2P sub-bean ----
     PARAMETER.nodeP2pVersion = nc.getP2p().getVersion();

framework/src/main/java/org/tron/core/db/Manager.java

@@ -48,6 +48,7 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.bouncycastle.util.encoders.Hex;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.tron.api.GrpcAPI;
 import org.tron.api.GrpcAPI.TransactionInfoList;
@@ -141,6 +142,7 @@
 import org.tron.core.service.MortgageService;
 import org.tron.core.service.RewardViCalService;
 import org.tron.core.services.event.exception.EventException;
+import org.tron.core.services.jsonrpc.TronJsonRpcImpl;
 import org.tron.core.store.AccountAssetStore;
 import org.tron.core.store.AccountIdIndexStore;
 import org.tron.core.store.AccountIndexStore;
@@ -276,6 +278,10 @@ public class Manager {
   @Autowired
   private RewardViCalService rewardViCalService;
 
+  @Lazy
+  @Autowired
+  private TronJsonRpcImpl tronJsonRpcImpl;
+
   /**
    * Cycle thread to rePush Transactions
    */
@@ -2264,7 +2270,8 @@ private void reOrgLogsFilter() {
   }
 
   private void postBlockFilter(final BlockCapsule blockCapsule, boolean solidified) {
-    BlockFilterCapsule blockFilterCapsule = new BlockFilterCapsule(blockCapsule, solidified);
+    BlockFilterCapsule blockFilterCapsule =
+        new BlockFilterCapsule(blockCapsule, solidified, tronJsonRpcImpl);
     if (!filterCapsuleQueue.offer(blockFilterCapsule)) {
       logger.info("Too many filters, block filter lost: {}.", blockCapsule.getBlockId());
     }
@@ -2278,7 +2285,7 @@ private void postLogsFilter(final BlockCapsule blockCapsule, boolean solidified,
               = getTransactionInfoByBlockNum(blockNumber).getTransactionInfoList();
       LogsFilterCapsule logsFilterCapsule = new LogsFilterCapsule(blockNumber,
           blockCapsule.getBlockId().toString(), blockCapsule.getBloom(), transactionInfoList,
-          solidified, removed);
+          solidified, removed, tronJsonRpcImpl);
 
       if (!filterCapsuleQueue.offer(logsFilterCapsule)) {
         logger.info("Too many filters, logs filter lost: {}.", blockNumber);

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

@@ -60,6 +60,8 @@ public class JsonRpcApiUtil {
   public static final String TAG_SAFE_SUPPORT_ERROR = "TAG safe not supported";
   public static final String BLOCK_NUM_ERROR = "invalid block number";
 
+  static SecureRandom random = new SecureRandom();
+
   public static byte[] convertToTronAddress(byte[] address) {
     byte[] newAddress = new byte[21];
     byte[] temp = new byte[] {Wallet.getAddressPreFixByte()};
@@ -567,7 +569,6 @@ public static long parseBlockNumber(String blockNumOrTag, Wallet wallet)
   }
 
   public static String generateFilterId() {
-    SecureRandom random = new SecureRandom();
     byte[] uid = new byte[16]; // 128 bits are converted to 16 bytes
     random.nextBytes(uid);
     return ByteArray.toHexString(uid);

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

@@ -291,9 +291,10 @@ CompilationResult ethSubmitHashrate(String hashrate, String id)
   @JsonRpcErrors({
       @JsonRpcError(exception = JsonRpcMethodNotFoundException.class, code = -32601, data = "{}"),
       @JsonRpcError(exception = JsonRpcInvalidParamsException.class, code = -32602, data = "{}"),
+      @JsonRpcError(exception = JsonRpcExceedLimitException.class, code = -32005, data = "{}"),
   })
   String newFilter(FilterRequest fr) throws JsonRpcInvalidParamsException,
-      JsonRpcMethodNotFoundException;
+      JsonRpcMethodNotFoundException, JsonRpcExceedLimitException;
 
   @JsonRpcMethod("eth_newBlockFilter")
   @JsonRpcErrors({