Skip to content

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
mergify/bp/release/v0.50.x/pr-18047
Oct 23, 2023
Merged

feat(x/feegrant): Add limits to grant pruning and enable message to aid manually (backport #18047)#18128
julienrbrt merged 17 commits intorelease/v0.50.xfrom
mergify/bp/release/v0.50.x/pr-18047

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Oct 16, 2023

This is an automatic backport of pull request #18047 done by Mergify.
Cherry-pick of 4caecf1 has failed:

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

You are currently cherry-picking commit 4caecf13b.
  (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)

Changes to be committed:
	modified:   api/cosmos/feegrant/v1beta1/tx.pulsar.go
	modified:   api/cosmos/feegrant/v1beta1/tx_grpc.pb.go
	modified:   proto/cosmos/feegrant/v1beta1/tx.proto
	modified:   x/feegrant/CHANGELOG.md
	modified:   x/feegrant/README.md
	modified:   x/feegrant/events.go
	modified:   x/feegrant/keeper/msg_server.go
	modified:   x/feegrant/module/abci.go
	modified:   x/feegrant/module/autocli.go
	modified:   x/feegrant/module/module.go
	modified:   x/feegrant/tx.pb.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   client/v2/go.mod
	both modified:   client/v2/go.sum
	both modified:   go.mod
	both modified:   go.sum
	both modified:   simapp/go.mod
	both modified:   simapp/go.sum
	deleted by us:   simapp/gomod2nix.toml
	both modified:   tests/go.mod
	both modified:   tests/go.sum
	deleted by us:   tests/starship/tests/go.mod
	deleted by us:   tests/starship/tests/go.sum
	both modified:   x/circuit/go.mod
	both modified:   x/circuit/go.sum
	both modified:   x/evidence/go.mod
	both modified:   x/evidence/go.sum
	both modified:   x/feegrant/go.mod
	both modified:   x/feegrant/go.sum
	both modified:   x/feegrant/keeper/keeper.go
	both modified:   x/feegrant/keeper/keeper_test.go
	both modified:   x/feegrant/keeper/msg_server_test.go
	both modified:   x/feegrant/module/abci_test.go
	both modified:   x/nft/go.mod
	both modified:   x/nft/go.sum
	deleted by us:   x/params/go.mod
	deleted by us:   x/params/go.sum
	deleted by us:   x/protocolpool/go.mod
	deleted by us:   x/protocolpool/go.sum
	both modified:   x/upgrade/go.mod
	both modified:   x/upgrade/go.sum

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

…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
@mergify mergify bot requested a review from a team October 16, 2023 16:31
@mergify mergify bot added the conflicts label Oct 16, 2023
@ghost ghost self-requested a review October 16, 2023 16:31
@ghost ghost removed their request for review October 16, 2023 16:31
@ghost ghost requested a review from kocubinski October 16, 2023 16:31
@ghost ghost requested a review from samricotta October 16, 2023 16:31
Copy link
Copy Markdown
Contributor

@julienrbrt julienrbrt left a 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

@julienrbrt
Copy link
Copy Markdown
Contributor

After #18137, we can revert all go.mod changes here.
Use latest x/feegrant in simapp

@tac0turtle
Copy link
Copy Markdown
Contributor

@facundomedica could you resolve the conflicts

@julienrbrt
Copy link
Copy Markdown
Contributor

julienrbrt commented Oct 18, 2023

Superseded by #18165

@julienrbrt julienrbrt closed this Oct 18, 2023
@mergify mergify bot deleted the mergify/bp/release/v0.50.x/pr-18047 branch October 18, 2023 13:04
@tac0turtle tac0turtle restored the mergify/bp/release/v0.50.x/pr-18047 branch October 20, 2023 14:38
@tac0turtle
Copy link
Copy Markdown
Contributor

reopening this as the other pr is trying to change more than just the backport

@tac0turtle tac0turtle reopened this Oct 20, 2023
@ghost ghost self-requested a review October 20, 2023 14:38
@tac0turtle tac0turtle force-pushed the mergify/bp/release/v0.50.x/pr-18047 branch from 7cdc427 to 9a80f29 Compare October 20, 2023 14:43
@github-actions github-actions bot added C:x/distribution distribution module related and removed C:x/params labels Oct 20, 2023
@github-actions github-actions bot added C:x/bank and removed C:x/distribution distribution module related labels Oct 20, 2023
@tac0turtle tac0turtle requested a review from julienrbrt October 23, 2023 13:22
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai bot commented Oct 23, 2023

Important

Review Skipped

Reviews are disabled for bot users.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository.

To trigger a single review, invoke the @coderabbitai review command.


Tips

Chat with CodeRabbit Bot (@coderabbitai)

  • If you reply to a review comment from CodeRabbit, the bot will automatically respond.
  • To engage with CodeRabbit bot directly around the specific lines of code in the PR, mention @coderabbitai in your review comment
  • Note: Review comments are made on code diffs or files, not on the PR overview.
  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai help to get help.

Note: For conversation with the bot, please use the review comments on code diffs or files.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.json

@github-actions github-actions bot removed the C:x/bank label Oct 23, 2023
Copy link
Copy Markdown
Contributor

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

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

lgtm!

@julienrbrt julienrbrt enabled auto-merge (squash) October 23, 2023 13:48
@julienrbrt julienrbrt merged commit 026631c into release/v0.50.x Oct 23, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-18047 branch October 23, 2023 16:08
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants