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: working hash with initial version (backport #943) #945

Merged
merged 2 commits into from
May 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 7, 2024

Context

InitialVersion is not reflected in the WorkingHash calculation, only reflected in the SaveVersion. This will lead to the AppHash mismatch while upgrading, since the the hash of the root is already calculated in the WorkingHash and won't re-calculated in the SaveVersion which is wrong.


This is an automatic backport of pull request #943 done by Mergify.

(cherry picked from commit 70f77c2)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner May 7, 2024 18:26
@mergify mergify bot added the conflicts label May 7, 2024
Copy link
Contributor Author

mergify bot commented May 7, 2024

Cherry-pick of 70f77c2 has failed:

On branch mergify/bp/master/pr-943
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 70f77c2.
  (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:   mutable_tree.go
	modified:   tree_test.go

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

@tac0turtle tac0turtle merged commit bf2bf27 into master May 8, 2024
7 checks passed
@tac0turtle tac0turtle deleted the mergify/bp/master/pr-943 branch May 8, 2024 13:23
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