@aztec/blob-lib 3.0.0-canary.a9708bd → 3.0.0-devnet.2

package/dest/blob_batching.d.ts

@@ -1,6 +1,6 @@
 import { BLS12Fr, BLS12Point, Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
 import { Blob } from './blob.js';
+import { BlobAccumulator, FinalBlobAccumulator, FinalBlobBatchingChallenges } from './circuit_types/index.js';
 /**
  * A class to create, manage, and prove batched EVM blobs.
  */
@@ -33,13 +33,13 @@ export declare class BatchedBlob {
      *
      * @returns A batched blob.
      */
-    static batch(blobs: Blob[]): Promise<BatchedBlob>;
+    static batch(blobs: Blob[][]): Promise<BatchedBlob>;
     /**
      * Returns an empty BatchedBlobAccumulator with precomputed challenges from all blobs in the epoch.
      * @dev MUST input all blobs to be broadcast. Does not work in multiple calls because z and gamma are calculated
      *      beforehand from ALL blobs.
      */
-    static newAccumulator(blobs: Blob[]): Promise<BatchedBlobAccumulator>;
+    static newAccumulator(blobs: Blob[][]): Promise<BatchedBlobAccumulator>;
     /**
      * Gets the final challenges based on all blobs and their elements to perform a multi opening proof.
      * Used in BatchedBlobAccumulator as 'finalZ' and finalGamma':
@@ -48,12 +48,13 @@ export declare class BatchedBlob {
      *    - used such that p_i(z) = y_i = Blob.evaluationY for all n blob polynomials p_i().
      *  - gamma = H(H(...H(H(y_0, y_1) y_2)..y_n), z)
      *    - used such that y = sum_i { gamma^i * y_i }, and C = sum_i { gamma^i * C_i }, for all blob evaluations y_i (see above) and commitments C_i.
+     *
+     * @param blobs - The blobs to precompute the challenges for. Each sub-array is the blobs for an L1 block.
      * @returns Challenges z and gamma.
      */
-    static precomputeBatchedBlobChallenges(blobs: Blob[]): Promise<FinalBlobBatchingChallenges>;
-    static precomputeEmptyBatchedBlobChallenges(): Promise<FinalBlobBatchingChallenges>;
+    static precomputeBatchedBlobChallenges(blobs: Blob[][]): Promise<FinalBlobBatchingChallenges>;
+    verify(): boolean;
     getEthVersionedBlobHash(): Buffer;
-    static getEthVersionedBlobHash(commitment: Buffer): Buffer;
     /**
      * Returns a proof of opening of the blobs to verify on L1 using the point evaluation precompile:
      *
@@ -66,33 +67,10 @@ export declare class BatchedBlob {
      * See https://eips.ethereum.org/EIPS/eip-4844#point-evaluation-precompile
      */
     getEthBlobEvaluationInputs(): `0x${string}`;
+    toFinalBlobAccumulator(): FinalBlobAccumulator;
 }
 /**
- * Final values z and gamma are injected into each block root circuit. We ensure they are correct by:
- * - Checking equality in each block merge circuit and propagating up
- * - Checking final z_acc == z in root circuit
- * - Checking final gamma_acc == gamma in root circuit
- *
- *  - z = H(...H(H(z_0, z_1) z_2)..z_n)
- *    - where z_i = H(H(fields of blob_i), C_i),
- *    - used such that p_i(z) = y_i = Blob.evaluationY for all n blob polynomials p_i().
- *  - gamma = H(H(...H(H(y_0, y_1) y_2)..y_n), z)
- *    - used such that y = sum_i { gamma^i * y_i }, and C = sum_i { gamma^i * C_i }
- *      for all blob evaluations y_i (see above) and commitments C_i.
- *
- * Iteratively calculated by BlobAccumulatorPublicInputs.accumulate() in nr. See also precomputeBatchedBlobChallenges() above.
- */
-export declare class FinalBlobBatchingChallenges {
-    readonly z: Fr;
-    readonly gamma: BLS12Fr;
-    constructor(z: Fr, gamma: BLS12Fr);
-    equals(other: FinalBlobBatchingChallenges): boolean;
-    static empty(): FinalBlobBatchingChallenges;
-    static fromBuffer(buffer: Buffer | BufferReader): FinalBlobBatchingChallenges;
-    toBuffer(): Buffer<ArrayBufferLike>;
-}
-/**
- * See noir-projects/noir-protocol-circuits/crates/blob/src/blob_batching_public_inputs.nr -> BlobAccumulatorPublicInputs
+ * See noir-projects/noir-protocol-circuits/crates/blob/src/abis/blob_accumulator.nr
  */
 export declare class BatchedBlobAccumulator {
     /** Hash of Cs (to link to L1 blob hashes). */
@@ -136,21 +114,6 @@ export declare class BatchedBlobAccumulator {
     gammaPow: BLS12Fr, 
     /** Final challenge values used in evaluation. Optimistically input and checked in the final acc. */
     finalBlobChallenges: FinalBlobBatchingChallenges);
-    /**
-     * Init the first accumulation state of the epoch.
-     * We assume the input blob has not been evaluated at z.
-     *
-     * First state of the accumulator:
-     * - v_acc := sha256(C_0)
-     * - z_acc := z_0
-     * - y_acc := gamma^0 * y_0 = y_0
-     * - c_acc := gamma^0 * c_0 = c_0
-     * - gamma_acc := poseidon2(y_0.limbs)
-     * - gamma^(i + 1) = gamma^1 = gamma // denoted gamma_pow_acc
-     *
-     * @returns An initial blob accumulator.
-     */
-    static initialize(blob: Blob, finalBlobChallenges: FinalBlobBatchingChallenges): Promise<BatchedBlobAccumulator>;
     /**
      * Create the empty accumulation state of the epoch.
      * @returns An empty blob accumulator with challenges.
@@ -161,10 +124,11 @@ export declare class BatchedBlobAccumulator {
      * We assume the input blob has not been evaluated at z.
      * @returns An updated blob accumulator.
      */
-    accumulate(blob: Blob): Promise<BatchedBlobAccumulator>;
+    private accumulate;
     /**
      * Given blobs, accumulate all state.
      * We assume the input blobs have not been evaluated at z.
+     * @param blobs - The blobs to accumulate. They should be in the same L1 block.
      * @returns An updated blob accumulator.
      */
     accumulateBlobs(blobs: Blob[]): Promise<BatchedBlobAccumulator>;
@@ -179,10 +143,13 @@ export declare class BatchedBlobAccumulator {
      * - c := c_acc (final commitment to be checked on L1)
      * - gamma := poseidon2(gamma_acc, z) (challenge for linear combination of y and C, above)
      *
+     * @param verifyProof - Whether to verify the KZG proof.
      * @returns A batched blob.
      */
-    finalize(): Promise<BatchedBlob>;
+    finalize(verifyProof?: boolean): Promise<BatchedBlob>;
     isEmptyState(): boolean;
     clone(): BatchedBlobAccumulator;
+    toBlobAccumulator(): BlobAccumulator;
+    toFinalBlobAccumulator(): FinalBlobAccumulator;
 }
 //# sourceMappingURL=blob_batching.d.ts.map

package/dest/blob_batching.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blob_batching.d.ts","sourceRoot":"","sources":["../src/blob_batching.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"blob_batching.d.ts","sourceRoot":"","sources":["../src/blob_batching.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAI9G;;GAEG;AACH,qBAAa,WAAW;IAEpB,8CAA8C;aAC9B,mBAAmB,EAAE,EAAE;IACvC,gDAAgD;aAChC,CAAC,EAAE,EAAE;IACrB,mFAAmF;aACnE,CAAC,EAAE,OAAO;IAC1B,kFAAkF;aAClE,UAAU,EAAE,UAAU;IACtC,4HAA4H;aAC5G,CAAC,EAAE,UAAU;;IAT7B,8CAA8C;IAC9B,mBAAmB,EAAE,EAAE;IACvC,gDAAgD;IAChC,CAAC,EAAE,EAAE;IACrB,mFAAmF;IACnE,CAAC,EAAE,OAAO;IAC1B,kFAAkF;IAClE,UAAU,EAAE,UAAU;IACtC,4HAA4H;IAC5G,CAAC,EAAE,UAAU;IAG/B;;;;;;OAMG;WACU,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IAgBzD;;;;OAIG;WACU,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAK7E;;;;;;;;;;;OAWG;WACU,+BAA+B,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAmCnG,MAAM;IAKN,uBAAuB,IAAI,MAAM;IAIjC;;;;;;;;;;OAUG;IACH,0BAA0B,IAAI,KAAK,MAAM,EAAE;IAW3C,sBAAsB;CAGvB;AAED;;GAEG;AACH,qBAAa,sBAAsB;IAE/B,8CAA8C;aAC9B,sBAAsB,EAAE,EAAE;IAC1C,sEAAsE;aACtD,IAAI,EAAE,EAAE;IACxB,yGAAyG;aACzF,IAAI,EAAE,OAAO;IAC7B,qGAAqG;aACrF,IAAI,EAAE,UAAU;IAChC,oGAAoG;aACpF,IAAI,EAAE,UAAU;IAChC;;;;OAIG;aACa,QAAQ,EAAE,EAAE;IAC5B,uGAAuG;aACvF,QAAQ,EAAE,OAAO;IACjC,oGAAoG;aACpF,mBAAmB,EAAE,2BAA2B;;IAnBhE,8CAA8C;IAC9B,sBAAsB,EAAE,EAAE;IAC1C,sEAAsE;IACtD,IAAI,EAAE,EAAE;IACxB,yGAAyG;IACzF,IAAI,EAAE,OAAO;IAC7B,qGAAqG;IACrF,IAAI,EAAE,UAAU;IAChC,oGAAoG;IACpF,IAAI,EAAE,UAAU;IAChC;;;;OAIG;IACa,QAAQ,EAAE,EAAE;IAC5B,uGAAuG;IACvF,QAAQ,EAAE,OAAO;IACjC,oGAAoG;IACpF,mBAAmB,EAAE,2BAA2B;IAGlE;;;OAGG;IACH,MAAM,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,2BAA2B,GAAG,sBAAsB;IAalG;;;;OAIG;YACW,UAAU;IAyCxB;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE;IAkBnC;;;;;;;;;;;;;OAaG;IACG,QAAQ,CAAC,WAAW,UAAQ,GAAG,OAAO,CAAC,WAAW,CAAC;IAwBzD,YAAY;IAYZ,KAAK;IAaL,iBAAiB;IAWjB,sBAAsB;CAGvB"}

package/dest/blob_batching.js

@@ -1,11 +1,10 @@
 import { AZTEC_MAX_EPOCH_DURATION, BLOBS_PER_BLOCK } from '@aztec/constants';
-import { poseidon2Hash, sha256, sha256ToField } from '@aztec/foundation/crypto';
+import { poseidon2Hash, sha256ToField } from '@aztec/foundation/crypto';
 import { BLS12Fr, BLS12Point, Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-// Importing directly from 'c-kzg' does not work:
-import cKzg from 'c-kzg';
-import { Blob, VERSIONED_HASH_VERSION_KZG } from './blob.js';
-const { computeKzgProof, verifyKzgProof } = cKzg;
+import { computeBlobFieldsHashFromBlobs } from './blob_utils.js';
+import { BlobAccumulator, FinalBlobAccumulator, FinalBlobBatchingChallenges } from './circuit_types/index.js';
+import { computeEthVersionedBlobHash, hashNoirBigNumLimbs } from './hash.js';
+import { kzg } from './kzg_context.js';
 /**
  * A class to create, manage, and prove batched EVM blobs.
  */ export class BatchedBlob {
@@ -28,14 +27,15 @@ const { computeKzgProof, verifyKzgProof } = cKzg;
    *
    * @returns A batched blob.
    */ static async batch(blobs) {
-        const numBlobs = blobs.length;
-        if (numBlobs > BLOBS_PER_BLOCK * AZTEC_MAX_EPOCH_DURATION) {
-            throw new Error(`Too many blobs (${numBlobs}) sent to batch(). The maximum is ${BLOBS_PER_BLOCK * AZTEC_MAX_EPOCH_DURATION}.`);
+        if (blobs.length > AZTEC_MAX_EPOCH_DURATION) {
+            throw new Error(`Too many blocks sent to batch(). The maximum is ${AZTEC_MAX_EPOCH_DURATION}. Got ${blobs.length}.`);
         }
         // Precalculate the values (z and gamma) and initialize the accumulator:
         let acc = await this.newAccumulator(blobs);
         // Now we can create a multi opening proof of all input blobs:
-        acc = await acc.accumulateBlobs(blobs);
+        for (const blockBlobs of blobs){
+            acc = await acc.accumulateBlobs(blockBlobs);
+        }
         return await acc.finalize();
     }
     /**
@@ -54,27 +54,42 @@ const { computeKzgProof, verifyKzgProof } = cKzg;
    *    - used such that p_i(z) = y_i = Blob.evaluationY for all n blob polynomials p_i().
    *  - gamma = H(H(...H(H(y_0, y_1) y_2)..y_n), z)
    *    - used such that y = sum_i { gamma^i * y_i }, and C = sum_i { gamma^i * C_i }, for all blob evaluations y_i (see above) and commitments C_i.
+   *
+   * @param blobs - The blobs to precompute the challenges for. Each sub-array is the blobs for an L1 block.
    * @returns Challenges z and gamma.
    */ static async precomputeBatchedBlobChallenges(blobs) {
-        // We need to precompute the final challenge values to evaluate the blobs.
-        let z = blobs[0].challengeZ;
-        // We start at i = 1, because z is initialized as the first blob's challenge.
-        for(let i = 1; i < blobs.length; i++){
-            z = await poseidon2Hash([
-                z,
-                blobs[i].challengeZ
-            ]);
+        // Compute the final challenge z to evaluate the blobs.
+        let z;
+        for (const blockBlobs of blobs){
+            // Compute the hash of all the fields in the block.
+            const blobFieldsHash = await computeBlobFieldsHashFromBlobs(blockBlobs);
+            for (const blob of blockBlobs){
+                // Compute the challenge z for each blob and accumulate it.
+                const challengeZ = await blob.computeChallengeZ(blobFieldsHash);
+                if (!z) {
+                    z = challengeZ;
+                } else {
+                    z = await poseidon2Hash([
+                        z,
+                        challengeZ
+                    ]);
+                }
+            }
+        }
+        if (!z) {
+            throw new Error('No blobs to precompute challenges for.');
         }
         // Now we have a shared challenge for all blobs, evaluate them...
-        const proofObjects = blobs.map((b)=>computeKzgProof(b.data, z.toBuffer()));
-        const evaluations = proofObjects.map(([_, evaluation])=>BLS12Fr.fromBuffer(Buffer.from(evaluation)));
+        const allBlobs = blobs.flat();
+        const proofObjects = allBlobs.map((b)=>b.evaluate(z));
+        const evaluations = await Promise.all(proofObjects.map(({ y })=>hashNoirBigNumLimbs(y)));
         // ...and find the challenge for the linear combination of blobs.
-        let gamma = await hashNoirBigNumLimbs(evaluations[0]);
+        let gamma = evaluations[0];
         // We start at i = 1, because gamma is initialized as the first blob's evaluation.
-        for(let i = 1; i < blobs.length; i++){
+        for(let i = 1; i < allBlobs.length; i++){
             gamma = await poseidon2Hash([
                 gamma,
-                await hashNoirBigNumLimbs(evaluations[i])
+                evaluations[i]
             ]);
         }
         gamma = await poseidon2Hash([
@@ -83,33 +98,12 @@ const { computeKzgProof, verifyKzgProof } = cKzg;
         ]);
         return new FinalBlobBatchingChallenges(z, BLS12Fr.fromBN254Fr(gamma));
     }
-    static async precomputeEmptyBatchedBlobChallenges() {
-        const blobs = [
-            await Blob.fromFields([])
-        ];
-        // We need to precompute the final challenge values to evaluate the blobs.
-        const z = blobs[0].challengeZ;
-        // Now we have a shared challenge for all blobs, evaluate them...
-        const proofObjects = blobs.map((b)=>computeKzgProof(b.data, z.toBuffer()));
-        const evaluations = proofObjects.map(([_, evaluation])=>BLS12Fr.fromBuffer(Buffer.from(evaluation)));
-        // ...and find the challenge for the linear combination of blobs.
-        let gamma = await hashNoirBigNumLimbs(evaluations[0]);
-        gamma = await poseidon2Hash([
-            gamma,
-            z
-        ]);
-        return new FinalBlobBatchingChallenges(z, BLS12Fr.fromBN254Fr(gamma));
+    verify() {
+        return kzg.verifyKzgProof(this.commitment.compress(), this.z.toBuffer(), this.y.toBuffer(), this.q.compress());
     }
     // Returns ethereum's versioned blob hash, following kzg_to_versioned_hash: https://eips.ethereum.org/EIPS/eip-4844#helpers
     getEthVersionedBlobHash() {
-        const hash = sha256(this.commitment.compress());
-        hash[0] = VERSIONED_HASH_VERSION_KZG;
-        return hash;
-    }
-    static getEthVersionedBlobHash(commitment) {
-        const hash = sha256(commitment);
-        hash[0] = VERSIONED_HASH_VERSION_KZG;
-        return hash;
+        return computeEthVersionedBlobHash(this.commitment.compress());
     }
     /**
    * Returns a proof of opening of the blobs to verify on L1 using the point evaluation precompile:
@@ -131,44 +125,12 @@ const { computeKzgProof, verifyKzgProof } = cKzg;
         ]);
         return `0x${buf.toString('hex')}`;
     }
-}
-/**
- * Final values z and gamma are injected into each block root circuit. We ensure they are correct by:
- * - Checking equality in each block merge circuit and propagating up
- * - Checking final z_acc == z in root circuit
- * - Checking final gamma_acc == gamma in root circuit
- *
- *  - z = H(...H(H(z_0, z_1) z_2)..z_n)
- *    - where z_i = H(H(fields of blob_i), C_i),
- *    - used such that p_i(z) = y_i = Blob.evaluationY for all n blob polynomials p_i().
- *  - gamma = H(H(...H(H(y_0, y_1) y_2)..y_n), z)
- *    - used such that y = sum_i { gamma^i * y_i }, and C = sum_i { gamma^i * C_i }
- *      for all blob evaluations y_i (see above) and commitments C_i.
- *
- * Iteratively calculated by BlobAccumulatorPublicInputs.accumulate() in nr. See also precomputeBatchedBlobChallenges() above.
- */ export class FinalBlobBatchingChallenges {
-    z;
-    gamma;
-    constructor(z, gamma){
-        this.z = z;
-        this.gamma = gamma;
-    }
-    equals(other) {
-        return this.z.equals(other.z) && this.gamma.equals(other.gamma);
-    }
-    static empty() {
-        return new FinalBlobBatchingChallenges(Fr.ZERO, BLS12Fr.ZERO);
-    }
-    static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        return new FinalBlobBatchingChallenges(Fr.fromBuffer(reader), reader.readObject(BLS12Fr));
-    }
-    toBuffer() {
-        return serializeToBuffer(this.z, this.gamma);
+    toFinalBlobAccumulator() {
+        return new FinalBlobAccumulator(this.blobCommitmentsHash, this.z, this.y, this.commitment);
     }
 }
 /**
- * See noir-projects/noir-protocol-circuits/crates/blob/src/blob_batching_public_inputs.nr -> BlobAccumulatorPublicInputs
+ * See noir-projects/noir-protocol-circuits/crates/blob/src/abis/blob_accumulator.nr
  */ export class BatchedBlobAccumulator {
     blobCommitmentsHashAcc;
     zAcc;
@@ -193,27 +155,6 @@ const { computeKzgProof, verifyKzgProof } = cKzg;
         this.finalBlobChallenges = finalBlobChallenges;
     }
     /**
-   * Init the first accumulation state of the epoch.
-   * We assume the input blob has not been evaluated at z.
-   *
-   * First state of the accumulator:
-   * - v_acc := sha256(C_0)
-   * - z_acc := z_0
-   * - y_acc := gamma^0 * y_0 = y_0
-   * - c_acc := gamma^0 * c_0 = c_0
-   * - gamma_acc := poseidon2(y_0.limbs)
-   * - gamma^(i + 1) = gamma^1 = gamma // denoted gamma_pow_acc
-   *
-   * @returns An initial blob accumulator.
-   */ static async initialize(blob, finalBlobChallenges) {
-        const [q, evaluation] = computeKzgProof(blob.data, finalBlobChallenges.z.toBuffer());
-        const firstY = BLS12Fr.fromBuffer(Buffer.from(evaluation));
-        // Here, i = 0, so:
-        return new BatchedBlobAccumulator(sha256ToField([
-            blob.commitment
-        ]), blob.challengeZ, firstY, BLS12Point.decompress(blob.commitment), BLS12Point.decompress(Buffer.from(q)), await hashNoirBigNumLimbs(firstY), finalBlobChallenges.gamma, finalBlobChallenges);
-    }
-    /**
    * Create the empty accumulation state of the epoch.
    * @returns An empty blob accumulator with challenges.
    */ static newWithChallenges(finalBlobChallenges) {
@@ -223,20 +164,32 @@ const { computeKzgProof, verifyKzgProof } = cKzg;
    * Given blob i, accumulate all state.
    * We assume the input blob has not been evaluated at z.
    * @returns An updated blob accumulator.
-   */ async accumulate(blob) {
+   */ async accumulate(blob, blobFieldsHash) {
+        const { proof, y: thisY } = blob.evaluate(this.finalBlobChallenges.z);
+        const thisC = BLS12Point.decompress(blob.commitment);
+        const thisQ = BLS12Point.decompress(proof);
+        const blobChallengeZ = await blob.computeChallengeZ(blobFieldsHash);
         if (this.isEmptyState()) {
-            return BatchedBlobAccumulator.initialize(blob, this.finalBlobChallenges);
+            /**
+       * Init the first accumulation state of the epoch.
+       * - v_acc := sha256(C_0)
+       * - z_acc := z_0
+       * - y_acc := gamma^0 * y_0 = y_0
+       * - c_acc := gamma^0 * c_0 = c_0
+       * - gamma_acc := poseidon2(y_0.limbs)
+       * - gamma^(i + 1) = gamma^1 = gamma // denoted gamma_pow_acc
+       */ return new BatchedBlobAccumulator(sha256ToField([
+                blob.commitment
+            ]), blobChallengeZ, thisY, thisC, thisQ, await hashNoirBigNumLimbs(thisY), this.finalBlobChallenges.gamma, this.finalBlobChallenges);
         } else {
-            const [q, evaluation] = computeKzgProof(blob.data, this.finalBlobChallenges.z.toBuffer());
-            const thisY = BLS12Fr.fromBuffer(Buffer.from(evaluation));
             // Moving from i - 1 to i, so:
             return new BatchedBlobAccumulator(sha256ToField([
                 this.blobCommitmentsHashAcc,
                 blob.commitment
             ]), await poseidon2Hash([
                 this.zAcc,
-                blob.challengeZ
-            ]), this.yAcc.add(thisY.mul(this.gammaPow)), this.cAcc.add(BLS12Point.decompress(blob.commitment).mul(this.gammaPow)), this.qAcc.add(BLS12Point.decompress(Buffer.from(q)).mul(this.gammaPow)), await poseidon2Hash([
+                blobChallengeZ
+            ]), this.yAcc.add(thisY.mul(this.gammaPow)), this.cAcc.add(thisC.mul(this.gammaPow)), this.qAcc.add(thisQ.mul(this.gammaPow)), await poseidon2Hash([
                 this.gammaAcc,
                 await hashNoirBigNumLimbs(thisY)
             ]), this.gammaPow.mul(this.finalBlobChallenges.gamma), this.finalBlobChallenges);
@@ -245,12 +198,18 @@ const { computeKzgProof, verifyKzgProof } = cKzg;
     /**
    * Given blobs, accumulate all state.
    * We assume the input blobs have not been evaluated at z.
+   * @param blobs - The blobs to accumulate. They should be in the same L1 block.
    * @returns An updated blob accumulator.
    */ async accumulateBlobs(blobs) {
+        if (blobs.length > BLOBS_PER_BLOCK) {
+            throw new Error(`Too many blobs to accumulate. The maximum is ${BLOBS_PER_BLOCK} per block. Got ${blobs.length}.`);
+        }
+        // Compute the hash of all the fields in the block.
+        const blobFieldsHash = await computeBlobFieldsHashFromBlobs(blobs);
         // Initialize the acc to iterate over:
         let acc = this.clone();
-        for(let i = 0; i < blobs.length; i++){
-            acc = await acc.accumulate(blobs[i]);
+        for (const blob of blobs){
+            acc = await acc.accumulate(blob, blobFieldsHash);
         }
         return acc;
     }
@@ -265,8 +224,9 @@ const { computeKzgProof, verifyKzgProof } = cKzg;
    * - c := c_acc (final commitment to be checked on L1)
    * - gamma := poseidon2(gamma_acc, z) (challenge for linear combination of y and C, above)
    *
+   * @param verifyProof - Whether to verify the KZG proof.
    * @returns A batched blob.
-   */ async finalize() {
+   */ async finalize(verifyProof = false) {
         // All values in acc are final, apart from gamma := poseidon2(gammaAcc, z):
         const calculatedGamma = await poseidon2Hash([
             this.gammaAcc,
@@ -279,10 +239,11 @@ const { computeKzgProof, verifyKzgProof } = cKzg;
         if (!calculatedGamma.equals(this.finalBlobChallenges.gamma.toBN254Fr())) {
             throw new Error(`Blob batching mismatch: accumulated gamma ${calculatedGamma} does not equal injected gamma ${this.finalBlobChallenges.gamma.toBN254Fr()}`);
         }
-        if (!verifyKzgProof(this.cAcc.compress(), this.zAcc.toBuffer(), this.yAcc.toBuffer(), this.qAcc.compress())) {
+        const batchedBlob = new BatchedBlob(this.blobCommitmentsHashAcc, this.zAcc, this.yAcc, this.cAcc, this.qAcc);
+        if (verifyProof && !batchedBlob.verify()) {
             throw new Error(`KZG proof did not verify.`);
         }
-        return new BatchedBlob(this.blobCommitmentsHashAcc, this.zAcc, this.yAcc, this.cAcc, this.qAcc);
+        return batchedBlob;
     }
     isEmptyState() {
         return this.blobCommitmentsHashAcc.isZero() && this.zAcc.isZero() && this.yAcc.isZero() && this.cAcc.isZero() && this.qAcc.isZero() && this.gammaAcc.isZero() && this.gammaPow.isZero();
@@ -290,10 +251,10 @@ const { computeKzgProof, verifyKzgProof } = cKzg;
     clone() {
         return new BatchedBlobAccumulator(Fr.fromBuffer(this.blobCommitmentsHashAcc.toBuffer()), Fr.fromBuffer(this.zAcc.toBuffer()), BLS12Fr.fromBuffer(this.yAcc.toBuffer()), BLS12Point.fromBuffer(this.cAcc.toBuffer()), BLS12Point.fromBuffer(this.qAcc.toBuffer()), Fr.fromBuffer(this.gammaAcc.toBuffer()), BLS12Fr.fromBuffer(this.gammaPow.toBuffer()), FinalBlobBatchingChallenges.fromBuffer(this.finalBlobChallenges.toBuffer()));
     }
-}
-// To mimic the hash accumulation in the rollup circuits, here we hash
-// each u128 limb of the noir bignum struct representing the BLS field.
-async function hashNoirBigNumLimbs(field) {
-    const num = field.toNoirBigNum();
-    return await poseidon2Hash(num.limbs.map(Fr.fromHexString));
+    toBlobAccumulator() {
+        return new BlobAccumulator(this.blobCommitmentsHashAcc, this.zAcc, this.yAcc, this.cAcc, this.gammaAcc, this.gammaPow);
+    }
+    toFinalBlobAccumulator() {
+        return new FinalBlobAccumulator(this.blobCommitmentsHashAcc, this.zAcc, this.yAcc, this.cAcc);
+    }
 }

package/dest/blob_utils.d.ts

@@ -0,0 +1,30 @@
+import { BLS12Point, Fr } from '@aztec/foundation/fields';
+import { Blob } from './blob.js';
+/**
+ * @param blobs - The blobs to emit.
+ * @returns The blobs' compressed commitments in hex prefixed by the number of blobs. 1 byte for the prefix, 48 bytes
+ * per blob commitment.
+ * @dev Used for proposing blocks to validate injected blob commitments match real broadcast blobs.
+ */
+export declare function getPrefixedEthBlobCommitments(blobs: Blob[]): `0x${string}`;
+/**
+ * @param fields - Fields to broadcast in the blob(s)
+ * @returns As many blobs as required to broadcast the given fields to an L1 block.
+ *
+ * @throws If the number of fields does not match what's indicated by the checkpoint prefix.
+ */
+export declare function getBlobsPerL1Block(fields: Fr[]): Blob[];
+/**
+ * Get the fields from all blobs in the checkpoint. Ignoring the fields beyond the length specified by the
+ * checkpoint prefix (the first field).
+ *
+ * @param blobs - The blobs to read fields from. Should be all the blobs in the L1 block proposing the checkpoint.
+ * @param checkEncoding - Whether to check if the entire encoded blob fields are valid. If false, it will still check
+ * the checkpoint prefix and throw if there's not enough fields.
+ * @returns The fields added throughout the checkpoint.
+ */
+export declare function getBlobFieldsInCheckpoint(blobs: Blob[], checkEncoding?: boolean): Fr[];
+export declare function computeBlobFieldsHashFromBlobs(blobs: Blob[]): Promise<Fr>;
+export declare function computeBlobsHashFromBlobs(blobs: Blob[]): Fr;
+export declare function getBlobCommitmentsFromBlobs(blobs: Blob[]): BLS12Point[];
+//# sourceMappingURL=blob_utils.d.ts.map

package/dest/blob_utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"blob_utils.d.ts","sourceRoot":"","sources":["../src/blob_utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAIjC;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,MAAM,EAAE,CAS1E;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,CASvD;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,aAAa,UAAQ,GAAG,EAAE,EAAE,CAEpF;AAED,wBAAsB,8BAA8B,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAQ/E;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,CAE3D;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,CAEvE"}

package/dest/blob_utils.js

@@ -0,0 +1,60 @@
+import { FIELDS_PER_BLOB } from '@aztec/constants';
+import { BLS12Point } from '@aztec/foundation/fields';
+import { Blob } from './blob.js';
+import { deserializeEncodedBlobToFields } from './deserialize.js';
+import { computeBlobFieldsHash, computeBlobsHash } from './hash.js';
+/**
+ * @param blobs - The blobs to emit.
+ * @returns The blobs' compressed commitments in hex prefixed by the number of blobs. 1 byte for the prefix, 48 bytes
+ * per blob commitment.
+ * @dev Used for proposing blocks to validate injected blob commitments match real broadcast blobs.
+ */ export function getPrefixedEthBlobCommitments(blobs) {
+    // Prefix the number of blobs.
+    const lenBuf = Buffer.alloc(1);
+    lenBuf.writeUint8(blobs.length);
+    const blobBuf = Buffer.concat(blobs.map((blob)=>blob.commitment));
+    const buf = Buffer.concat([
+        lenBuf,
+        blobBuf
+    ]);
+    return `0x${buf.toString('hex')}`;
+}
+/**
+ * @param fields - Fields to broadcast in the blob(s)
+ * @returns As many blobs as required to broadcast the given fields to an L1 block.
+ *
+ * @throws If the number of fields does not match what's indicated by the checkpoint prefix.
+ */ export function getBlobsPerL1Block(fields) {
+    if (!fields.length) {
+        throw new Error('Cannot create blobs from empty fields.');
+    }
+    const numBlobs = Math.ceil(fields.length / FIELDS_PER_BLOB);
+    return Array.from({
+        length: numBlobs
+    }, (_, i)=>Blob.fromFields(fields.slice(i * FIELDS_PER_BLOB, (i + 1) * FIELDS_PER_BLOB)));
+}
+/**
+ * Get the fields from all blobs in the checkpoint. Ignoring the fields beyond the length specified by the
+ * checkpoint prefix (the first field).
+ *
+ * @param blobs - The blobs to read fields from. Should be all the blobs in the L1 block proposing the checkpoint.
+ * @param checkEncoding - Whether to check if the entire encoded blob fields are valid. If false, it will still check
+ * the checkpoint prefix and throw if there's not enough fields.
+ * @returns The fields added throughout the checkpoint.
+ */ export function getBlobFieldsInCheckpoint(blobs, checkEncoding = false) {
+    return deserializeEncodedBlobToFields(Buffer.concat(blobs.map((b)=>b.data)), checkEncoding);
+}
+export async function computeBlobFieldsHashFromBlobs(blobs) {
+    const fields = blobs.map((b)=>b.toFields()).flat();
+    const numBlobFields = fields[0].toNumber();
+    if (numBlobFields > fields.length) {
+        throw new Error(`The prefix indicates ${numBlobFields} fields. Got ${fields.length}.`);
+    }
+    return await computeBlobFieldsHash(fields.slice(0, numBlobFields));
+}
+export function computeBlobsHashFromBlobs(blobs) {
+    return computeBlobsHash(blobs.map((b)=>b.getEthVersionedBlobHash()));
+}
+export function getBlobCommitmentsFromBlobs(blobs) {
+    return blobs.map((b)=>BLS12Point.decompress(b.commitment));
+}

package/dest/circuit_types/blob_accumulator.d.ts

@@ -0,0 +1,21 @@
+import { BLS12Fr, BLS12Point, Fr } from '@aztec/foundation/fields';
+import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
+/**
+ * See `noir-projects/noir-protocol-circuits/crates/blob/src/abis/blob_accumulator.nr` for documentation.
+ */
+export declare class BlobAccumulator {
+    blobCommitmentsHashAcc: Fr;
+    zAcc: Fr;
+    yAcc: BLS12Fr;
+    cAcc: BLS12Point;
+    gammaAcc: Fr;
+    gammaPowAcc: BLS12Fr;
+    constructor(blobCommitmentsHashAcc: Fr, zAcc: Fr, yAcc: BLS12Fr, cAcc: BLS12Point, gammaAcc: Fr, gammaPowAcc: BLS12Fr);
+    static empty(): BlobAccumulator;
+    equals(other: BlobAccumulator): boolean;
+    static fromBuffer(buffer: Buffer | BufferReader): BlobAccumulator;
+    toBuffer(): Buffer<ArrayBufferLike>;
+    toFields(): Fr[];
+    static fromFields(fields: Fr[] | FieldReader): BlobAccumulator;
+}
+//# sourceMappingURL=blob_accumulator.d.ts.map

package/dest/circuit_types/blob_accumulator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"blob_accumulator.d.ts","sourceRoot":"","sources":["../../src/circuit_types/blob_accumulator.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F;;GAEG;AACH,qBAAa,eAAe;IAEjB,sBAAsB,EAAE,EAAE;IAC1B,IAAI,EAAE,EAAE;IACR,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,UAAU;IAChB,QAAQ,EAAE,EAAE;IACZ,WAAW,EAAE,OAAO;gBALpB,sBAAsB,EAAE,EAAE,EAC1B,IAAI,EAAE,EAAE,EACR,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,EAAE,EACZ,WAAW,EAAE,OAAO;IAG7B,MAAM,CAAC,KAAK,IAAI,eAAe;IAI/B,MAAM,CAAC,KAAK,EAAE,eAAe;IAW7B,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,eAAe;IAYjE,QAAQ;IAWR,QAAQ;IAaR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,eAAe;CAe/D"}

package/dest/circuit_types/blob_accumulator.js

@@ -0,0 +1,58 @@
+import { BLS12_FQ_LIMBS, BLS12_FR_LIMBS } from '@aztec/constants';
+import { BLS12Fq, BLS12Fr, BLS12Point, Fr } from '@aztec/foundation/fields';
+import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
+/**
+ * See `noir-projects/noir-protocol-circuits/crates/blob/src/abis/blob_accumulator.nr` for documentation.
+ */ export class BlobAccumulator {
+    blobCommitmentsHashAcc;
+    zAcc;
+    yAcc;
+    cAcc;
+    gammaAcc;
+    gammaPowAcc;
+    constructor(blobCommitmentsHashAcc, zAcc, yAcc, cAcc, gammaAcc, gammaPowAcc){
+        this.blobCommitmentsHashAcc = blobCommitmentsHashAcc;
+        this.zAcc = zAcc;
+        this.yAcc = yAcc;
+        this.cAcc = cAcc;
+        this.gammaAcc = gammaAcc;
+        this.gammaPowAcc = gammaPowAcc;
+    }
+    static empty() {
+        return new BlobAccumulator(Fr.ZERO, Fr.ZERO, BLS12Fr.ZERO, BLS12Point.ZERO, Fr.ZERO, BLS12Fr.ZERO);
+    }
+    equals(other) {
+        return this.blobCommitmentsHashAcc.equals(other.blobCommitmentsHashAcc) && this.zAcc.equals(other.zAcc) && this.yAcc.equals(other.yAcc) && this.cAcc.equals(other.cAcc) && this.gammaAcc.equals(other.gammaAcc) && this.gammaPowAcc.equals(other.gammaPowAcc);
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new BlobAccumulator(Fr.fromBuffer(reader), Fr.fromBuffer(reader), BLS12Fr.fromBuffer(reader), BLS12Point.fromBuffer(reader), Fr.fromBuffer(reader), BLS12Fr.fromBuffer(reader));
+    }
+    toBuffer() {
+        return serializeToBuffer(this.blobCommitmentsHashAcc, this.zAcc, this.yAcc, this.cAcc, this.gammaAcc, this.gammaPowAcc);
+    }
+    toFields() {
+        return [
+            this.blobCommitmentsHashAcc,
+            this.zAcc,
+            ...this.yAcc.toNoirBigNum().limbs.map(Fr.fromString),
+            ...this.cAcc.x.toNoirBigNum().limbs.map(Fr.fromString),
+            ...this.cAcc.y.toNoirBigNum().limbs.map(Fr.fromString),
+            new Fr(this.cAcc.isInfinite),
+            this.gammaAcc,
+            ...this.gammaPowAcc.toNoirBigNum().limbs.map(Fr.fromString)
+        ];
+    }
+    static fromFields(fields) {
+        const reader = FieldReader.asReader(fields);
+        return new BlobAccumulator(reader.readField(), reader.readField(), BLS12Fr.fromNoirBigNum({
+            limbs: reader.readFieldArray(BLS12_FR_LIMBS).map((f)=>f.toString())
+        }), new BLS12Point(BLS12Fq.fromNoirBigNum({
+            limbs: reader.readFieldArray(BLS12_FQ_LIMBS).map((f)=>f.toString())
+        }), BLS12Fq.fromNoirBigNum({
+            limbs: reader.readFieldArray(BLS12_FQ_LIMBS).map((f)=>f.toString())
+        }), reader.readBoolean()), reader.readField(), BLS12Fr.fromNoirBigNum({
+            limbs: reader.readFieldArray(BLS12_FR_LIMBS).map((f)=>f.toString())
+        }));
+    }
+}

package/dest/circuit_types/final_blob_accumulator.d.ts

@@ -0,0 +1,22 @@
+import { BLS12Fr, BLS12Point, Fr } from '@aztec/foundation/fields';
+import { BufferReader } from '@aztec/foundation/serialize';
+import { inspect } from 'util';
+/**
+ * See `noir-projects/noir-protocol-circuits/crates/blob/src/abis/final_blob_accumulator.nr` for documentation.
+ */
+export declare class FinalBlobAccumulator {
+    blobCommitmentsHash: Fr;
+    z: Fr;
+    y: BLS12Fr;
+    c: BLS12Point;
+    constructor(blobCommitmentsHash: Fr, z: Fr, y: BLS12Fr, c: BLS12Point);
+    static empty(): FinalBlobAccumulator;
+    static fromBuffer(buffer: Buffer | BufferReader): FinalBlobAccumulator;
+    toBuffer(): Buffer<ArrayBufferLike>;
+    toFields(): Fr[];
+    toString(): string;
+    equals(other: FinalBlobAccumulator): boolean;
+    static random(): FinalBlobAccumulator;
+    [inspect.custom](): string;
+}
+//# sourceMappingURL=final_blob_accumulator.d.ts.map

package/dest/circuit_types/final_blob_accumulator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"final_blob_accumulator.d.ts","sourceRoot":"","sources":["../../src/circuit_types/final_blob_accumulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B;;GAEG;AACH,qBAAa,oBAAoB;IAEtB,mBAAmB,EAAE,EAAE;IACvB,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,OAAO;IACV,CAAC,EAAE,UAAU;gBAHb,mBAAmB,EAAE,EAAE,EACvB,CAAC,EAAE,EAAE,EACL,CAAC,EAAE,OAAO,EACV,CAAC,EAAE,UAAU;IAGtB,MAAM,CAAC,KAAK,IAAI,oBAAoB;IAIpC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,oBAAoB;IAUtE,QAAQ;IAIR,QAAQ;IAUR,QAAQ;IAQR,MAAM,CAAC,KAAK,EAAE,oBAAoB;IAUlC,MAAM,CAAC,MAAM;IAIb,CAAC,OAAO,CAAC,MAAM,CAAC;CAQjB"}