@ensdomains/merkle-builder 0.0.3 → 0.0.4

package/dist/index.cjs

@@ -404,6 +404,9 @@ var Coder = class {
     return c.pos;
   }
   pos = 0;
+  get remaining() {
+    return Math.max(0, this.buf.length - this.pos);
+  }
   reset() {
     this.pos = 0;
   }
@@ -807,7 +810,7 @@ function mimcHash(v) {
 }
 
 // src/surgery.ts
-function pluckLimbs(node, depth, exact) {
+function pluckLimbs(node, depth) {
   if (!node || depth <= 0) return { trunk: node, limbs: [] };
   const queue = [];
   if (isBranch(node)) {
@@ -831,29 +834,30 @@ function pluckLimbs(node, depth, exact) {
   const limbs = [];
   while (queue.length) {
     const [parent, path] = queue.pop();
-    parent.children.forEach((child, i) => {
-      if (!child) return;
+    parent.children.forEach((x, i) => {
+      if (!x) return;
       if (path.length + 1 === depth) {
         parent.children[i] = void 0;
-        limbs.push([Uint8Array.of(...path, i), child]);
-      } else if (isBranch(child)) {
-        queue.push([child, [...path, i]]);
-      } else if (isExtension(child) && path.length + child.path.length <= depth) {
-        queue.push([child.child, [...path, i, ...child.path]]);
-      } else if (exact) {
-        parent.children[i] = void 0;
-        const full = [...path, i, ...child.path];
-        const rest = new Uint8Array(full.slice(depth));
-        limbs.push([
-          new Uint8Array(full.slice(0, depth)),
-          isLeaf(child) ? newLeaf(rest, child.data) : rest.length ? { path: rest, child: child.child } : child.child
-        ]);
+        limbs.push([Uint8Array.of(...path, i), x]);
+      } else if (isBranch(x)) {
+        queue.push([x, [...path, i]]);
+      } else if (isExtension(x)) {
+        const full = [...path, i, ...x.path];
+        if (full.length >= depth) {
+          const { cache, ...branch } = x.child;
+          const child = newBranch();
+          if (cache) child.cache = cache;
+          parent.children[i] = { path: x.path, child };
+          limbs.push([new Uint8Array(full.slice(0, depth)), branch]);
+        } else {
+          queue.push([x.child, full]);
+        }
       }
     });
   }
   return { trunk: node, limbs };
 }
-function graftLimb(trunk, path, limb) {
+function graftLimb(trunk, [path, limb]) {
   if (!path.length) return limb;
   if (!trunk) {
     if (isBranch(limb)) {
@@ -864,39 +868,32 @@ function graftLimb(trunk, path, limb) {
       return copy;
     }
   }
-  let start = 0;
   let index = 0;
-  let node = trunk;
+  let parent = trunk;
   while (index < path.length - 1) {
-    if (isBranch(node)) {
-      const child = node.children[path[index]];
-      if (!child) {
-        start = index;
-        index = path.length - 1;
-        break;
-      }
-      start = ++index;
-      node = child;
-    } else if (isExtension(node)) {
-      ++start;
-      index += node.path.length;
-      node = node.child;
+    if (isBranch(parent)) {
+      parent = parent.children[path[index++]];
+    } else if (isExtension(parent)) {
+      index += parent.path.length;
+      if (index >= path.length) break;
+      parent = parent.child;
     } else {
       break;
     }
   }
-  if (!isBranch(node)) throw new RangeError("invalid graft");
-  if (start === index) {
-    node.children[path[start]] = limb;
-  } else if (isBranch(limb)) {
-    node.children[path[start]] = {
-      path: path.slice(start + 1),
-      child: limb
-    };
+  if (isExtension(parent)) {
+    if (!isBranch(limb)) throw new RangeError("expected branch");
+    parent.child.children = limb.children;
+  } else if (isBranch(parent)) {
+    if (isBranch(limb)) {
+      parent.children[path[index]] = index + 1 == path.length ? limb : { path: path.slice(index + 1), child: limb };
+    } else {
+      const copy = { ...limb };
+      copy.path = concat(path.subarray(index + 1), copy.path);
+      parent.children[path[index]] = copy;
+    }
   } else {
-    const copy = { ...limb };
-    copy.path = concat(path.subarray(start + 1), copy.path);
-    node.children[path[start]] = copy;
+    throw new RangeError("invalid graft location");
   }
   return trunk;
 }

package/dist/index.d.cts

@@ -41,6 +41,7 @@ declare class Coder {
     static getByteCount(node: MaybeNode): number;
     pos: number;
     constructor(buf?: Uint8Array);
+    get remaining(): number;
     reset(): void;
     expand(need: number): void;
     require(need: number): void;
@@ -74,11 +75,11 @@ declare function insertBytes(node: MaybeNode, slot: Uint8Array, value: Uint8Arra
 declare function mimcHash(v: bigint[]): bigint;
 
 type Limb = [path: Uint8Array, node: Node];
-declare function pluckLimbs(node: MaybeNode, depth: number, exact?: boolean): {
+declare function pluckLimbs(node: MaybeNode, depth: number): {
     trunk: MaybeNode;
     limbs: Limb[];
 };
-declare function graftLimb(trunk: MaybeNode, path: Uint8Array, limb: Node): Node;
+declare function graftLimb(trunk: MaybeNode, [path, limb]: Limb): Node;
 
 type Hex = `0x${string}`;
 declare function keccak256(v: Uint8Array): Uint8Array;

package/dist/index.d.ts

@@ -41,6 +41,7 @@ declare class Coder {
     static getByteCount(node: MaybeNode): number;
     pos: number;
     constructor(buf?: Uint8Array);
+    get remaining(): number;
     reset(): void;
     expand(need: number): void;
     require(need: number): void;
@@ -74,11 +75,11 @@ declare function insertBytes(node: MaybeNode, slot: Uint8Array, value: Uint8Arra
 declare function mimcHash(v: bigint[]): bigint;
 
 type Limb = [path: Uint8Array, node: Node];
-declare function pluckLimbs(node: MaybeNode, depth: number, exact?: boolean): {
+declare function pluckLimbs(node: MaybeNode, depth: number): {
     trunk: MaybeNode;
     limbs: Limb[];
 };
-declare function graftLimb(trunk: MaybeNode, path: Uint8Array, limb: Node): Node;
+declare function graftLimb(trunk: MaybeNode, [path, limb]: Limb): Node;
 
 type Hex = `0x${string}`;
 declare function keccak256(v: Uint8Array): Uint8Array;

package/dist/index.js

@@ -342,6 +342,9 @@ var Coder = class {
     return c.pos;
   }
   pos = 0;
+  get remaining() {
+    return Math.max(0, this.buf.length - this.pos);
+  }
   reset() {
     this.pos = 0;
   }
@@ -745,7 +748,7 @@ function mimcHash(v) {
 }
 
 // src/surgery.ts
-function pluckLimbs(node, depth, exact) {
+function pluckLimbs(node, depth) {
   if (!node || depth <= 0) return { trunk: node, limbs: [] };
   const queue = [];
   if (isBranch(node)) {
@@ -769,29 +772,30 @@ function pluckLimbs(node, depth, exact) {
   const limbs = [];
   while (queue.length) {
     const [parent, path] = queue.pop();
-    parent.children.forEach((child, i) => {
-      if (!child) return;
+    parent.children.forEach((x, i) => {
+      if (!x) return;
       if (path.length + 1 === depth) {
         parent.children[i] = void 0;
-        limbs.push([Uint8Array.of(...path, i), child]);
-      } else if (isBranch(child)) {
-        queue.push([child, [...path, i]]);
-      } else if (isExtension(child) && path.length + child.path.length <= depth) {
-        queue.push([child.child, [...path, i, ...child.path]]);
-      } else if (exact) {
-        parent.children[i] = void 0;
-        const full = [...path, i, ...child.path];
-        const rest = new Uint8Array(full.slice(depth));
-        limbs.push([
-          new Uint8Array(full.slice(0, depth)),
-          isLeaf(child) ? newLeaf(rest, child.data) : rest.length ? { path: rest, child: child.child } : child.child
-        ]);
+        limbs.push([Uint8Array.of(...path, i), x]);
+      } else if (isBranch(x)) {
+        queue.push([x, [...path, i]]);
+      } else if (isExtension(x)) {
+        const full = [...path, i, ...x.path];
+        if (full.length >= depth) {
+          const { cache, ...branch } = x.child;
+          const child = newBranch();
+          if (cache) child.cache = cache;
+          parent.children[i] = { path: x.path, child };
+          limbs.push([new Uint8Array(full.slice(0, depth)), branch]);
+        } else {
+          queue.push([x.child, full]);
+        }
       }
     });
   }
   return { trunk: node, limbs };
 }
-function graftLimb(trunk, path, limb) {
+function graftLimb(trunk, [path, limb]) {
   if (!path.length) return limb;
   if (!trunk) {
     if (isBranch(limb)) {
@@ -802,39 +806,32 @@ function graftLimb(trunk, path, limb) {
       return copy;
     }
   }
-  let start = 0;
   let index = 0;
-  let node = trunk;
+  let parent = trunk;
   while (index < path.length - 1) {
-    if (isBranch(node)) {
-      const child = node.children[path[index]];
-      if (!child) {
-        start = index;
-        index = path.length - 1;
-        break;
-      }
-      start = ++index;
-      node = child;
-    } else if (isExtension(node)) {
-      ++start;
-      index += node.path.length;
-      node = node.child;
+    if (isBranch(parent)) {
+      parent = parent.children[path[index++]];
+    } else if (isExtension(parent)) {
+      index += parent.path.length;
+      if (index >= path.length) break;
+      parent = parent.child;
     } else {
       break;
     }
   }
-  if (!isBranch(node)) throw new RangeError("invalid graft");
-  if (start === index) {
-    node.children[path[start]] = limb;
-  } else if (isBranch(limb)) {
-    node.children[path[start]] = {
-      path: path.slice(start + 1),
-      child: limb
-    };
+  if (isExtension(parent)) {
+    if (!isBranch(limb)) throw new RangeError("expected branch");
+    parent.child.children = limb.children;
+  } else if (isBranch(parent)) {
+    if (isBranch(limb)) {
+      parent.children[path[index]] = index + 1 == path.length ? limb : { path: path.slice(index + 1), child: limb };
+    } else {
+      const copy = { ...limb };
+      copy.path = concat(path.subarray(index + 1), copy.path);
+      parent.children[path[index]] = copy;
+    }
   } else {
-    const copy = { ...limb };
-    copy.path = concat(path.subarray(start + 1), copy.path);
-    node.children[path[start]] = copy;
+    throw new RangeError("invalid graft location");
   }
   return trunk;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ensdomains/merkle-builder",
-	"version": "0.0.3",
+	"version": "0.0.4",
 	"description": "Low-level Merkle-Patricia storage trie implementation",
 	"type": "module",
 	"main": "dist/index.cjs",