Skip to content

fix: legacy node key (backport #928)#929

Merged
tac0turtle merged 3 commits intorelease/v1.x.xfrom
mergify/bp/release/v1.x.x/pr-928
Apr 8, 2024
Merged

fix: legacy node key (backport #928)#929
tac0turtle merged 3 commits intorelease/v1.x.xfrom
mergify/bp/release/v1.x.x/pr-928

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 8, 2024

Context

After reformatting of the pruned root node, it may be referred as a legacy node, since the nonce is 0.


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

(cherry picked from commit 0d64869)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team April 8, 2024 18:00
@mergify mergify bot added the conflicts label Apr 8, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Apr 8, 2024

Cherry-pick of 0d64869 has failed:

On branch mergify/bp/release/v1.x.x/pr-928
Your branch is up to date with 'origin/release/v1.x.x'.

You are currently cherry-picking commit 0d64869.
  (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

@mergify mergify bot mentioned this pull request Apr 8, 2024
@tac0turtle
Copy link
Contributor

ran tests locally.

@tac0turtle tac0turtle merged commit 32a58a0 into release/v1.x.x Apr 8, 2024
@tac0turtle tac0turtle deleted the mergify/bp/release/v1.x.x/pr-928 branch April 8, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

2 participants