Incentives: Use agreement round when estimating a node's proposal interval

agreement/selector.go

@@ -51,7 +51,13 @@ func (sel selector) CommitteeSize(proto config.ConsensusParams) uint64 {
 // looking at online stake (and status and key material). It is exported so that
 // AVM can provide opcodes that return the same data.
 func BalanceRound(r basics.Round, cparams config.ConsensusParams) basics.Round {
-	return r.SubSaturate(basics.Round(2 * cparams.SeedRefreshInterval * cparams.SeedLookback))
+	return r.SubSaturate(BalanceLookback(cparams))
+}
+
+// BalanceLookback is how far back agreement looks when considering balances for
+// voting stake.
+func BalanceLookback(cparams config.ConsensusParams) basics.Round {
+	return basics.Round(2 * cparams.SeedRefreshInterval * cparams.SeedLookback)
 }
 
 func seedRound(r basics.Round, cparams config.ConsensusParams) basics.Round {

ledger/apply/keyreg.go

@@ -20,6 +20,7 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/algorand/go-algorand/agreement"
 	"github.com/algorand/go-algorand/data/basics"
 	"github.com/algorand/go-algorand/data/transactions"
 )
@@ -79,7 +80,8 @@ func Keyreg(keyreg transactions.KeyregTxnFields, header transactions.Header, bal
 		}
 		record.Status = basics.Online
 		if params.Payouts.Enabled {
-			record.LastHeartbeat = header.FirstValid
+			lookback := agreement.BalanceLookback(balances.ConsensusParams())
+			record.LastHeartbeat = round + lookback
 		}
 		record.VoteFirstValid = keyreg.VoteFirst
 		record.VoteLastValid = keyreg.VoteLast

ledger/eval/eval.go

@@ -259,7 +259,7 @@ func (x *roundCowBase) onlineStake() (basics.MicroAlgos, error) {
 		return basics.MicroAlgos{}, err
 	}
 	x.totalOnline = total
-	return x.totalOnline, err
+	return x.totalOnline, nil
 }
 
 func (x *roundCowBase) updateAssetResourceCache(aa ledgercore.AccountAsset, r ledgercore.AssetResource) {
@@ -1639,6 +1639,11 @@ func (eval *BlockEvaluator) generateKnockOfflineAccountsList(participating []bas
 	updates := &eval.block.ParticipationUpdates
 
 	ch := activeChallenge(&eval.proto, uint64(current), eval.state)
+	onlineStake, err := eval.state.onlineStake()
+	if err != nil {
+		logging.Base().Errorf("unable to fetch online stake, no knockoffs: %v", err)
+		return
+	}
 
 	// Make a set of candidate addresses to check for expired or absentee status.
 	type candidateData struct {
@@ -1730,7 +1735,12 @@ func (eval *BlockEvaluator) generateKnockOfflineAccountsList(participating []bas
 
 		if acctData.Status == basics.Online {
 			lastSeen := max(acctData.LastProposed, acctData.LastHeartbeat)
-			if isAbsent(eval.state.prevTotals.Online.Money, acctData.MicroAlgosWithRewards, lastSeen, current) ||
+			oad, lErr := eval.state.lookupAgreement(accountAddr)
+			if lErr != nil {
+				logging.Base().Errorf("unable to check account for absenteeism: %v", accountAddr)
+				continue
+			}
+			if isAbsent(onlineStake, oad.VotingStake(), lastSeen, current) ||
 				failsChallenge(ch, accountAddr, lastSeen) {
 				updates.AbsentParticipationAccounts = append(
 					updates.AbsentParticipationAccounts,
@@ -1767,7 +1777,7 @@ func isAbsent(totalOnlineStake basics.MicroAlgos, acctStake basics.MicroAlgos, l
 	// Don't consider accounts that were online when payouts went into effect as
 	// absent.  They get noticed the next time they propose or keyreg, which
 	// ought to be soon, if they are high stake or want to earn incentives.
-	if lastSeen == 0 {
+	if lastSeen == 0 || acctStake.Raw == 0 {
 		return false
 	}
 	// See if the account has exceeded 10x their expected observation interval.
@@ -1881,6 +1891,14 @@ func (eval *BlockEvaluator) validateAbsentOnlineAccounts() error {
 	addressSet := make(map[basics.Address]bool, suspensionCount)
 
 	ch := activeChallenge(&eval.proto, uint64(eval.Round()), eval.state)
+	totalOnlineStake, err := eval.state.onlineStake()
+	if err != nil {
+		logging.Base().Errorf("unable to fetch online stake, can't check knockoffs: %v", err)
+		// I suppose we can still return successfully if the absent list is empty.
+		if len(eval.block.ParticipationUpdates.AbsentParticipationAccounts) > 0 {
+			return err
+		}
+	}
 
 	for _, accountAddr := range eval.block.ParticipationUpdates.AbsentParticipationAccounts {
 		if _, exists := addressSet[accountAddr]; exists {
@@ -1901,7 +1919,11 @@ func (eval *BlockEvaluator) validateAbsentOnlineAccounts() error {
 		}
 
 		lastSeen := max(acctData.LastProposed, acctData.LastHeartbeat)
-		if isAbsent(eval.state.prevTotals.Online.Money, acctData.MicroAlgos, lastSeen, eval.Round()) {
+		oad, lErr := eval.state.lookupAgreement(accountAddr)
+		if lErr != nil {
+			return fmt.Errorf("unable to check absent account: %v", accountAddr)
+		}
+		if isAbsent(totalOnlineStake, oad.VotingStake(), lastSeen, eval.Round()) {
 			continue // ok. it's "normal absent"
 		}
 		if failsChallenge(ch, accountAddr, lastSeen) {

ledger/eval/eval_test.go

@@ -804,9 +804,16 @@ func (ledger *evalTestLedger) GetKnockOfflineCandidates(rnd basics.Round, _ conf
 	return ret, nil
 }
 
-// OnlineCirculation just returns a deterministic value for a given round.
+// OnlineCirculation add up the balances of all online accounts in rnd. It
+// doesn't remove expired accounts.
 func (ledger *evalTestLedger) OnlineCirculation(rnd, voteRound basics.Round) (basics.MicroAlgos, error) {
-	return basics.MicroAlgos{Raw: uint64(rnd) * 1_000_000}, nil
+	circulation := basics.MicroAlgos{}
+	for _, data := range ledger.roundBalances[rnd] {
+		if data.Status == basics.Online {
+			circulation.Raw += data.MicroAlgos.Raw
+		}
+	}
+	return circulation, nil
 }
 
 func (ledger *evalTestLedger) LookupApplication(rnd basics.Round, addr basics.Address, aidx basics.AppIndex) (ledgercore.AppResource, error) {