[4844] Fix some Devnet9 Hive tests (hyperledger#5929)

* Return latest valid hash for blob validation * Fix invalid hash * Fix null hash * Change HISTORY_BUFFER_LENGTH --------- Signed-off-by: Gabriel-Trintinalia <[email protected]>
NickSneo · Nov 12, 2023 · 50034e5 · 50034e5
1 parent 4fe9e6b
commit 50034e5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...perledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java b/...perledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java
@@ -130,7 +130,12 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
     try {
       maybeVersionedHashes = extractVersionedHashes(maybeVersionedHashParam);
     } catch (RuntimeException ex) {
-      return respondWithInvalid(reqId, blockParam, null, INVALID, "Invalid versionedHash");
+      return respondWithInvalid(
+          reqId,
+          blockParam,
+          mergeCoordinator.getLatestValidAncestor(blockParam.getParentHash()).orElse(null),
+          INVALID,
+          "Invalid versionedHash");
     }
 
     final Optional<BlockHeader> maybeParentHeader =
@@ -240,7 +245,7 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
       return respondWithInvalid(
           reqId,
           blockParam,
-          null,
+          mergeCoordinator.getLatestValidAncestor(blockParam.getParentHash()).orElse(null),
           getInvalidBlockHashStatus(),
           blobValidationResult.getErrorMessage());
     }

diff --git a/...core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ParentBeaconBlockRootHelper.java b/...core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ParentBeaconBlockRootHelper.java
@@ -25,7 +25,7 @@
 public interface ParentBeaconBlockRootHelper {
 
   // Modulus to use for the timestamp to store the root
-  public static final long HISTORICAL_ROOTS_MODULUS = 8191;
+  public static final long HISTORICAL_ROOTS_MODULUS = 98304;
   public static final Address BEACON_ROOTS_ADDRESS =
       Address.fromHexString("0xbEAC020008aFF7331c0A389CB2AAb67597567d7a");