feat(x/gov): hard min voting period to 3 weeks (#10)

atomone-hub · Sep 17, 2024 · 77ae416 · 77ae416
1 parent bf92e1e
commit 77ae416
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/x/gov/keeper/msg_server_test.go b/x/gov/keeper/msg_server_test.go
@@ -1,6 +1,7 @@
 package keeper_test
 
 import (
+	"fmt"
 	"strings"
 	"time"
 
@@ -1023,7 +1024,7 @@ func (suite *KeeperTestSuite) TestMsgUpdateParams() {
 				}
 			},
 			expErr:    true,
-			expErrMsg: "voting period must be positive",
+			expErrMsg: fmt.Sprintf("voting period must be at least %s: 0s", v1.MinVotingPeriod.String()),
 		},
 	}
 

diff --git a/x/gov/types/v1/params.go b/x/gov/types/v1/params.go
@@ -9,13 +9,16 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-// Default period for deposits & voting
+// Default period for deposits & voting and min voting period
 const (
-	DefaultPeriod time.Duration = time.Hour * 24 * 2 // 2 days
+	DefaultVotingPeriod  time.Duration = time.Hour * 24 * 21 // 21 days
+	MinVotingPeriod      time.Duration = time.Hour * 24 * 21 // 21 days
+	DefaultDepositPeriod time.Duration = time.Hour * 24 * 14 // 14 days
 )
 
 // Default governance params
 var (
+	minVotingPeriod               = MinVotingPeriod
 	DefaultMinDepositTokens       = sdk.NewInt(10000000)
 	DefaultQuorum                 = sdk.NewDecWithPrec(334, 3)
 	DefaultThreshold              = sdk.NewDecWithPrec(5, 1)
@@ -73,8 +76,8 @@ func NewParams(
 func DefaultParams() Params {
 	return NewParams(
 		sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, DefaultMinDepositTokens)),
-		DefaultPeriod,
-		DefaultPeriod,
+		DefaultDepositPeriod,
+		DefaultVotingPeriod,
 		DefaultQuorum.String(),
 		DefaultThreshold.String(),
 		DefaultVetoThreshold.String(),
@@ -133,11 +136,11 @@ func (p Params) ValidateBasic() error {
 	}
 
 	if p.VotingPeriod == nil {
-		return fmt.Errorf("voting period must not be nil: %d", p.VotingPeriod)
+		return fmt.Errorf("voting period must not be nil")
 	}
 
-	if p.VotingPeriod.Seconds() <= 0 {
-		return fmt.Errorf("voting period must be positive: %s", p.VotingPeriod)
+	if p.VotingPeriod.Seconds() < minVotingPeriod.Seconds() {
+		return fmt.Errorf("voting period must be at least %s: %s", minVotingPeriod.String(), p.VotingPeriod.String())
 	}
 
 	minInitialDepositRatio, err := math.LegacyNewDecFromStr(p.MinInitialDepositRatio)

diff --git a/x/gov/types/v1/params_legacy.go b/x/gov/types/v1/params_legacy.go
@@ -94,8 +94,8 @@ func validateVotingParams(i interface{}) error {
 		return errors.New("voting period must not be nil")
 	}
 
-	if v.VotingPeriod.Seconds() <= 0 {
-		return fmt.Errorf("voting period must be positive: %s", v.VotingPeriod)
+	if v.VotingPeriod.Seconds() < MinVotingPeriod.Seconds() {
+		return fmt.Errorf("voting period must be at least %s: %s", MinVotingPeriod.String(), v.VotingPeriod.String())
 	}
 
 	return nil

diff --git a/x/gov/types/v1beta1/params.go b/x/gov/types/v1beta1/params.go
@@ -10,7 +10,8 @@ import (
 
 // Default period for deposits & voting
 const (
-	DefaultPeriod time.Duration = time.Hour * 24 * 2 // 2 days
+	DefaultVotingPeriod  time.Duration = time.Hour * 24 * 21 // 21 days
+	DefaultDepositPeriod time.Duration = time.Hour * 24 * 14 // 14 days
 )
 
 // Default governance params
@@ -33,7 +34,7 @@ func NewDepositParams(minDeposit sdk.Coins, maxDepositPeriod time.Duration) Depo
 func DefaultDepositParams() DepositParams {
 	return NewDepositParams(
 		sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, DefaultMinDepositTokens)),
-		DefaultPeriod,
+		DefaultDepositPeriod,
 	)
 }
 
@@ -82,7 +83,7 @@ func NewVotingParams(votingPeriod time.Duration) VotingParams {
 
 // DefaultVotingParams default parameters for voting
 func DefaultVotingParams() VotingParams {
-	return NewVotingParams(DefaultPeriod)
+	return NewVotingParams(DefaultVotingPeriod)
 }
 
 // Equal checks equality of TallyParams