fix(stf,server/v2/cometbft): fix default events + improve codec handling

server/v2/cometbft/grpc.go

@@ -256,13 +256,19 @@ func (t txServer[T]) Simulate(ctx context.Context, req *txtypes.SimulateRequest)
 		msgResponses = append(msgResponses, anyMsg)
 	}
 
+	event, err := intoABCIEvents(txResult.Events, map[string]struct{}{}, false)
+	if err != nil {
+		return nil, status.Errorf(codes.Unknown, "failed to convert events: %v", err)
+	}
+
 	return &txtypes.SimulateResponse{
 		GasInfo: &sdk.GasInfo{
 			GasUsed:   txResult.GasUsed,
 			GasWanted: txResult.GasWanted,
 		},
 		Result: &sdk.Result{
 			MsgResponses: msgResponses,
+			Events:       event,
 		},
 	}, nil
 }

server/v2/stf/stf.go

@@ -2,8 +2,10 @@ package stf
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
+	"strings"
 
 	appmodulev2 "cosmossdk.io/core/appmodule/v2"
 	corecontext "cosmossdk.io/core/context"
@@ -358,12 +360,53 @@ func (s STF[T]) runTxMsgs(
 			e.EventIndex = int32(j + 1)
 			events = append(events, e)
 		}
+
+		// add message event
+		events = append(events, createMessageEvent(msg, int32(i+1), int32(len(execCtx.events)+1)))
 	}
 
 	consumed := execCtx.meter.Limit() - execCtx.meter.Remaining()
 	return msgResps, consumed, events, nil
 }
 
+// Create a message event, with two kv: action, the type url of the message
+// and module, the module of the message.
+func createMessageEvent(msg transaction.Msg, msgIndex, eventIndex int32) event.Event {
+	// Assumes that module name is the second element of the msg type URL
+	// e.g. "cosmos.bank.v1beta1.MsgSend" => "bank"
+	// It returns an empty string if the input is not a valid type URL
+	getModuleNameFromTypeURL := func(input string) string {
+		moduleName := strings.Split(input, ".")
+		if len(moduleName) > 1 {
+			return moduleName[1]
+		}
+
+		return ""
+	}
+
+	return event.Event{
+		MsgIndex:   msgIndex,
+		EventIndex: eventIndex,
+		Type:       "message",
+		Attributes: func() ([]appdata.EventAttribute, error) {
+			typeURL := msgTypeURL(msg)
+			return []appdata.EventAttribute{
+				{Key: "action", Value: "/" + typeURL},
+				{Key: "module", Value: getModuleNameFromTypeURL(typeURL)},
+			}, nil
+		},
+		Data: func() (json.RawMessage, error) {
+			typeURL := msgTypeURL(msg)
+			attrs := []appdata.EventAttribute{
+				{Key: "action", Value: "/" + typeURL},
+				{Key: "module", Value: getModuleNameFromTypeURL(typeURL)},
+			}
+
+			return json.Marshal(attrs)
+		},
+	}
+}
+
 // preBlock executes the pre block logic.
 func (s STF[T]) preBlock(
 	ctx *executionContext,

server/v2/stf/stf_test.go

@@ -225,8 +225,8 @@ func TestSTF(t *testing.T) {
 		}
 		// check TxEvents
 		events := txResult.Events
-		if len(events) != 6 {
-			t.Fatalf("Expected 6 TxEvents, got %d", len(events))
+		if len(events) != 7 {
+			t.Fatalf("Expected 7 TxEvents, got %d", len(events))
 		}
 		for i, event := range events {
 			if event.BlockStage != appdata.TxProcessingStage {
@@ -235,7 +235,8 @@ func TestSTF(t *testing.T) {
 			if event.TxIndex != 1 {
 				t.Errorf("Expected TxIndex 1, got %d", event.TxIndex)
 			}
-			if event.EventIndex != int32(i%2+1) {
+			if event.EventIndex != int32(i%2+1) &&
+				(event.Type == "message" && event.EventIndex != 3) { // special case for message event type as it happens in the msg handling flow
 				t.Errorf("Expected EventIndex %d, got %d", i%2+1, event.EventIndex)
 			}
 
@@ -247,7 +248,7 @@ func TestSTF(t *testing.T) {
 				t.Errorf("Expected 1 or 2 attributes, got %d", len(attrs))
 			}
 
-			if len(attrs) == 2 {
+			if len(attrs) == 2 && event.Type != "message" {
 				if attrs[1].Key != "index" || attrs[1].Value != "2" {
 					t.Errorf("Expected attribute key 'index' and value '2', got key '%s' and value '%s'", attrs[1].Key, attrs[1].Value)
 				}
@@ -273,7 +274,19 @@ func TestSTF(t *testing.T) {
 				if attrs[0].Key != "msg" || attrs[0].Value != "&BoolValue{Value:true,XXX_unrecognized:[],}" {
 					t.Errorf("Expected msg attribute with value '&BoolValue{Value:true,XXX_unrecognized:[],}', got '%s'", attrs[0].Value)
 				}
-			case 4, 5:
+			case 4:
+				if event.Type != "message" {
+					t.Errorf("Expected event type 'message', got %s", event.Type)
+				}
+
+				if event.MsgIndex != 1 {
+					t.Errorf("Expected MsgIndex 1, got %d", event.MsgIndex)
+				}
+
+				if attrs[0].Key != "action" || attrs[0].Value != "/google.protobuf.BoolValue" {
+					t.Errorf("Expected msg attribute with value '/google.protobuf.BoolValue', got '%s'", attrs[0].Value)
+				}
+			case 5, 6:
 				if event.Type != "post-tx-exec" {
 					t.Errorf("Expected event type 'post-tx-exec', got %s", event.Type)
 				}

tests/systemtests/tx_test.go

@@ -122,7 +122,7 @@ func TestSimulateTx_GRPC(t *testing.T) {
 				require.NoError(t, err)
 				// Check the result and gas used are correct.
 				//
-				// The 12 events are:
+				// The 10 events are:
 				// - Sending Fee to the pool: coin_spent, coin_received and transfer
 				// - tx.* events: tx.fee, tx.acc_seq, tx.signature
 				// - Sending Amount to recipient: coin_spent, coin_received and transfer