aboutsummaryrefslogtreecommitdiff
path: root/src/merkleblock.h
diff options
context:
space:
mode:
authorMatt Corallo <git@bluematt.me>2014-11-01 23:53:55 -0700
committerMatt Corallo <git@bluematt.me>2015-04-23 17:50:39 -0700
commit30da90de8dcbb62199262f65516e574dab57d1bd (patch)
tree630cfb9d9a171668a9ee57f0fdd75f3aaeeec998 /src/merkleblock.h
parent734f80a5d18821f4f6d0488996655c6e35ce160c (diff)
Add CMerkleBlock constructor for tx set + block and an empty one
Diffstat (limited to 'src/merkleblock.h')
-rw-r--r--src/merkleblock.h5
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>