feat: add array of messages to a proposal

client/docs/swagger-ui/swagger.yaml

@@ -25056,7 +25056,7 @@ definitions:
     description: >-
       QueryEvidenceResponse is the response type for the Query/Evidence RPC
       method.
-  cosmos.gov.v1beta1.Deposit:
+  cosmos.gov.v1beta2.Deposit:
     type: object
     properties:
       proposal_id:
@@ -25081,7 +25081,7 @@ definitions:
     description: |-
       Deposit defines an amount deposited by an account address to an active
       proposal.
-  cosmos.gov.v1beta1.DepositParams:
+  cosmos.gov.v1beta2.DepositParams:
     type: object
     properties:
       min_deposit:
@@ -25106,7 +25106,7 @@ definitions:
           value: 2
            months.
     description: DepositParams defines the params for deposits on governance proposals.
-  cosmos.gov.v1beta1.Proposal:
+  cosmos.gov.v1beta2.Proposal:
     type: object
     properties:
       proposal_id:
@@ -25334,7 +25334,7 @@ definitions:
         type: string
         format: date-time
     description: Proposal defines the core field members of a governance proposal.
-  cosmos.gov.v1beta1.ProposalStatus:
+  cosmos.gov.v1beta2.ProposalStatus:
     type: string
     enum:
       - PROPOSAL_STATUS_UNSPECIFIED
@@ -25358,7 +25358,7 @@ definitions:
       been rejected.
        - PROPOSAL_STATUS_FAILED: PROPOSAL_STATUS_FAILED defines a proposal status of a proposal that has
       failed.
-  cosmos.gov.v1beta1.QueryDepositResponse:
+  cosmos.gov.v1beta2.QueryDepositResponse:
     type: object
     properties:
       deposit:
@@ -25392,7 +25392,7 @@ definitions:
     description: >-
       QueryDepositResponse is the response type for the Query/Deposit RPC
       method.
-  cosmos.gov.v1beta1.QueryDepositsResponse:
+  cosmos.gov.v1beta2.QueryDepositsResponse:
     type: object
     properties:
       deposits:
@@ -25448,7 +25448,7 @@ definitions:
     description: >-
       QueryDepositsResponse is the response type for the Query/Deposits RPC
       method.
-  cosmos.gov.v1beta1.QueryParamsResponse:
+  cosmos.gov.v1beta2.QueryParamsResponse:
     type: object
     properties:
       voting_params:
@@ -25511,7 +25511,7 @@ definitions:
               be
                vetoed. Default value: 1/3.
     description: QueryParamsResponse is the response type for the Query/Params RPC method.
-  cosmos.gov.v1beta1.QueryProposalResponse:
+  cosmos.gov.v1beta2.QueryProposalResponse:
     type: object
     properties:
       proposal:
@@ -25754,7 +25754,7 @@ definitions:
     description: >-
       QueryProposalResponse is the response type for the Query/Proposal RPC
       method.
-  cosmos.gov.v1beta1.QueryProposalsResponse:
+  cosmos.gov.v1beta2.QueryProposalsResponse:
     type: object
     properties:
       proposals:
@@ -26021,7 +26021,7 @@ definitions:
     description: |-
       QueryProposalsResponse is the response type for the Query/Proposals RPC
       method.
-  cosmos.gov.v1beta1.QueryTallyResultResponse:
+  cosmos.gov.v1beta2.QueryTallyResultResponse:
     type: object
     properties:
       tally:
@@ -26039,7 +26039,7 @@ definitions:
     description: >-
       QueryTallyResultResponse is the response type for the Query/Tally RPC
       method.
-  cosmos.gov.v1beta1.QueryVoteResponse:
+  cosmos.gov.v1beta2.QueryVoteResponse:
     type: object
     properties:
       vote:
@@ -26097,7 +26097,7 @@ definitions:
           Vote defines a vote on a governance proposal.
           A Vote consists of a proposal ID, the voter, and the vote option.
     description: QueryVoteResponse is the response type for the Query/Vote RPC method.
