Merge pull request cosmos#3136 from cosmos/jae/revert_remove_gov_slas…

…hing Revert remove gov slashing
irisnet · Dec 17, 2018 · 46620d4 · 46620d4
2 parents ac511ab + 5280340
commit 46620d4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/cmd/gaia/app/sim_test.go b/cmd/gaia/app/sim_test.go
@@ -87,8 +87,9 @@ func appStateFn(r *rand.Rand, accs []simulation.Account) json.RawMessage {
 			VotingPeriod: vp,
 		},
 		TallyParams: gov.TallyParams{
-			Threshold: sdk.NewDecWithPrec(5, 1),
-			Veto:      sdk.NewDecWithPrec(334, 3),
+			Threshold:         sdk.NewDecWithPrec(5, 1),
+			Veto:              sdk.NewDecWithPrec(334, 3),
+			GovernancePenalty: sdk.NewDecWithPrec(1, 2),
 		},
 	}
 	fmt.Printf("Selected randomly generated governance parameters:\n\t%+v\n", govGenesis)

diff --git a/x/gov/genesis.go b/x/gov/genesis.go
@@ -52,9 +52,10 @@ func DefaultGenesisState() GenesisState {
 			VotingPeriod: time.Duration(172800) * time.Second,
 		},
 		TallyParams: TallyParams{
-			Quorum:    sdk.NewDecWithPrec(334, 3),
-			Threshold: sdk.NewDecWithPrec(5, 1),
-			Veto:      sdk.NewDecWithPrec(334, 3),
+			Quorum:            sdk.NewDecWithPrec(334, 3),
+			Threshold:         sdk.NewDecWithPrec(5, 1),
+			Veto:              sdk.NewDecWithPrec(334, 3),
+			GovernancePenalty: sdk.NewDecWithPrec(1, 2),
 		},
 	}
 }
@@ -73,6 +74,12 @@ func ValidateGenesis(data GenesisState) error {
 			veto.String())
 	}
 
+	govPenalty := data.TallyParams.GovernancePenalty
+	if govPenalty.IsNegative() || govPenalty.GT(sdk.OneDec()) {
+		return fmt.Errorf("Governance vote veto threshold should be positive and less or equal to one, is %s",
+			govPenalty.String())
+	}
+
 	if data.DepositParams.MaxDepositPeriod > data.VotingParams.VotingPeriod {
 		return fmt.Errorf("Governance deposit period should be less than or equal to the voting period (%ds), is %ds",
 			data.VotingParams.VotingPeriod, data.DepositParams.MaxDepositPeriod)

diff --git a/x/gov/params.go b/x/gov/params.go
@@ -14,9 +14,10 @@ type DepositParams struct {
 
 // Param around Tallying votes in governance
 type TallyParams struct {
-	Quorum    sdk.Dec `json:"quorum"`    //  Minimum percentage of total stake needed to vote for a result to be considered valid
-	Threshold sdk.Dec `json:"threshold"` //  Minimum propotion of Yes votes for proposal to pass. Initial value: 0.5
-	Veto      sdk.Dec `json:"veto"`      //  Minimum value of Veto votes to Total votes ratio for proposal to be vetoed. Initial value: 1/3
+	Quorum            sdk.Dec `json:"quorum"`             //  Minimum percentage of total stake needed to vote for a result to be considered valid
+	Threshold         sdk.Dec `json:"threshold"`          //  Minimum propotion of Yes votes for proposal to pass. Initial value: 0.5
+	Veto              sdk.Dec `json:"veto"`               //  Minimum value of Veto votes to Total votes ratio for proposal to be vetoed. Initial value: 1/3
+	GovernancePenalty sdk.Dec `json:"governance_penalty"` //  Penalty if validator does not vote
 }
 
 // Param around Voting in governance