diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f7be8b0947e..7d4c0e34de6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -259,6 +259,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (cli) [\#11337](https://github.com/cosmos/cosmos-sdk/pull/11337) Fixes `show-adress` cli cmd * (crypto) [\#11298](https://github.com/cosmos/cosmos-sdk/pull/11298) Fix cgo secp signature verification and update libscep256k1 library. * (x/authz) [\#11512](https://github.com/cosmos/cosmos-sdk/pull/11512) Fix response of a panic to error, when subtracting balances. +* (x/feegrant) [\#11813](https://github.com/cosmos/cosmos-sdk/pull/11813) Fix pagination total count in `AllowancesByGranter` query. ### State Machine Breaking diff --git a/x/feegrant/keeper/grpc_query.go b/x/feegrant/keeper/grpc_query.go index 027eba648aa0..87278c4c59af 100644 --- a/x/feegrant/keeper/grpc_query.go +++ b/x/feegrant/keeper/grpc_query.go @@ -111,21 +111,22 @@ func (q Keeper) AllowancesByGranter(c context.Context, req *feegrant.QueryAllowa store := ctx.KVStore(q.storeKey) prefixStore := prefix.NewStore(store, feegrant.FeeAllowanceKeyPrefix) - pageRes, err := query.Paginate(prefixStore, req.Pagination, func(key []byte, value []byte) error { - var grant feegrant.Grant - + pageRes, err := query.FilteredPaginate(prefixStore, req.Pagination, func(key []byte, value []byte, accumulate bool) (bool, error) { // ParseAddressesFromFeeAllowanceKey expects the full key including the prefix. granter, _ := feegrant.ParseAddressesFromFeeAllowanceKey(append(feegrant.FeeAllowanceKeyPrefix, key...)) if !granter.Equals(granterAddr) { - return nil + return false, nil } - if err := q.cdc.Unmarshal(value, &grant); err != nil { - return err + if accumulate { + var grant feegrant.Grant + if err := q.cdc.Unmarshal(value, &grant); err != nil { + return false, err + } + grants = append(grants, &grant) } - grants = append(grants, &grant) - return nil + return true, nil }) if err != nil { diff --git a/x/feegrant/keeper/grpc_query_test.go b/x/feegrant/keeper/grpc_query_test.go index cf813d1c19f5..9a7b76ff1a5a 100644 --- a/x/feegrant/keeper/grpc_query_test.go +++ b/x/feegrant/keeper/grpc_query_test.go @@ -59,7 +59,7 @@ func (suite *KeeperTestSuite) TestFeeAllowance() { }, false, func() { - grantFeeAllowance(suite) + suite.grantFeeAllowance(suite.addrs[0], suite.addrs[1]) }, func(response *feegrant.QueryAllowanceResponse) { suite.Require().Equal(response.Allowance.Granter, suite.addrs[0].String()) @@ -124,7 +124,7 @@ func (suite *KeeperTestSuite) TestFeeAllowances() { }, false, func() { - grantFeeAllowance(suite) + suite.grantFeeAllowance(suite.addrs[0], suite.addrs[1]) }, func(resp *feegrant.QueryAllowancesResponse) { suite.Require().Equal(len(resp.Allowances), 1) @@ -190,12 +190,16 @@ func (suite *KeeperTestSuite) TestFeeAllowancesByGranter() { }, false, func() { - grantFeeAllowance(suite) + suite.grantFeeAllowance(suite.addrs[0], suite.addrs[1]) + + // adding this allowance to check whether the pagination working fine. + suite.grantFeeAllowance(suite.addrs[1], suite.addrs[2]) }, func(resp *feegrant.QueryAllowancesByGranterResponse) { suite.Require().Equal(len(resp.Allowances), 1) suite.Require().Equal(resp.Allowances[0].Granter, suite.addrs[0].String()) suite.Require().Equal(resp.Allowances[0].Grantee, suite.addrs[1].String()) + suite.Require().Equal(resp.Pagination.Total, uint64(1)) }, }, } @@ -214,9 +218,9 @@ func (suite *KeeperTestSuite) TestFeeAllowancesByGranter() { } } -func grantFeeAllowance(suite *KeeperTestSuite) { +func (suite *KeeperTestSuite) grantFeeAllowance(granter, grantee sdk.AccAddress) { exp := suite.sdkCtx.BlockTime().AddDate(1, 0, 0) - err := suite.app.FeeGrantKeeper.GrantAllowance(suite.sdkCtx, suite.addrs[0], suite.addrs[1], &feegrant.BasicAllowance{ + err := suite.app.FeeGrantKeeper.GrantAllowance(suite.sdkCtx, granter, grantee, &feegrant.BasicAllowance{ SpendLimit: sdk.NewCoins(sdk.NewInt64Coin("atom", 555)), Expiration: &exp, })