fix: use right slot number for future epoch of proposers duties - #6545
Merged
Conversation
nazarhussain
changed the title
nazarhussain
changed the title
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## unstable #6545 +/- ##
=========================================
Coverage 61.46% 61.46%
=========================================
Files 556 556
Lines 58652 58652
Branches 1848 1848
=========================================
Hits 36051 36051
Misses 22561 22561
Partials 40 40 |
Contributor
Performance Report鉁旓笍 no performance regression detected 馃殌馃殌 Significant benchmark improvement detected
Full benchmark results
|
jeluard
reviewed
Mar 15, 2024
| const clk = | ||
| clock === "real" | ||
| ? new Clock({config, genesisTime: 0, signal: new AbortController().signal}) | ||
| : { |
Contributor
There was a problem hiding this comment.
Introducing a small utility function to create this dummy Clock would improve readability.
Member
There was a problem hiding this comment.
we should probably look into reusing ClockMock from validator client
| currentSlotWithGossipDisparity: undefined, | ||
| isCurrentSlotGivenGossipDisparity: vi.fn(), | ||
| }, | ||
| clock: clk, |
Contributor
There was a problem hiding this comment.
Nitpick: could we possibly rename clk to clock, and the previous clock to something else?
Contributor
There was a problem hiding this comment.
Or maybe clock should be a parameter to this function, with a default value to the most common one.
| const pubkeys = getPubkeysForIndices(state.validators, indexes); | ||
|
|
||
| const startSlot = computeStartSlotAtEpoch(stateEpoch); | ||
| const startSlot = computeStartSlotAtEpoch(epoch); |
Contributor
There was a problem hiding this comment.
This is the fix, right? Maybe it would be worth adding a comment clarifying what is done here?
Member
There was a problem hiding this comment.
The previous code would have deserved a comment on why we use the stateEpoch instead of actual requested epoch which didn't make sense of course. But it makes sense now, shouldn't require a comment imo
nflaig
reviewed
Mar 15, 2024
| const pubkeys = getPubkeysForIndices(state.validators, indexes); | ||
|
|
||
| const startSlot = computeStartSlotAtEpoch(stateEpoch); | ||
| const startSlot = computeStartSlotAtEpoch(epoch); |
Member
There was a problem hiding this comment.
The previous code would have deserved a comment on why we use the stateEpoch instead of actual requested epoch which didn't make sense of course. But it makes sense now, shouldn't require a comment imo
| const clk = | ||
| clock === "real" | ||
| ? new Clock({config, genesisTime: 0, signal: new AbortController().signal}) | ||
| : { |
Member
There was a problem hiding this comment.
we should probably look into reusing ClockMock from validator client
jeluard
previously approved these changes
Mar 15, 2024
nflaig
previously approved these changes
Mar 15, 2024
nflaig
approved these changes
Mar 15, 2024
Member
|
馃帀 This PR is included in v1.18.0 馃帀 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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
Fix the block proper duties slot numbers.
Description
When the proposer duties API is called with future epoch, the wrong slot index was used. As given below we are calling for epoch 1, so the slot should start from 8, not for 0. (with minimal preset).
Steps to test or reproduce