payload attribute computations in event handler #14963
Open
+209
−92
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
…py path unit test for code coverage
james-prysm
changed the title
rkapka
reviewed
Mar 4, 2025
| } | ||
| }() | ||
| if lr == nil { | ||
| log.Warn("event stream skipping a nil lazy event reader callback") |
There was a problem hiding this comment.
Suggested change
| log.Warn("event stream skipping a nil lazy event reader callback") | |
| log.Warn("Event stream skipping a nil lazy event reader callback") |
| r := lr() | ||
| if r == nil { | ||
| log.Warn("event stream skipping a nil event reader") |
There was a problem hiding this comment.
Suggested change
| log.Warn("event stream skipping a nil event reader") | |
| log.Warn("Event stream skipping a nil event reader") |
| // all of the checked fields empty, so the logical short circuit should hit immediately. | ||
| func needsFill(ev payloadattribute.EventData) bool { | ||
| return ev.HeadState == nil || ev.HeadState.IsNil() || | ||
| ev.HeadState.LatestBlockHeader() == nil || ev.HeadState.LatestBlockHeader() == nil || |
There was a problem hiding this comment.
ev.HeadState.LatestBlockHeader() == nil is checked twice
| attr, err := s.computePayloadAttributes(ctx, ev) | ||
| ev.HeadState, err = s.HeadFetcher.HeadState(ctx) | ||
| if err != nil { | ||
| return ev, errors.Wrap(err, "Could not get head state") |
There was a problem hiding this comment.
Suggested change
| return ev, errors.Wrap(err, "Could not get head state") | |
| return ev, errors.Wrap(err, "could not get head state") |
|
|
||
| ev.HeadBlock, err = s.HeadFetcher.HeadBlock(ctx) | ||
| if err != nil { | ||
| return ev, errors.Wrap(err, "Could not look up head block") |
There was a problem hiding this comment.
Suggested change
| return ev, errors.Wrap(err, "Could not look up head block") | |
| return ev, errors.Wrap(err, "could not look up head block") |
| } | ||
| ev.HeadRoot, err = ev.HeadBlock.Block().HashTreeRoot() | ||
| if err != nil { | ||
| return ev, errors.Wrap(err, "Could not compute head block root") |
There was a problem hiding this comment.
Suggested change
| return ev, errors.Wrap(err, "Could not compute head block root") | |
| return ev, errors.Wrap(err, "could not compute head block root") |
|
|
||
| hsr, err := ev.HeadState.LatestBlockHeader().HashTreeRoot() | ||
| if err != nil { | ||
| return ev, errors.Wrap(err, "Could not compute latest block header root") |
There was a problem hiding this comment.
Suggested change
| return ev, errors.Wrap(err, "Could not compute latest block header root") | |
| return ev, errors.Wrap(err, "could not compute latest block header root") |
| if err != nil { | ||
| return ev, errors.Wrap(err, "Could not compute payload attributes") | ||
| return ev, errors.Wrap(err, "Could not run process blocks on head state into the proposal slot epoch") |
There was a problem hiding this comment.
Suggested change
| return ev, errors.Wrap(err, "Could not run process blocks on head state into the proposal slot epoch") | |
| return ev, errors.Wrap(err, "could not run process blocks on head state into the proposal slot epoch") |
|
|
||
| payload, err := ev.HeadBlock.Block().Body().Execution() | ||
| if err != nil { | ||
| return ev, errors.Wrap(err, "Could not get execution payload for head block") |
There was a problem hiding this comment.
Suggested change
| return ev, errors.Wrap(err, "Could not get execution payload for head block") | |
| return ev, errors.Wrap(err, "could not get execution payload for head block") |
rkapka
reviewed
Mar 4, 2025
Comment on lines
+177
to
+179
| // the fcu args have differing amounts of completeness based on the code path, | ||
| // and there is work we only want to do if a client is actually listening to the events beacon api endpoint. | ||
| // temporary solution: just fire a blank event and fill in the details in the api handler. |
There was a problem hiding this comment.
Removing the cfg parameter means that in case of firing from notifyForkchoiceUpdate you have to do extra work in the handler, since you need to recompute what you already have available. What about leaving the parameter and filling event data only when cfg != nil? You can then pass nil as the value in lateBlockTasks.
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.
What type of PR is this?
Bug fix
What does this PR do? Why is it needed?
This fixes the payload attribute event bugs referenced here:
#14644 (comment)
Other notes for review
Further testing is required, particularly if head is far behind, process_slots can timeout and trigger errors in the event stream response, which may need additional handling.
Acknowledgements