-  cosmos.gov.v1beta1.QueryVotesResponse:
+  cosmos.gov.v1beta2.QueryVotesResponse:
     type: object
     properties:
       votes:
@@ -26176,7 +26176,7 @@ definitions:
 
               was set, its value is undefined otherwise
     description: QueryVotesResponse is the response type for the Query/Votes RPC method.
-  cosmos.gov.v1beta1.TallyParams:
+  cosmos.gov.v1beta2.TallyParams:
     type: object
     properties:
       quorum:
@@ -26198,7 +26198,7 @@ definitions:
           Minimum value of Veto votes to Total votes ratio for proposal to be
            vetoed. Default value: 1/3.
     description: TallyParams defines the params for tallying votes on governance proposals.
-  cosmos.gov.v1beta1.TallyResult:
+  cosmos.gov.v1beta2.TallyResult:
     type: object
     properties:
       'yes':
@@ -26210,7 +26210,7 @@ definitions:
       no_with_veto:
         type: string
     description: TallyResult defines a standard tally for a governance proposal.
-  cosmos.gov.v1beta1.Vote:
+  cosmos.gov.v1beta2.Vote:
     type: object
     properties:
       proposal_id:
@@ -26264,7 +26264,7 @@ definitions:
     description: |-
       Vote defines a vote on a governance proposal.
       A Vote consists of a proposal ID, the voter, and the vote option.
-  cosmos.gov.v1beta1.VoteOption:
+  cosmos.gov.v1beta2.VoteOption:
     type: string
     enum:
       - VOTE_OPTION_UNSPECIFIED
@@ -26282,14 +26282,14 @@ definitions:
        - VOTE_OPTION_ABSTAIN: VOTE_OPTION_ABSTAIN defines an abstain vote option.
        - VOTE_OPTION_NO: VOTE_OPTION_NO defines a no vote option.
        - VOTE_OPTION_NO_WITH_VETO: VOTE_OPTION_NO_WITH_VETO defines a no with veto vote option.
-  cosmos.gov.v1beta1.VotingParams:
+  cosmos.gov.v1beta2.VotingParams:
     type: object
     properties:
       voting_period:
         type: string
         description: Length of the voting period.
     description: VotingParams defines the params for voting on governance proposals.
-  cosmos.gov.v1beta1.WeightedVoteOption:
+  cosmos.gov.v1beta2.WeightedVoteOption:
     type: object
     properties:
       option:

proto/cosmos/gov/v1beta1/genesis.proto

@@ -5,7 +5,7 @@ package cosmos.gov.v1beta1;
 import "gogoproto/gogo.proto";
 import "cosmos/gov/v1beta1/gov.proto";
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1";
 
 // GenesisState defines the gov module's genesis state.
 message GenesisState {

proto/cosmos/gov/v1beta1/gov.proto

@@ -8,7 +8,7 @@ import "google/protobuf/any.proto";
 import "google/protobuf/duration.proto";
 import "cosmos_proto/cosmos.proto";
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1";
 
 option (gogoproto.goproto_stringer_all) = false;
 option (gogoproto.stringer_all)         = false;

proto/cosmos/gov/v1beta1/query.proto

@@ -7,7 +7,7 @@ import "google/api/annotations.proto";
 import "cosmos/gov/v1beta1/gov.proto";
 import "cosmos_proto/cosmos.proto";
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1";
 
 // Query defines the gRPC querier service for gov module
 service Query {

simapp/app.go

@@ -76,7 +76,6 @@ import (
 	paramsclient "github.com/cosmos/cosmos-sdk/x/params/client"
 	paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
-	paramproposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
 	"github.com/cosmos/cosmos-sdk/x/slashing"
 	slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
@@ -287,15 +286,9 @@ func NewSimApp(
 
 	app.AuthzKeeper = authzkeeper.NewKeeper(keys[authzkeeper.StoreKey], appCodec, app.msgSvcRouter)
 
-	// register the proposal types
-	govRouter := govtypes.NewRouter()
-	govRouter.AddRoute(govtypes.RouterKey, govtypes.ProposalHandler).
-		AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)).
-		AddRoute(distrtypes.RouterKey, distr.NewCommunityPoolSpendProposalHandler(app.DistrKeeper)).
-		AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper))
 	govKeeper := govkeeper.NewKeeper(
 		appCodec, keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper,
-		&stakingKeeper, govRouter,
+		&stakingKeeper, app.msgSvcRouter,
 	)
 
 	app.GovKeeper = *govKeeper.SetHooks(

simapp/params/weights.go

@@ -17,10 +17,7 @@ const (
 	DefaultWeightMsgDelegate                    int = 100
 	DefaultWeightMsgUndelegate                  int = 100
 	DefaultWeightMsgBeginRedelegate             int = 100
-
-	DefaultWeightCommunitySpendProposal int = 5
-	DefaultWeightTextProposal           int = 5
-	DefaultWeightParamChangeProposal    int = 5
+	DefaultWeightMsgSubmitProposal int = 5
 
 	// feegrant
 	DefaultWeightGrantAllowance  int = 100

simapp/utils.go

@@ -68,7 +68,6 @@ func SimulationOperations(app App, cdc codec.JSONCodec, config simtypes.Config)
 	}
 
 	simState.ParamChanges = app.SimulationManager().GenerateParamChanges(config.Seed)
-	simState.Contents = app.SimulationManager().GetProposalContents(simState)
 	return app.SimulationManager().WeightedOperations(simState)
 }
 

