Merge PR: modify-new- proposal (#2986)

* update * update --------- Co-authored-by: KamiD <[email protected]>
okx · Mar 1, 2023 · 6f892cd · 6f892cd
1 parent bb1f68e
commit 6f892cd
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 14 deletions.
diff --git a/libs/cosmos-sdk/x/mint/client/cli/tx.go b/libs/cosmos-sdk/x/mint/client/cli/tx.go
@@ -120,7 +120,7 @@ Where proposal.json contains:
 			txBldr := auth.NewTxBuilderFromCLI(inBuf).WithTxEncoder(utils.GetTxEncoder(cdc))
 			cliCtx := context.NewCLIContext().WithCodec(cdc)
 
-			proposal, err := utils2.ParseParseModifyNextBlockUpdateProposalJSON(cdc, args[0])
+			proposal, err := utils2.ParseModifyNextBlockUpdateProposalJSON(cdc, args[0])
 			if err != nil {
 				return err
 			}

diff --git a/libs/cosmos-sdk/x/mint/client/utils/utils.go b/libs/cosmos-sdk/x/mint/client/utils/utils.go
@@ -39,7 +39,7 @@ type ModifyNextBlockUpdateProposalJSON struct {
 }
 
 // ParseModifyNextBlockUpdateProposalJSON parses json from proposal file to ModifyNextBlockUpdateProposalJSON struct
-func ParseParseModifyNextBlockUpdateProposalJSON(cdc *codec.Codec, proposalFilePath string) (
+func ParseModifyNextBlockUpdateProposalJSON(cdc *codec.Codec, proposalFilePath string) (
 	proposal ModifyNextBlockUpdateProposalJSON, err error) {
 	contents, err := ioutil.ReadFile(proposalFilePath)
 	if err != nil {

diff --git a/libs/cosmos-sdk/x/mint/internal/types/errors.go b/libs/cosmos-sdk/x/mint/internal/types/errors.go
@@ -20,6 +20,7 @@ var (
 	ErrProposerMustBeValidator = sdkerrors.Register(ModuleName, 5, "the proposal of proposer must be validator")
 	ErrNotReachedVenus5Height  = sdkerrors.Register(ModuleName, 6, "venus5 block height has not been reached")
 	ErrNextBlockUpdateTooLate  = sdkerrors.Register(ModuleName, 7, "the next block to update is too late")
+	ErrCodeInvalidHeight       = sdkerrors.Register(ModuleName, 8, "height must be greater than current block")
 )
 
 // ErrTreasuresInternal returns an error when the length of address list in the proposal is larger than the max limitation

diff --git a/libs/cosmos-sdk/x/mint/internal/types/proposal.go b/libs/cosmos-sdk/x/mint/internal/types/proposal.go
@@ -192,6 +192,10 @@ func (mp ModifyNextBlockUpdateProposal) ValidateBasic() sdk.Error {
 		return govtypes.ErrInvalidProposalType(mp.ProposalType())
 	}
 
+	if global.GetGlobalHeight() > 0 && mp.BlockNum <= uint64(global.GetGlobalHeight()) {
+		return ErrCodeInvalidHeight
+	}
+
 	return nil
 }
 

diff --git a/libs/cosmos-sdk/x/mint/internal/types/proposal_test.go b/libs/cosmos-sdk/x/mint/internal/types/proposal_test.go
@@ -43,39 +43,76 @@ func (suite *ProposalSuite) TestNewChangeDistributionTypeProposal() {
 	}{
 		{
 			"no proposal title",
-			func() {},
+			func() {
+				global.SetGlobalHeight(0)
+				tmtypes.UnittestOnlySetMilestoneVenus5Height(0)
+			},
 			"",
 			"description",
 			0,
 			exgovtypes.ErrInvalidProposalContent("title is required"),
 		},
 		{
 			"gt max proposal title length",
-			func() {},
+			func() {
+				global.SetGlobalHeight(0)
+				tmtypes.UnittestOnlySetMilestoneVenus5Height(0)
+			},
 			RandStr(types.MaxTitleLength + 1),
 			"description",
 			0,
 			exgovtypes.ErrInvalidProposalContent("title length is bigger than max title length"),
 		},
 		{
 			"gt max proposal title length",
-			func() {},
+			func() {
+				global.SetGlobalHeight(0)
+				tmtypes.UnittestOnlySetMilestoneVenus5Height(0)
+			},
 			RandStr(types.MaxTitleLength),
 			"",
 			0,
 			exgovtypes.ErrInvalidProposalContent("description is required"),
 		},
 		{
 			"gt max proposal description length",
-			func() {},
+			func() {
+				global.SetGlobalHeight(0)
+				tmtypes.UnittestOnlySetMilestoneVenus5Height(0)
+			},
 			RandStr(types.MaxTitleLength),
 			RandStr(types.MaxDescriptionLength + 1),
 			0,
 			exgovtypes.ErrInvalidProposalContent("description length is bigger than max description length"),
 		},
+		{
+			"invalid height",
+			func() {
+				global.SetGlobalHeight(100)
+				tmtypes.UnittestOnlySetMilestoneVenus5Height(-1)
+			},
+			RandStr(types.MaxTitleLength),
+			RandStr(types.MaxDescriptionLength),
+			100,
+			ErrCodeInvalidHeight,
+		},
+		{
+			"valid height",
+			func() {
+				global.SetGlobalHeight(100)
+				tmtypes.UnittestOnlySetMilestoneVenus5Height(-1)
+			},
+			RandStr(types.MaxTitleLength),
+			RandStr(types.MaxDescriptionLength),
+			101,
+			nil,
+		},
 		{
 			"ok",
-			func() {},
+			func() {
+				global.SetGlobalHeight(0)
+				tmtypes.UnittestOnlySetMilestoneVenus5Height(0)
+			},
 			RandStr(types.MaxTitleLength),
 			RandStr(types.MaxDescriptionLength),
 			0,
@@ -84,9 +121,6 @@ func (suite *ProposalSuite) TestNewChangeDistributionTypeProposal() {
 	}
 
 	for _, tc := range testCases {
-		global.SetGlobalHeight(0)
-		tmtypes.UnittestOnlySetMilestoneVenus2Height(0)
-
 		suite.Run(tc.title, func() {
 			tc.setMilestoneHeight()
 			title := tc.proposalTitle

diff --git a/libs/cosmos-sdk/x/mint/proposal_handler_test.go b/libs/cosmos-sdk/x/mint/proposal_handler_test.go
@@ -514,12 +514,12 @@ func (suite *MintTestSuite) TestModifyNextBlockUpdateProposal() {
 			proposal.BlockNum = tc.blockNum
 			govProposal.Content = proposal
 
+			oldMinter := suite.app.MintKeeper.GetMinterCustom(suite.ctx)
 			err := suite.govHandler(suite.ctx, &govProposal)
 			suite.Require().Equal(err, tc.expectError)
-			if err != nil {
-				minter := suite.app.MintKeeper.GetMinterCustom(suite.ctx)
-				suite.Require().Equal(tc.expectBlockNum, minter.NextBlockToUpdate)
-			}
+			newMinter := suite.app.MintKeeper.GetMinterCustom(suite.ctx)
+			suite.Require().Equal(tc.expectBlockNum, newMinter.NextBlockToUpdate)
+			suite.app.MintKeeper.SetMinterCustom(suite.ctx, oldMinter)
 		})
 	}
 }