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.

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

fix(client/v2): fix marshalling of queries with any (backport #18309) #18354

Merged
merged 6 commits into from
Nov 3, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 3, 2023

This is an automatic backport of pull request #18309 done by Mergify.
Cherry-pick of 2caf00d has failed:

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

You are currently cherry-picking commit 2caf00deb.
  (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:   x/tx/go.mod
	modified:   x/tx/signing/aminojson/any.go
	modified:   x/tx/signing/aminojson/options.go
	new file:   x/tx/signing/aminojson/options_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   client/debug/main.go
	both modified:   client/v2/autocli/app.go
	both modified:   client/v2/go.mod
	both modified:   x/tx/CHANGELOG.md
	both modified:   x/tx/signing/aminojson/json_marshal.go

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

(cherry picked from commit 2caf00d)

# Conflicts:
#	client/debug/main.go
#	client/v2/autocli/app.go
#	client/v2/go.mod
#	x/tx/CHANGELOG.md
#	x/tx/signing/aminojson/json_marshal.go
@mergify mergify bot requested a review from a team as a code owner November 3, 2023 10:22
@mergify mergify bot added the conflicts label Nov 3, 2023
Copy link
Contributor

coderabbitai bot commented Nov 3, 2023

Important

Auto Review Skipped

Bot user detected.

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.
  • @coderabbitai resolve to resolve all the CodeRabbit review comments.

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

@julienrbrt julienrbrt self-assigned this Nov 3, 2023
@julienrbrt julienrbrt requested review from julienrbrt and removed request for facundomedica and likhita-809 November 3, 2023 10:26
Copy link
Contributor

github-actions bot commented Nov 3, 2023

@julienrbrt your pull request is missing a changelog!

@github-actions github-actions bot added C:x/evidence C:x/upgrade C:x/feegrant C:Cosmovisor Issues and PR related to Cosmovisor C:x/nft C:Confix Issues and PR related to Confix C:x/circuit C:Hubl Tool: Hubl labels Nov 3, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) November 3, 2023 10:33
@github-actions github-actions bot removed the C:x/tx label Nov 3, 2023
@julienrbrt julienrbrt merged commit e83a200 into release/v0.50.x Nov 3, 2023
54 of 55 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-18309 branch November 3, 2023 11:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:CLI C:Confix Issues and PR related to Confix C:Cosmovisor Issues and PR related to Cosmovisor C:Hubl Tool: Hubl C:x/circuit C:x/evidence C:x/feegrant C:x/nft C:x/upgrade
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant