Merge remote-tracking branch 'origin/main' into feat/v2-piece-cid

src/aggregate.js

@@ -9,7 +9,7 @@ import { indexAreaStart } from './inclusion.js'
 
 const NodeSize = BigInt(Node.Size)
 const EntrySize = Number(Index.EntrySize)
-export const MAX_CAPACITY = 2n ** BigInt(Tree.MAX_HEIGHT) * NodeSize
+export const MAX_CAPACITY = Piece.PaddedSize.fromHeight(Tree.MAX_HEIGHT)
 
 /**
  * Default aggregate size (32GiB).

src/api.ts

@@ -177,14 +177,22 @@ export interface PieceInfo {
   size: PaddedPieceSize
 }
 
-export interface PieceInfoView extends PieceInfo {
+export interface PieceView {
+  /**
+   * Commitment to the data segment (Merkle node which is the root of the
+   * subtree containing all the nodes making up the data segment)
+   */
+  link: PieceLink
+
   /**
    * Height of the perfect binary merkle tree representing
    * this piece.
    */
   height: number
 }
 
+export interface PieceInfoView extends PieceInfo, PieceView {}
+
 /**
  * Represents a piece tree and underlying merkle tree.
  */

src/piece.js

@@ -46,7 +46,7 @@ class PieceInfo {
     this.height = height
   }
   get size() {
-    return 2n ** BigInt(this.height) * BigInt(NODE_SIZE)
+    return PaddedSize.fromHeight(this.height)
   }
   toJSON() {
     return toJSON(this)

src/piece/padded-size.js

@@ -60,4 +60,11 @@ export const toUnpaddedSize = (size) => size - size / BYTES_PER_QUAD
  *
  * @param {API.PaddedPieceSize} size
  */
-export const toHeight = (size) => log2Ceil(size / BYTES_PER_NODE)
+export const toHeight = (size) => log2Ceil(size / NODE_SIZE)
+
+/**
+ * Calculates the padded size of the piece tree from height.
+ *
+ * @param {number} height
+ */
+export const fromHeight = (height) => 2n ** BigInt(height) * NODE_SIZE

test/piece-size.spec.js

@@ -80,6 +80,22 @@ export const testPieceSize = {
     ])
   ),
 
+  // to height - from height
+  ...Object.fromEntries(
+    [128, 1024, 34359738368].map((size) => [
+      `PaddedSize.fromHeight(PaddedSize.toHeight(PaddedSize.from(${size})))) === ${size}`,
+      (assert) => {
+        assert.equal(
+          PaddedSize.fromHeight(
+            PaddedSize.toHeight(PaddedSize.from(size))
+          ),
+          BigInt(size)
+        )
+      },
+    ])
+  ),
+
+
   // throw
   ...Object.fromEntries(
     [9, 128, 99453687, 1016 + 0x1000000].map((size) => [