Use slot to determine fork version #14653
Open
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
james-prysm
previously approved these changes
Nov 21, 2024
rkapka
requested changes
Nov 21, 2024
| @@ -726,18 +720,19 @@ func (s *Server) GetAttesterSlashingsV2(w http.ResponseWriter, r *http.Request) | |||
| ctx, span := trace.StartSpan(r.Context(), "beacon.GetAttesterSlashingsV2") | |||
| defer span.End() | |||
|
|
|||
| slot := s.HeadFetcher.HeadSlot() | |||
There was a problem hiding this comment.
Head slot is the slot of the most recent block, not the current slot. There is a TimeFetcher interface that can give you the current slot.
Comment on lines
+86
to
+103
| func ToForkVersion(slot primitives.Slot) int { | ||
| epoch := ToEpoch(slot) | ||
| switch { | ||
| case epoch >= params.BeaconConfig().ElectraForkEpoch: | ||
| return version.Electra | ||
| case epoch >= params.BeaconConfig().DenebForkEpoch: | ||
| return version.Deneb | ||
| case epoch >= params.BeaconConfig().CapellaForkEpoch: | ||
| return version.Capella | ||
| case epoch >= params.BeaconConfig().BellatrixForkEpoch: | ||
| return version.Bellatrix | ||
| case epoch >= params.BeaconConfig().AltairForkEpoch: | ||
| return version.Altair | ||
| default: | ||
| return version.Phase0 | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
This is a good candidate for a unit test.
prestonvanloon
requested changes
Nov 21, 2024
james-prysm
reviewed
Nov 22, 2024
| httputil.HandleError(w, "Could not get head state: "+err.Error(), http.StatusInternalServerError) | ||
| return | ||
| v := slots.ToForkVersion(primitives.Slot(slot)) | ||
| if slot == 0 { |
There was a problem hiding this comment.
shouldn't this be based on rawSlot instead of slot?
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?
Other
What does this PR do? Why is it needed?
This PR updates the logic to use the slot instead of the head state version to determine the fork version.
This approach reduces the risk of errors in cases where the block for the first slot of a new fork is delayed or not proposed, which could result in the head state still reflecting the previous fork.
Which issues(s) does this PR fix?
N/A
Other notes for review
Acknowledgements