-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Replace validator wait for activation stream with polling (#1…
- Loading branch information
1 parent
470581e
commit 775a694
Showing
18 changed files
with
1,263 additions
and
543 deletions.
There are no files selected for viewing
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
Large diffs are not rendered by default.
Oops, something went wrong.
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| package beacon_api | ||
|
|
||
| import ( | ||
| "context" | ||
| "strconv" | ||
| "time" | ||
|
|
||
| "github.com/ethereum/go-ethereum/common/hexutil" | ||
| "github.com/pkg/errors" | ||
| "github.com/prysmaticlabs/prysm/v5/config/params" | ||
| "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives" | ||
| ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1" | ||
| "google.golang.org/grpc" | ||
| ) | ||
|
|
||
| func (c *beaconApiValidatorClient) waitForActivation(ctx context.Context, in *ethpb.ValidatorActivationRequest) (ethpb.BeaconNodeValidator_WaitForActivationClient, error) { | ||
| return &waitForActivationClient{ | ||
| ctx: ctx, | ||
| beaconApiValidatorClient: c, | ||
| ValidatorActivationRequest: in, | ||
| }, nil | ||
| } | ||
|
|
||
| type waitForActivationClient struct { | ||
| grpc.ClientStream | ||
| ctx context.Context | ||
| *beaconApiValidatorClient | ||
| *ethpb.ValidatorActivationRequest | ||
| lastRecvTime time.Time | ||
| } | ||
|
|
||
| func computeWaitElements(now, lastRecvTime time.Time) (time.Duration, time.Time) { | ||
| nextRecvTime := lastRecvTime.Add(time.Duration(params.BeaconConfig().SecondsPerSlot) * time.Second) | ||
|
|
||
| if lastRecvTime.IsZero() { | ||
| nextRecvTime = now | ||
| } | ||
|
|
||
| if nextRecvTime.Before(now) { | ||
| return time.Duration(0), now | ||
| } | ||
|
|
||
| return nextRecvTime.Sub(now), nextRecvTime | ||
| } | ||
|
|
||
| func (c *waitForActivationClient) Recv() (*ethpb.ValidatorActivationResponse, error) { | ||
| waitDuration, nextRecvTime := computeWaitElements(time.Now(), c.lastRecvTime) | ||
|
|
||
| select { | ||
| case <-time.After(waitDuration): | ||
| c.lastRecvTime = nextRecvTime | ||
|
|
||
| // Represents the target set of keys | ||
| stringTargetPubKeysToPubKeys := make(map[string][]byte, len(c.ValidatorActivationRequest.PublicKeys)) | ||
| stringTargetPubKeys := make([]string, len(c.ValidatorActivationRequest.PublicKeys)) | ||
|
|
||
| // Represents the set of keys actually returned by the beacon node | ||
| stringRetrievedPubKeys := make(map[string]struct{}) | ||
|
|
||
| // Contains all keys in targetPubKeys but not in retrievedPubKeys | ||
| var missingPubKeys [][]byte | ||
|
|
||
| var statuses []*ethpb.ValidatorActivationResponse_Status | ||
|
|
||
| for index, publicKey := range c.ValidatorActivationRequest.PublicKeys { | ||
| stringPubKey := hexutil.Encode(publicKey) | ||
| stringTargetPubKeysToPubKeys[stringPubKey] = publicKey | ||
| stringTargetPubKeys[index] = stringPubKey | ||
| } | ||
|
|
||
| stateValidators, err := c.stateValidatorsProvider.StateValidators(c.ctx, stringTargetPubKeys, nil, nil) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "failed to get state validators") | ||
| } | ||
|
|
||
| for _, data := range stateValidators.Data { | ||
| pubkey, err := hexutil.Decode(data.Validator.Pubkey) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "failed to parse validator public key") | ||
| } | ||
|
|
||
| stringRetrievedPubKeys[data.Validator.Pubkey] = struct{}{} | ||
|
|
||
| index, err := strconv.ParseUint(data.Index, 10, 64) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "failed to parse validator index") | ||
| } | ||
|
|
||
| validatorStatus, ok := beaconAPITogRPCValidatorStatus[data.Status] | ||
| if !ok { | ||
| return nil, errors.New("invalid validator status: " + data.Status) | ||
| } | ||
|
|
||
| statuses = append(statuses, ðpb.ValidatorActivationResponse_Status{ | ||
| PublicKey: pubkey, | ||
| Index: primitives.ValidatorIndex(index), | ||
| Status: ðpb.ValidatorStatusResponse{Status: validatorStatus}, | ||
| }) | ||
| } | ||
|
|
||
| for stringTargetPubKey, targetPubKey := range stringTargetPubKeysToPubKeys { | ||
| if _, ok := stringRetrievedPubKeys[stringTargetPubKey]; !ok { | ||
| missingPubKeys = append(missingPubKeys, targetPubKey) | ||
| } | ||
| } | ||
|
|
||
| for _, missingPubKey := range missingPubKeys { | ||
| statuses = append(statuses, ðpb.ValidatorActivationResponse_Status{ | ||
| PublicKey: missingPubKey, | ||
| Index: primitives.ValidatorIndex(^uint64(0)), | ||
| Status: ðpb.ValidatorStatusResponse{Status: ethpb.ValidatorStatus_UNKNOWN_STATUS}, | ||
| }) | ||
| } | ||
|
|
||
| return ðpb.ValidatorActivationResponse{ | ||
| Statuses: statuses, | ||
| }, nil | ||
| case <-c.ctx.Done(): | ||
| return nil, errors.New("context canceled") | ||
| } | ||
| } |
Oops, something went wrong.