extend light client protocol for Electra #6375
Merged
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
Add missing Electra support for light client protocol: - ethereum/consensus-specs#3811 Tested against PR consensus-spec-tests, the test runner automatically picks up the new tests once available.
tersec
reviewed
Jun 26, 2024
| @@ -188,8 +213,71 @@ template kind*( | |||
| deneb.LightClientStore]): LightClientDataFork = | |||
| LightClientDataFork.Deneb | |||
|
|
|||
| template kind*( | |||
| x: typedesc[ # `SomeLightClientObject` doesn't work here (Nim 1.6) | |||
There was a problem hiding this comment.
Might link to nim-lang/Nim#18095 here
tersec
reviewed
Jun 26, 2024
| @@ -951,6 +1135,108 @@ func toDenebLightClientHeader( | |||
| execution_branch: blck.message.body.build_proof( | |||
| capella.EXECUTION_PAYLOAD_GINDEX).get) | |||
|
|
|||
| # https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.3/specs/electra/light-client/full-node.md#modified-block_to_light_client_header | |||
| func toElectraLightClientHeader( | |||
| blck: # `SomeSignedBeaconBlock` doesn't work here (Nim 1.6) | |||
tersec
reviewed
Jun 26, 2024
| beacon: blck.message.toBeaconBlockHeader()) | ||
|
|
||
| func toElectraLightClientHeader( | ||
| blck: # `SomeSignedBeaconBlock` doesn't work here (Nim 1.6) |
There was a problem hiding this comment.
This way it won't be a mystery to check if/when it's eventually fixed
tersec
reviewed
Jun 26, 2024
| capella.EXECUTION_PAYLOAD_GINDEX).get) | ||
|
|
||
| func toElectraLightClientHeader( | ||
| blck: # `SomeSignedBeaconBlock` doesn't work here (Nim 1.6) |
tersec
reviewed
Jun 26, 2024
| capella.EXECUTION_PAYLOAD_GINDEX).get) | ||
|
|
||
| func toElectraLightClientHeader( | ||
| blck: # `SomeSignedBeaconBlock` doesn't work here (Nim 1.6) |
tersec
reviewed
Jun 26, 2024
| hash_tree_root(payload.consolidation_requests)), | ||
| execution_branch: blck.message.body.build_proof( | ||
| capella.EXECUTION_PAYLOAD_GINDEX).get) | ||
|
|
||
| func toLightClientHeader*( | ||
| blck: # `SomeSignedBeaconBlock` doesn't work here (Nim 1.6) |
tersec
reviewed
Jun 26, 2024
| @@ -990,9 +1275,13 @@ func shortLog*[ | |||
| capellaData: typeof(x.capellaData.shortLog()) | |||
| of LightClientDataFork.Deneb: | |||
| denebData: typeof(x.denebData.shortLog()) | |||
| of LightClientDataFork.Electra: | |||
| electraData: typeof(x.electraData.shortLog()) | |||
|
|
|||
| let xKind = x.kind # Nim 1.6.12: Using `kind: x.kind` inside case is broken | |||
There was a problem hiding this comment.
Was this ever isolated/reproduced/fixed/reported/already-reported-upstream or maybe fixed in 2.0.6?
There was a problem hiding this comment.
not reported upstream, but this is the error that is produced when trying to inline x.kind:
Error: a case selecting discriminator 'kind' with value 'x.kind' appears in the object construction, but the field(s) 'denebData' are in conflict with this value.
Still applies to 2.0.6, have updated the comment in #6389
|
Also for all the "... works in Nim 1.6 ..." etc comments, as of the last couple days, |
tersec
reviewed
Jun 26, 2024
|
|
||
| if epoch < cfg.CAPELLA_FORK_EPOCH: | ||
| return | ||
| header.execution == default(ExecutionPayloadHeader) and |
There was a problem hiding this comment.
In general,
type L = object
a: string
b: int
c: array[32, byte]
d: array[32, byte]
e: uint64
func a(x: L): bool =
x == default(L)
discard a(L())produces, with Nim 2.0.6 using refc,
struct tyObject_L__0ubpPjj6L2pwUQ1bt60yqg {
NimStringDesc *a;
NI b;
tyArray__vEOa9c5qaE9ajWxR5R4zwfQg c;
tyArray__vEOa9c5qaE9ajWxR5R4zwfQg d;
NU64 e;
};
...
N_LIB_PRIVATE N_NIMCALL(NIM_BOOL,
a__a_u7)(tyObject_L__0ubpPjj6L2pwUQ1bt60yqg *x_p0) {
NIM_BOOL result;
tyObject_L__0ubpPjj6L2pwUQ1bt60yqg T1_;
result = (NIM_BOOL)0;
nimZeroMem((void *)(&T1_), sizeof(tyObject_L__0ubpPjj6L2pwUQ1bt60yqg));
result = eqeq___a_u15(x_p0, (&T1_));
popFrame();
return result;
}whereas
type L = object
a: string
b: int
c: array[32, byte]
d: array[32, byte]
e: uint64
func a(x: L): bool =
x == static(default(L))
discard a(L())results in
struct tyObject_L__0ubpPjj6L2pwUQ1bt60yqg {
NimStringDesc *a;
NI b;
tyArray__vEOa9c5qaE9ajWxR5R4zwfQg c;
tyArray__vEOa9c5qaE9ajWxR5R4zwfQg d;
NU64 e;
};
...
static NIM_CONST tyObject_L__0ubpPjj6L2pwUQ1bt60yqg
TM__R8RUzYq41iOx0I9bZH5Nyrw_2 = {
((NimStringDesc *)NIM_NIL),
((NI)0),
{((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0),
((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0),
((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0),
((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0),
((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0)},
{((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0),
((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0),
((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0),
((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0),
((NU8)0), ((NU8)0), ((NU8)0), ((NU8)0)},
0ULL};
...
N_LIB_PRIVATE N_NIMCALL(NIM_BOOL,
a__a_u7)(tyObject_L__0ubpPjj6L2pwUQ1bt60yqg *x_p0) {
NIM_BOOL result;
result = (NIM_BOOL)0;
result = eqeq___a_u15(x_p0, (&TM__R8RUzYq41iOx0I9bZH5Nyrw_2));
popFrame();
return result;
}It's possible gcc and clang can both under -O3 -flto deduce that they don't have to consume the stack space, reinitialize/zero every time, et cetera, but that seems fairly excessive when wrapping the default(...) as static(default(...)) or using const foo = default(...); compare_with(foo) avoids the per-call construction/zeroing/stack space altogether of this object.
etan-status
added a commit
that referenced
this pull request
Jun 26, 2024
Addresses feedback from #6375 that is applicable to pre-existing code moreso than to the new PR.
tersec
pushed a commit
that referenced
this pull request
Jun 26, 2024
Addresses feedback from #6375 that is applicable to pre-existing code moreso than to the new PR.
etan-status
added a commit
that referenced
this pull request
Aug 6, 2024
Followup on incorrect upgrade procedure in #6375 where `blob_gas_used` was accidentally copied into `excess_blob_gas` when running Electra `LightClientStore` with earlier `LightClient(Bootstrap|Update)`.
tersec
pushed a commit
that referenced
this pull request
Aug 6, 2024
Followup on incorrect upgrade procedure in #6375 where `blob_gas_used` was accidentally copied into `excess_blob_gas` when running Electra `LightClientStore` with earlier `LightClient(Bootstrap|Update)`.
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.
Add missing Electra support for light client protocol:
Tested against PR consensus-spec-tests, the test runner automatically picks up the new tests once available.