-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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.
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
feat(x/feegrant): Add limits to grant pruning and enable message to aid manually (backport #18047) #18128
feat(x/feegrant): Add limits to grant pruning and enable message to aid manually (backport #18047) #18128
Conversation
…id manually (#18047) (cherry picked from commit 4caecf1) # Conflicts: # client/v2/go.mod # client/v2/go.sum # go.mod # go.sum # simapp/go.mod # simapp/go.sum # simapp/gomod2nix.toml # tests/go.mod # tests/go.sum # tests/starship/tests/go.mod # tests/starship/tests/go.sum # x/circuit/go.mod # x/circuit/go.sum # x/evidence/go.mod # x/evidence/go.sum # x/feegrant/go.mod # x/feegrant/go.sum # x/feegrant/keeper/keeper.go # x/feegrant/keeper/keeper_test.go # x/feegrant/keeper/msg_server_test.go # x/feegrant/module/abci_test.go # x/nft/go.mod # x/nft/go.sum # x/params/go.mod # x/params/go.sum # x/protocolpool/go.mod # x/protocolpool/go.sum # x/upgrade/go.mod # x/upgrade/go.sum
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should use api v0.7.2
After #18137, we can revert all go.mod changes here. |
@facundomedica could you resolve the conflicts |
…into mergify/bp/release/v0.50.x/pr-18047
Superseded by #18165 |
reopening this as the other pr is trying to change more than just the backport |
7cdc427
to
9a80f29
Compare
…com/cosmos/cosmos-sdk into mergify/bp/release/v0.50.x/pr-18047
…com/cosmos/cosmos-sdk into mergify/bp/release/v0.50.x/pr-18047
Important Review SkippedReviews are disabled for bot users. Please check the settings in the CodeRabbit UI or the To trigger a single review, invoke the TipsChat with CodeRabbit Bot (
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm!
This is an automatic backport of pull request #18047 done by Mergify.
Cherry-pick of 4caecf1 has failed:
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com