Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(x/gov): implement a minimum amount per deposit #18146

Merged
merged 25 commits into from
Nov 2, 2023
Merged

feat(x/gov): implement a minimum amount per deposit #18146

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
fb1f74c
feat: implement a minimum amount per deposit
facundomedica Oct 17, 2023
32d9be5
allow minDepositRatio of zero
facundomedica Oct 17, 2023
b5ff28a
cl++
facundomedica Oct 17, 2023
2f5bb4c
lint
facundomedica Oct 17, 2023
70506fa
fix some tests
facundomedica Oct 18, 2023
89d493f
Update x/gov/keeper/deposit.go
facundomedica Oct 19, 2023
0bba608
Update x/gov/keeper/deposit.go
facundomedica Oct 19, 2023
5cf3bc2
Merge branch 'facu/limit-deposits' of https://github.com/cosmos/cosmo…
facundomedica Oct 19, 2023
7f2f019
fix tests
facundomedica Oct 19, 2023
62bc6cc
fixed sims
facundomedica Oct 19, 2023
7fa8f2f
figuring out issue in e2e
facundomedica Oct 19, 2023
9a3d624
update e2e
facundomedica Oct 19, 2023
cf4e715
fixed e2e
facundomedica Oct 19, 2023
cef4978
remove comment
facundomedica Oct 20, 2023
3c15843
merge main
facundomedica Oct 30, 2023
c5b709a
suggestions
facundomedica Oct 30, 2023
0f10c90
fix
facundomedica Oct 30, 2023
c7e841c
fix all tests
facundomedica Oct 30, 2023
f2cd8c3
fix more tests
facundomedica Oct 30, 2023
63c003d
fix
facundomedica Oct 30, 2023
e4b06f9
Update proto/cosmos/gov/v1/gov.proto
facundomedica Oct 31, 2023
8f3d1b5
fix sims with a hack
facundomedica Oct 31, 2023
05159a7
erge branch 'facu/limit-deposits' of https://github.com/cosmos/cosmos…
facundomedica Oct 31, 2023
cbb97e6
fix sim ops tests
facundomedica Oct 31, 2023
d2d05e6
remove testing
facundomedica Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

### State Machine Breaking

* (x/gov) [#18146](https://github.com/cosmos/cosmos-sdk/pull/18146) Add denom check to reject denoms outside of those listed in `MinDeposit`. A new `MinDepositRatio` param is added (with a default value of `0.001`) and now deposits are required to be at least `MinDepositRatio*MinDeposit` to be accepted.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changelog entry correctly summarizes the changes made in the PR. It mentions the addition of the MinDepositRatio parameter and the new requirement for deposits. However, it might be helpful to also mention the new error constant ErrInvalidDepositDenom that was added for handling invalid deposit denominations.

- * (x/gov) [#18146](https://github.com/cosmos/cosmos-sdk/pull/18146) Add denom check to reject denoms outside of those listed in `MinDeposit`. A new `MinDepositRatio` param is added (with a default value of `0.001`) and now deposits are required to be at least `MinDepositRatio*MinDeposit` to be accepted.
+ * (x/gov) [#18146](https://github.com/cosmos/cosmos-sdk/pull/18146) Add denom check to reject denoms outside of those listed in `MinDeposit`. A new `MinDepositRatio` param is added (with a default value of `0.001`) and now deposits are required to be at least `MinDepositRatio*MinDeposit` to be accepted. Added a new error constant `ErrInvalidDepositDenom` for handling invalid deposit denominations.
Commitable suggestion (Beta)
Suggested change
* (x/gov) [#18146](https://github.com/cosmos/cosmos-sdk/pull/18146) Add denom check to reject denoms outside of those listed in `MinDeposit`. A new `MinDepositRatio` param is added (with a default value of `0.001`) and now deposits are required to be at least `MinDepositRatio*MinDeposit` to be accepted.
* (x/gov) [#18146](https://github.com/cosmos/cosmos-sdk/pull/18146) Add denom check to reject denoms outside of those listed in `MinDeposit`. A new `MinDepositRatio` param is added (with a default value of `0.001`) and now deposits are required to be at least `MinDepositRatio*MinDeposit` to be accepted. Added a new error constant `ErrInvalidDepositDenom` for handling invalid deposit denominations.

julienrbrt marked this conversation as resolved.
Show resolved Hide resolved
* (x/distribution) [#17657](https://github.com/cosmos/cosmos-sdk/pull/17657) Migrate community pool funds from x/distribution to x/protocolpool.
* (x/distribution) [#17115](https://github.com/cosmos/cosmos-sdk/pull/17115) Migrate `PreviousProposer` to collections.
* (x/upgrade) [#16244](https://github.com/cosmos/cosmos-sdk/pull/16244) upgrade module no longer stores the app version but gets and sets the app version stored in the `ParamStore` of baseapp.
Expand Down
151 changes: 117 additions & 34 deletions api/cosmos/gov/v1/gov.pulsar.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions proto/cosmos/gov/v1/gov.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,4 +261,11 @@ 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 1000stake, a deposit of 1stake would be
facundomedica marked this conversation as resolved.
Show resolved Hide resolved
// required.
//
// Since: cosmos-sdk 0.50
string min_deposit_ratio = 16 [(cosmos_proto.scalar) = "cosmos.Dec"];
}
28 changes: 0 additions & 28 deletions tests/e2e/gov/deposits.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"cosmossdk.io/x/gov/types/v1beta1"

"github.com/cosmos/cosmos-sdk/testutil"
clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli"
"github.com/cosmos/cosmos-sdk/testutil/network"
sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down Expand Up @@ -72,33 +71,6 @@ func (s *DepositTestSuite) TearDownSuite() {
s.network.Cleanup()
}

func (s *DepositTestSuite) TestQueryDepositsWithoutInitialDeposit() {
val := s.network.Validators[0]

// submit proposal without initial deposit
id := s.submitProposal(val, sdk.NewCoin(s.cfg.BondDenom, math.NewInt(0)), "TestQueryDepositsWithoutInitialDeposit")

// deposit amount
depositAmount := sdk.NewCoin(s.cfg.BondDenom, v1.DefaultMinDepositTokens.Add(math.NewInt(50)))
msg := v1.NewMsgDeposit(val.Address, id, sdk.NewCoins(depositAmount))
_, err := clitestutil.SubmitTestTx(val.ClientCtx, msg, val.Address, clitestutil.TestTxConfig{})
s.Require().NoError(err)
s.Require().NoError(s.network.WaitForNextBlock())

// query deposit
proposalID := strconv.FormatUint(id, 10)
deposit := s.queryDeposit(val, proposalID, false, "")
s.Require().NotNil(deposit)
s.Require().Equal(depositAmount.String(), sdk.Coins(deposit.Deposit.Amount).String())

// query deposits
deposits := s.queryDeposits(val, proposalID, false, "")
s.Require().NotNil(deposits)
s.Require().Len(deposits.Deposits, 1)
// verify initial deposit
s.Require().Equal(depositAmount.String(), sdk.Coins(deposits.Deposits[0].Amount).String())
}

func (s *DepositTestSuite) TestQueryDepositsWithInitialDeposit() {
val := s.network.Validators[0]
depositAmount := sdk.NewCoin(s.cfg.BondDenom, v1.DefaultMinDepositTokens)
Expand Down
Loading