merkle: optimization, isZeroTree now requires tree level to eliminate…

… searching array
kaxxa123 · Sep 10, 2024 · 1d0edd2 · 1d0edd2
1 parent 42e3b86
commit 1d0edd2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/merkle/src/draw_merkle.ts b/merkle/src/draw_merkle.ts
@@ -155,7 +155,7 @@ export class TreeDisplay extends SMT {
     //
     //      buffer - buffer to which the subtree is to be written.
     _drawTreeLevel(parent: string, level: number, horizIdx: number, totalwidth: number, buffer: Buffer) {
-        if (this.isZeroTree(parent)) {
+        if (this.isZeroTree(parent, level)) {
             this._drawNode("   0  ", level, horizIdx, totalwidth, buffer);
 
             if (level < this.LEVELS_TOTAL()) {

diff --git a/merkle/src/sparse_merkle.ts b/merkle/src/sparse_merkle.ts
@@ -138,7 +138,8 @@ export class SMT {
     // Returns
     //      Array of hashes of all possible zero subtrees
     //      starting from a zero root and ending with a
-    //      zero leaf.
+    //      zero leaf. Returned array will be 
+    //      (LEVELS_TOTAL+1) long.
     private _computeZeroTree(): string[] {
         const cache = []
         let lastHash = this.HASH_ZERO();
@@ -160,8 +161,8 @@ export class SMT {
     //
     // Returns
     //      true if the hash is one of the zero subtree hashes
-    isZeroTree(hash: string): boolean {
-        return (this._hashZeroTree.indexOf(hash) != -1);
+    isZeroTree(hash: string, level: number): boolean {
+        return (this._hashZeroTree[level] == hash);
     }
 
     // Get leaf lowest index/address.
@@ -203,7 +204,7 @@ export class SMT {
         // Read adjecent nodes
         for (let pos = 0; pos < this.LEVELS_TOTAL(); ++pos) {
 
-            zero = zero || (this.isZeroTree(node));
+            zero = zero || (this.isZeroTree(node, pos));
             if (zero) {
                 node = this.HASH_ZERO_TREE(pos + 1);
                 toRead.push(node);