Merge branch 'develop' into print-tracked-validators-size

CHANGELOG.md

@@ -27,6 +27,7 @@ The format is based on Keep a Changelog, and this project adheres to Semantic Ve
 - Return false from HasBlock if the block is being synced. 
 - Cleanup forkchoice on failed insertions.
 - Use read only validator for core processing to avoid unnecessary copying.
+- Fee Recipient log also prints total tracked validators cache size. 
 
 ### Deprecated
 

beacon-chain/cache/tracked_validators.go

@@ -47,3 +47,9 @@ func (t *TrackedValidatorsCache) Validating() bool {
 	defer t.Unlock()
 	return len(t.trackedValidators) > 0
 }
+
+func (t *TrackedValidatorsCache) Size() int {
+	t.Lock()
+	defer t.Unlock()
+	return len(t.trackedValidators)
+}

beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go

@@ -404,7 +404,7 @@ func (vs *Server) PrepareBeaconProposer(
 	_ context.Context, request *ethpb.PrepareBeaconProposerRequest,
 ) (*emptypb.Empty, error) {
 	var validatorIndices []primitives.ValidatorIndex
-
+	beforeCacheSize := vs.TrackedValidatorsCache.Size()
 	for _, r := range request.Recipients {
 		recipient := hexutil.Encode(r.FeeRecipient)
 		if !common.IsHexAddress(recipient) {
@@ -428,7 +428,9 @@ func (vs *Server) PrepareBeaconProposer(
 	}
 	if len(validatorIndices) != 0 {
 		log.WithFields(logrus.Fields{
-			"validatorCount": len(validatorIndices),
+			"validatorCount":                 len(validatorIndices),
+			"previousTotalTrackedValidators": beforeCacheSize,
+			"totalTrackedValidators":         vs.TrackedValidatorsCache.Size(),
 		}).Debug("Updated fee recipient addresses for validator indices")
 	}
 	return &emptypb.Empty{}, nil