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

feat(client): add positional optional to client v2 (backport #16316) #16615

Merged
merged 7 commits into from
Jun 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 20, 2023

This is an automatic backport of pull request #16316 done by Mergify.
Cherry-pick of e078f1a has failed:

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

You are currently cherry-picking commit e078f1a49.
  (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/autocli/v1/options.pulsar.go
	modified:   client/v2/CHANGELOG.md
	modified:   client/v2/autocli/app.go
	modified:   client/v2/autocli/common_test.go
	modified:   client/v2/autocli/flag/message.go
	modified:   client/v2/autocli/flag/register.go
	modified:   client/v2/autocli/query_test.go
	modified:   client/v2/go.mod
	modified:   client/v2/go.sum
	modified:   proto/cosmos/autocli/v1/options.proto

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   simapp/go.mod
	both modified:   simapp/go.sum
	both modified:   tests/go.mod
	both modified:   tests/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

Co-authored-by: Julien Robert <julien@rbrt.fr>
(cherry picked from commit e078f1a)

# Conflicts:
#	simapp/go.mod
#	simapp/go.sum
#	tests/go.mod
#	tests/go.sum
@mergify mergify bot requested a review from a team as a code owner June 20, 2023 04:04
@mergify mergify bot added the conflicts label Jun 20, 2023
@github-prbot github-prbot requested review from a team, kocubinski and testinginprod and removed request for a team June 20, 2023 04:04
@github-actions github-actions bot added the C:CLI label Jun 20, 2023
@github-actions github-actions bot added C:collections C:Confix Issues and PR related to Confix C:Cosmovisor Issues and PR related to Cosmovisor C:Hubl Tool: Hubl C:orm C:Rosetta Issues and PR related to Rosetta C:x/circuit C:x/evidence C:x/feegrant C:x/nft C:x/tx C:x/upgrade labels Jun 20, 2023
@tac0turtle
Copy link
Member

i dont think this needs to be backported because the changes are in their own go.mods

@julienrbrt
Copy link
Member

i dont think this needs to be backported because the changes are in their own go.mods

api changes do not but client/v2 changes still need to be backport as it imports the SDK.

@julienrbrt julienrbrt self-assigned this Jun 20, 2023
@@ -13,15 +13,15 @@ require (
cosmossdk.io/store v0.1.0-alpha.1.0.20230606190835-3e18f4088b2c
github.com/cometbft/cometbft v0.38.0-rc1
github.com/cosmos/cosmos-proto v1.0.0-beta.3
github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20230616095813-1111e0b51118
github.com/cosmos/cosmos-sdk v0.50.0-alpha.0.0.20230619222503-1fb9c870c960
Copy link
Member

Choose a reason for hiding this comment

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

this is updated because it should point to a release branch pseudo version instead of from main.

@github-actions github-actions bot removed C:collections C:Cosmovisor Issues and PR related to Cosmovisor C:Hubl Tool: Hubl C:Rosetta Issues and PR related to Rosetta C:x/nft C:x/tx C:x/feegrant C:orm C:Confix Issues and PR related to Confix labels Jun 20, 2023
@julienrbrt julienrbrt merged commit e9ba371 into release/v0.50.x Jun 20, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-16316 branch June 20, 2023 15:19
@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