go/consensus/cometbft/abci: Validate system txs after results are set

Author: peternose

go/consensus/cometbft/abci/mux.go

@@ -515,6 +515,11 @@ func (mux *abciMux) ProcessProposal(req types.RequestProcessProposal) (resp type
 		}
 	}
 
+	// Validate system transactions included by the proposer.
+	if err := mux.validateSystemTxs(); err != nil {
+		panic(fmt.Errorf("proposed block has invalid system transactions: %w", err))
+	}
+
 	return types.ResponseProcessProposal{
 		Status: types.ResponseProcessProposal_ACCEPT,
 	}
@@ -808,11 +813,6 @@ func (mux *abciMux) EndBlock(req types.RequestEndBlock) types.ResponseEndBlock {
 		},
 	}
 
-	// Validate system transactions included by the proposer.
-	if err := mux.validateSystemTxs(); err != nil {
-		panic(fmt.Errorf("proposed block has invalid system transactions: %w", err))
-	}
-
 	return resp
 }
 

go/consensus/cometbft/abci/system.go

@@ -90,13 +90,8 @@ func (mux *abciMux) processSystemTx(ctx *api.Context, tx *transaction.Transactio
 	return nil
 }
 
-// validateSystemTxs performs system transaction validation at the end of a block.
+// validateSystemTxs performs system transaction validation.
 func (mux *abciMux) validateSystemTxs() error {
-	// Don't perform any validation when we are still building the proposal.
-	if len(mux.state.proposal.hash) == 0 {
-		return nil
-	}
-
 	var hasBlockMetadata bool
 	for _, tx := range mux.state.blockCtx.SystemTransactions {
 		switch tx.Method {