ledger: do final validation in endOfBlock() (#3132)

## Summary

1. It doesn't make sense to calculate new totals in `finalValidation()`
2. `endOfBlock()` already does some validation

Moving the content of `finalValidation()` to `endOfBlock()` makes things more reasonable.

Author: tolikzinovyev

ledger/internal/eval.go

@@ -1094,6 +1094,51 @@ func (eval *BlockEvaluator) endOfBlock() error {
 		return err
 	}
 
+	eval.state.mods.OptimizeAllocatedMemory(eval.proto)
+
+	if eval.validate {
+		// check commitments
+		txnRoot, err := eval.block.PaysetCommit()
+		if err != nil {
+			return err
+		}
+		if txnRoot != eval.block.TxnRoot {
+			return fmt.Errorf("txn root wrong: %v != %v", txnRoot, eval.block.TxnRoot)
+		}
+
+		var expectedTxnCount uint64
+		if eval.proto.TxnCounter {
+			expectedTxnCount = eval.state.txnCounter()
+		}
+		if eval.block.TxnCounter != expectedTxnCount {
+			return fmt.Errorf("txn count wrong: %d != %d", eval.block.TxnCounter, expectedTxnCount)
+		}
+
+		expectedVoters, expectedVotersWeight, err := eval.compactCertVotersAndTotal()
+		if err != nil {
+			return err
+		}
+		if eval.block.CompactCert[protocol.CompactCertBasic].CompactCertVoters != expectedVoters {
+			return fmt.Errorf("CompactCertVoters wrong: %v != %v", eval.block.CompactCert[protocol.CompactCertBasic].CompactCertVoters, expectedVoters)
+		}
+		if eval.block.CompactCert[protocol.CompactCertBasic].CompactCertVotersTotal != expectedVotersWeight {
+			return fmt.Errorf("CompactCertVotersTotal wrong: %v != %v", eval.block.CompactCert[protocol.CompactCertBasic].CompactCertVotersTotal, expectedVotersWeight)
+		}
+		if eval.block.CompactCert[protocol.CompactCertBasic].CompactCertNextRound != eval.state.compactCertNext() {
+			return fmt.Errorf("CompactCertNextRound wrong: %v != %v", eval.block.CompactCert[protocol.CompactCertBasic].CompactCertNextRound, eval.state.compactCertNext())
+		}
+		for ccType := range eval.block.CompactCert {
+			if ccType != protocol.CompactCertBasic {
+				return fmt.Errorf("CompactCertType %d unexpected", ccType)
+			}
+		}
+	}
+
+	err = eval.state.CalculateTotals()
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -1189,7 +1234,6 @@ func (eval *BlockEvaluator) validateExpiredOnlineAccounts() error {
 
 // resetExpiredOnlineAccountsParticipationKeys after all transactions and rewards are processed, modify the accounts so that their status is offline
 func (eval *BlockEvaluator) resetExpiredOnlineAccountsParticipationKeys() error {
-
 	expectedMaxNumberOfExpiredAccounts := eval.proto.MaxProposedExpiredOnlineAccounts
 	lengthOfExpiredParticipationAccounts := len(eval.block.ParticipationUpdates.ExpiredParticipationAccounts)
 
@@ -1218,51 +1262,6 @@ func (eval *BlockEvaluator) resetExpiredOnlineAccountsParticipationKeys() error
 	return nil
 }
 
-// FinalValidation does the validation that must happen after the block is built and all state updates are computed
-func (eval *BlockEvaluator) finalValidation() error {
-	eval.state.mods.OptimizeAllocatedMemory(eval.proto)
-	if eval.validate {
-		// check commitments
-		txnRoot, err := eval.block.PaysetCommit()
-		if err != nil {
-			return err
-		}
-		if txnRoot != eval.block.TxnRoot {
-			return fmt.Errorf("txn root wrong: %v != %v", txnRoot, eval.block.TxnRoot)
-		}
-
-		var expectedTxnCount uint64
-		if eval.proto.TxnCounter {
-			expectedTxnCount = eval.state.txnCounter()
-		}
-		if eval.block.TxnCounter != expectedTxnCount {
-			return fmt.Errorf("txn count wrong: %d != %d", eval.block.TxnCounter, expectedTxnCount)
-		}
-
-		expectedVoters, expectedVotersWeight, err := eval.compactCertVotersAndTotal()
-		if err != nil {
-			return err
-		}
-		if eval.block.CompactCert[protocol.CompactCertBasic].CompactCertVoters != expectedVoters {
-			return fmt.Errorf("CompactCertVoters wrong: %v != %v", eval.block.CompactCert[protocol.CompactCertBasic].CompactCertVoters, expectedVoters)
-		}
-		if eval.block.CompactCert[protocol.CompactCertBasic].CompactCertVotersTotal != expectedVotersWeight {
-			return fmt.Errorf("CompactCertVotersTotal wrong: %v != %v", eval.block.CompactCert[protocol.CompactCertBasic].CompactCertVotersTotal, expectedVotersWeight)
-		}
-		if eval.block.CompactCert[protocol.CompactCertBasic].CompactCertNextRound != eval.state.compactCertNext() {
-			return fmt.Errorf("CompactCertNextRound wrong: %v != %v", eval.block.CompactCert[protocol.CompactCertBasic].CompactCertNextRound, eval.state.compactCertNext())
-		}
-		for ccType := range eval.block.CompactCert {
-			if ccType != protocol.CompactCertBasic {
-				return fmt.Errorf("CompactCertType %d unexpected", ccType)
-			}
-		}
-
-	}
-
-	return eval.state.CalculateTotals()
-}
-
 // GenerateBlock produces a complete block from the BlockEvaluator.  This is
 // used during proposal to get an actual block that will be proposed, after
 // feeding in tentative transactions into this block evaluator.
@@ -1284,11 +1283,6 @@ func (eval *BlockEvaluator) GenerateBlock() (*ledgercore.ValidatedBlock, error)
 		return nil, err
 	}
 
-	err = eval.finalValidation()
-	if err != nil {
-		return nil, err
-	}
-
 	vb := ledgercore.MakeValidatedBlock(eval.block, eval.state.deltas())
 	eval.blockGenerated = true
 	proto, ok := config.Consensus[eval.block.BlockHeader.CurrentProtocol]
@@ -1450,11 +1444,6 @@ transactionGroupLoop:
 		}
 	}
 
-	err = eval.finalValidation()
-	if err != nil {
-		return ledgercore.StateDelta{}, err
-	}
-
 	return eval.state.deltas(), nil
 }
 

ledger/internal/evalindexer.go

@@ -47,11 +47,5 @@ func (eval *BlockEvaluator) ProcessBlockForIndexer(block *bookkeeping.Block) (le
 			fmt.Errorf("ProcessBlockForIndexer() err: %w", err)
 	}
 
-	err = eval.finalValidation()
-	if err != nil {
-		return ledgercore.StateDelta{}, []transactions.SignedTxnInBlock{},
-			fmt.Errorf("ProcessBlockForIndexer() err: %w", err)
-	}
-
 	return eval.state.deltas(), eval.block.Payset, nil
 }