feat: properly consider Eth-Consensus-Version header #6582
Closed
Conversation
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
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## unstable #6582 +/- ##
============================================
+ Coverage 61.49% 61.50% +0.01%
============================================
Files 556 556
Lines 58895 58917 +22
Branches 1856 1857 +1
============================================
+ Hits 36216 36236 +20
- Misses 22638 22640 +2
Partials 41 41 |
Performance Report✔️ no performance regression detected 🚀🚀 Significant benchmark improvement detected
Full benchmark results
|
nflaig
reviewed
Mar 25, 2024
| publishBlockV2: { | ||
| body: unknown; | ||
| query: {broadcast_validation?: string}; | ||
| headers: {"eth-consensus-version"?: ForkName}; |
There was a problem hiding this comment.
you can't be sure this is a valid ForkName here, as I think we shouldn't be modifying the server side in this PR it doesn't matter much but it is safer to handle this as string as header value needs to be validated first
Suggested change
| headers: {"eth-consensus-version"?: ForkName}; | |
| headers: {"eth-consensus-version"?: string}; |
nflaig
reviewed
Mar 25, 2024
| @@ -187,7 +187,7 @@ export type Api = { | |||
|
|
|||
| publishBlockV2( | |||
| blockOrContents: allForks.SignedBeaconBlockOrContents, | |||
| opts?: {broadcastValidation?: BroadcastValidation} | |||
| opts?: {broadcastValidation?: BroadcastValidation; version?: ForkName} | |||
There was a problem hiding this comment.
relying on consumer to provide this is not correct, this is mandatory and should be handled internally by the API client
nflaig
requested changes
Mar 25, 2024
There was a problem hiding this comment.
This PR does not address the actual problem noted in #6580 that we are not setting the header when sending the request.
As noted in #6580 (comment) I don't think it is worth it to change the behavior on the server at all, current approach works and it compatible with all clients. Would prefer to keep this PR minimal to avoid regressions and cause less conflicts on refactor branch.
Header is still missing
{
host: '127.0.0.1:9596',
connection: 'keep-alive',
'content-type': 'application/json',
accept: '*/*',
'accept-language': '*',
'sec-fetch-mode': 'cors',
'user-agent': 'node',
'accept-encoding': 'gzip, deflate',
'content-length': '1022'
}| body: createAllForksSignedBlockOrContents(version).toJson(item), | ||
| query: {broadcast_validation: broadcastValidation}, | ||
| }; | ||
| const headers = version !== undefined ? {"eth-consensus-version": version} : {}; |
There was a problem hiding this comment.
Version header must be set as per spec, see how this is handled in the refactored api client
lodestar/packages/api/src/beacon/routes/beacon/block.ts
Lines 357 to 370 in c3afb0b
|
Superseded by #6593 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Follow the beacon-APIs specs.
Description
Get the consensus version of submitted block from the
Eth-Consensus-Versionheader value. Falls back to current behavior (extract from the submitted block payload) if not submitted.Test by executing the following command, with
block.jsoncontaining the appropriate block data:Fixes #6580