types/module/simulation.go

@@ -17,9 +17,6 @@ type AppModuleSimulation interface {
 	// randomized genesis states
 	GenerateGenesisState(input *SimulationState)
 
-	// content functions used to simulate governance proposals
-	ProposalContents(simState SimulationState) []simulation.WeightedProposalContent
-
 	// randomized module parameters for param change proposals
 	RandomizedParams(r *rand.Rand) []simulation.ParamChange
 
@@ -47,17 +44,6 @@ func NewSimulationManager(modules ...AppModuleSimulation) *SimulationManager {
 	}
 }
 
-// GetProposalContents returns each module's proposal content generator function
-// with their default operation weight and key.
-func (sm *SimulationManager) GetProposalContents(simState SimulationState) []simulation.WeightedProposalContent {
-	wContents := make([]simulation.WeightedProposalContent, 0, len(sm.Modules))
-	for _, module := range sm.Modules {
-		wContents = append(wContents, module.ProposalContents(simState)...)
-	}
-
-	return wContents
-}
-
 // RegisterStoreDecoders registers each of the modules' store decoders into a map
 func (sm *SimulationManager) RegisterStoreDecoders() {
 	for _, module := range sm.Modules {
@@ -99,14 +85,13 @@ func (sm *SimulationManager) WeightedOperations(simState SimulationState) []simu
 // GenesisState generator function
 type SimulationState struct {
 	AppParams    simulation.AppParams
-	Cdc          codec.JSONCodec                      // application codec
-	Rand         *rand.Rand                           // random number
-	GenState     map[string]json.RawMessage           // genesis state
-	Accounts     []simulation.Account                 // simulation accounts
-	InitialStake int64                                // initial coins per account
-	NumBonded    int64                                // number of initially bonded accounts
-	GenTimestamp time.Time                            // genesis timestamp
-	UnbondTime   time.Duration                        // staking unbond time stored to use it as the slashing maximum evidence duration
-	ParamChanges []simulation.ParamChange             // simulated parameter changes from modules
-	Contents     []simulation.WeightedProposalContent // proposal content generator functions with their default weight and app sim key
+	Cdc          codec.JSONCodec            // application codec
+	Rand         *rand.Rand                 // random number
+	GenState     map[string]json.RawMessage // genesis state
+	Accounts     []simulation.Account       // simulation accounts
+	InitialStake int64                      // initial coins per account
+	NumBonded    int64                      // number of initially bonded accounts
+	GenTimestamp time.Time                  // genesis timestamp
+	UnbondTime   time.Duration              // staking unbond time stored to use it as the slashing maximum evidence duration
+	ParamChanges []simulation.ParamChange   // simulated parameter changes from modules
 }