Merkle root calculation and witness commitment check for Block#218
Merged
TheBlueMatt merged 1 commit intorust-bitcoin:masterfrom Feb 17, 2019
Merged
Merkle root calculation and witness commitment check for Block#218TheBlueMatt merged 1 commit intorust-bitcoin:masterfrom
TheBlueMatt merged 1 commit intorust-bitcoin:masterfrom
Conversation
Member
|
Sounds like we should also remove it for things that implement BitcoinHash and maybe implement for [Transaction], too?
… On Jan 20, 2019, at 12:07, Tamás Blummer ***@***.***> wrote:
Merkle root calculation for a block should use txid() of transactions.
There was no specialized implementation of MerkleRoot for Block, but one for &[ ? :BitcoinHash] which matches the txdata vector in Block, thereby misleading to use it for merkle root calculation of blocks.
You can view, comment on, or merge this pull request online at:
#218
Commit Summary
Implement the correct merkle root calculation for Blocks
File Changes
M src/util/hash.rs (21)
Patch Links:
https://github.com/rust-bitcoin/rust-bitcoin/pull/218.patch
https://github.com/rust-bitcoin/rust-bitcoin/pull/218.diff
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or mute the thread.
|
Contributor
Author
|
I think we should remove the [ ? :BitcoinHash] implementation. The wittness merkle root needs the BitcoinHash based calc. I plan to add a method to check witness commitment in coinbase, that would be explicit there. |
TheBlueMatt
reviewed
Jan 20, 2019
2f13444 to
026ea2a
Compare
4bc55d1 to
fcca7eb
Compare
Contributor
Author
|
@TheBlueMatt how to deal with this fuzz error? I can't figure if it is related at all. |
Member
|
I kicked travis. I think it is random (and spurious), but @dongcarl would have to confirm. |
Member
|
@tamasblummer If you're seeing what I think you're seeing... According to @sgeisler it is spurious and will go away once we merge #210 and bump |
TheBlueMatt
reviewed
Jan 22, 2019
61b07cd to
98c951d
Compare
Contributor
Author
|
made checks of data sizes stricter matching https://github.com/bitcoin/bitcoin/pull/8149/files#diff-7ec3c68a81efff79b6ca22ac1f1eabbaR3637 |
TheBlueMatt
previously approved these changes
Jan 24, 2019
Member
TheBlueMatt
left a comment
There was a problem hiding this comment.
Looks good. Will likely need rather straijghtforward rebase after #215.
98c951d to
c7bebd0
Compare
dongcarl
reviewed
Jan 31, 2019
dongcarl
suggested changes
Jan 31, 2019
Contributor
Author
|
there are tests added in this PR what do you mean? |
Member
You're right. My apologies! |
…mentations for types implementing BitcoinHash as it is misleading. MerkleRoot is defined instead for a Block.
de1bda7 to
d8c93d9
Compare
Contributor
Author
|
squashed |
dongcarl
approved these changes
Feb 1, 2019
Member
|
@TheBlueMatt Please re-ACK |
TheBlueMatt
approved these changes
Feb 17, 2019
yancyribbens
pushed a commit
to yancyribbens/rust-bitcoin
that referenced
this pull request
Mar 23, 2024
Add secp as a param instead of creating a new context
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Merkle root calculation for a block should use txid() of transactions.
There was no specialized implementation of MerkleRoot for Block, but one for &[ ? :BitcoinHash] which matches the txdata vector in Block, thereby misleading to use it for merkle root calculation of blocks.