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: legacy node key (backport #594) #596

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 5, 2024

Description

Closes: #XXXX

Bug found when running E2E on Osmosis repo.

Summary by CodeRabbit

  • Bug Fixes
    • Fixed a legacy node key issue in IAVL.

This is an automatic backport of pull request #594 done by [Mergify](https://mergify.com).

* fix legacy node key bug

* changelog

(cherry picked from commit 8cf5abb)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Apr 5, 2024
Copy link
Author

mergify bot commented Apr 5, 2024

Cherry-pick of 8cf5abb has failed:

On branch mergify/bp/osmo-v23/v0.47.5-iavl-v1/pr-594
Your branch is up to date with 'origin/osmo-v23/v0.47.5-iavl-v1'.

You are currently cherry-picking commit 8cf5abb16.
  (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:   go.mod
	modified:   go.sum
	modified:   simapp/go.mod
	modified:   simapp/go.sum
	modified:   tests/go.mod
	modified:   tests/go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@czarcas7ic czarcas7ic merged commit 245b6ff into osmo-v23/v0.47.5-iavl-v1 Apr 5, 2024
21 checks passed
@czarcas7ic czarcas7ic deleted the mergify/bp/osmo-v23/v0.47.5-iavl-v1/pr-594 branch April 5, 2024 20:21
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.

1 participant