refactor: depinject without app.yaml (#12394)

core/appconfig/config.go

@@ -40,6 +40,16 @@ func LoadYAML(bz []byte) depinject.Config {
 	return LoadJSON(j)
 }
 
+// WrapAny marshals a proto message into a proto Any instance
+func WrapAny(config protoreflect.ProtoMessage) *anypb.Any {
+	cfg, err := anypb.New(config)
+	if err != nil {
+		panic(err)
+	}
+
+	return cfg
+}
+
 // Compose composes a v1alpha1 app config into a container option by resolving
 // the required modules and composing their options.
 func Compose(appConfig *appv1alpha1.Config) depinject.Config {

proto/cosmos/group/v1/module/v1/module.proto → proto/cosmos/group/module/v1/module.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package cosmos.group.v1.module.v1;
+package cosmos.group.module.v1;
 
 import "cosmos/app/v1alpha1/module.proto";
 import "gogoproto/gogo.proto";

simapp/app.go

@@ -15,14 +15,11 @@ import (
 	tmos "github.com/tendermint/tendermint/libs/os"
 	dbm "github.com/tendermint/tm-db"
 
-	"cosmossdk.io/core/appconfig"
-
-	"github.com/cosmos/cosmos-sdk/depinject"
-
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
+	"github.com/cosmos/cosmos-sdk/depinject"
 	"github.com/cosmos/cosmos-sdk/runtime"
 	"github.com/cosmos/cosmos-sdk/server/api"
 	"github.com/cosmos/cosmos-sdk/server/config"
@@ -191,11 +188,6 @@ func init() {
 	DefaultNodeHome = filepath.Join(userHomeDir, ".simapp")
 }
 
-//go:embed app.yaml
-var appConfigYaml []byte
-
-var AppConfig = appconfig.LoadYAML(appConfigYaml)
-
 // NewSimApp returns a reference to an initialized SimApp.
 func NewSimApp(
 	logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool, invCheckPeriod uint, encodingConfig simappparams.EncodingConfig,

simapp/app_config.go

@@ -0,0 +1,196 @@
+package simapp
+
+import (
+	"time"
+
+	"google.golang.org/protobuf/types/known/durationpb"
+
+	"cosmossdk.io/core/appconfig"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
+	"github.com/cosmos/cosmos-sdk/x/authz"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
+	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
+	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
+	evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
+	"github.com/cosmos/cosmos-sdk/x/feegrant"
+	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+	"github.com/cosmos/cosmos-sdk/x/group"
+	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
+	"github.com/cosmos/cosmos-sdk/x/nft"
+	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
+	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
+	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+
+	runtimev1alpha1 "cosmossdk.io/api/cosmos/app/runtime/v1alpha1"
+	appv1alpha1 "cosmossdk.io/api/cosmos/app/v1alpha1"
+	authmodulev1 "cosmossdk.io/api/cosmos/auth/module/v1"
+	authzmodulev1 "cosmossdk.io/api/cosmos/authz/module/v1"
+	bankmodulev1 "cosmossdk.io/api/cosmos/bank/module/v1"
+	capabilitymodulev1 "cosmossdk.io/api/cosmos/capability/module/v1"
+	distrmodulev1 "cosmossdk.io/api/cosmos/distribution/module/v1"
+	evidencemodulev1 "cosmossdk.io/api/cosmos/evidence/module/v1"
+	feegrantmodulev1 "cosmossdk.io/api/cosmos/feegrant/module/v1"
+	genutilmodulev1 "cosmossdk.io/api/cosmos/genutil/module/v1"
+	groupmodulev1 "cosmossdk.io/api/cosmos/group/module/v1"
+	mintmodulev1 "cosmossdk.io/api/cosmos/mint/module/v1"
+	nftmodulev1 "cosmossdk.io/api/cosmos/nft/module/v1"
+	paramsmodulev1 "cosmossdk.io/api/cosmos/params/module/v1"
+	slashingmodulev1 "cosmossdk.io/api/cosmos/slashing/module/v1"
+	stakingmodulev1 "cosmossdk.io/api/cosmos/staking/module/v1"
+	txmodulev1 "cosmossdk.io/api/cosmos/tx/module/v1"
+	upgrademodulev1 "cosmossdk.io/api/cosmos/upgrade/module/v1"
+	vestingmodulev1 "cosmossdk.io/api/cosmos/vesting/module/v1"
+)
+
+var AppConfig = appconfig.Compose(&appv1alpha1.Config{
+	Modules: []*appv1alpha1.ModuleConfig{
+		{
+			Name: "runtime",
+			Config: appconfig.WrapAny(&runtimev1alpha1.Module{
+				AppName: "SimApp",
+				// During begin block slashing happens after distr.BeginBlocker so that
+				// there is nothing left over in the validator fee pool, so as to keep the
+				// CanWithdrawInvariant invariant.
+				// NOTE: staking module is required if HistoricalEntries param > 0
+				// NOTE: capability module's beginblocker must come before any modules using capabilities (e.g. IBC)
+				BeginBlockers: []string{
+					upgradetypes.ModuleName,
+					capabilitytypes.ModuleName,
+					minttypes.ModuleName,
+					distrtypes.ModuleName,
+					slashingtypes.ModuleName,
+					evidencetypes.ModuleName,
+					stakingtypes.ModuleName,
+					authtypes.ModuleName,
+					banktypes.ModuleName,
+					govtypes.ModuleName,
+					crisistypes.ModuleName,
+					genutiltypes.ModuleName,
+					authz.ModuleName,
+					feegrant.ModuleName,
+					nft.ModuleName,
+					group.ModuleName,
+					paramstypes.ModuleName,
+					vestingtypes.ModuleName,
+				},
+				EndBlockers: []string{
+					crisistypes.ModuleName,
+					govtypes.ModuleName,
+					stakingtypes.ModuleName,
+					capabilitytypes.ModuleName,
+					authtypes.ModuleName,
+					banktypes.ModuleName,
+					distrtypes.ModuleName,
+					slashingtypes.ModuleName,
+					minttypes.ModuleName,
+					genutiltypes.ModuleName,
+					evidencetypes.ModuleName,
+					authz.ModuleName,
+					feegrant.ModuleName,
+					nft.ModuleName,
+					group.ModuleName,
+					paramstypes.ModuleName,
+					upgradetypes.ModuleName,
+					vestingtypes.ModuleName,
+				},
+				OverrideStoreKeys: []*runtimev1alpha1.StoreKeyConfig{
+					{
+						ModuleName: authtypes.ModuleName,
+						KvStoreKey: "acc",
+					},
+				},
+			}),
+		},
+		{
+			Name: authtypes.ModuleName,
+			Config: appconfig.WrapAny(&authmodulev1.Module{
+				Bech32Prefix: "cosmos",
+				ModuleAccountPermissions: []*authmodulev1.ModuleAccountPermission{
+					{Account: authtypes.FeeCollectorName},
+					{Account: distrtypes.ModuleName},
+					{Account: minttypes.ModuleName, Permissions: []string{authtypes.Minter}},
+					{Account: stakingtypes.BondedPoolName, Permissions: []string{authtypes.Burner, stakingtypes.ModuleName}},
+					{Account: stakingtypes.NotBondedPoolName, Permissions: []string{authtypes.Burner, stakingtypes.ModuleName}},
+					{Account: govtypes.ModuleName, Permissions: []string{authtypes.Burner}},
+					{Account: nft.ModuleName},
+				},
+			}),
+		},
+
+		{
+			Name:   vestingtypes.ModuleName,
+			Config: appconfig.WrapAny(&vestingmodulev1.Module{}),
+		},
+		{
+			Name:   banktypes.ModuleName,
+			Config: appconfig.WrapAny(&bankmodulev1.Module{}),
+		},
+		{
+			Name:   stakingtypes.ModuleName,
+			Config: appconfig.WrapAny(&stakingmodulev1.Module{}),
+		},
+		{
+			Name:   slashingtypes.ModuleName,
+			Config: appconfig.WrapAny(&slashingmodulev1.Module{}),
+		},
+		{
+			Name:   paramstypes.ModuleName,
+			Config: appconfig.WrapAny(&paramsmodulev1.Module{}),
+		},
+		{
+			Name:   "tx",
+			Config: appconfig.WrapAny(&txmodulev1.Module{}),
+		},
+		{
+			Name:   genutiltypes.ModuleName,
+			Config: appconfig.WrapAny(&genutilmodulev1.Module{}),
+		},
+		{
+			Name:   authz.ModuleName,
+			Config: appconfig.WrapAny(&authzmodulev1.Module{}),
+		},
+		{
+			Name:   upgradetypes.ModuleName,
+			Config: appconfig.WrapAny(&upgrademodulev1.Module{}),
+		},
+		{
+			Name:   distrtypes.ModuleName,
+			Config: appconfig.WrapAny(&distrmodulev1.Module{}),
+		},
+		{
+			Name: capabilitytypes.ModuleName,
+			Config: appconfig.WrapAny(&capabilitymodulev1.Module{
+				SealKeeper: true,
+			}),
+		},
+		{
+			Name:   evidencetypes.ModuleName,
+			Config: appconfig.WrapAny(&evidencemodulev1.Module{}),
+		},
+		{
+			Name:   minttypes.ModuleName,
+			Config: appconfig.WrapAny(&mintmodulev1.Module{}),
+		},
+		{
+			Name: group.ModuleName,
+			Config: appconfig.WrapAny(&groupmodulev1.Module{
+				MaxExecutionPeriod: durationpb.New(time.Second * 1209600),
+				MaxMetadataLen:     255,
+			}),
+		},
+		{
+			Name:   nft.ModuleName,
+			Config: appconfig.WrapAny(&nftmodulev1.Module{}),
+		},
+		{
+			Name:   feegrant.ModuleName,
+			Config: appconfig.WrapAny(&feegrantmodulev1.Module{}),
+		},
+	},
+})
+
+// Alternatively this configuration can be set as yaml or json: https://github.com/cosmos/cosmos-sdk/blob/91b1d83f1339e235a1dfa929ecc00084101a19e3/simapp/app.yaml