Merge 15f6d42 into 8eeebd1

commitground · Nov 24, 2018 · 01aa04f · 01aa04f
2 parents 8eeebd1 + 15f6d42
commit 01aa04f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/contracts/tree.sol b/contracts/tree.sol
@@ -114,12 +114,21 @@ library PatriciaTree {
         bytes32 potentialSiblingValue,
         uint branchMask,
         bytes32[] _siblings
+    ) {
+        return getNonInclusionProofWithHashedKey(tree, keccak256(key));
+    }
+
+    function getNonInclusionProofWithHashedKey(Tree storage tree, bytes32 hashedKey) internal view returns (
+        bytes32 potentialSiblingLabel,
+        bytes32 potentialSiblingValue,
+        uint branchMask,
+        bytes32[] _siblings
     ){
         uint length;
         uint numSiblings;
 
         // Start from root edge
-        D.Label memory label = D.Label(keccak256(key), 256);
+        D.Label memory label = D.Label(hashedKey, 256);
         D.Edge memory e = tree.rootEdge;
         bytes32[256] memory siblings;
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "solidity-patricia-tree",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Patricia Tree solidity implemenation",
   "directories": {
     "test": "test"