-
Notifications
You must be signed in to change notification settings - Fork 428
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Introduce ExecutionPayloadParams concept to be able to better compose… (
#5932) * Introduce ExecutionPayloadParams concept to be able to better compose and validate complex method signatures * whitespace * fix CreateBlockRequest * Revert "fix CreateBlockRequest" This reverts commit 21c72e4. * fix * fixes * fix * fix whitespace * support V1 error codes
- Loading branch information
1 parent
b71b755
commit eac4723
Showing
7 changed files
with
76 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
src/Nethermind/Nethermind.Merge.Plugin/Data/IExecutionPayloadParams.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
// SPDX-FileCopyrightText: 2023 Demerzel Solutions Limited | ||
// SPDX-License-Identifier: LGPL-3.0-only | ||
|
||
using System.Collections.Generic; | ||
using System.Diagnostics.CodeAnalysis; | ||
using System.Linq; | ||
using Nethermind.Core.Extensions; | ||
using Nethermind.Core.Specs; | ||
|
||
namespace Nethermind.Merge.Plugin.Data; | ||
|
||
public interface IExecutionPayloadParams | ||
{ | ||
ExecutionPayload ExecutionPayload { get; } | ||
ValidationResult ValidateParams(IReleaseSpec spec, int version, out string? error); | ||
} | ||
|
||
public enum ValidationResult : byte { Success, Fail, Invalid }; | ||
|
||
public class ExecutionPayloadV3Params : IExecutionPayloadParams | ||
{ | ||
private readonly ExecutionPayloadV3 _executionPayload; | ||
private readonly byte[]?[] _blobVersionedHashes; | ||
|
||
public ExecutionPayloadV3Params(ExecutionPayloadV3 executionPayload, byte[]?[] blobVersionedHashes) | ||
{ | ||
_executionPayload = executionPayload; | ||
_blobVersionedHashes = blobVersionedHashes; | ||
} | ||
|
||
public ExecutionPayload ExecutionPayload => _executionPayload; | ||
|
||
public ValidationResult ValidateParams(IReleaseSpec spec, int version, out string? error) | ||
{ | ||
static IEnumerable<byte[]?> FlattenHashesFromTransactions(ExecutionPayloadV3 payload) => | ||
payload.GetTransactions() | ||
.Where(t => t.BlobVersionedHashes is not null) | ||
.SelectMany(t => t.BlobVersionedHashes!); | ||
|
||
if (FlattenHashesFromTransactions(_executionPayload).SequenceEqual(_blobVersionedHashes, Bytes.NullableEqualityComparer)) | ||
{ | ||
error = null; | ||
return ValidationResult.Success; | ||
} | ||
|
||
error = "Blob versioned hashes do not match"; | ||
return ValidationResult.Invalid; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters