Fixes to make init genesis pass

cosmos · Jul 26, 2024 · d741d2e · d741d2e
1 parent cc5c4d0
commit d741d2e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/runtime/v2/builder.go b/runtime/v2/builder.go
@@ -128,8 +128,10 @@ func (a *AppBuilder[T]) Build(opts ...AppBuilderOption[T]) (*App[T], error) {
 	home := v.GetString(FlagHome)
 
 	storeOpts := rootstore.DefaultStoreOptions()
-	if err := v.Sub("store.options").Unmarshal(&storeOpts); err != nil {
-		return nil, fmt.Errorf("failed to store options: %w", err)
+	if s := v.Sub("store.options"); s != nil {
+		if err := s.Unmarshal(&storeOpts); err != nil {
+			return nil, fmt.Errorf("failed to store options: %w", err)
+		}
 	}
 
 	scRawDb, err := db.NewDB(db.DBType(v.GetString("store.app-db-backend")), "application", filepath.Join(home, "data"), nil)

diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go
@@ -166,7 +166,7 @@ func (m *MM[T]) InitGenesisJSON(
 		case appmodulev2.HasGenesis:
 			m.logger.Debug("running initialization for module", "module", moduleName)
 			if err := module.InitGenesis(ctx, genesisData[moduleName]); err != nil {
-				return err
+				return fmt.Errorf("init module %s: %w", moduleName, err)
 			}
 		case appmodulev2.HasABCIGenesis:
 			m.logger.Debug("running initialization for module", "module", moduleName)

diff --git a/server/v2/stf/core_event_service.go b/server/v2/stf/core_event_service.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"slices"
 
+	"github.com/cosmos/cosmos-sdk/codec"
 	gogoproto "github.com/cosmos/gogoproto/proto"
 	"golang.org/x/exp/maps"
 
@@ -55,7 +56,7 @@ 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)
+	evtJSON, err := codec.ProtoMarshalJSON(tev, nil)
 	if err != nil {
 		return event.Event{}, err
 	}

diff --git a/server/v2/store/commands.go b/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)
 		}

diff --git a/simapp/v2/app_di.go b/simapp/v2/app_di.go
@@ -3,8 +3,6 @@ package simapp
 import (
 	_ "embed"
 
-	"github.com/spf13/viper"
-
 	clienthelpers "cosmossdk.io/client/v2/helpers"
 	coreapp "cosmossdk.io/core/app"
 	"cosmossdk.io/core/legacy"
@@ -31,6 +29,8 @@ import (
 	slashingkeeper "cosmossdk.io/x/slashing/keeper"
 	stakingkeeper "cosmossdk.io/x/staking/keeper"
 	upgradekeeper "cosmossdk.io/x/upgrade/keeper"
+	_ "github.com/cosmos/cosmos-sdk/x/genutil"
+	"github.com/spf13/viper"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"