fix(stf): fixes to make init genesis pass (#21088)

Co-authored-by: marbar3778 <marbar3778@yahoo.com>

server/v2/stf/core_event_service.go

@@ -1,10 +1,12 @@
 package stf
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"slices"
 
+	"github.com/cosmos/gogoproto/jsonpb"
 	gogoproto "github.com/cosmos/gogoproto/proto"
 	"golang.org/x/exp/maps"
 
@@ -55,14 +57,14 @@ func (em *eventManager) EmitNonConsensus(event gogoproto.Message) error {
 // TypedEventToEvent takes typed event and converts to Event object
 func TypedEventToEvent(tev gogoproto.Message) (event.Event, error) {
 	evtType := gogoproto.MessageName(tev)
-	evtJSON, err := gogoproto.Marshal(tev)
-	if err != nil {
+	buf := new(bytes.Buffer)
+	jm := &jsonpb.Marshaler{OrigName: true, EmitDefaults: true, AnyResolver: nil}
+	if err := jm.Marshal(buf, tev); err != nil {
 		return event.Event{}, err
 	}
 
 	var attrMap map[string]json.RawMessage
-	err = json.Unmarshal(evtJSON, &attrMap)
-	if err != nil {
+	if err := json.Unmarshal(buf.Bytes(), &attrMap); err != nil {
 		return event.Event{}, err
 	}
 

server/v2/store/commands.go

@@ -129,7 +129,7 @@ func createRootStore(cmd *cobra.Command, rootDir string, v *viper.Viper, logger
 	}
 
 	storeOpts := root.DefaultStoreOptions()
-	if v != nil {
+	if v != nil && v.Sub("store.options") != nil {
 		if err := v.Sub("store.options").Unmarshal(&storeOpts); err != nil {
 			return nil, 0, fmt.Errorf("failed to store options: %w", err)
 		}