OPify engine_getPayloadV4 (#10328)

Author: flcl42

src/Nethermind/Nethermind.Optimism/Rpc/IOptimismEngineRpcModule.cs

@@ -81,7 +81,7 @@ Task<ResultWrapper<PayloadStatusV1>> engine_newPayloadV3(ExecutionPayloadV3 exec
         Description = "Returns the most recent version of an execution payload and fees with respect to the transaction set contained by the mempool.",
         IsSharable = true,
         IsImplemented = true)]
-    public Task<ResultWrapper<GetPayloadV4Result?>> engine_getPayloadV4(byte[] payloadId);
+    public Task<ResultWrapper<OptimismGetPayloadV4Result?>> engine_getPayloadV4(byte[] payloadId);
 
     [JsonRpcMethod(
         Description = "Signals which protocol version is recommended and required.",

src/Nethermind/Nethermind.Optimism/Rpc/OptimismEngineRpcModule.cs

@@ -70,9 +70,10 @@ public Task<ResultWrapper<PayloadStatusV1>> engine_newPayloadV4(OptimismExecutio
         return _engineRpcModule.engine_newPayloadV4(executionPayload, blobVersionedHashes, parentBeaconBlockRoot, executionRequests);
     }
 
-    public Task<ResultWrapper<GetPayloadV4Result?>> engine_getPayloadV4(byte[] payloadId)
+    public async Task<ResultWrapper<OptimismGetPayloadV4Result?>> engine_getPayloadV4(byte[] payloadId)
     {
-        return _engineRpcModule.engine_getPayloadV4(payloadId);
+        ResultWrapper<GetPayloadV4Result?> result = await _engineRpcModule.engine_getPayloadV4(payloadId);
+        return ResultWrapper<OptimismGetPayloadV4Result?>.From(result, result.Data is null ? null : new OptimismGetPayloadV4Result(result.Data));
     }
 
     public ResultWrapper<OptimismSignalSuperchainV1Result> engine_signalSuperchainV1(OptimismSuperchainSignal signal)

src/Nethermind/Nethermind.Optimism/Rpc/OptimismGetPayloadV3Result.cs

@@ -9,7 +9,7 @@ namespace Nethermind.Optimism.Rpc;
 
 public class OptimismGetPayloadV3Result
 {
-    public OptimismGetPayloadV3Result(GetPayloadV3Result result)
+    public OptimismGetPayloadV3Result(GetPayloadV3Result<ExecutionPayloadV3> result)
     {
         ExecutionPayload = result.ExecutionPayload;
         BlockValue = result.BlockValue;

src/Nethermind/Nethermind.Optimism/Rpc/OptimismGetPayloadV4Result.cs

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using Nethermind.Merge.Plugin.Data;
+
+namespace Nethermind.Optimism.Rpc;
+
+public class OptimismGetPayloadV4Result(GetPayloadV4Result result) : OptimismGetPayloadV3Result(result)
+{
+    public byte[][]? ExecutionRequests { get; } = result.ExecutionRequests;
+
+    public override string ToString() =>
+        $"{{ExecutionPayload: {ExecutionPayload}, Fees: {BlockValue}, BlobsBundle blobs count: {BlobsBundle.Blobs.Length}, ShouldOverrideBuilder {ShouldOverrideBuilder}, ExecutionRequests count : {ExecutionRequests?.Length}}}";
+}