Add CMerkleBlock constructor for tx set + block and an empty one

2014-11-01 23:53:55 -07:00
parent 734f80a5d1
commit 30da90de8d
2 changed files with 28 additions and 0 deletions
--- 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>