feat!(x/gov): implement a minimum amount per deposit (backport cosmos…

…#19312) (#510) * feat(x/gov): implement a minimum amount per deposit (cosmos#18146) Co-authored-by: Aleksandr Bezobchuk <[email protected]> Co-authored-by: Julien Robert <[email protected]> * Fix * Fix test * Fix e2e * Fix e2e * Fix test * update changelog * Include expedited proposal logic * Update deposit.go --------- Co-authored-by: MSalopek <[email protected]> Co-authored-by: Aleksandr Bezobchuk <[email protected]> Co-authored-by: Julien Robert <[email protected]> Co-authored-by: Adam Tucker <[email protected]> Co-authored-by: Adam Tucker <[email protected]>
osmosis-labs · Mar 22, 2024 · 106ba23 · 106ba23
1 parent dead65a
commit 106ba23
Show file tree

Hide file tree

Showing 23 changed files with 578 additions and 189 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,6 +44,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (slashing) [#543](https://github.com/osmosis-labs/cosmos-sdk/pull/543) Make slashing not write sign info every block
 * (authz) [#513](https://github.com/osmosis-labs/cosmos-sdk/pull/513) Limit expired authz grant pruning to 200 per block
 * (gov) [#514](https://github.com/osmosis-labs/cosmos-sdk/pull/514) Let gov hooks return an error
+* (gov) [#510](https://github.com/osmosis-labs/cosmos-sdk/pull/510) Implement a minimum amount per deposit
 * (slashing) [#580](https://github.com/osmosis-labs/cosmos-sdk/pull/580) Less time intensive slashing migration
 
 ## [State Compatible]

diff --git a/api/cosmos/gov/v1/gov.pulsar.go b/api/cosmos/gov/v1/gov.pulsar.go
diff --git a/proto/cosmos/gov/v1/gov.proto b/proto/cosmos/gov/v1/gov.proto
@@ -253,4 +253,12 @@ message Params {
 
   // burn deposits if quorum with vote type no_veto is met
   bool burn_vote_veto = 15;
+
+  // The ratio representing the proportion of the deposit value minimum that must be met when making a deposit.
+  // Default value: 0.01. Meaning that for a chain with a min_deposit of 100stake, a deposit of 1stake would be
+  // required.
+  //
+  // Since: cosmos-sdk 0.50
+  // NOTE: backported from v50 (https://github.com/cosmos/cosmos-sdk/pull/18146)
+  string min_deposit_ratio = 16 [(cosmos_proto.scalar) = "cosmos.Dec"];
 }
diff --git a/tests/e2e/gov/deposits.go b/tests/e2e/gov/deposits.go
@@ -72,33 +72,6 @@ func (s *DepositTestSuite) TearDownSuite() {
 	s.network.Cleanup()
 }
 
-func (s *DepositTestSuite) TestQueryDepositsWithoutInitialDeposit() {
-	val := s.network.Validators[0]
-	clientCtx := val.ClientCtx
-
-	// submit proposal without initial deposit
-	id := s.submitProposal(val, sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(0)), "TestQueryDepositsWithoutInitialDeposit")
-	proposalID := strconv.FormatUint(id, 10)
-
-	// deposit amount
-	depositAmount := sdk.NewCoin(s.cfg.BondDenom, v1.DefaultMinDepositTokens.Add(sdk.NewInt(50))).String()
-	_, err := govclitestutil.MsgDeposit(clientCtx, val.Address.String(), proposalID, depositAmount)
-	s.Require().NoError(err)
-	s.Require().NoError(s.network.WaitForNextBlock())
-
-	// query deposit
-	deposit := s.queryDeposit(val, proposalID, false, "")
-	s.Require().NotNil(deposit)
-	s.Require().Equal(sdk.Coins(deposit.Amount).String(), depositAmount)
-
-	// query deposits
-	deposits := s.queryDeposits(val, proposalID, false, "")
-	s.Require().NotNil(deposits)
-	s.Require().Len(deposits.Deposits, 1)
-	// verify initial deposit
-	s.Require().Equal(sdk.Coins(deposits.Deposits[0].Amount).String(), depositAmount)
-}
-
 func (s *DepositTestSuite) TestQueryDepositsWithInitialDeposit() {
 	val := s.network.Validators[0]
 	depositAmount := sdk.NewCoin(s.cfg.BondDenom, v1.DefaultMinDepositTokens)
@@ -149,7 +122,7 @@ func (s *DepositTestSuite) TestQueryProposalAfterVotingPeriod() {
 	s.Require().Contains(err.Error(), fmt.Sprintf("proposal %s doesn't exist", proposalID))
 
 	// query deposits
-	deposits := s.queryDeposits(val, proposalID, true, "proposal 3 doesn't exist")
+	deposits := s.queryDeposits(val, proposalID, true, fmt.Sprintf("proposal %s doesn't exist", proposalID))
 	s.Require().Nil(deposits)
 }