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

cli: add argument to generate-packet-data cli to use selected encoding format (backport #4537) #4569

Merged
merged 3 commits into from
Sep 7, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 5, 2023

This is an automatic backport of pull request #4537 done by Mergify.
Cherry-pick of 1e3eee6 has failed:

On branch mergify/bp/release/v7.3.x/pr-4537
Your branch is up to date with 'origin/release/v7.3.x'.

You are currently cherry-picking commit 1e3eee62.
  (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:   docs/apps/interchain-accounts/client.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/apps/27-interchain-accounts/host/client/cli/tx.go
	both modified:   modules/apps/27-interchain-accounts/host/client/cli/tx_test.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

…ing format (#4537)

* add encoding parameter to cli

* updated docs

* testing encoding parameter of cli

* linter fixes

* review feedback

* Update client.md

* typos

* Update modules/apps/27-interchain-accounts/host/client/cli/tx.go

Co-authored-by: Damian Nolan <[email protected]>

* address review feedback

---------

Co-authored-by: srdtrk <[email protected]>
Co-authored-by: Damian Nolan <[email protected]>
(cherry picked from commit 1e3eee6)

# Conflicts:
#	modules/apps/27-interchain-accounts/host/client/cli/tx.go
#	modules/apps/27-interchain-accounts/host/client/cli/tx_test.go
@srdtrk srdtrk removed the conflicts label Sep 5, 2023
Copy link
Contributor

@crodriguezvega crodriguezvega left a comment

Choose a reason for hiding this comment

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

Thanks a lot for fixing the conflicts, @srdtrk!

Copy link
Contributor

@damiannolan damiannolan left a comment

Choose a reason for hiding this comment

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

LGTM

@crodriguezvega crodriguezvega merged commit de5104b into release/v7.3.x Sep 7, 2023
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v7.3.x/pr-4537 branch September 7, 2023 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants