feat(x/feegrant): Add limits to grant pruning and enable message to aid manually (backport #18047)#18128
Merged
julienrbrt merged 17 commits intorelease/v0.50.xfrom Oct 23, 2023
Merged
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
julienrbrt
suggested changes
Oct 16, 2023
Contributor
julienrbrt
left a comment
There was a problem hiding this comment.
We should use api v0.7.2
Contributor
|
After #18137, we can revert all go.mod changes here. |
Contributor
|
@facundomedica could you resolve the conflicts |
…into mergify/bp/release/v0.50.x/pr-18047
Contributor
|
Superseded by #18165 |
Contributor
|
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
facundomedica
approved these changes
Oct 20, 2023
julienrbrt
reviewed
Oct 20, 2023
…com/cosmos/cosmos-sdk into mergify/bp/release/v0.50.x/pr-18047
Contributor
|
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 (
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill 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