@aztec/blob-lib 0.0.1-commit.fce3e4f → 0.0.1-commit.ff7989d6c

package/src/blob.ts

@@ -1,10 +1,11 @@
 import { FIELDS_PER_BLOB } from '@aztec/constants';
-import { BLS12Fr, Fr } from '@aztec/foundation/fields';
+import { BLS12Fr } from '@aztec/foundation/curves/bls12';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { computeBlobCommitment, computeChallengeZ, computeEthVersionedBlobHash } from './hash.js';
 import type { BlobJson } from './interface.js';
-import { BYTES_PER_BLOB, BYTES_PER_COMMITMENT, kzg } from './kzg_context.js';
+import { BYTES_PER_BLOB, BYTES_PER_COMMITMENT, getKzg } from './kzg_context.js';
 
 export { FIELDS_PER_BLOB };
 
@@ -41,8 +42,8 @@ export class Blob {
    *
    * @throws If data does not match the expected length (BYTES_PER_BLOB).
    */
-  static fromBlobBuffer(data: Uint8Array): Blob {
-    const commitment = computeBlobCommitment(data);
+  static async fromBlobBuffer(data: Uint8Array): Promise<Blob> {
+    const commitment = await computeBlobCommitment(data);
     return new Blob(data, commitment);
   }
 
@@ -54,13 +55,13 @@ export class Blob {
    * @param fields - The array of fields to create the Blob from.
    * @returns A Blob created from the array of fields.
    */
-  static fromFields(fields: Fr[]): Blob {
+  static async fromFields(fields: Fr[]): Promise<Blob> {
     if (fields.length > FIELDS_PER_BLOB) {
       throw new Error(`Attempted to overfill blob with ${fields.length} fields. The maximum is ${FIELDS_PER_BLOB}.`);
     }
 
     const data = Buffer.concat([serializeToBuffer(fields)], BYTES_PER_BLOB);
-    const commitment = computeBlobCommitment(data);
+    const commitment = await computeBlobCommitment(data);
     return new Blob(data, commitment);
   }
 
@@ -80,16 +81,16 @@ export class Blob {
   /**
    * Create a Blob from a JSON object.
    *
-   * Blobs will be in this form when requested from the blob sink, or from
+   * Blobs will be in this form when requested from the blob client, or from
    * the beacon chain via `getBlobSidecars`
    * https://ethereum.github.io/beacon-APIs/?urls.primaryName=dev#/Beacon/getBlobSidecars
    *
    * @param json - The JSON object to create the Blob from.
    * @returns A Blob created from the JSON object.
    */
-  static fromJson(json: BlobJson): Blob {
+  static async fromJson(json: BlobJson): Promise<Blob> {
     const blobBuffer = Buffer.from(json.blob.slice(2), 'hex');
-    const blob = Blob.fromBlobBuffer(blobBuffer);
+    const blob = await Blob.fromBlobBuffer(blobBuffer);
 
     if (blob.commitment.toString('hex') !== json.kzg_commitment.slice(2)) {
       throw new Error('KZG commitment does not match');
@@ -101,13 +102,11 @@ export class Blob {
   /**
    * Get the JSON representation of the blob.
    *
-   * @param index - optional - The index of the blob in the block.
    * @returns The JSON representation of the blob.
    */
-  toJson(index: number): BlobJson {
+  toJSON(): BlobJson {
     return {
       blob: `0x${Buffer.from(this.data).toString('hex')}`,
-      index: index.toString(),
       // eslint-disable-next-line camelcase
       kzg_commitment: `0x${this.commitment.toString('hex')}`,
     };
@@ -135,8 +134,9 @@ export class Blob {
    *  y: BLS12Fr -  Evaluation y = p(z), where p() is the blob polynomial. BLS12 field element, rep. as BigNum in nr, bigint in ts.
    *  proof: Buffer - KZG opening proof for y = p(z). The commitment to quotient polynomial Q, used in compressed BLS12 point format (48 bytes).
    */
-  evaluate(challengeZ: Fr, verifyProof = false) {
-    const res = kzg.computeKzgProof(this.data, challengeZ.toBuffer());
+  async evaluate(challengeZ: Fr, verifyProof = false) {
+    const kzg = getKzg();
+    const res = await kzg.asyncComputeKzgProof(this.data, challengeZ.toBuffer());
     if (verifyProof && !kzg.verifyKzgProof(this.commitment, challengeZ.toBuffer(), res[1], res[0])) {
       throw new Error(`KZG proof did not verify.`);
     }
@@ -178,6 +178,7 @@ export class Blob {
   }
 
   static getViemKzgInstance() {
+    const kzg = getKzg();
     return {
       blobToKzgCommitment: kzg.blobToKzgCommitment.bind(kzg),
       computeBlobKzgProof: kzg.computeBlobKzgProof.bind(kzg),

package/src/blob_batching.ts

@@ -1,13 +1,15 @@
-import { AZTEC_MAX_EPOCH_DURATION, BLOBS_PER_CHECKPOINT } from '@aztec/constants';
-import { poseidon2Hash, sha256ToField } from '@aztec/foundation/crypto';
-import { BLS12Fr, BLS12Point, Fr } from '@aztec/foundation/fields';
+import { BLOBS_PER_CHECKPOINT, MAX_CHECKPOINTS_PER_EPOCH } from '@aztec/constants';
+import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
+import { sha256ToField } from '@aztec/foundation/crypto/sha256';
+import { BLS12Fr, BLS12Point } from '@aztec/foundation/curves/bls12';
+import { Fr } from '@aztec/foundation/curves/bn254';
 
 import { BatchedBlob } from './batched_blob.js';
 import { Blob } from './blob.js';
 import { getBlobsPerL1Block } from './blob_utils.js';
 import { BlobAccumulator, FinalBlobAccumulator, FinalBlobBatchingChallenges } from './circuit_types/index.js';
 import { computeBlobFieldsHash, hashNoirBigNumLimbs } from './hash.js';
-import { kzg } from './kzg_context.js';
+import { getKzg } from './kzg_context.js';
 
 /**
  * A class to create, manage, and prove batched EVM blobs.
@@ -73,9 +75,9 @@ export class BatchedBlobAccumulator {
    */
   static async batch(blobFieldsPerCheckpoint: Fr[][], verifyProof = false): Promise<BatchedBlob> {
     const numCheckpoints = blobFieldsPerCheckpoint.length;
-    if (numCheckpoints > AZTEC_MAX_EPOCH_DURATION) {
+    if (numCheckpoints > MAX_CHECKPOINTS_PER_EPOCH) {
       throw new Error(
-        `Too many checkpoints sent to batch(). The maximum is ${AZTEC_MAX_EPOCH_DURATION}. Got ${numCheckpoints}.`,
+        `Too many checkpoints sent to batch(). The maximum is ${MAX_CHECKPOINTS_PER_EPOCH}. Got ${numCheckpoints}.`,
       );
     }
 
@@ -107,7 +109,7 @@ export class BatchedBlobAccumulator {
     for (const blobFields of blobFieldsPerCheckpoint) {
       // Compute the hash of all the fields in the block.
       const blobFieldsHash = await computeBlobFieldsHash(blobFields);
-      const blobs = getBlobsPerL1Block(blobFields);
+      const blobs = await getBlobsPerL1Block(blobFields);
       for (const blob of blobs) {
         // Compute the challenge z for each blob and accumulate it.
         const challengeZ = await blob.computeChallengeZ(blobFieldsHash);
@@ -124,7 +126,7 @@ export class BatchedBlobAccumulator {
     }
 
     // Now we have a shared challenge for all blobs, evaluate them...
-    const proofObjects = allBlobs.map(b => b.evaluate(z));
+    const proofObjects = await Promise.all(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 = evaluations[0];
@@ -143,7 +145,7 @@ export class BatchedBlobAccumulator {
    * @returns An updated blob accumulator.
    */
   async accumulateBlob(blob: Blob, blobFieldsHash: Fr) {
-    const { proof, y: thisY } = blob.evaluate(this.finalBlobChallenges.z);
+    const { proof, y: thisY } = await blob.evaluate(this.finalBlobChallenges.z);
     const thisC = BLS12Point.decompress(blob.commitment);
     const thisQ = BLS12Point.decompress(proof);
     const blobChallengeZ = await blob.computeChallengeZ(blobFieldsHash);
@@ -190,7 +192,7 @@ export class BatchedBlobAccumulator {
    * @returns An updated blob accumulator.
    */
   async accumulateFields(blobFields: Fr[]) {
-    const blobs = getBlobsPerL1Block(blobFields);
+    const blobs = await getBlobsPerL1Block(blobFields);
 
     if (blobs.length > BLOBS_PER_CHECKPOINT) {
       throw new Error(
@@ -248,7 +250,12 @@ export class BatchedBlobAccumulator {
   }
 
   verify() {
-    return kzg.verifyKzgProof(this.cAcc.compress(), this.zAcc.toBuffer(), this.yAcc.toBuffer(), this.qAcc.compress());
+    return getKzg().verifyKzgProof(
+      this.cAcc.compress(),
+      this.zAcc.toBuffer(),
+      this.yAcc.toBuffer(),
+      this.qAcc.compress(),
+    );
   }
 
   isEmptyState() {

package/src/blob_utils.ts

@@ -1,5 +1,6 @@
 import { FIELDS_PER_BLOB } from '@aztec/constants';
-import { BLS12Point, Fr } from '@aztec/foundation/fields';
+import { BLS12Point } from '@aztec/foundation/curves/bls12';
+import { Fr } from '@aztec/foundation/curves/bn254';
 
 import type { BatchedBlob } from './batched_blob.js';
 import { Blob } from './blob.js';
@@ -29,14 +30,16 @@ export function getPrefixedEthBlobCommitments(blobs: Blob[]): `0x${string}` {
  *
  * @throws If the number of fields does not match what's indicated by the checkpoint prefix.
  */
-export function getBlobsPerL1Block(fields: Fr[]): Blob[] {
+export async function getBlobsPerL1Block(fields: Fr[]): Promise<Blob[]> {
   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)),
+  return await Promise.all(
+    Array.from({ length: numBlobs }, (_, i) =>
+      Blob.fromFields(fields.slice(i * FIELDS_PER_BLOB, (i + 1) * FIELDS_PER_BLOB)),
+    ),
   );
 }
 

package/src/circuit_types/blob_accumulator.ts

@@ -1,5 +1,6 @@
 import { BLS12_FQ_LIMBS, BLS12_FR_LIMBS } from '@aztec/constants';
-import { BLS12Fq, BLS12Fr, BLS12Point, Fr } from '@aztec/foundation/fields';
+import { BLS12Fq, BLS12Fr, BLS12Point } from '@aztec/foundation/curves/bls12';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 /**

package/src/circuit_types/final_blob_accumulator.ts

@@ -1,4 +1,5 @@
-import { BLS12Fr, BLS12Point, Fr } from '@aztec/foundation/fields';
+import { BLS12Fr, BLS12Point } from '@aztec/foundation/curves/bls12';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { inspect } from 'util';

package/src/circuit_types/final_blob_batching_challenges.ts

@@ -1,4 +1,5 @@
-import { BLS12Fr, Fr } from '@aztec/foundation/fields';
+import { BLS12Fr } from '@aztec/foundation/curves/bls12';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 /**

package/src/encoding/block_blob_data.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { FieldReader } from '@aztec/foundation/serialize';
 
 import { BlobDeserializationError } from '../errors.js';
@@ -17,6 +17,18 @@ import { type TxBlobData, decodeTxBlobData, encodeTxBlobData } from './tx_blob_d
 
 // Must match the implementation in `noir-protocol-circuits/crates/types/src/blob_data/block_blob_data.nr`.
 
+export const NUM_BLOCK_END_BLOB_FIELDS = 6;
+export const NUM_FIRST_BLOCK_END_BLOB_FIELDS = 7;
+export const NUM_CHECKPOINT_END_MARKER_FIELDS = 1;
+
+/**
+ * Returns the number of blob fields used for block end data.
+ * @param isFirstBlockInCheckpoint - Whether this is the first block in a checkpoint.
+ */
+export function getNumBlockEndBlobFields(isFirstBlockInCheckpoint: boolean): number {
+  return isFirstBlockInCheckpoint ? NUM_FIRST_BLOCK_END_BLOB_FIELDS : NUM_BLOCK_END_BLOB_FIELDS;
+}
+
 export interface BlockEndBlobData {
   blockEndMarker: BlockEndMarker;
   blockEndStateField: BlockEndStateField;
@@ -46,7 +58,7 @@ export function encodeBlockEndBlobData(blockEndBlobData: BlockEndBlobData): Fr[]
 export function decodeBlockEndBlobData(fields: Fr[] | FieldReader, isFirstBlock: boolean): BlockEndBlobData {
   const reader = FieldReader.asReader(fields);
 
-  const numBlockEndData = isFirstBlock ? 7 : 6;
+  const numBlockEndData = getNumBlockEndBlobFields(isFirstBlock);
   if (numBlockEndData > reader.remainingFields()) {
     throw new BlobDeserializationError(
       `Incorrect encoding of blob fields: not enough fields for block end data. Expected ${numBlockEndData} fields, only ${reader.remainingFields()} remaining.`,

package/src/encoding/block_end_marker.ts

@@ -1,5 +1,6 @@
 import { BLOCK_END_PREFIX } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 
 import { BlobDeserializationError } from '../errors.js';
 
@@ -11,12 +12,12 @@ const NUM_TXS_BIT_SIZE = 16n;
 
 export interface BlockEndMarker {
   timestamp: bigint;
-  blockNumber: number;
+  blockNumber: BlockNumber;
   numTxs: number;
 }
 
 export function encodeBlockEndMarker(blockEndMarker: BlockEndMarker) {
-  let value = BLOCK_END_PREFIX;
+  let value = BigInt(BLOCK_END_PREFIX);
   value <<= TIMESTAMP_BIT_SIZE;
   value += blockEndMarker.timestamp;
   value <<= BLOCK_NUMBER_BIT_SIZE;
@@ -30,13 +31,13 @@ export function decodeBlockEndMarker(field: Fr): BlockEndMarker {
   let value = field.toBigInt();
   const numTxs = Number(value & (2n ** NUM_TXS_BIT_SIZE - 1n));
   value >>= NUM_TXS_BIT_SIZE;
-  const blockNumber = Number(value & (2n ** BLOCK_NUMBER_BIT_SIZE - 1n));
+  const blockNumber = BlockNumber(Number(value & (2n ** BLOCK_NUMBER_BIT_SIZE - 1n)));
   value >>= BLOCK_NUMBER_BIT_SIZE;
   const timestamp = value & (2n ** TIMESTAMP_BIT_SIZE - 1n);
   value >>= TIMESTAMP_BIT_SIZE;
 
   const prefix = value;
-  if (prefix !== BLOCK_END_PREFIX) {
+  if (prefix !== BigInt(BLOCK_END_PREFIX)) {
     throw new BlobDeserializationError(`Incorrect encoding of blob fields: invalid block end marker.`);
   }
 
@@ -50,5 +51,5 @@ export function decodeBlockEndMarker(field: Fr): BlockEndMarker {
 // Check if a field is a block end marker. Used before decoding to check if it has reached the end of the block.
 export function isBlockEndMarker(field: Fr): boolean {
   const prefix = field.toBigInt() >> (NUM_TXS_BIT_SIZE + BLOCK_NUMBER_BIT_SIZE + TIMESTAMP_BIT_SIZE);
-  return prefix === BLOCK_END_PREFIX;
+  return prefix === BigInt(BLOCK_END_PREFIX);
 }

package/src/encoding/block_end_state_field.ts

@@ -4,7 +4,7 @@ import {
   NULLIFIER_TREE_HEIGHT,
   PUBLIC_DATA_TREE_HEIGHT,
 } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 
 import { BlobDeserializationError } from '../errors.js';
 

package/src/encoding/checkpoint_blob_data.ts

@@ -1,8 +1,15 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 
 import { BlobDeserializationError } from '../errors.js';
-import { type BlockBlobData, decodeBlockBlobData, encodeBlockBlobData } from './block_blob_data.js';
+import {
+  type BlockBlobData,
+  NUM_BLOCK_END_BLOB_FIELDS,
+  NUM_CHECKPOINT_END_MARKER_FIELDS,
+  NUM_FIRST_BLOCK_END_BLOB_FIELDS,
+  decodeBlockBlobData,
+  encodeBlockBlobData,
+} from './block_blob_data.js';
 import {
   type CheckpointEndMarker,
   decodeCheckpointEndMarker,
@@ -25,7 +32,7 @@ export function encodeCheckpointBlobData(checkpointBlobData: CheckpointBlobData)
 
 export function encodeCheckpointBlobDataFromBlocks(blocks: BlockBlobData[]): Fr[] {
   const blocksBlobFields = blocks.map(block => encodeBlockBlobData(block)).flat();
-  const numBlobFields = blocksBlobFields.length + 1; // +1 for the checkpoint end marker.
+  const numBlobFields = blocksBlobFields.length + NUM_CHECKPOINT_END_MARKER_FIELDS;
   return blocksBlobFields.concat(encodeCheckpointEndMarker({ numBlobFields }));
 }
 
@@ -87,9 +94,9 @@ export function getTotalNumBlobFieldsFromTxs(txsPerBlock: TxStartMarker[][]): nu
   }
 
   return (
-    (numBlocks ? 1 : 0) + // l1ToL2Messages root in the first block
-    numBlocks * 6 + // 6 fields for each block end blob data.
+    (numBlocks ? NUM_FIRST_BLOCK_END_BLOB_FIELDS - NUM_BLOCK_END_BLOB_FIELDS : 0) + // l1ToL2Messages root in the first block
+    numBlocks * NUM_BLOCK_END_BLOB_FIELDS + // 6 fields for each block end blob data.
     txsPerBlock.reduce((total, txs) => total + txs.reduce((total, tx) => total + tx.numBlobFields, 0), 0) +
-    1 // checkpoint end marker
+    NUM_CHECKPOINT_END_MARKER_FIELDS // checkpoint end marker
   );
 }

package/src/encoding/checkpoint_end_marker.ts

@@ -1,5 +1,5 @@
 import { CHECKPOINT_END_PREFIX } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 
 import { BlobDeserializationError } from '../errors.js';
 
@@ -12,7 +12,7 @@ export interface CheckpointEndMarker {
 }
 
 export function encodeCheckpointEndMarker(checkpointEndMarker: CheckpointEndMarker) {
-  let value = CHECKPOINT_END_PREFIX;
+  let value = BigInt(CHECKPOINT_END_PREFIX);
   value <<= NUM_BLOB_FIELDS_BIT_SIZE;
   value += BigInt(checkpointEndMarker.numBlobFields);
   return new Fr(value);
@@ -24,7 +24,7 @@ export function decodeCheckpointEndMarker(field: Fr): CheckpointEndMarker {
   value >>= NUM_BLOB_FIELDS_BIT_SIZE;
 
   const prefix = value;
-  if (prefix !== CHECKPOINT_END_PREFIX) {
+  if (prefix !== BigInt(CHECKPOINT_END_PREFIX)) {
     throw new BlobDeserializationError(`Incorrect encoding of blob fields: invalid checkpoint end marker.`);
   }
 
@@ -36,5 +36,5 @@ export function decodeCheckpointEndMarker(field: Fr): CheckpointEndMarker {
 // Check if a field is a checkpoint end marker. Used to check if it has reached the end of the blob fields.
 export function isCheckpointEndMarker(field: Fr): boolean {
   const prefix = field.toBigInt() >> NUM_BLOB_FIELDS_BIT_SIZE;
-  return prefix === CHECKPOINT_END_PREFIX;
+  return prefix === BigInt(CHECKPOINT_END_PREFIX);
 }

package/src/encoding/fixtures.ts

@@ -9,7 +9,8 @@ import {
   PRIVATE_LOG_SIZE_IN_FIELDS,
 } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 
 import type { BlockBlobData, BlockEndBlobData } from './block_blob_data.js';
 import type { BlockEndMarker } from './block_end_marker.js';
@@ -109,7 +110,7 @@ export function makeBlockEndMarker({
 }: { seed?: number } & Partial<BlockEndMarker> = {}): BlockEndMarker {
   return {
     numTxs: seed,
-    blockNumber: seed + 1,
+    blockNumber: BlockNumber(seed + 1),
     timestamp: BigInt(seed + 2),
     ...overrides,
   };

package/src/encoding/tx_blob_data.ts

@@ -1,5 +1,5 @@
 import { chunk } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { FieldReader } from '@aztec/foundation/serialize';
 
 import { BlobDeserializationError } from '../errors.js';

package/src/encoding/tx_start_marker.ts

@@ -1,5 +1,5 @@
 import { TX_START_PREFIX } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 
 import { BlobDeserializationError } from '../errors.js';
 
@@ -30,7 +30,7 @@ export interface TxStartMarker {
 }
 
 export function encodeTxStartMarker(txStartMarker: TxStartMarker): Fr {
-  let value = TX_START_PREFIX;
+  let value = BigInt(TX_START_PREFIX);
   value <<= NUM_NOTE_HASH_BIT_SIZE;
   value += BigInt(txStartMarker.numNoteHashes);
   value <<= NUM_NULLIFIER_BIT_SIZE;
@@ -78,7 +78,7 @@ export function decodeTxStartMarker(field: Fr): TxStartMarker {
   value >>= NUM_NOTE_HASH_BIT_SIZE;
 
   const prefix = value;
-  if (prefix !== TX_START_PREFIX) {
+  if (prefix !== BigInt(TX_START_PREFIX)) {
     throw new BlobDeserializationError(`Incorrect encoding of blob fields: invalid tx start marker.`);
   }
 

package/src/hash.ts

@@ -1,7 +1,9 @@
-import { poseidon2Hash, sha256, sha256ToField } from '@aztec/foundation/crypto';
-import { BLS12Fr, Fr } from '@aztec/foundation/fields';
+import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
+import { sha256, sha256ToField } from '@aztec/foundation/crypto/sha256';
+import { BLS12Fr } from '@aztec/foundation/curves/bls12';
+import { Fr } from '@aztec/foundation/curves/bn254';
 
-import { BYTES_PER_BLOB, BYTES_PER_COMMITMENT, kzg } from './kzg_context.js';
+import { BYTES_PER_BLOB, BYTES_PER_COMMITMENT, getKzg } from './kzg_context.js';
 import { SpongeBlob } from './sponge_blob.js';
 
 const VERSIONED_HASH_VERSION_KZG = 0x01;
@@ -42,12 +44,12 @@ export async function computeBlobFieldsHash(fields: Fr[]): Promise<Fr> {
   return sponge.squeeze();
 }
 
-export function computeBlobCommitment(data: Uint8Array): Buffer {
+export async function computeBlobCommitment(data: Uint8Array): Promise<Buffer> {
   if (data.length !== BYTES_PER_BLOB) {
     throw new Error(`Expected ${BYTES_PER_BLOB} bytes per blob. Got ${data.length}.`);
   }
 
-  return Buffer.from(kzg.blobToKzgCommitment(data));
+  return Buffer.from(await getKzg().asyncBlobToKzgCommitment(data));
 }
 
 /**

package/src/index.ts

@@ -7,3 +7,4 @@ export * from './encoding/index.js';
 export * from './hash.js';
 export * from './interface.js';
 export * from './sponge_blob.js';
+export * from './kzg_context.js';

package/src/interface.ts

@@ -3,6 +3,5 @@
  */
 export interface BlobJson {
   blob: string;
-  index: string;
   kzg_commitment: string;
 }

package/src/kzg_context.ts

@@ -2,4 +2,15 @@ import { DasContextJs } from '@crate-crypto/node-eth-kzg';
 
 export * from '@crate-crypto/node-eth-kzg';
 
-export const kzg = DasContextJs.create({ usePrecomp: true });
+let kzgInstance: DasContextJs | undefined;
+
+/**
+ * Returns the lazily-initialized KZG context.
+ * The first call takes ~3 seconds to initialize the precomputation tables.
+ */
+export function getKzg(): DasContextJs {
+  if (!kzgInstance) {
+    kzgInstance = DasContextJs.create({ usePrecomp: true });
+  }
+  return kzgInstance;
+}

package/src/sponge_blob.ts

@@ -1,7 +1,7 @@
 import { BLOBS_PER_CHECKPOINT, FIELDS_PER_BLOB, TWO_POW_64 } from '@aztec/constants';
 import { type FieldsOf, makeTuple } from '@aztec/foundation/array';
-import { poseidon2Permutation } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { poseidon2Permutation } from '@aztec/foundation/crypto/poseidon';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import {
   BufferReader,
   FieldReader,

package/src/testing.ts

@@ -1,5 +1,6 @@
 import { makeTuple } from '@aztec/foundation/array';
-import { BLS12Fq, BLS12Fr, BLS12Point, BLSPointNotOnCurveError, Fr } from '@aztec/foundation/fields';
+import { BLS12Fq, BLS12Fr, BLS12Point, BLSPointNotOnCurveError } from '@aztec/foundation/curves/bls12';
+import { Fr } from '@aztec/foundation/curves/bn254';
 
 import { Blob } from './blob.js';
 import { BlobAccumulator } from './circuit_types/blob_accumulator.js';
@@ -88,6 +89,6 @@ export function makeFinalBlobBatchingChallenges(seed = 1) {
  * @param length
  * @returns
  */
-export function makeRandomBlob(length: number): Blob {
+export function makeRandomBlob(length: number): Promise<Blob> {
   return Blob.fromFields([...Array.from({ length: length }, () => Fr.random())]);
 }