Send correct state root with finalization event #13842
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
saolyn
reviewed
Apr 2, 2024
| e := notifier.ReceivedEvents()[0] | ||
| assert.Equal(t, statefeed.FinalizedCheckpoint, int(e.Type)) | ||
| fc, ok := e.Data.(*ethpbv1.EventFinalizedCheckpoint) | ||
| require.Equal(t, true, ok, "event has wrong data type") |
There was a problem hiding this comment.
If it's true then it should be okay, why do you have what seems like an error message here as well?
There was a problem hiding this comment.
In the require.Equal fails during tests execution, then "event has wrong data type" is displayed. It helps for test debugging.
nalepae
approved these changes
Apr 2, 2024
| @@ -443,16 +443,25 @@ func (s *Service) updateFinalizationOnBlock(ctx context.Context, preState, postS | |||
|
|
|||
| // sendNewFinalizedEvent sends a new finalization checkpoint event over the | |||
| // event feed. It needs to be called on the background | |||
| func (s *Service) sendNewFinalizedEvent(signed interfaces.ReadOnlySignedBeaconBlock, postState state.BeaconState) { | |||
| func (s *Service) sendNewFinalizedEvent(ctx context.Context, postState state.BeaconState) { | |||
| isValidPayload := false | |||
| s.headLock.RLock() | |||
| if s.head != nil { | |||
| isValidPayload = s.head.optimistic | |||
There was a problem hiding this comment.
I know this line has not be modified in this PR, but this case is not tested, and I guess it's quite an important case to test.
| isValidPayload := false | ||
| s.headLock.RLock() | ||
| if s.head != nil { | ||
| isValidPayload = s.head.optimistic | ||
| } | ||
| s.headLock.RUnlock() | ||
|
|
||
| blk, err := s.cfg.BeaconDB.Block(ctx, bytesutil.ToBytes32(postState.FinalizedCheckpoint().Root)) | ||
| if err != nil { | ||
| log.WithError(err).Error("Could not retrieve block for finalized checkpoint root. Finalized event will not be emitted") |
| return | ||
| } | ||
| if blk == nil || blk.IsNil() || blk.Block() == nil || blk.Block().IsNil() { | ||
| log.WithError(err).Error("Block retrieved for finalized checkpoint root is nil. Finalized event will not be emitted") |
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?
When sending the finalized event to the event feed we send the root of the received block's state as the finalized state root, but it should be the root of the finalized block's state.
Which issues(s) does this PR fix?
Fixes #13752