diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-28 10:02:45 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-28 10:07:25 +0200 |
| commit | 6364408122210b2fa9f4e135783ff82636ef81c1 (patch) | |
| tree | cc1737e3bfdae29485b3116606fe615d47680dfa /src/merkleblock.h | |
| parent | f9645ba80a004d87b9094b5348ab744e6c8d585e (diff) | |
| parent | 1ec900a29e115503ca3a70eba28f2de33ca06228 (diff) | |
Merge pull request #5199
1ec900a Remove broken+useless lock/unlock log prints (Matt Corallo)
352ed22 Add merkle blocks test (Matt Corallo)
59ed61b Add RPC call to generate and verify merkle blocks (Matt Corallo)
30da90d Add CMerkleBlock constructor for tx set + block and an empty one (Matt Corallo)
Diffstat (limited to 'src/merkleblock.h')
| -rw-r--r-- | src/merkleblock.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/merkleblock.h b/src/merkleblock.h index 52c914967f..d90face17c 100644 --- a/src/merkleblock.h +++ b/src/merkleblock.h @@ -139,6 +139,11 @@ public: */ CMerkleBlock(const CBlock& block, CBloomFilter& filter); + // Create from a CBlock, matching the txids in the set + CMerkleBlock(const CBlock& block, const std::set<uint256>& txids); + + CMerkleBlock() {} + ADD_SERIALIZE_METHODS; template <typename Stream, typename Operation> |