Merge pull request #11 from kcalvinalvin/2024-08-26-fix-root-idx

Fix root_idx when the leaf is not at the bottom
utreexo · Aug 26, 2024 · a0d0713 · a0d0713
2 parents 28d6e3d + a4e4f6b
commit a0d0713
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/pytreexo.py b/pytreexo.py
@@ -78,7 +78,7 @@ def root_idx(numleaves: int, position: int) -> int:
         if not root_present(numleaves, row):
             continue
         pos = position
-        for _ in range(row): pos = parent(pos, tree_rows(numleaves))
+        for _ in range(detect_row(position, tree_rows(numleaves)), row): pos = parent(pos, tree_rows(numleaves))
         if isroot(pos, numleaves, tree_rows(numleaves)):
             return idx
         idx += 1

diff --git a/tests/test_cases.json b/tests/test_cases.json
@@ -80,6 +80,17 @@
       "proofhashes": [],
       "expected": true
     },
+    {
+      "numleaves": 6,
+      "roots": [
+        "2b77298feac78ab51bc5079099a074c6d789bd350442f5079fcba2b3402694e5",
+        "9eec588c41d87b16b0ee226cb38da3864f9537632321d8be855a73d5616dcc73"
+      ],
+      "targets": [8],
+      "target_preimages": [1],
+      "proofhashes": ["9576f4ade6e9bc3a6458b506ce3e4e890df29cb14cb5d3d887672aef55647a2b"],
+      "expected": true
+    },
     {
       "numleaves": 8,
       "roots": [