feat: support core API genesis in module manager

types/module/genesis.go

@@ -0,0 +1 @@
+package module

types/module/mock_appmodule_test.go

@@ -1,6 +1,10 @@
 package module_test
 
-import "github.com/cosmos/cosmos-sdk/types/module"
+import (
+	"cosmossdk.io/core/appmodule"
+
+	"github.com/cosmos/cosmos-sdk/types/module"
+)
 
 // AppModuleWithAllExtensions is solely here for the purpose of generating
 // mocks to be used in module tests.
@@ -13,3 +17,12 @@ type AppModuleWithAllExtensions interface {
 	module.BeginBlockAppModule
 	module.EndBlockAppModule
 }
+
+// CoreAppModule is solely here for the purpose of generating
+// mocks to be used in module tests.
+type CoreAppModule interface {
+	// TODO: remove module.AppModuleBasic
+	module.AppModuleBasic
+	appmodule.AppModule
+	appmodule.HasGenesis
+}

types/module/module.go

@@ -34,6 +34,7 @@ import (
 	"sort"
 
 	"cosmossdk.io/core/appmodule"
+	"cosmossdk.io/core/genesis"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 	abci "github.com/tendermint/tendermint/abci/types"
@@ -100,21 +101,41 @@ func (bm BasicManager) RegisterInterfaces(registry codectypes.InterfaceRegistry)
 
 // DefaultGenesis provides default genesis information for all modules
 func (bm BasicManager) DefaultGenesis(cdc codec.JSONCodec) map[string]json.RawMessage {
-	genesis := make(map[string]json.RawMessage)
+	genesisData := make(map[string]json.RawMessage)
 	for _, b := range bm {
-		if mod, ok := b.(HasGenesisBasics); ok {
-			genesis[b.Name()] = mod.DefaultGenesis(cdc)
+		if mod, ok := b.(appmodule.HasGenesis); ok {
+			target := genesis.RawJSONTarget{}
+			err := mod.DefaultGenesis(target.Target())
+			if err != nil {
+				panic(err)
+			}
+
+			genesisData[b.Name()], err = target.JSON()
+			if err != nil {
+				panic(err)
+			}
+		} else if mod, ok := b.(HasGenesisBasics); ok {
+			genesisData[b.Name()] = mod.DefaultGenesis(cdc)
 		}
 	}
 
-	return genesis
+	return genesisData
 }
 
 // ValidateGenesis performs genesis state validation for all modules
-func (bm BasicManager) ValidateGenesis(cdc codec.JSONCodec, txEncCfg client.TxEncodingConfig, genesis map[string]json.RawMessage) error {
+func (bm BasicManager) ValidateGenesis(cdc codec.JSONCodec, txEncCfg client.TxEncodingConfig, genesisData map[string]json.RawMessage) error {
 	for _, b := range bm {
-		if mod, ok := b.(HasGenesisBasics); ok {
-			if err := mod.ValidateGenesis(cdc, txEncCfg, genesis[b.Name()]); err != nil {
+		if mod, ok := b.(appmodule.HasGenesis); ok {
+			source, err := genesis.SourceFromRawJSON(genesisData[b.Name()])
+			if err != nil {
+				return err
+			}
+
+			if err := mod.ValidateGenesis(source); err != nil {
+				return err
+			}
+		} else if mod, ok := b.(HasGenesisBasics); ok {
+			if err := mod.ValidateGenesis(cdc, txEncCfg, genesisData[b.Name()]); err != nil {
 				return err
 			}
 		}
@@ -370,9 +391,22 @@ func (m *Manager) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, genesisData
 			continue
 		}
 
-		if module, ok := m.Modules[moduleName].(HasGenesis); ok {
-			ctx.Logger().Debug("running initialization for module", "module", moduleName)
+		mod := m.Modules[moduleName]
+
+		ctx.Logger().Debug("running initialization for module", "module", moduleName)
 
+		if module, ok := mod.(appmodule.HasGenesis); ok {
+			// core API genesis
+			source, err := genesis.SourceFromRawJSON(genesisData[moduleName])
+			if err != nil {
+				panic(err)
+			}
+
+			err = module.InitGenesis(ctx, source)
+			if err != nil {
+				panic(err)
+			}
+		} else if module, ok := mod.(HasGenesis); ok {
 			moduleValUpdates := module.InitGenesis(ctx, cdc, genesisData[moduleName])
 
 			// use these validator updates if provided, the module manager assumes
@@ -406,15 +440,34 @@ func (m *Manager) ExportGenesisForModules(ctx sdk.Context, cdc codec.JSONCodec,
 	if len(modulesToExport) == 0 {
 		modulesToExport = m.OrderExportGenesis
 	}
-
 	// verify modules exists in app, so that we don't panic in the middle of an export
 	if err := m.checkModulesExists(modulesToExport); err != nil {
 		panic(err)
 	}
 
 	channels := make(map[string]chan json.RawMessage)
 	for _, moduleName := range modulesToExport {
-		if module, ok := m.Modules[moduleName].(HasGenesis); ok {
+		mod := m.Modules[moduleName]
+
+		if module, ok := mod.(appmodule.HasGenesis); ok {
+			// core API genesis
+			channels[moduleName] = make(chan json.RawMessage)
+			go func(module appmodule.HasGenesis, ch chan json.RawMessage) {
+				ctx := ctx.WithGasMeter(storetypes.NewInfiniteGasMeter()) // avoid race conditions
+				target := genesis.RawJSONTarget{}
+				err := module.ExportGenesis(ctx, target.Target())
+				if err != nil {
+					panic(err)
+				}
+
+				rawJSON, err := target.JSON()
+				if err != nil {
+					panic(err)
+				}
+
+				channels[moduleName] <- rawJSON
+			}(module, channels[moduleName])
+		} else if module, ok := mod.(HasGenesis); ok {
 			channels[moduleName] = make(chan json.RawMessage)
 			go func(module HasGenesis, ch chan json.RawMessage) {
 				ctx := ctx.WithGasMeter(storetypes.NewInfiniteGasMeter()) // avoid race conditions
@@ -426,6 +479,7 @@ func (m *Manager) ExportGenesisForModules(ctx sdk.Context, cdc codec.JSONCodec,
 
 	genesisData := make(map[string]json.RawMessage)
 	for moduleName := range channels {
+
 		genesisData[moduleName] = <-channels[moduleName]
 	}