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: x/authz allow insufficient funds error #11252

Merged
merged 9 commits into from
Mar 1, 2022
Merged

fix: x/authz allow insufficient funds error #11252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8ec1b76
chore: allow insufficient funds error
aleem1314 Feb 23, 2022
f9a0f87
add changelog
aleem1314 Feb 23, 2022
4437d03
update err msg
aleem1314 Feb 23, 2022
070ca68
update insufficient funds err check
aleem1314 Feb 23, 2022
933f36a
Merge branch 'master' into aleem/fix-authz-sim
aleem1314 Feb 23, 2022
489deb9
chore: add else check
aleem1314 Feb 28, 2022
022d9ab
Merge branch 'master' into aleem/fix-authz-sim
aleem1314 Feb 28, 2022
d337d2d
Merge branch 'master' into aleem/fix-authz-sim
robert-zaremba Feb 28, 2022
05334f1
Merge branch 'master' into aleem/fix-authz-sim
amaury1093 Mar 1, 2022
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 @@ -213,6 +213,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (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

### State Machine Breaking

Expand Down
20 changes: 8 additions & 12 deletions x/authz/simulation/operations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ func SimulateMsgExec(ak authz.AccountKeeper, bk authz.BankKeeper, k keeper.Keepe

msg := []sdk.Msg{banktype.NewMsgSend(granterAddr, granteeAddr, coins)}
authorization, err := targetGrant.GetAuthorization()
if err != nil{
if err != nil {
return simtypes.NoOpMsg(authz.ModuleName, TypeMsgExec, err.Error()), nil, err
}

Expand All @@ -259,17 +259,13 @@ func SimulateMsgExec(ak authz.AccountKeeper, bk authz.BankKeeper, k keeper.Keepe
return simtypes.NoOpMsg(authz.ModuleName, TypeMsgExec, "not a send authorization"), nil, nil
}

if sendAuth.SpendLimit.IsAllLTE(coins) {
return simtypes.NoOpMsg(authz.ModuleName, TypeMsgExec, "over spend limit"), nil, nil
}

res, err := sendAuth.Accept(ctx, msg[0])
_, err = sendAuth.Accept(ctx, msg[0])
if err != nil {
return simtypes.NoOpMsg(authz.ModuleName, TypeMsgExec, err.Error()), nil, err
}

if !res.Accept {
return simtypes.NoOpMsg(authz.ModuleName, TypeMsgExec, "expired or invalid grant"), nil, 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
}
}
aleem1314 marked this conversation as resolved.
Show resolved Hide resolved

msgExec := authz.NewMsgExec(granteeAddr, msg)
Expand All @@ -278,9 +274,9 @@ func SimulateMsgExec(ak authz.AccountKeeper, bk authz.BankKeeper, k keeper.Keepe
if err != nil {
return simtypes.NoOpMsg(authz.ModuleName, TypeMsgExec, "fee error"), nil, err
}

txCfg := simappparams.MakeTestEncodingConfig().TxConfig
granteeAcc := ak.GetAccount(ctx, granteeAddr)

tx, err := helpers.GenTx(
txCfg,
[]sdk.Msg{&msgExec},
Expand Down