LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

imp(feegrant): ensure we only execute revokeAllowance if there is no error is the grant is to be removed (#18767)

Browse Source
This commit is contained in:
Luke 2023-12-17 21:26:47 +08:00 committed by GitHub
parent 821d080a59
commit 5367c93e1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x/feegrant/CHANGELOG.md
View File

@ -35,6 +35,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
* [#18047](https://github.com/cosmos/cosmos-sdk/pull/18047) Added a limit of 200 grants pruned per EndBlock and the method PruneAllowances that prunes 75 expired grants on every run.
### Improvements
* [#18767](https://github.com/cosmos/cosmos-sdk/pull/18767) Ensure we only execute revokeAllowance if there is no error is the grant is to be removed.
### API Breaking Changes
* [#15606](https://github.com/cosmos/cosmos-sdk/pull/15606) `NewKeeper` now takes a `KVStoreService` instead of a `StoreKey` and methods in the `Keeper` now take a `context.Context` instead of a `sdk.Context`.

5
x/feegrant/keeper/keeper.go
View File

@ -250,12 +250,9 @@ func (k Keeper) UseGrantedFees(ctx context.Context, granter, grantee sdk.AccAddr
}
remove, err := grant.Accept(ctx, fee, msgs)
if remove {
if remove && err == nil {
// Ignoring the `revokeFeeAllowance` error, because the user has enough grants to perform this transaction.
_ = k.revokeAllowance(ctx, granter, grantee)
if err != nil {
return err
}
emitUseGrantEvent(ctx, granterStr, granteeStr)
return nil

8
x/feegrant/keeper/keeper_test.go
View File

@ -295,10 +295,12 @@ func (suite *KeeperTestSuite) TestUseGrantedFee() {
suite.Error(err)
suite.Contains(err.Error(), "fee allowance expired")
// verify: feegrant is revoked
// verify: feegrant is not revoked
// Because using the past feegrant will return err, data will be rolled back in actual scenarios.
// Only when the feegrant allowance used up in a certain transaction feegrant will revoked success due to err is nil
// abci's EndBlocker will remove the expired feegrant.
_, err = suite.feegrantKeeper.GetAllowance(ctx, suite.addrs[0], suite.addrs[2])
suite.Error(err)
suite.Contains(err.Error(), "not found")
suite.Require().NoError(err)
}
func (suite *KeeperTestSuite) TestIterateGrants() {