Sync with latest Komodo changes

2018-08-06 12:52:22 -07:00
parent 55135eed8a cbd0560df3
commit 5034d1c134
150 changed files with 10076 additions and 2162 deletions
--- a/src/primitives/block.h
+++ b/src/primitives/block.h
@@ -229,6 +229,12 @@ public:
 };


+uint256 BuildMerkleTree(bool* fMutated, const std::vector<uint256> leaves,
+        std::vector<uint256> &vMerkleTree);
+
+std::vector<uint256> GetMerkleBranch(int nIndex, int nLeaves, const std::vector<uint256> &vMerkleTree);
+
+
 /**
 * Custom serializer for CBlockHeader that omits the nonce and solution, for use
 * as input to Equihash.