Fix for merging LNPBP4 merkle blocks #115
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dr-orlovsky
requested review from
cryptoquick,
crisdut,
nicbus,
zoedberg and
fedsten
dr-orlovsky
force-pushed
the
lnpbp4/merge-fix
branch
from
3bdf17c
to
699a801
Compare
dr-orlovsky
force-pushed
the
lnpbp4/merge-fix
branch
from
c37adcc
to
90002c5
Compare
|
@dr-orlovsky thanks for finding the bug! :) Could you please open a PR to apply this fix also to the |
dr-orlovsky
added a commit
that referenced
this pull request
Dec 25, 2022
Backport of #115 Fix for merging LNPBP4 merkle blocks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The problem was caused by a very simple oversight: 387af22
It took me drawing a lot of charts to finally see the obvious mistake.
As far as I can see, this fix is not consensus-breaking, so after getting ACKs on this PR to master, I will backport it into
v0.8andv0.9as well and will releasev0.8.3version.Additionally to the fix I made a test in 75fdf50 which matches the merkle blocks which fails to merge from the original bug report RGB-WG/rgb-node#208 (comment) This test fails before the fix is applied - and after the fix it passes successfully.
Next, I improved code style of merkle block merge in 1e11bd0 to ensure that the code is correct and problems like this can't be easily introduced in a future.