Fix at compilation

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

Author: fab-10

CHANGELOG.md

@@ -3,6 +3,8 @@
 ## Unreleased
 
 ### Breaking Changes
+- RPC changes to enhance compatibility with other ELs
+  - RPCs using filter parameter including `eth_getLogs` and `trace_filter` return an error if `fromBlock` is greater than `toBlock`, or if `toBlock` extends beyond chain head (previously returned an empty list) [#9604](https://github.com/hyperledger/besu/pull/9604)
 
 ### Upcoming Breaking Changes
 - ETC Classic and Mordor network support in Besu is deprecated [#9437](https://github.com/hyperledger/besu/pull/9437)
@@ -17,7 +19,7 @@
 - Performance: Optimise EIP-196 AltBn128: EcAdd 33-128% faster, EcMul 8% faster [#9570](https://github.com/hyperledger/besu/pull/9570)
 - Update to Netty 4.2.9.Final [#9587](https://github.com/hyperledger/besu/pull/9587)
 - Update to log4j 2.25.3 [#9600](https://github.com/hyperledger/besu/pull/9600)
-- Add `engine_getBlobsV3` method [#9582](https://github.com/hyperledger/besu/pull/9582)  
+- Add `engine_getBlobsV3` method [#9582](https://github.com/hyperledger/besu/pull/9582)
 
 ##  25.12.0
 

acceptance-tests/tests/build.gradle

@@ -103,6 +103,8 @@ processTestResources.dependsOn(
         ':acceptance-tests:catalogless-test-plugins:jar'
 )
 
+compileTestJava.dependsOn ':buildDetachedTestPlugins'
+
 // FKA acceptanceTestNotPrivacy
 task acceptanceTest(type: Test) {
   inputs.property "integration.date", LocalTime.now() // so it runs at every invocation

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetLogs.java

@@ -108,6 +108,9 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
                                     new InvalidJsonRpcParameters(
                                         "toBlock not found: " + filter.getToBlock(),
                                         RpcErrorType.INVALID_BLOCK_NUMBER_PARAMS));
+
+                    FilterParameter.validateBlockRange(
+                        fromBlockNumber, toBlockNumber, blockchain.headBlockNumber());
                     if (maxLogRange > 0 && (toBlockNumber - fromBlockNumber) > maxLogRange) {
                       throw new InvalidJsonRpcParameters(
                           "Requested range exceeds maximum range limit",

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceFilter.java

@@ -106,6 +106,9 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     final long toBlock = resolveBlockNumber(filterParameter.getToBlock());
     LOG.trace("Received RPC rpcName={} fromBlock={} toBlock={}", getName(), fromBlock, toBlock);
 
+    FilterParameter.validateBlockRange(
+        fromBlock, toBlock, getBlockchainQueries().headBlockNumber());
+
     if (maxRange > 0 && toBlock - fromBlock > maxRange) {
       LOG.atDebug()
           .setMessage("trace_filter request {} failed:")

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameter.java

@@ -18,6 +18,8 @@
 
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType;
 import org.hyperledger.besu.ethereum.api.query.LogsQuery;
 import org.hyperledger.besu.evm.log.LogTopic;
 
@@ -178,4 +180,31 @@ public String toString() {
   public boolean isValid() {
     return isValid;
   }
+
+  /**
+   * Validates that fromBlock <= toBlock and toBlock <= latestBlock for already resolved block
+   * numbers.
+   *
+   * @param fromBlockNumber the resolved from block number
+   * @param toBlockNumber the resolved to block number
+   * @param latestBlockNumber the latest block number in the chain
+   * @throws InvalidJsonRpcParameters if fromBlock > toBlock or toBlock > latestBlock
+   */
+  public static void validateBlockRange(
+      final long fromBlockNumber, final long toBlockNumber, final long latestBlockNumber) {
+    if (fromBlockNumber > toBlockNumber) {
+      throw new InvalidJsonRpcParameters(
+          "fromBlock (" + fromBlockNumber + ") is greater than toBlock (" + toBlockNumber + ")",
+          RpcErrorType.INVALID_PARAMS);
+    }
+    if (toBlockNumber > latestBlockNumber) {
+      throw new InvalidJsonRpcParameters(
+          "toBlock ("
+              + toBlockNumber
+              + ") is greater than latest block ("
+              + latestBlockNumber
+              + ")",
+          RpcErrorType.INVALID_PARAMS);
+    }
+  }
 }

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetLogsTest.java

@@ -87,14 +87,15 @@ public void shouldQueryFinalizedBlock() {
 
     when(blockchainQueries.finalizedBlockHeader()).thenReturn(Optional.of(blockHeader));
     when(blockHeader.getNumber()).thenReturn(blockNumber);
+    when(blockchainQueries.headBlockNumber()).thenReturn(100L);
     when(blockchainQueries.matchingLogs(anyLong(), anyLong(), any(), any()))
         .thenReturn(new ArrayList<>());
 
     final JsonRpcResponse response = method.response(request);
     assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
 
     verify(blockchainQueries).matchingLogs(eq(blockNumber), eq(blockNumber), any(), any());
-    verify(blockchainQueries, never()).headBlockNumber();
+    verify(blockchainQueries, times(1)).headBlockNumber();
     verify(blockchainQueries, never()).safeBlockHeader();
   }
 
@@ -125,6 +126,7 @@ public void shouldQuerySafeBlock() {
 
     when(blockchainQueries.safeBlockHeader()).thenReturn(Optional.of(blockHeader));
     when(blockHeader.getNumber()).thenReturn(blockNumber);
+    when(blockchainQueries.headBlockNumber()).thenReturn(100L);
     when(blockchainQueries.matchingLogs(anyLong(), anyLong(), any(), any()))
         .thenReturn(new ArrayList<>());
 
@@ -133,7 +135,7 @@ public void shouldQuerySafeBlock() {
 
     verify(blockchainQueries).matchingLogs(eq(blockNumber), eq(blockNumber), any(), any());
     verify(blockchainQueries, never()).finalizedBlockHeader();
-    verify(blockchainQueries, never()).headBlockNumber();
+    verify(blockchainQueries, times(1)).headBlockNumber();
   }
 
   @Test
@@ -142,6 +144,7 @@ public void shouldQueryNumericBlock() {
     final long toBlock = 10L;
     final JsonRpcRequestContext request = buildRequest(fromBlock, toBlock);
 
+    when(blockchainQueries.headBlockNumber()).thenReturn(100L);
     when(blockchainQueries.matchingLogs(anyLong(), anyLong(), any(), any()))
         .thenReturn(new ArrayList<>());
 
@@ -151,7 +154,7 @@ public void shouldQueryNumericBlock() {
     verify(blockchainQueries).matchingLogs(eq(fromBlock), eq(toBlock), any(), any());
 
     verify(blockchainQueries, never()).finalizedBlockHeader();
-    verify(blockchainQueries, never()).headBlockNumber();
+    verify(blockchainQueries, times(1)).headBlockNumber();
     verify(blockchainQueries, never()).safeBlockHeader();
   }
 
@@ -161,6 +164,7 @@ public void shouldQueryEarliestToNumeric() {
     final long latestBlock = 50L;
     final JsonRpcRequestContext request = buildRequest("earliest", latestBlock);
 
+    when(blockchainQueries.headBlockNumber()).thenReturn(100L);
     when(blockchainQueries.matchingLogs(anyLong(), anyLong(), any(), any()))
         .thenReturn(new ArrayList<>());
 
@@ -179,6 +183,7 @@ public void shouldQueryWrappedNumeric() {
     final JsonRpcRequestContext request =
         buildRequest(String.valueOf(fromBlock), String.valueOf(toBlock));
 
+    when(blockchainQueries.headBlockNumber()).thenReturn(150L);
     when(blockchainQueries.matchingLogs(anyLong(), anyLong(), any(), any()))
         .thenReturn(new ArrayList<>());
 
@@ -187,7 +192,7 @@ public void shouldQueryWrappedNumeric() {
 
     verify(blockchainQueries).matchingLogs(eq(fromBlock), eq(toBlock), any(), any());
     verify(blockchainQueries, never()).finalizedBlockHeader();
-    verify(blockchainQueries, never()).headBlockNumber();
+    verify(blockchainQueries, times(1)).headBlockNumber();
     verify(blockchainQueries, never()).safeBlockHeader();
   }
 
@@ -197,6 +202,7 @@ public void shouldQueryWrappedNumericToNumeric() {
     final long toBlock = 100L;
     final JsonRpcRequestContext request = buildRequest(String.valueOf(fromBlock), toBlock);
 
+    when(blockchainQueries.headBlockNumber()).thenReturn(150L);
     when(blockchainQueries.matchingLogs(anyLong(), anyLong(), any(), any()))
         .thenReturn(new ArrayList<>());
 
@@ -205,7 +211,7 @@ public void shouldQueryWrappedNumericToNumeric() {
 
     verify(blockchainQueries).matchingLogs(eq(fromBlock), eq(toBlock), any(), any());
     verify(blockchainQueries, never()).finalizedBlockHeader();
-    verify(blockchainQueries, never()).headBlockNumber();
+    verify(blockchainQueries, times(1)).headBlockNumber();
     verify(blockchainQueries, never()).safeBlockHeader();
   }
 
@@ -240,6 +246,8 @@ public void shouldQuerySafeToFinalized() {
     when(blockchainQueries.safeBlockHeader()).thenReturn(Optional.of(safeBlockHeader));
     when(finalizedBlockHeader.getNumber()).thenReturn(finalizedBlockNumber);
     when(safeBlockHeader.getNumber()).thenReturn(safeBlockNumber);
+    when(blockchainQueries.headBlockNumber())
+        .thenReturn(100L); // Latest block higher than finalized
     when(blockchainQueries.matchingLogs(anyLong(), anyLong(), any(), any()))
         .thenReturn(new ArrayList<>());
 
@@ -250,7 +258,7 @@ public void shouldQuerySafeToFinalized() {
         .matchingLogs(eq(safeBlockNumber), eq(finalizedBlockNumber), any(), any());
     verify(blockchainQueries, times(1)).finalizedBlockHeader();
     verify(blockchainQueries, times(1)).safeBlockHeader();
-    verify(blockchainQueries, never()).headBlockNumber();
+    verify(blockchainQueries, times(1)).headBlockNumber();
   }
 
   @Test
@@ -278,12 +286,35 @@ public void shouldFailIfParamsExceedMaxRange() {
     final JsonRpcRequestContext request = buildRequest(0, 50);
     maxLogRange = 20L;
     method = new EthGetLogs(blockchainQueries, maxLogRange);
+    when(blockchainQueries.headBlockNumber()).thenReturn(100L);
     final JsonRpcResponse response = method.response(request);
     assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
     final JsonRpcErrorResponse errorResponse = (JsonRpcErrorResponse) response;
     assertThat(errorResponse.getErrorType()).isEqualTo(RpcErrorType.EXCEEDS_RPC_MAX_BLOCK_RANGE);
   }
 
+  @Test
+  public void shouldFailIfFromBlockGreaterThanToBlock() {
+    final JsonRpcRequestContext request = buildRequest(10, 9);
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
+    final JsonRpcErrorResponse errorResponse = (JsonRpcErrorResponse) response;
+    assertThat(errorResponse.getErrorType()).isEqualTo(RpcErrorType.INVALID_PARAMS);
+  }
+
+  @Test
+  public void shouldFailIfToBlockGreaterThanLatestBlock() {
+    final long latestBlockNumber = 100L;
+    final long toBlock = 150L; // Greater than latest
+    when(blockchainQueries.headBlockNumber()).thenReturn(latestBlockNumber);
+
+    final JsonRpcRequestContext request = buildRequest(50, toBlock);
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
+    final JsonRpcErrorResponse errorResponse = (JsonRpcErrorResponse) response;
+    assertThat(errorResponse.getErrorType()).isEqualTo(RpcErrorType.INVALID_PARAMS);
+  }
+
   private JsonRpcRequestContext buildRequest(final long fromBlock, final long toBlock) {
     final FilterParameter filterParameter =
         buildFilterParameter(new BlockParameter(fromBlock), new BlockParameter(toBlock));

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceFilterTest.java

@@ -15,6 +15,7 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
@@ -48,10 +49,7 @@ public class TraceFilterTest {
   @Mock BlockchainQueries blockchainQueries;
 
   @ParameterizedTest
-  @CsvSource({
-    "0, 1001, 1000", "0, 5000, 1000", "1, 1002, 1000", "1, 6002, 1000", "1000, 3000, 1000",
-    "0, 501, 500", "0, 5000, 500", "1, 502, 500", "1, 6002, 500", "1000, 3000, 500"
-  })
+  @CsvSource({"0, 1001, 1000", "1, 6002, 1000", "1000, 3000, 500"})
   public void shouldFailIfParamsExceedMaxRange(
       final long fromBlock, final long toBlock, final long maxFilterRange) {
     final FilterParameter filterParameter =
@@ -70,6 +68,9 @@ public void shouldFailIfParamsExceedMaxRange(
         new JsonRpcRequestContext(
             new JsonRpcRequest("2.0", "trace_filter", new Object[] {filterParameter}));
 
+    // Mock headBlockNumber for validation with a value higher than toBlock
+    when(blockchainQueries.headBlockNumber()).thenReturn(Math.max(toBlock + 1000, 10000L));
+
     method =
         new TraceFilter(
             protocolSchedule,

ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_fromBlockExceedToBlock.json

@@ -13,7 +13,10 @@
   "response": {
     "jsonrpc": "2.0",
     "id": 406,
-    "result" : []
+    "error" : {
+      "code": -32602,
+      "message": "Invalid params"
+    }
   },
   "statusCode": 200
 }