Skip to content

requests validation hotfix #8156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjnrohit merged 6 commits into from
Feb 4, 2025
Merged

requests validation hotfix #8156

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
04939be
requests validation hotfix
rjnrohit Feb 3, 2025
9b347d6
fix test
rjnrohit Feb 3, 2025
d134e1f
revert prague tests
rjnrohit Feb 3, 2025
c45f2d3
add tests
rjnrohit Feb 4, 2025
a226fb1
format files
rjnrohit Feb 4, 2025
a16beaf
Merge branch 'master' into requests_validation_fix
rjnrohit Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.V4.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ private async Task<IReadOnlyList<ExecutionPayload>> ProduceBranchV4(IEngineRpcMo
ExecutionPayloadV3? getPayloadResult = await BuildAndGetPayloadOnBranchV4(rpc, chain, parentHeader,
parentBlock.Timestamp + 12,
random ?? TestItem.KeccakA, Address.Zero);
PayloadStatusV1 payloadStatusResponse = (await rpc.engine_newPayloadV4(getPayloadResult, [], Keccak.Zero, executionRequests: withRequests ? ExecutionRequestsProcessorMock.Requests : new byte[][] { [], [], [] })).Data;
PayloadStatusV1 payloadStatusResponse = (await rpc.engine_newPayloadV4(getPayloadResult, [], Keccak.Zero, executionRequests: withRequests ? ExecutionRequestsProcessorMock.Requests : new byte[][] { })).Data;
payloadStatusResponse.Status.Should().Be(PayloadStatus.Valid);
if (setHead)
{
Expand Down
24 changes: 23 additions & 1 deletion src/Nethermind/Nethermind.Merge.Plugin/Data/IExecutionPayloadParams.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,29 @@ public ValidationResult ValidateParams(IReleaseSpec spec, int version, out strin
if (ExecutionRequests.Length > ExecutionRequestExtensions.MaxRequestsCount)
{
error = $"Execution requests must have less than {ExecutionRequestExtensions.MaxRequestsCount} items";
return ValidationResult.Invalid;
return ValidationResult.Fail;
}

// verification of the requests
for (int i = 0; i < ExecutionRequests.Length; i++)
{
if (ExecutionRequests[i] == null || ExecutionRequests[i].Length <= 1)
{
error = "Execution request data must be longer than 1 byte";
return ValidationResult.Fail;
}

if (i > 0 && ExecutionRequests[i][0] <= ExecutionRequests[i - 1][0])
{
error = "Execution requests must be ordered by request_type in ascending order";
return ValidationResult.Fail;
}

if (ExecutionRequests.Skip(i + 1).Any(req => req != null && req[0] == ExecutionRequests[i][0]))
{
error = "Execution requests must not contain duplicate request_type";
return ValidationResult.Fail;
}
}

}
Expand Down