From 759c4c2c15701f6478cd3f3aa00e2c34edfcba6e Mon Sep 17 00:00:00 2001 From: MD Aleem <72057206+aleem1314@users.noreply.github.com> Date: Tue, 1 Mar 2022 15:36:20 +0530 Subject: [PATCH] fix: x/authz allow insufficient funds error (#11252) ## Description Allow insufficient funds error for authz simulation Closes: #XXXX --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable) (cherry picked from commit a426780e71278f372ea0599457467ca10c51db3c) # Conflicts: # CHANGELOG.md # x/authz/simulation/operations.go --- CHANGELOG.md | 9 +++++++++ x/authz/simulation/operations.go | 24 +++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a739b8767615..f263e4102e22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,7 +61,16 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (grpc) [\#10985](https://github.com/cosmos/cosmos-sdk/pull/10992) The `/cosmos/tx/v1beta1/txs/{hash}` endpoint returns a 404 when a tx does not exist. * [\#10990](https://github.com/cosmos/cosmos-sdk/pull/10990) Fixes missing `iavl-cache-size` config parsing in `GetConfig` method. +<<<<<<< HEAD * [#11222](https://github.com/cosmos/cosmos-sdk/pull/11222) reject query with block height in the future +======= +* (crypto) [#11027] Remove dependency on Tendermint core for xsalsa20symmetric. +* (x/authz) [\#10447](https://github.com/cosmos/cosmos-sdk/pull/10447) Fix authz `NewGrant` expiration check. +* (x/authz) [\#10633](https://github.com/cosmos/cosmos-sdk/pull/10633) Fixed authorization not found error when executing message. +* [#11222](https://github.com/cosmos/cosmos-sdk/pull/11222) reject query with block height in the future +* [#11229](https://github.com/cosmos/cosmos-sdk/pull/11229) Handled the error message of `transaction encountered error` from tendermint. +* (x/authz) [\#11252](https://github.com/cosmos/cosmos-sdk/pull/11252) Allow insufficient funds error for authz simulation +>>>>>>> a426780e7 (fix: x/authz allow insufficient funds error (#11252)) ### Improvements diff --git a/x/authz/simulation/operations.go b/x/authz/simulation/operations.go index b2a5f20d4d90..2132da9cd00d 100644 --- a/x/authz/simulation/operations.go +++ b/x/authz/simulation/operations.go @@ -247,11 +247,18 @@ func SimulateMsgExec(ak authz.AccountKeeper, bk authz.BankKeeper, k keeper.Keepe return simtypes.NoOpMsg(authz.ModuleName, TypeMsgExec, err.Error()), nil, nil } +<<<<<<< HEAD if targetGrant.Authorization.TypeUrl == fmt.Sprintf("/%s", proto.MessageName(&banktype.SendAuthorization{})) { sendAuthorization := targetGrant.GetAuthorization().(*banktype.SendAuthorization) if sendAuthorization.SpendLimit.IsAllLT(coins) { return simtypes.NoOpMsg(authz.ModuleName, TypeMsgExec, "over spend limit"), nil, nil } +======= + msg := []sdk.Msg{banktype.NewMsgSend(granterAddr, granteeAddr, coins)} + authorization, err := targetGrant.GetAuthorization() + if err != nil { + return simtypes.NoOpMsg(authz.ModuleName, TypeMsgExec, err.Error()), nil, err +>>>>>>> a426780e7 (fix: x/authz allow insufficient funds error (#11252)) } granterspendableCoins := bk.SpendableCoins(ctx, granterAddr) @@ -259,16 +266,31 @@ func SimulateMsgExec(ak authz.AccountKeeper, bk authz.BankKeeper, k keeper.Keepe return simtypes.NoOpMsg(authz.ModuleName, TypeMsgExec, "insufficient funds"), nil, nil } +<<<<<<< HEAD +======= + _, err = sendAuth.Accept(ctx, msg[0]) + if err != nil { + if sdkerrors.ErrInsufficientFunds.Is(err) { + return simtypes.NoOpMsg(authz.ModuleName, TypeMsgExec, err.Error()), nil, nil + } else { + return simtypes.NoOpMsg(authz.ModuleName, TypeMsgExec, err.Error()), nil, err + } + } + + msgExec := authz.NewMsgExec(granteeAddr, msg) +>>>>>>> a426780e7 (fix: x/authz allow insufficient funds error (#11252)) granteeSpendableCoins := bk.SpendableCoins(ctx, granteeAddr) fees, err := simtypes.RandomFees(r, ctx, granteeSpendableCoins) if err != nil { return simtypes.NoOpMsg(authz.ModuleName, TypeMsgExec, "fee error"), nil, err } +<<<<<<< HEAD msg := authz.NewMsgExec(granteeAddr, []sdk.Msg{banktype.NewMsgSend(granterAddr, granteeAddr, coins)}) +======= +>>>>>>> a426780e7 (fix: x/authz allow insufficient funds error (#11252)) txCfg := simappparams.MakeTestEncodingConfig().TxConfig granteeAcc := ak.GetAccount(ctx, granteeAddr) - tx, err := helpers.GenTx( txCfg, []sdk.Msg{&msg},