fix the bug of only one erro is return is the n-th request is overflow

Author: 317787106

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

@@ -154,11 +154,24 @@ private void handleBatch(HttpServletResponse resp, JsonNode rootNode, int maxRes
 
     ArrayNode batchResult = MAPPER.createArrayNode();
     int accumulatedSize = 2; // "[]"
+    boolean overflow = false;
 
     for (int i = 0; i < rootNode.size(); i++) {
+      JsonNode subRequest = rootNode.get(i);
+
+      if (overflow) {
+        // Notifications (no "id") do not get a response even on overflow.
+        if (subRequest.has("id")) {
+          batchResult.add(buildErrorNode(JsonRpcError.RESPONSE_TOO_LARGE,
+              "Response exceeds the limit of " + maxResponseSize + " bytes",
+              subRequest.get("id")));
+        }
+        continue;
+      }
+
       byte[] subBody;
       try {
-        subBody = MAPPER.writeValueAsBytes(rootNode.get(i));
+        subBody = MAPPER.writeValueAsBytes(subRequest);
       } catch (JsonProcessingException e) {
         writeJsonRpcError(resp, JsonRpcError.INTERNAL_ERROR, "Internal error", null, true);
         return;
@@ -178,12 +191,14 @@ private void handleBatch(HttpServletResponse resp, JsonNode rootNode, int maxRes
         continue; // notification — no response
       }
 
-      // comma separator between array elements
+      // comma(,) separator between array elements
       int addition = responseBytes.length + (!batchResult.isEmpty() ? 1 : 0);
       if (maxResponseSize > 0 && accumulatedSize + addition > maxResponseSize) {
-        writeJsonRpcError(resp, JsonRpcError.RESPONSE_TOO_LARGE,
-            "Response exceeds the limit of " + maxResponseSize + " bytes", null, true);
-        return;
+        overflow = true;
+        batchResult.add(buildErrorNode(JsonRpcError.RESPONSE_TOO_LARGE,
+            "Response exceeds the limit of " + maxResponseSize + " bytes",
+            subRequest.get("id")));
+        continue;
       }
       accumulatedSize += addition;
 
@@ -197,6 +212,13 @@ private void handleBatch(HttpServletResponse resp, JsonNode rootNode, int maxRes
       batchResult.add(responseNode);
     }
 
+    // JSON-RPC 2.0 §6: MUST NOT return an empty Array when there are no response objects.
+    if (batchResult.isEmpty()) {
+      resp.setStatus(HttpServletResponse.SC_OK);
+      resp.setContentLength(0);
+      return;
+    }
+
     byte[] finalBytes = MAPPER.writeValueAsBytes(batchResult);
     resp.setContentType("application/json; charset=utf-8");
     resp.setStatus(HttpServletResponse.SC_OK);
@@ -215,8 +237,7 @@ private byte[] readBody(InputStream in) throws IOException {
     return buffer.toByteArray();
   }
 
-  private void writeJsonRpcError(HttpServletResponse resp, JsonRpcError error, String message,
-      JsonNode id, boolean isBatch) throws IOException {
+  private ObjectNode buildErrorNode(JsonRpcError error, String message, JsonNode id) {
     ObjectNode errorObj = MAPPER.createObjectNode();
     errorObj.put("jsonrpc", "2.0");
     ObjectNode errNode = errorObj.putObject("error");
@@ -227,6 +248,12 @@ private void writeJsonRpcError(HttpServletResponse resp, JsonRpcError error, Str
     } else {
       errorObj.putNull("id");
     }
+    return errorObj;
+  }
+
+  private void writeJsonRpcError(HttpServletResponse resp, JsonRpcError error, String message,
+      JsonNode id, boolean isBatch) throws IOException {
+    ObjectNode errorObj = buildErrorNode(error, message, id);
     byte[] bytes;
     if (isBatch) {
       ArrayNode arr = MAPPER.createArrayNode();

framework/src/test/java/org/tron/core/services/jsonrpc/JsonRpcServletTest.java

@@ -133,9 +133,9 @@ public void batchLimitDisabled_largeBatchAllowed() throws Exception {
     sb.append("]");
     MockHttpServletResponse resp = doPost(sb.toString());
     assertEquals(200, resp.getStatus());
-    JsonNode body = MAPPER.readTree(resp.getContentAsByteArray());
-    assertTrue("response must be a JSON array", body.isArray());
-    assertEquals("all notifications produce no response entries", 0, body.size());
+    assertEquals("all-notification batch must return empty body per JSON-RPC 2.0 §6",
+        0, resp.getContentLength());
+    assertEquals("", resp.getContentAsString());
   }
 
   // --- rpcServer.handle exceptions ---
@@ -218,7 +218,14 @@ public void batchShortCircuitsOnOverflow() throws Exception {
     assertEquals(200, resp.getStatus());
     JsonNode body = MAPPER.readTree(resp.getContentAsString());
     assertTrue("overflow response must be an array", body.isArray());
-    assertEquals(-32003, body.get(0).get("error").get("code").asInt());
+    // Geth-compatible: previous successes are preserved; overflow item and remaining
+    // unexecuted items each get a -32003 error with their original id.
+    assertEquals(3, body.size());
+    assertEquals("ok", body.get(0).get("result").asText());
+    assertEquals(-32003, body.get(1).get("error").get("code").asInt());
+    assertEquals(2, body.get(1).get("id").asInt());
+    assertEquals(-32003, body.get(2).get("error").get("code").asInt());
+    assertEquals(3, body.get(2).get("id").asInt());
     assertEquals("third sub-request must not be executed after overflow", 2, callCount[0]);
   }