extract creating encoding config from initia app

Author: sh-cha

app/app.go

@@ -38,7 +38,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/server/api"
 	"github.com/cosmos/cosmos-sdk/server/config"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
-	"github.com/cosmos/cosmos-sdk/std"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/types/module"
@@ -62,8 +61,6 @@ import (
 	// this line is used by starport scaffolding # stargate/app/moduleImport
 
 	"github.com/initia-labs/initia/app/keepers"
-	"github.com/initia-labs/initia/app/params"
-	cryptocodec "github.com/initia-labs/initia/crypto/codec"
 	initiatx "github.com/initia-labs/initia/tx"
 	moveconfig "github.com/initia-labs/initia/x/move/config"
 	movetypes "github.com/initia-labs/initia/x/move/types"
@@ -150,11 +147,7 @@ func NewInitiaApp(
 	logger.Info("mempool max txs", "max_txs", mempoolMaxTxs)
 	logger.Info("query gas limit", "gas_limit", queryGasLimit)
 
-	encodingConfig := params.MakeEncodingConfig()
-	std.RegisterLegacyAminoCodec(encodingConfig.Amino)
-	std.RegisterInterfaces(encodingConfig.InterfaceRegistry)
-	cryptocodec.RegisterLegacyAminoCodec(encodingConfig.Amino)
-	cryptocodec.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+	encodingConfig := MakeEncodingConfig()
 
 	appCodec := encodingConfig.Codec
 	legacyAmino := encodingConfig.Amino
@@ -225,7 +218,7 @@ func NewInitiaApp(
 	// non-dependant module elements, such as codec registration and genesis verification.
 	// By default it is composed of all the module from the module manager.
 	// Additionally, app module basics can be overwritten by passing them as argument.
-	app.BasicModuleManager = newBasicManagerFromManager(app)
+	app.BasicModuleManager = NewBasicManager()
 
 	// NOTE: upgrade module is required to be prioritized
 	app.ModuleManager.SetOrderPreBlockers(

app/encoding.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services"
+	"github.com/cosmos/cosmos-sdk/std"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	authcodec "github.com/cosmos/cosmos-sdk/x/auth/codec"
@@ -16,8 +17,24 @@ import (
 	moveconfig "github.com/initia-labs/initia/x/move/config"
 
 	oracleconfig "github.com/skip-mev/connect/v2/oracle/config"
+
+	cryptocodec "github.com/initia-labs/initia/crypto/codec"
 )
 
+func MakeEncodingConfig() params.EncodingConfig {
+	encodingConfig := params.MakeEncodingConfig()
+
+	std.RegisterLegacyAminoCodec(encodingConfig.Amino)
+	std.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+	cryptocodec.RegisterLegacyAminoCodec(encodingConfig.Amino)
+	cryptocodec.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+
+	basicManager := NewBasicManager()
+	basicManager.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+	basicManager.RegisterLegacyAminoCodec(encodingConfig.Amino)
+	return encodingConfig
+}
+
 func newTempApp() *InitiaApp {
 	return NewInitiaApp(
 		log.NewNopLogger(),
@@ -30,18 +47,6 @@ func newTempApp() *InitiaApp {
 	)
 }
 
-func MakeEncodingConfig() params.EncodingConfig {
-	tempApp := newTempApp()
-	encodingConfig := params.EncodingConfig{
-		InterfaceRegistry: tempApp.InterfaceRegistry(),
-		Codec:             tempApp.AppCodec(),
-		TxConfig:          tempApp.TxConfig(),
-		Amino:             tempApp.LegacyAmino(),
-	}
-
-	return encodingConfig
-}
-
 func AutoCliOpts() autocli.AppOptions {
 	tempApp := newTempApp()
 	modules := make(map[string]appmodule.AppModule, 0)
@@ -63,11 +68,6 @@ func AutoCliOpts() autocli.AppOptions {
 	}
 }
 
-func BasicManager() module.BasicManager {
-	tempApp := newTempApp()
-	return tempApp.BasicModuleManager
-}
-
 // EmptyAppOptions is a stub implementing AppOptions
 type EmptyAppOptions struct{}
 

app/genesis.go

@@ -41,7 +41,7 @@ type GenesisState map[string]json.RawMessage
 
 // NewDefaultGenesisState generates the default state for the application.
 func NewDefaultGenesisState(cdc codec.Codec, bondDenom string) GenesisState {
-	return GenesisState(BasicManager().DefaultGenesis(cdc)).
+	return GenesisState(NewBasicManager().DefaultGenesis(cdc)).
 		ConfigureBondDenom(cdc, bondDenom).
 		ConfigureICA(cdc).
 		AddMarketData(cdc, cdc.InterfaceRegistry().SigningContext().AddressCodec())

app/modules.go

@@ -157,19 +157,46 @@ func appModules(
 	}
 }
 
-// ModuleBasics defines the module BasicManager that is in charge of setting up basic,
-// non-dependant module elements, such as codec registration
-// and genesis verification.
-func newBasicManagerFromManager(app *InitiaApp) module.BasicManager {
-	basicManager := module.NewBasicManagerFromManager(
-		app.ModuleManager,
-		map[string]module.AppModuleBasic{
-			genutiltypes.ModuleName: genutil.NewAppModuleBasic(genutil.DefaultMessageValidator),
-			govtypes.ModuleName:     gov.NewAppModuleBasic(app.appCodec),
-		})
-	basicManager.RegisterLegacyAminoCodec(app.legacyAmino)
-	basicManager.RegisterInterfaces(app.interfaceRegistry)
-	return basicManager
+func NewBasicManager() module.BasicManager {
+	return module.NewBasicManager(
+		genutil.AppModuleBasic{},
+		auth.AppModuleBasic{},
+		bank.AppModuleBasic{},
+		capability.AppModuleBasic{},
+		crisis.AppModuleBasic{},
+		feegrantmodule.AppModuleBasic{},
+		gov.AppModuleBasic{},
+		reward.AppModuleBasic{},
+		slashing.AppModuleBasic{},
+		distr.AppModuleBasic{},
+		staking.AppModuleBasic{},
+		upgrade.AppModuleBasic{},
+		evidence.AppModuleBasic{},
+		authzmodule.AppModuleBasic{},
+		groupmodule.AppModuleBasic{},
+		consensus.AppModuleBasic{},
+		move.AppModuleBasic{},
+		auction.AppModuleBasic{},
+		ophost.AppModuleBasic{},
+		// connect modules
+		oracle.AppModuleBasic{},
+		marketmap.AppModuleBasic{},
+		// ibc modules
+		ibc.AppModuleBasic{},
+		ibctransfer.AppModuleBasic{},
+		ibcnfttransfer.AppModuleBasic{},
+		ica.AppModuleBasic{},
+		icaauth.AppModuleBasic{},
+		ibcfee.AppModuleBasic{},
+		ibcperm.AppModuleBasic{},
+		ibctm.AppModuleBasic{},
+		solomachine.AppModuleBasic{},
+		packetforward.AppModuleBasic{},
+		ibchooks.AppModuleBasic{},
+		forwarding.AppModuleBasic{},
+		ratelimit.AppModuleBasic{},
+		dynamicfee.AppModuleBasic{},
+	)
 }
 
 /*

cmd/initiad/root.go

@@ -67,7 +67,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
 	sdkConfig.Seal()
 
 	encodingConfig := initiaapp.MakeEncodingConfig()
-	basicManager := initiaapp.BasicManager()
+	basicManager := initiaapp.NewBasicManager()
 
 	// Get the executable name and configure the viper instance so that environmental
 	// variables are checked based off that name. The underscore character is used