Fix validator prev balance calculation

beacon-chain/rpc/attester_server.go

@@ -122,7 +122,8 @@ func (as *AttesterServer) RequestAttestation(ctx context.Context, req *pb.Attest
 	if err != nil {
 		return nil, fmt.Errorf("could not fetch head state: %v", err)
 	}
-	headState, err = state.ProcessSlots(ctx, headState, headBlock.Slot)
+
+	headState, err = state.ProcessSlots(ctx, headState, req.Slot)
 	if err != nil {
 		return nil, fmt.Errorf("could not process slot: %v", err)
 	}
@@ -140,7 +141,7 @@ func (as *AttesterServer) RequestAttestation(ctx context.Context, req *pb.Attest
 		}
 	}
 
-	startEpoch := headState.PreviousCrosslinks[req.Shard].EndEpoch
+	startEpoch := headState.CurrentCrosslinks[req.Shard].EndEpoch
 	endEpoch := startEpoch + params.BeaconConfig().MaxEpochsPerCrosslink
 	if endEpoch > targetEpoch {
 		endEpoch = targetEpoch

beacon-chain/rpc/attester_server_test.go

@@ -150,6 +150,7 @@ func TestRequestAttestation_OK(t *testing.T) {
 	}
 	req := &pb.AttestationRequest{
 		Shard: 0,
+		Slot:  3*params.BeaconConfig().SlotsPerEpoch + 1,
 	}
 	res, err := attesterServer.RequestAttestation(context.Background(), req)
 	if err != nil {
@@ -266,6 +267,7 @@ func TestAttestationDataAtSlot_handlesFarAwayJustifiedEpoch(t *testing.T) {
 	}
 	req := &pb.AttestationRequest{
 		Shard: 0,
+		Slot:  10000,
 	}
 	res, err := attesterServer.RequestAttestation(context.Background(), req)
 	if err != nil {

beacon-chain/rpc/proposer_server.go

@@ -143,8 +143,11 @@ func (ps *ProposerServer) attestations(ctx context.Context, expectedSlot uint64)
 		return nil, fmt.Errorf("could not retrieve pending attest ations from operations service: %v", err)
 	}
 	// advance slot, if it is behind
-	for beaconState.Slot < expectedSlot {
-		beaconState.Slot++
+	if beaconState.Slot < expectedSlot {
+		beaconState, err = state.ProcessSlots(ctx, beaconState, expectedSlot)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	var attsReadyForInclusion []*pbp2p.Attestation

beacon-chain/rpc/proposer_server_test.go

@@ -301,8 +301,11 @@ func TestPendingAttestations_FiltersExpiredAttestations(t *testing.T) {
 			StartEpoch: 9,
 			DataRoot:   params.BeaconConfig().ZeroHash[:],
 		}},
-		RandaoMixes:      make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
-		ActiveIndexRoots: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
+		RandaoMixes:       make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
+		ActiveIndexRoots:  make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
+		StateRoots:        make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
+		BlockRoots:        make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
+		LatestBlockHeader: &pbp2p.BeaconBlockHeader{StateRoot: []byte{}},
 	}
 
 	if err := db.SaveState(ctx, beaconState); err != nil {

validator/client/service.go

@@ -104,6 +104,7 @@ func (v *ValidatorService) Start() {
 		keys:                 v.keys,
 		pubkeys:              pubkeys,
 		logValidatorBalances: v.logValidatorBalances,
+		prevBalance:          make(map[[48]byte]uint64),
 	}
 	go run(v.ctx, v.validator)
 }

validator/client/validator.go

@@ -28,7 +28,7 @@ type validator struct {
 	attesterClient       pb.AttesterServiceClient
 	keys                 map[string]*keystore.Key
 	pubkeys              [][]byte
-	prevBalance          uint64
+	prevBalance          map[[48]byte]uint64
 	logValidatorBalances bool
 }
 

validator/client/validator_metrics.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	pb "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1"
+	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/sirupsen/logrus"
 )
@@ -24,13 +25,13 @@ func (v *validator) LogValidatorGainsAndLosses(ctx context.Context, slot uint64)
 		return nil
 	}
 
-	epoch := slot / params.BeaconConfig().SlotsPerEpoch
-	if epoch == 0 {
-		v.prevBalance = params.BeaconConfig().MaxEffectiveBalance
-	}
-	var totalPrevBalance uint64
 	reported := false
 	for _, pkey := range v.pubkeys {
+
+		if slot < params.BeaconConfig().SlotsPerEpoch {
+			v.prevBalance[bytesutil.ToBytes48(pkey)] = params.BeaconConfig().MaxEffectiveBalance
+		}
+
 		req := &pb.ValidatorPerformanceRequest{
 			Slot:      slot,
 			PublicKey: pkey,
@@ -61,8 +62,8 @@ func (v *validator) LogValidatorGainsAndLosses(ctx context.Context, slot uint64)
 		}
 		newBalance := float64(resp.Balance) / float64(params.BeaconConfig().GweiPerEth)
 
-		if v.prevBalance > 0 {
-			prevBalance := float64(v.prevBalance) / float64(params.BeaconConfig().GweiPerEth)
+		if v.prevBalance[bytesutil.ToBytes48(pkey)] > 0 {
+			prevBalance := float64(v.prevBalance[bytesutil.ToBytes48(pkey)]) / float64(params.BeaconConfig().GweiPerEth)
 			percentNet := (newBalance - prevBalance) / prevBalance
 			log.WithFields(logrus.Fields{
 				"prevBalance":   prevBalance,
@@ -72,9 +73,8 @@ func (v *validator) LogValidatorGainsAndLosses(ctx context.Context, slot uint64)
 				"pubKey":        tpk,
 			}).Info("Net gains/losses in eth")
 		}
-		totalPrevBalance += resp.Balance
+		v.prevBalance[bytesutil.ToBytes48(pkey)] = resp.Balance
 	}
 
-	v.prevBalance = totalPrevBalance
 	return nil
 }