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: ica handshake reopening channel - use GetAppVersion in favour of channel.Version (backport #2302) #2357

Merged
merged 3 commits into from
Sep 21, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 21, 2022

This is an automatic backport of pull request #2302 done by Mergify.
Cherry-pick of 9e6246f has failed:

On branch mergify/bp/release/v5.0.x/pr-2302
Your branch is up to date with 'origin/release/v5.0.x'.

You are currently cherry-picking commit 9e6246f.
  (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:   modules/apps/27-interchain-accounts/controller/keeper/handshake.go
	modified:   modules/apps/27-interchain-accounts/host/ibc_module_test.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/handshake.go
	modified:   testing/simapp/app.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   modules/apps/27-interchain-accounts/host/keeper/keeper.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

…of `channel.Version` (#2302)

* adding unwrapping of channel version to ica controller handshake reopening flow

* adding changelog

* adding ics4Wrapper to ics27 host submodule, handling unwrapping channel version in OnChanOpenTry handshake cb

* updating changelog

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
(cherry picked from commit 9e6246f)

# Conflicts:
#	CHANGELOG.md
#	modules/apps/27-interchain-accounts/host/keeper/keeper.go
@damiannolan
Copy link
Member

needs #2361

@colin-axner colin-axner merged commit b6921cd into release/v5.0.x Sep 21, 2022
@colin-axner colin-axner deleted the mergify/bp/release/v5.0.x/pr-2302 branch September 21, 2022 15:40
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.

2 participants