highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 22:50:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4926

Browse Source 
584a358 Do merkle root and txid duplicates check simultaneously (Pieter Wuille)
This commit is contained in:
Pieter Wuille
2014-10-02 06:05:02 +02:00
parent 471d38b015 584a358997
commit 76c171033c
3 changed files with 57 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core.h
View File

@@ -529,7 +529,11 @@ public:
return block;
}
uint256 BuildMerkleTree() const;
// Build the in-memory merkle tree for this block and return the merkle root.
// If non-NULL, *mutated is set to whether mutation was detected in the merkle
// tree (a duplication of transactions in the block leading to an identical
// merkle root).
uint256 BuildMerkleTree(bool* mutated = NULL) const;
std::vector<uint256> GetMerkleBranch(int nIndex) const;
static uint256 CheckMerkleBranch(uint256 hash, const std::vector<uint256>& vMerkleBranch, int nIndex);