diff options
author | instagibbs <gsanders87@gmail.com> | 2016-02-18 16:31:12 -0800 |
---|---|---|
committer | instagibbs <gsanders87@gmail.com> | 2016-03-23 10:40:38 -0400 |
commit | 7eb702954ed0e297c5ded548e6c4f11f55313b7a (patch) | |
tree | 3054521bdf5815fafa803017f2ce72f427e3d108 /src/merkleblock.h | |
parent | 3bdc583b3f072d0d23b1fc858890fd1acaff5914 (diff) |
Add importprunedfunds rpc call
Diffstat (limited to 'src/merkleblock.h')
-rw-r--r-- | src/merkleblock.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/merkleblock.h b/src/merkleblock.h index 996cd12624..835cbcce55 100644 --- a/src/merkleblock.h +++ b/src/merkleblock.h @@ -75,9 +75,9 @@ protected: /** * recursive function that traverses tree nodes, consuming the bits and hashes produced by TraverseAndBuild. - * it returns the hash of the respective node. + * it returns the hash of the respective node and its respective index. */ - uint256 TraverseAndExtract(int height, unsigned int pos, unsigned int &nBitsUsed, unsigned int &nHashUsed, std::vector<uint256> &vMatch); + uint256 TraverseAndExtract(int height, unsigned int pos, unsigned int &nBitsUsed, unsigned int &nHashUsed, std::vector<uint256> &vMatch, std::vector<unsigned int> &vnIndex); public: @@ -110,10 +110,11 @@ public: CPartialMerkleTree(); /** - * extract the matching txid's represented by this partial merkle tree. + * extract the matching txid's represented by this partial merkle tree + * and their respective indices within the partial tree. * returns the merkle root, or 0 in case of failure */ - uint256 ExtractMatches(std::vector<uint256> &vMatch); + uint256 ExtractMatches(std::vector<uint256> &vMatch, std::vector<unsigned int> &vnIndex); }; |