@ensdomains/merkle-builder 0.0.1 → 0.0.2

package/README.md

@@ -4,7 +4,7 @@
 * Matches [Ethereum](https://ethereum.org/developers/docs/apis/json-rpc/) and [Foundry](https://getfoundry.sh/) results
 * Memory efficient (copy-on-write, shared subexpressions)
 * Compute efficient (branch nodes hash once)
-* Multiple storage encodings (object, bytes, JSON)
+* Multiple storage encodings (object, [bytes](./src/coder.ts), [JSON](./src/json.ts))
 
 #### Roadmap
 
@@ -34,10 +34,10 @@
 
 * Replicate `eth_getProof` for [`L2ReverseRegistrar`](https://github.com/ensdomains/ens-contracts/blob/staging/contracts/reverseRegistrar/L2ReverseRegistrar.sol) (requires [`.env`](./.env.sample) for provider)
     * `bun demo/app.ts -c <chain>`
-        * ✅️ [`op`](https://optimistic.etherscan.io/address/0x0000000000D8e504002cC26E3Ec46D81971C1664) &rarr; `88` names as of `2026-01-09`
-        * ✅️ [`base`](https://basescan.org/address/0x0000000000D8e504002cC26E3Ec46D81971C1664) &rarr; `1,584,359` names as of `2026-01-09`
-        * ✅️ [`arb`](https://arbiscan.io/address/0x0000000000D8e504002cC26E3Ec46D81971C1664) &rarr; `146` names as of `2025-01-09`
-        * ✅️ [`linea`](https://lineascan.build/address/0x0000000000D8e504002cC26E3Ec46D81971C1664) &rarr; `74` names as of `2025-01-09`
-        * ✅️ [`scroll`](https://scrollscan.com/address/0x0000000000D8e504002cC26E3Ec46D81971C1664) &rarr; `47` names as of `2025-01-09`
+        * ✅️ [`op`](https://optimistic.etherscan.io/address/0x0000000000D8e504002cC26E3Ec46D81971C1664) &rarr; `95` names as of `2026-01-25`
+        * ✅️ [`base`](https://basescan.org/address/0x0000000000D8e504002cC26E3Ec46D81971C1664) &rarr; `1,846,927` names as of `2026-01-25`
+        * ✅️ [`arb`](https://arbiscan.io/address/0x0000000000D8e504002cC26E3Ec46D81971C1664) &rarr; `151` names as of `2026-01-25`
+        * ✅️ [`linea`](https://lineascan.build/address/0x0000000000D8e504002cC26E3Ec46D81971C1664) &rarr; `77` names as of `2026-01-25`
+        * ✅️ [`scroll`](https://scrollscan.com/address/0x0000000000D8e504002cC26E3Ec46D81971C1664) &rarr; `49` names as of `2026-01-25`
 * Deserialize from *trunk* and *limb* with precomputed hashes, perform surgery, and produce correct `eth_getProof`
     * `bun demo/memory.ts -c <chain> -d <depth>`

package/dist/index.cjs

@@ -642,7 +642,7 @@ function fromJSON(json) {
       }
     }
   }
-  throw new TypeError("invalid json");
+  throw Object.assign(new TypeError("invalid json"), { json });
 }
 function nibbleStr(path) {
   return Array.from(path, toNibbleChar).join("");
@@ -807,7 +807,7 @@ function mimcHash(v) {
 }
 
 // src/surgery.ts
-function pluckLimbs(node, depth) {
+function pluckLimbs(node, depth, exact) {
   if (!node || depth <= 0) return { trunk: node, limbs: [] };
   const queue = [];
   if (isBranch(node)) {
@@ -827,30 +827,27 @@ function pluckLimbs(node, depth) {
       trunk: void 0,
       limbs: [[node.path.subarray(0, depth), leaf]]
     };
-  } else {
-    return { trunk: node, limbs: [] };
   }
   const limbs = [];
   while (queue.length) {
     const [parent, path] = queue.pop();
-    const rest = depth - path.length - 1;
     parent.children.forEach((child, i) => {
       if (!child) return;
-      if (!rest) {
+      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 (child.path.length > rest) {
+      } 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 copy = { ...child };
-        copy.path = child.path.subarray(rest);
+        const full = [...path, i, ...child.path];
+        const rest = new Uint8Array(full.slice(depth));
         limbs.push([
-          Uint8Array.of(...path, i, ...child.path.subarray(0, rest)),
-          copy
+          new Uint8Array(full.slice(0, depth)),
+          isLeaf(child) ? newLeaf(rest, child.data) : rest.length ? { path: rest, child: child.child } : child.child
         ]);
-      } else if (isExtension(child)) {
-        queue.push([child.child, [...path, i, ...child.path]]);
       }
     });
   }

package/dist/index.d.cts

@@ -74,7 +74,7 @@ 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): {
+declare function pluckLimbs(node: MaybeNode, depth: number, exact?: boolean): {
     trunk: MaybeNode;
     limbs: Limb[];
 };

package/dist/index.d.ts

@@ -74,7 +74,7 @@ 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): {
+declare function pluckLimbs(node: MaybeNode, depth: number, exact?: boolean): {
     trunk: MaybeNode;
     limbs: Limb[];
 };

package/dist/index.js

@@ -580,7 +580,7 @@ function fromJSON(json) {
       }
     }
   }
-  throw new TypeError("invalid json");
+  throw Object.assign(new TypeError("invalid json"), { json });
 }
 function nibbleStr(path) {
   return Array.from(path, toNibbleChar).join("");
@@ -745,7 +745,7 @@ function mimcHash(v) {
 }
 
 // src/surgery.ts
-function pluckLimbs(node, depth) {
+function pluckLimbs(node, depth, exact) {
   if (!node || depth <= 0) return { trunk: node, limbs: [] };
   const queue = [];
   if (isBranch(node)) {
@@ -765,30 +765,27 @@ function pluckLimbs(node, depth) {
       trunk: void 0,
       limbs: [[node.path.subarray(0, depth), leaf]]
     };
-  } else {
-    return { trunk: node, limbs: [] };
   }
   const limbs = [];
   while (queue.length) {
     const [parent, path] = queue.pop();
-    const rest = depth - path.length - 1;
     parent.children.forEach((child, i) => {
       if (!child) return;
-      if (!rest) {
+      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 (child.path.length > rest) {
+      } 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 copy = { ...child };
-        copy.path = child.path.subarray(rest);
+        const full = [...path, i, ...child.path];
+        const rest = new Uint8Array(full.slice(depth));
         limbs.push([
-          Uint8Array.of(...path, i, ...child.path.subarray(0, rest)),
-          copy
+          new Uint8Array(full.slice(0, depth)),
+          isLeaf(child) ? newLeaf(rest, child.data) : rest.length ? { path: rest, child: child.child } : child.child
         ]);
-      } else if (isExtension(child)) {
-        queue.push([child.child, [...path, i, ...child.path]]);
       }
     });
   }

package/package.json

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