Implement Stream Duties in Validator Client #5814
Closed
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
rauljordan
commented
May 11, 2020
| @@ -37,7 +38,8 @@ func (vs *Server) StreamDuties(req *ethpb.DutiesRequest, stream ethpb.BeaconNode | |||
| } | |||
|
|
|||
| // We compute duties the very first time the endpoint is called. | |||
| res, err := vs.duties(stream.Context(), req) | |||
| currentEpoch := slotutil.EpochsSinceGenesis(vs.GenesisTimeFetcher.GenesisTime()) | |||
There was a problem hiding this comment.
Given duties are now a server-side stream, the beacon node needs to use an epoch ticker using roughtime to determine the duties instead of expecting an epoch argument in the grpc request
| @@ -66,6 +68,7 @@ func (vs *Server) StreamDuties(req *ethpb.DutiesRequest, stream ethpb.BeaconNode | |||
| case ev := <-stateChannel: | |||
| // If a reorg occurred, we recompute duties for the connected validator clients | |||
| // and send another response over the server stream right away. | |||
| currentEpoch = slotutil.EpochsSinceGenesis(vs.GenesisTimeFetcher.GenesisTime()) | |||
There was a problem hiding this comment.
If a reorg occurs, we still need to use the clock time to determine duties
| @@ -149,7 +152,7 @@ func (vs *Server) duties(ctx context.Context, req *ethpb.DutiesRequest) (*ethpb. | |||
| } | |||
|
|
|||
| return ðpb.DutiesResponse{ | |||
| Duties: validatorAssignments, | |||
| CurrentEpochDuties: validatorAssignments, | |||
There was a problem hiding this comment.
Duties is now deprecated. Instead, we send out current epoch duties and next epoch duties
| @@ -300,108 +300,6 @@ func (v *validator) SlotDeadline(slot uint64) time.Time { | |||
| return time.Unix(int64(v.genesisTime), 0 /*ns*/).Add(time.Duration(secs) * time.Second) | |||
| } | |||
|
|
|||
| // UpdateDuties checks the slot number to determine if the validator's | |||
There was a problem hiding this comment.
Moved this to its own file for clarity and isolation
| @@ -447,8 +345,8 @@ func (v *validator) RolesAt(ctx context.Context, slot uint64) (map[[48]byte][]va | |||
| // UpdateProtections goes through the duties of the given slot and fetches the required validator history, | |||
| // assigning it in validator. | |||
| func (v *validator) UpdateProtections(ctx context.Context, slot uint64) error { | |||
| attestingPubKeys := make([][48]byte, 0, len(v.duties.Duties)) | |||
There was a problem hiding this comment.
The .Duties type is deprecated
| res, err := stream.Recv() | ||
| // If the stream is closed, we stop the loop. | ||
| if err == io.EOF { | ||
| break |
There was a problem hiding this comment.
What should we do here? Safe to break? Panic?
2 tasks
|
Closing in favor of #5867 |
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?
What does this PR do? Why is it needed?
This PR is the follow-up to #5685, which now uses the server-side stream to update the validator client and call out to this function. This PR also does a few amends to the server-side implementation, where there were a few mismatches in requirements.
Other notes for review