api: Fix vote status computation.

cmd/goal/messages.go

@@ -62,7 +62,7 @@ const (
 	infoNodeShuttingDown                    = "Algorand node is shutting down..."
 	infoNodeSuccessfullyStopped             = "The node was successfully stopped."
 	infoNodeStatus                          = "Last committed block: %d\nTime since last block: %s\nSync Time: %s\nLast consensus protocol: %s\nNext consensus protocol: %s\nRound for next consensus protocol: %d\nNext consensus protocol supported: %v"
-	infoNodeStatusConsensusUpgradeVoting    = "Consensus upgrate state: Voting\nYes votes: %d\nNo votes: %d\nVotes remaining: %d\nYes votes required: %d\nVote window close round: %d"
+	infoNodeStatusConsensusUpgradeVoting    = "Consensus upgrade state: Voting\nYes votes: %d\nNo votes: %d\nVotes remaining: %d\nYes votes required: %d\nVote window close round: %d"
 	infoNodeStatusConsensusUpgradeScheduled = "Consensus upgrade state: Scheduled"
 	catchupStoppedOnUnsupported             = "Last supported block (%d) is committed. The next block consensus protocol is not supported. Catchup service is stopped."
 	infoNodeCatchpointCatchupStatus         = "Last committed block: %d\nSync Time: %s\nCatchpoint: %s"

cmd/goal/node.go

@@ -482,6 +482,7 @@ func makeStatusString(stat model.NodeStatusResponse) string {
 			upgradeVotesRequired := uint64(0)
 			upgradeNoVotes := uint64(0)
 			upgradeYesVotes := uint64(0)
+			upgradeVoteRounds := uint64(0)
 			if stat.UpgradeVotesRequired != nil {
 				upgradeVotesRequired = *stat.UpgradeVotesRequired
 			}
@@ -491,11 +492,14 @@ func makeStatusString(stat model.NodeStatusResponse) string {
 			if stat.UpgradeYesVotes != nil {
 				upgradeYesVotes = *stat.UpgradeYesVotes
 			}
+			if stat.UpgradeVoteRounds != nil {
+				upgradeVoteRounds = *stat.UpgradeVoteRounds
+			}
 			statusString = statusString + "\n" + fmt.Sprintf(
 				infoNodeStatusConsensusUpgradeVoting,
 				upgradeYesVotes,
 				upgradeNoVotes,
-				upgradeNextProtocolVoteBefore-stat.LastRound,
+				upgradeVoteRounds-upgradeYesVotes-upgradeNoVotes,
 				upgradeVotesRequired,
 				upgradeNextProtocolVoteBefore,
 			)

daemon/algod/api/server/v2/handlers.go

@@ -793,26 +793,29 @@ func (v2 *Handlers) GetStatus(ctx echo.Context) error {
 		CatchpointAcquiredBlocks:    &stat.CatchpointCatchupAcquiredBlocks,
 	}
 
-	nextProtocolVoteBefore := uint64(stat.NextProtocolVoteBefore)
-	var votesToGo int64 = int64(nextProtocolVoteBefore) - int64(stat.LastRound)
-	if votesToGo < 0 {
-		votesToGo = 0
-	}
-	if nextProtocolVoteBefore > 0 {
+	// Make sure a vote is happening
+	if stat.NextProtocolVoteBefore > 0 {
+		votesToGo := uint64(0)
+		// Check if the vote window is still open.
+		if stat.NextProtocolVoteBefore > stat.LastRound {
+			// subtract 1 because the variables are referring to "Last" round and "VoteBefore"
+			votesToGo = uint64(stat.NextProtocolVoteBefore - stat.LastRound - 1)
+		}
+
 		consensus := config.Consensus[protocol.ConsensusCurrentVersion]
 		upgradeVoteRounds := consensus.UpgradeVoteRounds
 		upgradeThreshold := consensus.UpgradeThreshold
-		votes := uint64(consensus.UpgradeVoteRounds) - uint64(votesToGo)
+		votes := consensus.UpgradeVoteRounds - votesToGo
 		votesYes := stat.NextProtocolApprovals
 		votesNo := votes - votesYes
-		upgradeDelay := uint64(stat.UpgradeDelay)
+		upgradeDelay := stat.UpgradeDelay
 		response.UpgradeVotesRequired = &upgradeThreshold
 		response.UpgradeNodeVote = &stat.UpgradeApprove
 		response.UpgradeDelay = &upgradeDelay
 		response.UpgradeVotes = &votes
 		response.UpgradeYesVotes = &votesYes
 		response.UpgradeNoVotes = &votesNo
-		response.UpgradeNextProtocolVoteBefore = &nextProtocolVoteBefore
+		response.UpgradeNextProtocolVoteBefore = numOrNil(uint64(stat.NextProtocolVoteBefore))
 		response.UpgradeVoteRounds = &upgradeVoteRounds
 	}
 

daemon/algod/api/server/v2/test/handlers_resources_test.go

@@ -229,7 +229,7 @@ func setupTestForLargeResources(t *testing.T, acctSize, maxResults int, accountM
 	acctData = accountMaker(acctSize)
 	ml.accounts[fakeAddr] = acctData
 
-	mockNode := makeMockNode(&ml, t.Name(), nil, false)
+	mockNode := makeMockNode(&ml, t.Name(), nil, cannedStatusReportGolden)
 	mockNode.config.MaxAPIResourcesPerAccount = uint64(maxResults)
 	dummyShutdownChan := make(chan struct{})
 	handlers = v2.Handlers{