Added the ability to create and verify merkle proofs #61
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
retest this please |
metalicjames
reviewed
Aug 7, 2018
src/kernel/merkletree.cpp
Outdated
| @@ -1,14 +1,21 @@ | |||
| #include <queue> | |||
|
|
|||
| #include <iostream> | |||
There was a problem hiding this comment.
I don't think iostream is needed here.
src/kernel/merkletree.h
Outdated
| class MerkleProof { | ||
| public: | ||
| MerkleProof(); | ||
| MerkleProof(Json::Value& json); |
There was a problem hiding this comment.
The json param should be marked const
src/kernel/merkletree.h
Outdated
| MerkleProof(Json::Value& json); | ||
| int positionInTotalSet; | ||
| std::vector<BigNum> leaves; | ||
| Json::Value toJson(); |
There was a problem hiding this comment.
toJson should be marked const.
src/kernel/merkletree.h
Outdated
|
|
||
| std::shared_ptr<MerkleNode> getLeftNode(); | ||
| std::shared_ptr<MerkleNode> getRightNode(); | ||
| MerkleNode* getAncestor(); |
There was a problem hiding this comment.
getAncestor should be marked const
src/kernel/merkletree.h
Outdated
| BigNum root; | ||
|
|
||
|
|
||
| CryptoKernel::MerkleNode* findDescendant(BigNum needle); |
There was a problem hiding this comment.
needle should be both const and passed by reference. I think the function itself can be marked const too.
tests/MerkletreeTests.cpp
Outdated
| @@ -1,4 +1,5 @@ | |||
| #include "MerkletreeTests.h" | |||
| #include <iostream> | |||
There was a problem hiding this comment.
iostream probably not needed here
|
Cleaned up the code based on your suggestions (thanks!). Let me know if it requires any additional changes. |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In order to support the pay-to-merkletree effort, i needed the merkletree class to support building and verifying merkle proofs.
I added this to the merkletree class, introduced two new classes:
MerkleProof holds the proof data, and can serialize/deserialize them to and from Json
MerkleRootNode can be initialized with a precomputed hash in case of reading a merkletree back from a proof - the nodes where the hash was calculated from are not availble, so the root value is just set from the constructor. LeftVal() and RightVal() will return empty.