PreChainStart Activation Fix (#2544)

* fix activation * remove logs * remove logs * revert change * fix test
prysmaticlabs · May 9, 2019 · 5fc6f2d · 5fc6f2d
1 parent 729c45d
commit 5fc6f2d
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 5 deletions.
diff --git a/beacon-chain/rpc/validator_server.go b/beacon-chain/rpc/validator_server.go
@@ -220,8 +220,17 @@ func (vs *ValidatorServer) ValidatorStatus(
 	if err != nil {
 		return nil, fmt.Errorf("could not fetch beacon state: %v", err)
 	}
+	chainStarted, _, err := vs.powChainService.HasChainStartLogOccurred()
+	if err != nil {
+		return nil, err
+	}
+
+	chainStartKeys, err := vs.chainStartPubkeys()
+	if err != nil {
+		return nil, err
+	}
 	validatorIndexMap := stateutils.ValidatorIndexMap(beaconState)
-	return vs.validatorStatus(ctx, req.PublicKey, validatorIndexMap, beaconState), nil
+	return vs.validatorStatus(ctx, req.PublicKey, chainStarted, chainStartKeys, validatorIndexMap, beaconState), nil
 }
 
 // MultipleValidatorStatus returns the validator status response for the set of validators
@@ -235,13 +244,22 @@ func (vs *ValidatorServer) MultipleValidatorStatus(
 	if err != nil {
 		return false, nil, err
 	}
+	chainStarted, _, err := vs.powChainService.HasChainStartLogOccurred()
+	if err != nil {
+		return false, nil, err
+	}
+
+	chainStartKeys, err := vs.chainStartPubkeys()
+	if err != nil {
+		return false, nil, err
+	}
+
 	validatorIndexMap := stateutils.ValidatorIndexMap(beaconState)
 	for i, key := range pubkeys {
 		if ctx.Err() != nil {
 			return false, nil, ctx.Err()
 		}
-
-		status := vs.validatorStatus(ctx, key, validatorIndexMap, beaconState)
+		status := vs.validatorStatus(ctx, key, chainStarted, chainStartKeys, validatorIndexMap, beaconState)
 		resp := &pb.ValidatorActivationResponse_Status{
 			Status:    status,
 			PublicKey: key,
@@ -256,8 +274,9 @@ func (vs *ValidatorServer) MultipleValidatorStatus(
 }
 
 func (vs *ValidatorServer) validatorStatus(
-	ctx context.Context, pubKey []byte, idxMap map[[32]byte]int, beaconState *pbp2p.BeaconState,
-) *pb.ValidatorStatusResponse {
+	ctx context.Context, pubKey []byte, chainStarted bool,
+	chainStartKeys map[[96]byte]bool, idxMap map[[32]byte]int,
+	beaconState *pbp2p.BeaconState) *pb.ValidatorStatusResponse {
 	pk := bytesutil.ToBytes32(pubKey)
 	valIdx, ok := idxMap[pk]
 	_, eth1BlockNumBigInt := vs.beaconDB.DepositByPubkey(ctx, pubKey)
@@ -277,6 +296,23 @@ func (vs *ValidatorServer) validatorStatus(
 		}
 	}
 
+	if !chainStarted {
+		return &pb.ValidatorStatusResponse{
+			Status:                 pb.ValidatorStatus_UNKNOWN_STATUS,
+			ActivationEpoch:        params.BeaconConfig().FarFutureEpoch - params.BeaconConfig().GenesisEpoch,
+			Eth1DepositBlockNumber: eth1BlockNumBigInt.Uint64(),
+		}
+	}
+
+	if exists := chainStartKeys[bytesutil.ToBytes96(pubKey)]; exists {
+		return &pb.ValidatorStatusResponse{
+			Status:                 pb.ValidatorStatus_ACTIVE,
+			ActivationEpoch:        0,
+			Eth1DepositBlockNumber: eth1BlockNumBigInt.Uint64(),
+			DepositInclusionSlot:   0,
+		}
+	}
+
 	depositBlockSlot, err := vs.depositBlockSlot(ctx, beaconState.Slot, eth1BlockNumBigInt, beaconState)
 	if err != nil {
 		return &pb.ValidatorStatusResponse{
@@ -433,3 +469,16 @@ func (vs *ValidatorServer) depositBlockSlot(ctx context.Context, currentSlot uin
 
 	return depositBlockSlot, nil
 }
+
+func (vs *ValidatorServer) chainStartPubkeys() (map[[96]byte]bool, error) {
+	pubkeys := make(map[[96]byte]bool)
+	deposits := vs.powChainService.ChainStartDeposits()
+	for _, dep := range deposits {
+		depInput, err := helpers.DecodeDepositInput(dep)
+		if err != nil {
+			return nil, err
+		}
+		pubkeys[bytesutil.ToBytes96(depInput.Pubkey)] = true
+	}
+	return pubkeys, nil
+}
diff --git a/beacon-chain/rpc/validator_server_test.go b/beacon-chain/rpc/validator_server_test.go
@@ -714,6 +714,7 @@ func TestWaitForActivation_ContextClosed(t *testing.T) {
 		beaconDB:           db,
 		ctx:                ctx,
 		chainService:       newMockChainService(),
+		powChainService:    &mockPOWChainService{},
 		canonicalStateChan: make(chan *pbp2p.BeaconState, 1),
 	}
 	req := &pb.ValidatorActivationRequest{