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

fix: initial deposit for v1 props #444

Merged
merged 5 commits into from
Mar 7, 2024
Merged

fix: initial deposit for v1 props #444

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2705c40
test: min initial deposit for v1 props
fragwuerdig Mar 6, 2024
49a2a1c
fix: v1 not accounted for in deposit check
fragwuerdig Mar 6, 2024
ca3fdef
lint: min_initial_deposit_test.go
fragwuerdig Mar 6, 2024
aa87018
docs: correct comments
fragwuerdig Mar 7, 2024
de22d6a
fix: apply suggestions from strath
fragwuerdig Mar 7, 2024
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
21 changes: 16 additions & 5 deletions custom/auth/ante/min_initial_deposit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
)

Expand All @@ -26,24 +27,34 @@ func NewMinInitialDepositDecorator(govKeeper govkeeper.Keeper, treasuryKeeper Tr

// IsMsgSubmitProposal checks whether the input msg is a MsgSubmitProposal
func IsMsgSubmitProposal(msg sdk.Msg) bool {
_, ok := msg.(*govv1beta1.MsgSubmitProposal)
return ok
_, okv1beta1 := msg.(*govv1beta1.MsgSubmitProposal)
_, okv1 := msg.(*govv1.MsgSubmitProposal)
return okv1beta1 || okv1
}

// HandleCheckMinInitialDeposit
func HandleCheckMinInitialDeposit(ctx sdk.Context, msg sdk.Msg, govKeeper govkeeper.Keeper, treasuryKeeper TreasuryKeeper) (err error) {
submitPropMsg, ok := msg.(*govv1beta1.MsgSubmitProposal)
if !ok {
submitPropMsgV1Beta1, okV1Beta1 := msg.(*govv1beta1.MsgSubmitProposal)
submitPropMsgV1, okV1 := msg.(*govv1.MsgSubmitProposal)

if !(okV1Beta1 || okV1) {
return fmt.Errorf("could not dereference msg as MsgSubmitProposal")
}

var initialDepositCoins sdk.Coins

if okV1Beta1 {
initialDepositCoins = submitPropMsgV1Beta1.GetInitialDeposit()
} else if okV1 {
initialDepositCoins = submitPropMsgV1.GetInitialDeposit()
}

minDeposit := govKeeper.GetDepositParams(ctx).MinDeposit
requiredAmount := sdk.NewDecFromInt(minDeposit[0].Amount).Mul(treasuryKeeper.GetMinInitialDepositRatio(ctx)).TruncateInt()

requiredDepositCoins := sdk.NewCoins(
sdk.NewCoin(core.MicroLunaDenom, requiredAmount),
)
initialDepositCoins := submitPropMsg.GetInitialDeposit()

if !initialDepositCoins.IsAllGTE(requiredDepositCoins) {
return fmt.Errorf("not enough initial deposit provided. Expected %q; got %q", requiredDepositCoins, initialDepositCoins)
Expand Down
46 changes: 46 additions & 0 deletions custom/auth/ante/min_initial_deposit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

"github.com/classic-terra/core/v2/custom/auth/ante"
core "github.com/classic-terra/core/v2/types"

// core "github.com/terra-money/core/types"
// treasury "github.com/terra-money/core/x/treasury/types"

Expand Down Expand Up @@ -60,6 +61,21 @@ func (suite *AnteTestSuite) TestMinInitialDepositRatioDefault() {
// antehandler should not error
_, err = antehandler(suite.ctx, tx, false)
suite.Require().NoError(err, "error: Proposal whithout initial deposit should have gone through")

// create v1 proposal
msgv1, _ := govv1.NewMsgSubmitProposal([]sdk.Msg{}, depositCoins1, addr1.String(), "metadata")
feeAmountv1 := testdata.NewTestFeeAmount()
gasLimitv1 := testdata.NewTestGasLimit()
suite.Require().NoError(suite.txBuilder.SetMsgs(msgv1))
suite.txBuilder.SetFeeAmount(feeAmountv1)
suite.txBuilder.SetGasLimit(gasLimitv1)
privs, accNums, accSeqs = []cryptotypes.PrivKey{priv1}, []uint64{0}, []uint64{0}
txv1, err := suite.CreateTestTx(privs, accNums, accSeqs, suite.ctx.ChainID())
suite.Require().NoError(err)

// ante handler should not error for v1 proposal
_, err = antehandler(suite.ctx, txv1, false)
suite.Require().NoError(err, "error: v1 proposal whithout initial deposit should have gone through")
}

func (suite *AnteTestSuite) TestMinInitialDepositRatioWithSufficientDeposit() {
Expand Down Expand Up @@ -102,6 +118,21 @@ func (suite *AnteTestSuite) TestMinInitialDepositRatioWithSufficientDeposit() {
// antehandler should not error
_, err = antehandler(suite.ctx, tx, false)
suite.Require().NoError(err, "error: Proposal with sufficient initial deposit should have gone through")

// create v1 proposal
msgv1, _ := govv1.NewMsgSubmitProposal([]sdk.Msg{}, depositCoins1, addr1.String(), "metadata")
feeAmountv1 := testdata.NewTestFeeAmount()
gasLimitv1 := testdata.NewTestGasLimit()
suite.Require().NoError(suite.txBuilder.SetMsgs(msgv1))
suite.txBuilder.SetFeeAmount(feeAmountv1)
suite.txBuilder.SetGasLimit(gasLimitv1)
privs, accNums, accSeqs = []cryptotypes.PrivKey{priv1}, []uint64{0}, []uint64{0}
txv1, err := suite.CreateTestTx(privs, accNums, accSeqs, suite.ctx.ChainID())
suite.Require().NoError(err)

// ante handler should not error for v1 proposal
_, err = antehandler(suite.ctx, txv1, false)
suite.Require().NoError(err, "error: v1 proposal with sufficient initial deposit should have gone through")
}

func (suite *AnteTestSuite) TestMinInitialDepositRatioWithInsufficientDeposit() {
Expand Down Expand Up @@ -144,4 +175,19 @@ func (suite *AnteTestSuite) TestMinInitialDepositRatioWithInsufficientDeposit()
// antehandler should not error
_, err = antehandler(suite.ctx, tx, false)
suite.Require().Error(err, "error: Proposal with insufficient initial deposit should have failed")

// create v1 proposal
msgv1, _ := govv1.NewMsgSubmitProposal([]sdk.Msg{}, depositCoins1, addr1.String(), "metadata")
feeAmountv1 := testdata.NewTestFeeAmount()
gasLimitv1 := testdata.NewTestGasLimit()
suite.Require().NoError(suite.txBuilder.SetMsgs(msgv1))
suite.txBuilder.SetFeeAmount(feeAmountv1)
suite.txBuilder.SetGasLimit(gasLimitv1)
privs, accNums, accSeqs = []cryptotypes.PrivKey{priv1}, []uint64{0}, []uint64{0}
txv1, err := suite.CreateTestTx(privs, accNums, accSeqs, suite.ctx.ChainID())
suite.Require().NoError(err)

// ante handler should not error for v1 proposal
_, err = antehandler(suite.ctx, txv1, false)
suite.Require().Error(err, "error: v1 proposal with insufficient initial deposit should have failed")
}
Loading