Merge PR #1688: Un-hardcode in governance parameters

cosmos · Jul 27, 2018 · 55ef898 · 55ef898
1 parent d46140a
commit 55ef898
Show file tree

Hide file tree

Showing 9 changed files with 111 additions and 71 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/PENDING.md b/PENDING.md
@@ -24,6 +24,7 @@ BREAKING CHANGES
   * `gaiacli gov deposit --depositer`
   * `gaiacli gov vote --voter`
 * [x/gov] Added tags sub-package, changed tags to use dash-case 
+* [x/gov] Governance parameters are now stored in globalparams store
 
 FEATURES
 * [lcd] Can now query governance proposals by ProposalStatus
@@ -48,6 +49,7 @@ IMPROVEMENTS
 * [x/bank] Unit tests are now table-driven
 * [tests] Fixes ansible scripts to work with AWS too
 * [tests] \#1806 CLI tests are now behind the build flag 'cli_test', so go test works on a new repo
+* [x/gov] Initial governance parameters can now be set in the genesis file
 
 BUG FIXES
 *  \#1666 Add intra-tx counter to the genesis validators
@@ -56,4 +58,4 @@ BUG FIXES
 *  \#1766 Fixes bad example for keybase identity
 *  \#1804 Fixes gen-tx genesis generation logic temporarily until upstream updates
 *  \#1799 Fix `gaiad export`
-*  \#1828 Force user to specify amount on create-validator command by removing default
+*  \#1828 Force user to specify amount on create-validator command by removing default
diff --git a/cmd/gaia/app/app.go b/cmd/gaia/app/app.go
@@ -93,7 +93,7 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppOptio
 	app.ibcMapper = ibc.NewMapper(app.cdc, app.keyIBC, app.RegisterCodespace(ibc.DefaultCodespace))
 	app.paramsKeeper = params.NewKeeper(app.cdc, app.keyParams)
 	app.stakeKeeper = stake.NewKeeper(app.cdc, app.keyStake, app.coinKeeper, app.RegisterCodespace(stake.DefaultCodespace))
-	app.govKeeper = gov.NewKeeper(app.cdc, app.keyGov, app.coinKeeper, app.stakeKeeper, app.RegisterCodespace(gov.DefaultCodespace))
+	app.govKeeper = gov.NewKeeper(app.cdc, app.keyGov, app.paramsKeeper.Setter(), app.coinKeeper, app.stakeKeeper, app.RegisterCodespace(gov.DefaultCodespace))
 	app.feeCollectionKeeper = auth.NewFeeCollectionKeeper(app.cdc, app.keyFeeCollection)
 	app.slashingKeeper = slashing.NewKeeper(app.cdc, app.keySlashing, app.stakeKeeper, app.paramsKeeper.Getter(), app.RegisterCodespace(slashing.DefaultCodespace))
 

diff --git a/x/gov/genesis.go b/x/gov/genesis.go
@@ -6,19 +6,37 @@ import (
 
 // GenesisState - all staking state that must be provided at genesis
 type GenesisState struct {
-	StartingProposalID int64 `json:"starting_proposalID"`
+	StartingProposalID int64             `json:"starting_proposalID"`
+	DepositProcedure   DepositProcedure  `json:"deposit_period"`
+	VotingProcedure    VotingProcedure   `json:"voting_period"`
+	TallyingProcedure  TallyingProcedure `json:"tallying_procedure"`
 }
 
-func NewGenesisState(startingProposalID int64) GenesisState {
+func NewGenesisState(startingProposalID int64, dp DepositProcedure, vp VotingProcedure, tp TallyingProcedure) GenesisState {
 	return GenesisState{
 		StartingProposalID: startingProposalID,
+		DepositProcedure:   dp,
+		VotingProcedure:    vp,
+		TallyingProcedure:  tp,
 	}
 }
 
 // get raw genesis raw message for testing
 func DefaultGenesisState() GenesisState {
 	return GenesisState{
 		StartingProposalID: 1,
+		DepositProcedure: DepositProcedure{
+			MinDeposit:       sdk.Coins{sdk.NewCoin("steak", 10)},
+			MaxDepositPeriod: 200,
+		},
+		VotingProcedure: VotingProcedure{
+			VotingPeriod: 200,
+		},
+		TallyingProcedure: TallyingProcedure{
+			Threshold:         sdk.NewRat(1, 2),
+			Veto:              sdk.NewRat(1, 3),
+			GovernancePenalty: sdk.NewRat(1, 100),
+		},
 	}
 }
 
@@ -29,13 +47,22 @@ func InitGenesis(ctx sdk.Context, k Keeper, data GenesisState) {
 		// TODO: Handle this with #870
 		panic(err)
 	}
+	k.setDepositProcedure(ctx, data.DepositProcedure)
+	k.setVotingProcedure(ctx, data.VotingProcedure)
+	k.setTallyingProcedure(ctx, data.TallyingProcedure)
 }
 
 // WriteGenesis - output genesis parameters
 func WriteGenesis(ctx sdk.Context, k Keeper) GenesisState {
-	initalProposalID, _ := k.getNewProposalID(ctx)
+	startingProposalID, _ := k.getNewProposalID(ctx)
+	depositProcedure := k.GetDepositProcedure(ctx)
+	votingProcedure := k.GetVotingProcedure(ctx)
+	tallyingProcedure := k.GetTallyingProcedure(ctx)
 
 	return GenesisState{
-		initalProposalID,
+		StartingProposalID: startingProposalID,
+		DepositProcedure:   depositProcedure,
+		VotingProcedure:    votingProcedure,
+		TallyingProcedure:  tallyingProcedure,
 	}
 }
diff --git a/x/gov/handler.go b/x/gov/handler.go
@@ -118,7 +118,7 @@ func EndBlocker(ctx sdk.Context, keeper Keeper) (resTags sdk.Tags, nonVotingVals
 		activeProposal := keeper.ActiveProposalQueuePop(ctx)
 
 		proposalStartBlock := activeProposal.GetVotingStartBlock()
-		votingPeriod := keeper.GetVotingProcedure().VotingPeriod
+		votingPeriod := keeper.GetVotingProcedure(ctx).VotingPeriod
 		if ctx.BlockHeight() < proposalStartBlock+votingPeriod {
 			continue
 		}
@@ -144,7 +144,7 @@ func EndBlocker(ctx sdk.Context, keeper Keeper) (resTags sdk.Tags, nonVotingVals
 	return resTags, nonVotingVals
 }
 func shouldPopInactiveProposalQueue(ctx sdk.Context, keeper Keeper) bool {
-	depositProcedure := keeper.GetDepositProcedure()
+	depositProcedure := keeper.GetDepositProcedure(ctx)
 	peekProposal := keeper.InactiveProposalQueuePeek(ctx)
 
 	if peekProposal == nil {
@@ -158,7 +158,7 @@ func shouldPopInactiveProposalQueue(ctx sdk.Context, keeper Keeper) bool {
 }
 
 func shouldPopActiveProposalQueue(ctx sdk.Context, keeper Keeper) bool {
-	votingProcedure := keeper.GetVotingProcedure()
+	votingProcedure := keeper.GetVotingProcedure(ctx)
 	peekProposal := keeper.ActiveProposalQueuePeek(ctx)
 
 	if peekProposal == nil {