diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2015-11-06 01:42:38 +0100 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-06-22 15:42:59 +0200 |
| commit | 8b49040854be2e26b66366aeae1cba4716f93d93 (patch) | |
| tree | b217f3fb71bc0745c1f74ab239fbe0ebcf52a751 /src/consensus/merkle.h | |
| parent | 449f9b8debcceb61a92043bc7031528a53627c47 (diff) | |
| download | bitcoin-8b49040854be2e26b66366aeae1cba4716f93d93.tar.xz | |
BIP141: Commitment structure and deployment
Includes a fix by Suhas Daftuar and LongShao007
Diffstat (limited to 'src/consensus/merkle.h')
| -rw-r--r-- | src/consensus/merkle.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/consensus/merkle.h b/src/consensus/merkle.h index 6ef59745ac..194aea9b75 100644 --- a/src/consensus/merkle.h +++ b/src/consensus/merkle.h @@ -23,6 +23,12 @@ uint256 ComputeMerkleRootFromBranch(const uint256& leaf, const std::vector<uint2 uint256 BlockMerkleRoot(const CBlock& block, bool* mutated = NULL); /* + * Compute the Merkle root of the witness transactions in a block. + * *mutated is set to true if a duplicated subtree was found. + */ +uint256 BlockWitnessMerkleRoot(const CBlock& block, bool* mutated = NULL); + +/* * Compute the Merkle branch for the tree of transactions in a block, for a * given position. * This can be verified using ComputeMerkleRootFromBranch. |