diff --git a/src/util/merkleblock.rs b/src/util/merkleblock.rs index d4ce3973..74ee2f4b 100644 --- a/src/util/merkleblock.rs +++ b/src/util/merkleblock.rs @@ -431,18 +431,31 @@ impl MerkleBlock { /// assert_eq!(txid, matches[0]); /// ``` pub fn from_block(block: &Block, match_txids: &HashSet) -> Self { - let header = block.header; + let block_txids: Vec<_> = block.txdata.iter().map(Transaction::txid).collect(); + Self::from_header_txids(&block.header, &block_txids, match_txids) + } - let mut matches: Vec = Vec::with_capacity(block.txdata.len()); - let mut hashes: Vec = Vec::with_capacity(block.txdata.len()); + /// Create a MerkleBlock from the block's header and txids, that should contain proofs for match_txids. + /// + /// The `header` is the block header, `block_txids` is the full list of txids included in the block and + /// `match_txids` is a set containing the transaction ids that should be included in the partial merkle tree. + /// ``` - for hash in block.txdata.iter().map(Transaction::txid) { - matches.push(match_txids.contains(&hash)); - hashes.push(hash); + pub fn from_header_txids( + header: &BlockHeader, + block_txids: &[Txid], + match_txids: &HashSet, + ) -> Self { + let matches: Vec = block_txids + .into_iter() + .map(|txid| match_txids.contains(txid)) + .collect(); + + let pmt = PartialMerkleTree::from_txids(&block_txids, &matches); + MerkleBlock { + header: *header, + txn: pmt, } - - let pmt = PartialMerkleTree::from_txids(&hashes, &matches); - MerkleBlock { header, txn: pmt } } /// Extract the matching txid's represented by this partial merkle tree