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

Jump to bottom

fix: grants by granter pagination total (backport #11813) #11828

Merged
merged 1 commit into from
May 12, 2022
Merged

fix: grants by granter pagination total (backport #11813) #11828

merged 1 commit into from
May 12, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 29, 2022

This is an automatic backport of pull request #11813 done by Mergify.
Cherry-pick of 8dfc205 has failed:

On branch mergify/bp/release/v0.45.x/pr-11813
Your branch is up to date with 'origin/release/v0.45.x'.

You are currently cherry-picking commit 8dfc20573.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/feegrant/keeper/grpc_query.go
	both modified:   x/feegrant/keeper/grpc_query_test.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Apr 29, 2022
@julienrbrt
Copy link
Member

ParseAddressesFromFeeAllowanceKey does not exist in v0.45, so it cannot be backported, without at least backporting #10947.

@bez do we want that?

@alexanderbez
Copy link
Contributor

ParseAddressesFromFeeAllowanceKey does not exist in v0.45, so it cannot be backported, without at least backporting #10947.

@bez do we want that?

ohh yikes, good catch. Yeah I think we should do that if possible 👍

@alexanderbez alexanderbez added the S:blocked Status: Blocked label Apr 29, 2022
@julienrbrt julienrbrt self-assigned this Apr 29, 2022
@julienrbrt julienrbrt mentioned this pull request May 6, 2022
Merged
19 tasks
@atheeshp @julienrbrt
fix: grants by granter pagination total (#11813)
97eaf50 
Closes: #11812

---

*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/main/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/main/docs/building-modules)
- [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/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

*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 8dfc205)
@julienrbrt julienrbrt force-pushed the mergify/bp/release/v0.45.x/pr-11813 branch from df73fa8 to 97eaf50 Compare May 6, 2022 15:43
@julienrbrt julienrbrt removed S:blocked Status: Blocked conflicts labels May 6, 2022
julienrbrt
julienrbrt reviewed May 6, 2022
View reviewed changes
x/feegrant/keeper/grpc_query.go
var grant feegrant.Grant

granter, _ := feegrant.ParseAddressesFromFeeAllowanceKey(key)
prefixStore := prefix.NewStore(store, feegrant.FeeAllowanceKeyPrefix)
Copy link
Member

@julienrbrt julienrbrt May 6, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am unfamiliar with this addition while cherry-picking. It comes from #10830 and is a feature from 0.46.
Should we just use the store here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this looks correct!

We need to iterate over the FeeAllowanceKeyPrefix prefix. Looks like the key is composed as follows: FeeAllowanceKeyPrefix | grantee | granter

alexanderbez
alexanderbez approved these changes May 6, 2022
View reviewed changes
x/feegrant/keeper/grpc_query.go
var grant feegrant.Grant

granter, _ := feegrant.ParseAddressesFromFeeAllowanceKey(key)
prefixStore := prefix.NewStore(store, feegrant.FeeAllowanceKeyPrefix)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this looks correct!

We need to iterate over the FeeAllowanceKeyPrefix prefix. Looks like the key is composed as follows: FeeAllowanceKeyPrefix | grantee | granter

@julienrbrt
Copy link
Member

@alexanderbez @marbar3778 I can't click on merge on that one

@alexanderbez alexanderbez merged commit cf17549 into release/v0.45.x May 12, 2022
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.45.x/pr-11813 branch May 12, 2022 23:34
@alexanderbez
Copy link
Contributor

Boom!

randy75828 pushed a commit to Switcheo/cosmos-sdk that referenced this pull request Aug 10, 2022
@mergify @randy75828
fix: grants by granter pagination total (cosmos#11813) (cosmos#11828)
6a745a3
Eengineer1 pushed a commit to cheqd/cosmos-sdk that referenced this pull request Aug 26, 2022
@mergify @Eengineer1
fix: grants by granter pagination total (cosmos#11813) (cosmos#11828)
cd9f2af
@faddat faddat mentioned this pull request Dec 11, 2023
Draft
19 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@julienrbrt julienrbrt julienrbrt left review comments

@alexanderbez alexanderbez alexanderbez approved these changes

@aaronc aaronc Awaiting requested review from aaronc aaronc is a code owner

Assignees

@julienrbrt julienrbrt

Labels
C:x/feegrant
Projects
Cosmos-SDK
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@julienrbrt @alexanderbez @atheeshp