[apr] More log in various steps of actual compute for apr (#2523)

block/header.go

@@ -42,6 +42,12 @@ func (h Header) MarshalJSON() ([]byte, error) {
 	})
 }
 
+// String ..
+func (h Header) String() string {
+	s, _ := json.Marshal(h)
+	return string(s)
+}
+
 // EncodeRLP encodes the header using tagged RLP representation.
 func (h *Header) EncodeRLP(w io.Writer) error {
 	return HeaderRegistry.Encode(w, h.Header)

core/blockchain.go

@@ -2309,7 +2309,16 @@ func (bc *BlockChain) UpdateValidatorVotingPower(
 			state, wrapper, blkPerEpoch,
 		)
 		if err == nil && aprComputed != nil {
-			stats.APR = *aprComputed
+			a := *aprComputed
+			utils.Logger().Info().
+				Str("return-rate", a.String()).
+				Uint64("new-epoch", newEpochSuperCommittee.Epoch.Uint64()).
+				Msg("apr computed")
+			stats.APR = a
+		}
+
+		if err != nil {
+			utils.Logger().Debug().Err(err).Msg("issue with compute of apr")
 		}
 
 		if err := rawdb.WriteValidatorStats(

staking/apr/compute.go

@@ -26,7 +26,7 @@ type Reader interface {
 }
 
 const (
-	secondsInYear = int64(3.154e+7)
+	secondsInYear = int64(31_557_600)
 )
 
 var (
@@ -53,7 +53,14 @@ func expectedRewardPerYear(
 
 	// TODO some more sanity checks of some sort?
 	expectedValue := new(big.Int).Div(diffReward, diffTime)
-	return new(big.Int).Mul(expectedValue, oneYear), nil
+	expectedPerYear := new(big.Int).Mul(expectedValue, oneYear)
+	utils.Logger().Info().
+		Uint64("diff-reward", diffReward.Uint64()).
+		Uint64("diff-time", diffTime.Uint64()).
+		Uint64("expected-value", expectedValue.Uint64()).
+		Uint64("expected-per-year", expectedPerYear.Uint64()).
+		Msg("expected reward per year computed")
+	return expectedPerYear, nil
 }
 
 func pastTwoEpochHeaders(
@@ -120,12 +127,21 @@ func ComputeForValidator(
 		new(big.Int).Sub(now, common.Big1),
 		numeric.ZeroDec()
 
+	utils.Logger().Info().
+		Uint64("now", now.Uint64()).
+		Uint64("two-epoch-ago", twoEpochAgo.Uint64()).
+		Uint64("one-epoch-ago", oneEpochAgo.Uint64()).
+		Msg("apr - begin compute for validator ")
+
 	twoSnapshotAgo, err := bc.ReadValidatorSnapshotAtEpoch(
 		twoEpochAgo,
 		validatorNow.Address,
 	)
 
 	if err != nil {
+		utils.Logger().Debug().
+			RawJSON("validator-now", []byte(validatorNow.String())).
+			Err(err).Msg("could not retrieve two snapshot ago")
 		return &zero, nil
 	}
 
@@ -135,6 +151,9 @@ func ComputeForValidator(
 	)
 
 	if err != nil {
+		utils.Logger().Debug().
+			RawJSON("validator-now", []byte(validatorNow.String())).
+			Err(err).Msg("could not retrieve one snapshot ago")
 		return &zero, nil
 	}
 
@@ -145,6 +164,7 @@ func ComputeForValidator(
 	headerOneEpochAgo, headerTwoEpochAgo, err := pastTwoEpochHeaders(bc)
 
 	if err != nil {
+		utils.Logger().Debug().Err(err).Msg("could not retrieve past two epoch headers")
 		return &zero, nil
 	}
 
@@ -159,6 +179,12 @@ func ComputeForValidator(
 		return &zero, nil
 	}
 
+	utils.Logger().Info().
+		RawJSON("current-epoch-header", []byte(bc.CurrentHeader().String())).
+		RawJSON("one-epoch-ago-header", []byte(headerOneEpochAgo.String())).
+		RawJSON("two-epoch-ago-header", []byte(headerTwoEpochAgo.String())).
+		Msg("headers used for apr computation")
+
 	estimatedRewardPerYear, err := expectedRewardPerYear(
 		headerOneEpochAgo, headerTwoEpochAgo,
 		oneSnapshotAgo, twoSnapshotAgo,

staking/availability/measure.go

@@ -259,7 +259,7 @@ func computeAndMutateEPOSStatus(
 		Str("signed", computed.Signed.String()).
 		Str("to-sign", computed.ToSign.String()).
 		Str("percentage-signed", computed.Percentage.String()).
-		Bool("meets-threshold", computed.IsBelowThreshold).
+		Bool("is-below-threshold", computed.IsBelowThreshold).
 		Msg("check if signing percent is meeting required threshold")
 
 	const missedTooManyBlocks = true