Repository navigation
Re-add next-epoch lookahead for PTC duties #16591
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -94,18 +94,22 @@ func (vs *Server) dutiesv2(ctx context.Context, req *ethpb.DutiesRequest) (*ethp | |
| return nil, status.Errorf(core.ErrorReasonToGRPC(rpcErr.Reason), "%v", rpcErr.Err) | ||
| } | ||
| } | ||
| // PTC assignments are not stable for the next epoch, so only compute for current epoch. | ||
| currentPTCDuties, rpcErr := vs.CoreService.PTCDuties(ctx, s, req.Epoch, requestIndices) | ||
| if rpcErr != nil { | ||
| return nil, status.Errorf(core.ErrorReasonToGRPC(rpcErr.Reason), "%v", rpcErr.Err) | ||
| } | ||
| nextPTCDuties, rpcErr := vs.CoreService.PTCDuties(ctx, s, req.Epoch+1, requestIndices) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I realized we can probably use .Add(1) instead of +1 for this and other ones |
||
| if rpcErr != nil { | ||
| return nil, status.Errorf(core.ErrorReasonToGRPC(rpcErr.Reason), "%v", rpcErr.Err) | ||
| } | ||
|
|
||
| // Build index maps for O(1) lookup | ||
| currentAttesterMap := buildAttesterMap(currentAttesterDuties) | ||
| nextAttesterMap := buildAttesterMap(nextAttesterDuties) | ||
| proposerMap := buildProposerMap(proposerDuties) | ||
| nextProposerMap := buildProposerMap(nextProposerDuties) | ||
| currentPTCAssignments := buildPTCMap(currentPTCDuties) | ||
| nextPTCAssignments := buildPTCMap(nextPTCDuties) | ||
| validatorAssignments := make([]*ethpb.DutiesV2Response_Duty, 0, len(req.PublicKeys)) | ||
| nextValidatorAssignments := make([]*ethpb.DutiesV2Response_Duty, 0, len(req.PublicKeys)) | ||
|
|
||
|
|
@@ -160,6 +164,10 @@ func (vs *Server) dutiesv2(ctx context.Context, req *ethpb.DutiesRequest) (*ethp | |
| nextDuty.CommitteesAtSlot = ad.CommitteesAtSlot | ||
| nextDuty.ValidatorCommitteeIndex = ad.ValidatorCommitteeIndex | ||
| } | ||
| if ptcSlots, ok := nextPTCAssignments[info.index]; ok { | ||
| nextDuty.PtcSlots = ptcSlots | ||
| } | ||
|
|
||
| // Sync committee flags | ||
| if coreTime.HigherEqualThanAltairVersionAndEpoch(s, req.Epoch) { | ||
| inSync, err := helpers.IsCurrentPeriodSyncCommittee(s, info.index) | ||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ### Changed | ||
|
|
||
| - Re-add next-epoch lookahead for PTC duties and fix REST handler to use explicit requested epoch |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i guess we can do .Add(1) here too