feat(gov): app-wiring for x/gov

proto/cosmos/gov/module/v1/module.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+
+package cosmos.gov.module.v1;
+
+import "cosmos/app/v1alpha1/module.proto";
+
+// Module is the config object of the gov module.
+message Module {
+  option (cosmos.app.v1alpha1.module) = {
+    go_import: "github.com/cosmos/cosmos-sdk/x/gov"
+  };
+
+  uint64 max_metadata_len = 1;
+}

simapp/app.go

@@ -253,15 +253,15 @@ func NewSimApp(
 		AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)).
 		AddRoute(distrtypes.RouterKey, distr.NewCommunityPoolSpendProposalHandler(app.DistrKeeper)).
 		AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper))
-	govConfig := govtypes.DefaultConfig()
+	//govConfig := govtypes.DefaultConfig()
 	/*
 		Example of setting gov params:
 		govConfig.MaxMetadataLen = 10000
 	*/
-	govKeeper := govkeeper.NewKeeper(
-		app.appCodec, app.keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper,
-		app.StakingKeeper, govRouter, app.MsgServiceRouter(), govConfig,
-	)
+	//govKeeper := govkeeper.NewKeeper(
+	//	app.appCodec, app.keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper,
+	//	app.StakingKeeper, govRouter, app.MsgServiceRouter(), govConfig,
+	//)
 
 	app.GovKeeper = *govKeeper.SetHooks(
 		govtypes.NewMultiGovHooks(

x/distribution/module.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	"math/rand"
 
 	gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime"
@@ -240,6 +241,7 @@ type distrOutputs struct {
 	DistrKeeper keeper.Keeper
 	Module      runtime.AppModuleWrapper
 	Hooks       staking.StakingHooksWrapper
+	GovHandler  govv1beta1.RoutedHandler
 }
 
 func provideModule(in distrInputs) distrOutputs {
@@ -250,5 +252,6 @@ func provideModule(in distrInputs) distrOutputs {
 		DistrKeeper: k,
 		Module:      runtime.WrapAppModule(m),
 		Hooks:       staking.StakingHooksWrapper{StakingHooks: k.Hooks()},
+		GovHandler:  govv1beta1.RoutedHandler{Handler: NewCommunityPoolSpendProposalHandler(k), RouteKey: types.RouterKey},
 	}
 }

x/gov/keeper/keeper.go

@@ -55,34 +55,27 @@ type Keeper struct {
 func NewKeeper(
 	cdc codec.BinaryCodec, key storetypes.StoreKey, paramSpace types.ParamSubspace,
 	authKeeper types.AccountKeeper, bankKeeper types.BankKeeper, sk types.StakingKeeper,
-	legacyRouter v1beta1.Router, router *baseapp.MsgServiceRouter,
-	config types.Config,
+	router *baseapp.MsgServiceRouter, config types.Config,
 ) Keeper {
 	// ensure governance module account is set
 	if addr := authKeeper.GetModuleAddress(types.ModuleName); addr == nil {
 		panic(fmt.Sprintf("%s module account has not been set", types.ModuleName))
 	}
 
-	// It is vital to seal the governance proposal router here as to not allow
-	// further handlers to be registered after the keeper is created since this
-	// could create invalid or non-deterministic behavior.
-	legacyRouter.Seal()
-
 	// If MaxMetadataLen not set by app developer, set to default value.
 	if config.MaxMetadataLen == 0 {
 		config.MaxMetadataLen = types.DefaultConfig().MaxMetadataLen
 	}
 
 	return Keeper{
-		storeKey:     key,
-		paramSpace:   paramSpace,
-		authKeeper:   authKeeper,
-		bankKeeper:   bankKeeper,
-		sk:           sk,
-		cdc:          cdc,
-		legacyRouter: legacyRouter,
-		router:       router,
-		config:       config,
+		storeKey:   key,
+		paramSpace: paramSpace,
+		authKeeper: authKeeper,
+		bankKeeper: bankKeeper,
+		sk:         sk,
+		cdc:        cdc,
+		router:     router,
+		config:     config,
 	}
 }
 
@@ -97,6 +90,14 @@ func (keeper *Keeper) SetHooks(gh types.GovHooks) *Keeper {
 	return keeper
 }
 
+func (keeper *Keeper) SetLegacyRouter(router v1beta1.Router) {
+	// It is vital to seal the governance proposal router here as to not allow
+	// further handlers to be registered after the keeper is created since this
+	// could create invalid or non-deterministic behavior.
+	router.Seal()
+	keeper.legacyRouter = router
+}
+
 // Logger returns a module-specific logger.
 func (keeper Keeper) Logger(ctx sdk.Context) log.Logger {
 	return ctx.Logger().With("module", "x/"+types.ModuleName)

x/gov/module.go

@@ -4,11 +4,16 @@ package gov
 
 import (
 	"context"
+	modulev1 "cosmossdk.io/api/cosmos/gov/module/v1"
+	"cosmossdk.io/core/appmodule"
 	"encoding/json"
 	"fmt"
+	"github.com/cosmos/cosmos-sdk/baseapp"
+	"github.com/cosmos/cosmos-sdk/runtime"
+	store "github.com/cosmos/cosmos-sdk/store/types"
 	"math/rand"
 
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 	abci "github.com/tendermint/tendermint/abci/types"
 
@@ -74,7 +79,7 @@ func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, config client.TxEncod
 }
 
 // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the gov module.
-func (a AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) {
+func (a AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *gwruntime.ServeMux) {
 	if err := v1.RegisterQueryHandlerClient(context.Background(), mux, v1.NewQueryClient(clientCtx)); err != nil {
 		panic(err)
 	}
@@ -128,6 +133,47 @@ func NewAppModule(cdc codec.Codec, keeper keeper.Keeper, ak types.AccountKeeper,
 	}
 }
 
+func init() {
+	appmodule.Register(
+		&modulev1.Module{},
+		appmodule.Provide(provideModuleBasic, provideModule),
+		appmodule.Invoke(invokeAddRoutes))
+}
+
+func provideModuleBasic() runtime.AppModuleBasicWrapper {
+	return runtime.WrapAppModuleBasic(AppModuleBasic{})
+}
+
+func provideModule(
+	config *modulev1.Module,
+	cdc codec.Codec,
+	key *store.KVStoreKey,
+	subSpace types.ParamSubspace,
+	msgServiceRouter *baseapp.MsgServiceRouter,
+	ak types.AccountKeeper,
+	bk types.BankKeeper,
+	sk types.StakingKeeper) (runtime.AppModuleWrapper, v1beta1.RoutedHandler) {
+
+	kConfig := types.DefaultConfig()
+	if config.MaxMetadataLen != 0 {
+		kConfig.MaxMetadataLen = config.MaxMetadataLen
+	}
+
+	k := keeper.NewKeeper(cdc, key, subSpace, ak, bk, sk, msgServiceRouter, kConfig)
+	m := NewAppModule(cdc, k, ak, bk)
+	return runtime.WrapAppModule(m), v1beta1.RoutedHandler{Handler: v1beta1.ProposalHandler, RouteKey: types.RouterKey}
+}
+
+func invokeAddRoutes(
+	keeper keeper.Keeper,
+	routes []v1beta1.RoutedHandler) {
+	router := v1beta1.NewRouter()
+	for _, r := range routes {
+		router.AddRoute(r.RouteKey, r.Handler)
+	}
+	keeper.SetLegacyRouter(router)
+}
+
 // Name returns the gov module's name.
 func (AppModule) Name() string {
 	return types.ModuleName

x/gov/types/v1beta1/content.go

@@ -18,3 +18,11 @@ type Content interface {
 // Handler defines a function that handles a proposal after it has passed the
 // governance process.
 type Handler func(ctx sdk.Context, content Content) error
+
+type RoutedHandler struct {
+	Handler  Handler
+	RouteKey string
+}
+
+// ManyPerContainer implements the depinject.ManyPerContainer interface.
+func (RoutedHandler) ManyPerContainer() {}

x/params/module.go

@@ -3,6 +3,7 @@ package params
 import (
 	"context"
 	"encoding/json"
+	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	"math/rand"
 
 	gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime"
@@ -187,6 +188,7 @@ type paramsOutputs struct {
 	ParamsKeeper  keeper.Keeper
 	BaseAppOption runtime.BaseAppOption
 	Module        runtime.AppModuleWrapper
+	GovHandler    govv1beta1.RoutedHandler
 }
 
 func provideModule(in paramsInputs) paramsOutputs {
@@ -195,8 +197,9 @@ func provideModule(in paramsInputs) paramsOutputs {
 		app.SetParamStore(k.Subspace(baseapp.Paramspace).WithKeyTable(types.ConsensusParamsKeyTable()))
 	}
 	m := runtime.WrapAppModule(NewAppModule(k))
+	govHandler := govv1beta1.RoutedHandler{RouteKey: proposal.RouterKey, Handler: NewParamChangeProposalHandler(k)}
 
-	return paramsOutputs{ParamsKeeper: k, BaseAppOption: baseappOpt, Module: m}
+	return paramsOutputs{ParamsKeeper: k, BaseAppOption: baseappOpt, Module: m, GovHandler: govHandler}
 }
 
 func provideSubSpace(key depinject.ModuleKey, k keeper.Keeper) types.Subspace {