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(statemachine)!: use path within IBC store without escaping characters in solomachine (backport #4429) #4453

Merged
merged 8 commits into from
Aug 25, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 24, 2023

This is an automatic backport of pull request #4429 done by Mergify.
Cherry-pick of 98b0c99 has failed:

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

You are currently cherry-picking commit 98b0c992.
  (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/core/23-commitment/types/merkle.go
	modified:   modules/core/exported/commitment.go
	modified:   modules/light-clients/06-solomachine/client_state_test.go
	modified:   testing/solomachine.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/light-clients/06-solomachine/client_state.go
	both modified:   modules/light-clients/07-tendermint/upgrade.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

…ers in solomachine (#4429)

(cherry picked from commit 98b0c99)

# Conflicts:
#	modules/light-clients/06-solomachine/client_state.go
#	modules/light-clients/07-tendermint/upgrade.go
@crodriguezvega crodriguezvega removed their assignment Aug 24, 2023
@crodriguezvega crodriguezvega merged commit b4766b0 into release/v7.3.x Aug 25, 2023
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v7.3.x/pr-4429 branch August 25, 2023 06:44
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