@aztec/blob-lib 0.0.1-fake-c83136db25 → 0.0.1-fake-ceab37513c

package/dest/blob_batching_public_inputs.js

@@ -0,0 +1,168 @@
+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';
+import { inspect } from 'util';
+import { BatchedBlobAccumulator, FinalBlobBatchingChallenges } from './blob_batching.js';
+/**
+ * See nr BlobAccumulatorPublicInputs and ts BatchedBlobAccumulator for documentation.
+ */ export class BlobAccumulatorPublicInputs {
+    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 BlobAccumulatorPublicInputs(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 BlobAccumulatorPublicInputs(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);
+    }
+    /**
+   * Given blobs, accumulate all public inputs state.
+   * We assume the input blobs have not been evaluated at z.
+   * NOTE: Does NOT accumulate non circuit values including Q. This exists to simulate/check exactly what the circuit is doing
+   * and is unsafe for other use. For that reason, a toBatchedBlobAccumulator does not exist. See evaluateBlobs() oracle for usage.
+   * @returns An updated blob accumulator.
+   */ async accumulateBlobs(blobs, finalBlobChallenges) {
+        let acc = new BatchedBlobAccumulator(this.blobCommitmentsHashAcc, this.zAcc, this.yAcc, this.cAcc, BLS12Point.ZERO, this.gammaAcc, this.gammaPowAcc, finalBlobChallenges);
+        acc = await acc.accumulateBlobs(blobs);
+        return new BlobAccumulatorPublicInputs(acc.blobCommitmentsHashAcc, acc.zAcc, acc.yAcc, acc.cAcc, acc.gammaAcc, acc.gammaPow);
+    }
+    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 BlobAccumulatorPublicInputs(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())
+        }));
+    }
+    /**
+   * Converts from an accumulator to a struct for the public inputs of our rollup circuits.
+   * @returns A BlobAccumulatorPublicInputs instance.
+   */ static fromBatchedBlobAccumulator(accumulator) {
+        return new BlobAccumulatorPublicInputs(accumulator.blobCommitmentsHashAcc, accumulator.zAcc, accumulator.yAcc, accumulator.cAcc, accumulator.gammaAcc, accumulator.gammaPow);
+    }
+}
+/**
+ * See nr FinalBlobAccumulatorPublicInputs and ts BatchedBlobAccumulator for documentation.
+ */ export class FinalBlobAccumulatorPublicInputs {
+    blobCommitmentsHash;
+    z;
+    y;
+    c;
+    constructor(blobCommitmentsHash, z, y, c){
+        this.blobCommitmentsHash = blobCommitmentsHash;
+        this.z = z;
+        this.y = y;
+        this.c = c;
+    }
+    static empty() {
+        return new FinalBlobAccumulatorPublicInputs(Fr.ZERO, Fr.ZERO, BLS12Fr.ZERO, BLS12Point.ZERO);
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new FinalBlobAccumulatorPublicInputs(Fr.fromBuffer(reader), Fr.fromBuffer(reader), BLS12Fr.fromBuffer(reader), BLS12Point.fromBuffer(reader));
+    }
+    toBuffer() {
+        return serializeToBuffer(this.blobCommitmentsHash, this.z, this.y, this.c);
+    }
+    static fromBatchedBlob(blob) {
+        return new FinalBlobAccumulatorPublicInputs(blob.blobCommitmentsHash, blob.z, blob.y, blob.commitment);
+    }
+    toFields() {
+        return [
+            this.blobCommitmentsHash,
+            this.z,
+            ...this.y.toNoirBigNum().limbs.map(Fr.fromString),
+            ...this.c.toBN254Fields()
+        ];
+    }
+    // The below is used to send to L1 for proof verification
+    toString() {
+        // We prepend 32 bytes for the (unused) 'blobHash' slot. This is not read or required by getEpochProofPublicInputs() on L1, but
+        // is expected since we usually pass the full precompile inputs via verifyEpochRootProof() to getEpochProofPublicInputs() to ensure
+        // we use calldata rather than a slice in memory:
+        const buf = Buffer.concat([
+            Buffer.alloc(32),
+            this.z.toBuffer(),
+            this.y.toBuffer(),
+            this.c.compress()
+        ]);
+        return buf.toString('hex');
+    }
+    equals(other) {
+        return this.blobCommitmentsHash.equals(other.blobCommitmentsHash) && this.z.equals(other.z) && this.y.equals(other.y) && this.c.equals(other.c);
+    }
+    // Creates a random instance. Used for testing only - will not prove/verify.
+    static random() {
+        return new FinalBlobAccumulatorPublicInputs(Fr.random(), Fr.random(), BLS12Fr.random(), BLS12Point.random());
+    }
+    // Warning: MUST be final accumulator state.
+    static fromBatchedBlobAccumulator(accumulator) {
+        return new FinalBlobAccumulatorPublicInputs(accumulator.blobCommitmentsHashAcc, accumulator.zAcc, accumulator.yAcc, accumulator.cAcc);
+    }
+    [inspect.custom]() {
+        return `FinalBlobAccumulatorPublicInputs {
+      blobCommitmentsHash: ${inspect(this.blobCommitmentsHash)},
+      z: ${inspect(this.z)},
+      y: ${inspect(this.y)},
+      c: ${inspect(this.c)},
+    }`;
+    }
+}
+/**
+ * startBlobAccumulator: Accumulated opening proofs for all blobs before this block range.
+ * endBlobAccumulator: Accumulated opening proofs for all blobs after adding this block range.
+ * finalBlobChallenges:  Final values z and gamma, shared across the epoch.
+ */ export class BlockBlobPublicInputs {
+    startBlobAccumulator;
+    endBlobAccumulator;
+    finalBlobChallenges;
+    constructor(startBlobAccumulator, endBlobAccumulator, finalBlobChallenges){
+        this.startBlobAccumulator = startBlobAccumulator;
+        this.endBlobAccumulator = endBlobAccumulator;
+        this.finalBlobChallenges = finalBlobChallenges;
+    }
+    static empty() {
+        return new BlockBlobPublicInputs(BlobAccumulatorPublicInputs.empty(), BlobAccumulatorPublicInputs.empty(), FinalBlobBatchingChallenges.empty());
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new BlockBlobPublicInputs(reader.readObject(BlobAccumulatorPublicInputs), reader.readObject(BlobAccumulatorPublicInputs), reader.readObject(FinalBlobBatchingChallenges));
+    }
+    toBuffer() {
+        return serializeToBuffer(this.startBlobAccumulator, this.endBlobAccumulator, this.finalBlobChallenges);
+    }
+}

package/dest/encoding.d.ts

@@ -1,26 +1,66 @@
 import { Fr } from '@aztec/foundation/fields';
-export interface TxStartMarker {
-    prefix: bigint;
-    numBlobFields: number;
-    revertCode: number;
-    numNoteHashes: number;
-    numNullifiers: number;
-    numL2ToL1Msgs: number;
-    numPublicDataWrites: number;
-    numPrivateLogs: number;
-    publicLogsLength: number;
-    contractClassLogLength: number;
-}
-export declare function encodeTxStartMarker(txStartMarker: Omit<TxStartMarker, 'prefix'>): Fr;
-export declare function decodeTxStartMarker(field: Fr): TxStartMarker;
-export declare function getNumBlobFieldsFromTxStartMarker(field: Fr): number;
-export declare function isValidTxStartMarker(txStartMarker: TxStartMarker): boolean;
-export declare function createBlockEndMarker(numTxs: number): Fr;
-export declare function getNumTxsFromBlockEndMarker(field: Fr): number;
-export declare function isBlockEndMarker(field: Fr): boolean;
+import type { Blob as BlobBuffer } from 'c-kzg';
+export declare const TX_START_PREFIX = 8392562855083340404n;
+export declare const TX_START_PREFIX_BYTES_LENGTH: number;
+export declare const TX_EFFECT_PREFIX_BYTE_LENGTH: number;
+export declare const REVERT_CODE_PREFIX = 1;
 /**
- * Check that the fields are emitted from the circuits and conform to the encoding.
- * @param blobFields - The concatenated fields from all blobs of an L1 block.
+ * Deserializes a blob buffer into an array of field elements.
+ *
+ * Blobs are converted into BN254 fields to perform a poseidon2 hash on them (fieldHash).
+ * This method is sparse, meaning it does not include trailing zeros at the end of the blob.
+ *
+ * However, we cannot simply trim the zero's from the end of the blob, as some logs may include zero's
+ * within them.
+ * If we end on a set of zeros, such as the log below:
+ * length 7: [ a, b, c, d, e, 0, 0]
+ *
+ * we will end up with the incorrect hash if we trim the zeros from the end.
+ *
+ * Each transactions logs contains a TX start prefix, which includes a string followed
+ * by the length ( in field elements ) of the transaction's log.
+ *
+ * This function finds the end of the last transaction's logs, and returns the array up to this point.
+ *
+ * We search for a series of Tx Prefixes progressing the cursor in the field reader until we hit
+ * a field that is not a Tx Prefix, this indicates that we have reached the end of the last transaction's logs.
+ *
+ * +------------------+------------------+------------------+------------------+
+ * | TX1 Start Prefix | TX1 Log Fields   | TX2 Start Prefix | Padded zeros     |
+ * | [3 a,b,c]        | [3, a, b, c]     | [5 d,e,f,0,0]    | [0, 0, 0, .., 0] |
+ * +------------------+------------------+------------------+------------------+
+ *                                                          ^
+ *                                                          |
+ * Function reads until here --------------------------------
+ *
+ * @param blob - The blob buffer to deserialize.
+ * @returns An array of field elements.
  */
-export declare function checkBlobFieldsEncoding(blobFields: Fr[]): boolean;
+export declare function deserializeEncodedBlobToFields(blob: BlobBuffer): Fr[];
+/**
+ * Get the length of the transaction from the first field.
+ *
+ * @param firstField - The first field of the transaction.
+ * @returns The length of the transaction.
+ *
+ * @throws If the first field does not include the correct prefix - encoding invalid.
+ */
+export declare function getLengthFromFirstField(firstField: Fr): number;
+/**
+ * Determines whether a field is the first field of a tx effect
+ */
+export declare function isValidFirstField(field: Fr): boolean;
+/**
+ * Extract the fields from a blob buffer, but do not take into account encoding
+ * that will include trailing zeros.
+ *
+ * +------------------+------------------+------------------+------------------+
+ * |                  |                  |                  | Padded zeros     |
+ * | [3 a,b,c]        | [3, a, b, c]     | [5 d,e,f,0,0]    | [0, 0, 0, .., 0] |
+ * +------------------+------------------+------------------+------------------+
+ *                                                ^
+ *                                                |
+ * Function reads until here ----------------------
+ */
+export declare function extractBlobFieldsFromBuffer(blob: BlobBuffer): Fr[];
 //# sourceMappingURL=encoding.d.ts.map

package/dest/encoding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encoding.d.ts","sourceRoot":"","sources":["../src/encoding.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAa9C,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,CAAC;CAChC;AAGD,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,MAqB/E;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,EAAE,GAAG,aAAa,CAmC5D;AAED,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,EAAE,UAE1D;AAED,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,aAAa,WAEhE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,MAGlD;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,EAAE,UAEpD;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,EAAE,WAIzC;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,EAAE,EAAE,WAsCvD"}
+{"version":3,"file":"encoding.d.ts","sourceRoot":"","sources":["../src/encoding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,KAAK,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,OAAO,CAAC;AAIhD,eAAO,MAAM,eAAe,uBAAuB,CAAC;AAEpD,eAAO,MAAM,4BAA4B,QAA0C,CAAC;AAEpF,eAAO,MAAM,4BAA4B,QAAmC,CAAC;AAC7E,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,UAAU,GAAG,EAAE,EAAE,CAsBrE;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,EAAE,GAAG,MAAM,CAO9D;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,EAAE,GAAG,OAAO,CAqBpD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,UAAU,GAAG,EAAE,EAAE,CAYlE"}

package/dest/encoding.js

@@ -1,123 +1,113 @@
-import { BLOCK_END_PREFIX, TX_START_PREFIX } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
-import { FieldReader } from '@aztec/foundation/serialize';
-const NUM_BLOB_FIELDS_BIT_SIZE = 32n;
-const REVERT_CODE_BIT_SIZE = 8n;
-const NUM_NOTE_HASH_BIT_SIZE = 16n;
-const NUM_NULLIFIER_BIT_SIZE = 16n;
-const NUM_L2_TO_L1_MSG_BIT_SIZE = 16n;
-const NUM_PUBLIC_DATA_WRITE_BIT_SIZE = 16n;
-const NUM_PRIVATE_LOG_BIT_SIZE = 16n;
-const PUBLIC_LOGS_LENGTH_BIT_SIZE = 32n;
-const CONTRACT_CLASS_LOG_LENGTH_BIT_SIZE = 16n;
-// Must match the implementation in `noir-protocol-circuits/crates/rollup-lib/src/tx_base/components/tx_blob_data.nr`.
-export function encodeTxStartMarker(txStartMarker) {
-    let value = TX_START_PREFIX;
-    value <<= NUM_NOTE_HASH_BIT_SIZE;
-    value += BigInt(txStartMarker.numNoteHashes);
-    value <<= NUM_NULLIFIER_BIT_SIZE;
-    value += BigInt(txStartMarker.numNullifiers);
-    value <<= NUM_L2_TO_L1_MSG_BIT_SIZE;
-    value += BigInt(txStartMarker.numL2ToL1Msgs);
-    value <<= NUM_PUBLIC_DATA_WRITE_BIT_SIZE;
-    value += BigInt(txStartMarker.numPublicDataWrites);
-    value <<= NUM_PRIVATE_LOG_BIT_SIZE;
-    value += BigInt(txStartMarker.numPrivateLogs);
-    value <<= PUBLIC_LOGS_LENGTH_BIT_SIZE;
-    value += BigInt(txStartMarker.publicLogsLength);
-    value <<= CONTRACT_CLASS_LOG_LENGTH_BIT_SIZE;
-    value += BigInt(txStartMarker.contractClassLogLength);
-    value <<= REVERT_CODE_BIT_SIZE;
-    value += BigInt(txStartMarker.revertCode);
-    value <<= NUM_BLOB_FIELDS_BIT_SIZE;
-    value += BigInt(txStartMarker.numBlobFields);
-    return new Fr(value);
-}
-export function decodeTxStartMarker(field) {
-    let value = field.toBigInt();
-    const numBlobFields = Number(value & 2n ** NUM_BLOB_FIELDS_BIT_SIZE - 1n);
-    value >>= NUM_BLOB_FIELDS_BIT_SIZE;
-    const revertCode = Number(value & 2n ** REVERT_CODE_BIT_SIZE - 1n);
-    value >>= REVERT_CODE_BIT_SIZE;
-    const contractClassLogLength = Number(value & 2n ** CONTRACT_CLASS_LOG_LENGTH_BIT_SIZE - 1n);
-    value >>= CONTRACT_CLASS_LOG_LENGTH_BIT_SIZE;
-    const publicLogsLength = Number(value & 2n ** PUBLIC_LOGS_LENGTH_BIT_SIZE - 1n);
-    value >>= PUBLIC_LOGS_LENGTH_BIT_SIZE;
-    const numPrivateLogs = Number(value & 2n ** NUM_PRIVATE_LOG_BIT_SIZE - 1n);
-    value >>= NUM_PRIVATE_LOG_BIT_SIZE;
-    const numPublicDataWrites = Number(value & 2n ** NUM_PUBLIC_DATA_WRITE_BIT_SIZE - 1n);
-    value >>= NUM_PUBLIC_DATA_WRITE_BIT_SIZE;
-    const numL2ToL1Msgs = Number(value & 2n ** NUM_L2_TO_L1_MSG_BIT_SIZE - 1n);
-    value >>= NUM_L2_TO_L1_MSG_BIT_SIZE;
-    const numNullifiers = Number(value & 2n ** NUM_NULLIFIER_BIT_SIZE - 1n);
-    value >>= NUM_NULLIFIER_BIT_SIZE;
-    const numNoteHashes = Number(value & 2n ** NUM_NOTE_HASH_BIT_SIZE - 1n);
-    value >>= NUM_NOTE_HASH_BIT_SIZE;
-    // Do not throw if the prefix doesn't match.
-    // The caller function can check it by calling `isValidTxStartMarker`, and decide what to do if it's incorrect.
-    const prefix = value;
-    return {
-        prefix,
-        numBlobFields,
-        revertCode,
-        numNoteHashes,
-        numNullifiers,
-        numL2ToL1Msgs,
-        numPublicDataWrites,
-        numPrivateLogs,
-        publicLogsLength,
-        contractClassLogLength
-    };
-}
-export function getNumBlobFieldsFromTxStartMarker(field) {
-    return Number(field.toBigInt() & 2n ** NUM_BLOB_FIELDS_BIT_SIZE - 1n);
-}
-export function isValidTxStartMarker(txStartMarker) {
-    return txStartMarker.prefix === TX_START_PREFIX;
-}
-export function createBlockEndMarker(numTxs) {
-    // Must match the implementation in `block_rollup_public_inputs_composer.nr > create_block_end_marker`.
-    return new Fr(BLOCK_END_PREFIX * 256n * 256n + BigInt(numTxs));
-}
-export function getNumTxsFromBlockEndMarker(field) {
-    return Number(field.toBigInt() & 0xffffn);
+import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
+// Note duplicated from stdlib !
+// This will appear as 0x74785f7374617274 in logs
+export const TX_START_PREFIX = 8392562855083340404n;
+// These are helper constants to decode tx effects from blob encoded fields
+export const TX_START_PREFIX_BYTES_LENGTH = TX_START_PREFIX.toString(16).length / 2;
+// 7 bytes for: | 0 | txlen[0] | txlen[1] | 0 | REVERT_CODE_PREFIX | 0 | revertCode |
+export const TX_EFFECT_PREFIX_BYTE_LENGTH = TX_START_PREFIX_BYTES_LENGTH + 7;
+export const REVERT_CODE_PREFIX = 1;
+/**
+ * Deserializes a blob buffer into an array of field elements.
+ *
+ * Blobs are converted into BN254 fields to perform a poseidon2 hash on them (fieldHash).
+ * This method is sparse, meaning it does not include trailing zeros at the end of the blob.
+ *
+ * However, we cannot simply trim the zero's from the end of the blob, as some logs may include zero's
+ * within them.
+ * If we end on a set of zeros, such as the log below:
+ * length 7: [ a, b, c, d, e, 0, 0]
+ *
+ * we will end up with the incorrect hash if we trim the zeros from the end.
+ *
+ * Each transactions logs contains a TX start prefix, which includes a string followed
+ * by the length ( in field elements ) of the transaction's log.
+ *
+ * This function finds the end of the last transaction's logs, and returns the array up to this point.
+ *
+ * We search for a series of Tx Prefixes progressing the cursor in the field reader until we hit
+ * a field that is not a Tx Prefix, this indicates that we have reached the end of the last transaction's logs.
+ *
+ * +------------------+------------------+------------------+------------------+
+ * | TX1 Start Prefix | TX1 Log Fields   | TX2 Start Prefix | Padded zeros     |
+ * | [3 a,b,c]        | [3, a, b, c]     | [5 d,e,f,0,0]    | [0, 0, 0, .., 0] |
+ * +------------------+------------------+------------------+------------------+
+ *                                                          ^
+ *                                                          |
+ * Function reads until here --------------------------------
+ *
+ * @param blob - The blob buffer to deserialize.
+ * @returns An array of field elements.
+ */ export function deserializeEncodedBlobToFields(blob) {
+    // Convert blob buffer to array of field elements
+    const reader = BufferReader.asReader(blob);
+    const array = reader.readArray(blob.length >> 5, Fr); // >> 5 = / 32 (bytes per field)
+    const fieldReader = FieldReader.asReader(array);
+    // Read fields until we hit zeros at the end
+    while(!fieldReader.isFinished()){
+        const currentField = fieldReader.peekField();
+        // Stop when we hit a zero field
+        if (!currentField || currentField.isZero()) {
+            break;
+        }
+        // Skip the remaining fields in this transaction
+        const len = getLengthFromFirstField(currentField);
+        fieldReader.skip(len);
+    }
+    // Return array up to last non-zero field
+    return array.slice(0, fieldReader.cursor);
 }
-export function isBlockEndMarker(field) {
-    const value = field.toBigInt();
-    const numTxs = value & 0xffffn;
-    return value - numTxs === BLOCK_END_PREFIX * 256n * 256n;
+/**
+ * Get the length of the transaction from the first field.
+ *
+ * @param firstField - The first field of the transaction.
+ * @returns The length of the transaction.
+ *
+ * @throws If the first field does not include the correct prefix - encoding invalid.
+ */ export function getLengthFromFirstField(firstField) {
+    // Check that the first field includes the correct prefix
+    if (!isValidFirstField(firstField)) {
+        throw new Error('Invalid prefix');
+    }
+    const buf = firstField.toBuffer().subarray(-TX_EFFECT_PREFIX_BYTE_LENGTH);
+    return new Fr(buf.subarray(TX_START_PREFIX_BYTES_LENGTH + 1, TX_START_PREFIX_BYTES_LENGTH + 3)).toNumber();
 }
 /**
- * Check that the fields are emitted from the circuits and conform to the encoding.
- * @param blobFields - The concatenated fields from all blobs of an L1 block.
- */ export function checkBlobFieldsEncoding(blobFields) {
-    const reader = FieldReader.asReader(blobFields);
-    const checkpointPrefix = reader.readField();
-    if (checkpointPrefix.toBigInt() !== BigInt(blobFields.length)) {
+ * Determines whether a field is the first field of a tx effect
+ */ export function isValidFirstField(field) {
+    const buf = field.toBuffer();
+    if (!buf.subarray(0, field.size - TX_EFFECT_PREFIX_BYTE_LENGTH).equals(Buffer.alloc(field.size - TX_EFFECT_PREFIX_BYTE_LENGTH))) {
         return false;
     }
-    const numFieldsInCheckpoint = checkpointPrefix.toNumber();
-    let seenNumTxs = 0;
-    while(reader.cursor < numFieldsInCheckpoint){
-        const currentField = reader.readField();
-        if (isBlockEndMarker(currentField)) {
-            // Found a block end marker. Confirm that the number of txs in this block is correct.
-            const numTxs = getNumTxsFromBlockEndMarker(currentField);
-            if (numTxs !== seenNumTxs) {
-                return false;
-            }
-            seenNumTxs = 0;
-            continue;
-        }
-        // If the field is not a block end marker, it must be a tx start marker.
-        const txStartMarker = decodeTxStartMarker(currentField);
-        if (!isValidTxStartMarker(txStartMarker)) {
-            return false;
-        }
-        seenNumTxs += 1;
-        // Skip the remaining fields in this tx. -1 because we already read the tx start marker.
-        reader.skip(txStartMarker.numBlobFields - 1);
-    // TODO: Check the encoding of the tx if we want to be more strict.
+    const sliced = buf.subarray(-TX_EFFECT_PREFIX_BYTE_LENGTH);
+    if (// Checking we start with the correct prefix...
+    !new Fr(sliced.subarray(0, TX_START_PREFIX_BYTES_LENGTH)).equals(new Fr(TX_START_PREFIX)) || // ...and include the revert code prefix..
+    sliced[sliced.length - 3] !== REVERT_CODE_PREFIX || // ...and the following revert code is valid.
+    sliced[sliced.length - 1] > 4) {
+        return false;
     }
     return true;
 }
+/**
+ * Extract the fields from a blob buffer, but do not take into account encoding
+ * that will include trailing zeros.
+ *
+ * +------------------+------------------+------------------+------------------+
+ * |                  |                  |                  | Padded zeros     |
+ * | [3 a,b,c]        | [3, a, b, c]     | [5 d,e,f,0,0]    | [0, 0, 0, .., 0] |
+ * +------------------+------------------+------------------+------------------+
+ *                                                ^
+ *                                                |
+ * Function reads until here ----------------------
+ */ export function extractBlobFieldsFromBuffer(blob) {
+    const reader = BufferReader.asReader(blob);
+    const array = reader.readArray(blob.length >> 5, Fr);
+    // Find the index of the last non-zero field
+    let lastNonZeroIndex = array.length - 1;
+    while(lastNonZeroIndex >= 0 && array[lastNonZeroIndex].isZero()){
+        lastNonZeroIndex--;
+    }
+    // Return the trimmed array
+    return array.slice(0, lastNonZeroIndex + 1);
+}

package/dest/index.d.ts

@@ -1,11 +1,8 @@
 export * from './blob.js';
 export * from './blob_batching.js';
-export * from './blob_utils.js';
-export * from './circuit_types/index.js';
-export * from './deserialize.js';
 export * from './encoding.js';
-export * from './errors.js';
-export * from './hash.js';
 export * from './interface.js';
+export * from './errors.js';
+export * from './blob_batching_public_inputs.js';
 export * from './sponge_blob.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,WAAW,CAAC;AAC1B,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,kCAAkC,CAAC;AACjD,cAAc,kBAAkB,CAAC"}

package/dest/index.js

@@ -1,10 +1,20 @@
+import cKzg from 'c-kzg';
+const { loadTrustedSetup } = cKzg;
 export * from './blob.js';
 export * from './blob_batching.js';
-export * from './blob_utils.js';
-export * from './circuit_types/index.js';
-export * from './deserialize.js';
 export * from './encoding.js';
-export * from './errors.js';
-export * from './hash.js';
 export * from './interface.js';
+export * from './errors.js';
+export * from './blob_batching_public_inputs.js';
 export * from './sponge_blob.js';
+try {
+    loadTrustedSetup(8); // See https://notes.ethereum.org/@jtraglia/windowed_multiplications
+} catch (error) {
+    if (error.message.includes('trusted setup is already loaded')) {
+    // NB: The c-kzg lib has no way of checking whether the setup is loaded or not,
+    // and it throws an error if it's already loaded, even though nothing is wrong.
+    // This is a rudimentary way of ensuring we load the trusted setup if we need it.
+    } else {
+        throw new Error(error);
+    }
+}

package/dest/sponge_blob.d.ts

@@ -2,23 +2,23 @@ import { type FieldsOf } from '@aztec/foundation/array';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader, type Tuple } from '@aztec/foundation/serialize';
 /**
- * A Poseidon2 sponge used to accumulate data that will be added to blobs.
+ * A Poseidon2 sponge used to accumulate data that will be added to a blob.
  * See noir-projects/noir-protocol-circuits/crates/types/src/abis/sponge_blob.nr.
  */
 export declare class SpongeBlob {
-    /** Sponge with absorbed fields that will go into one or more blobs. */
+    /** Sponge with absorbed tx effects that will go into a blob. */
     readonly sponge: Poseidon2Sponge;
     /** Number of effects absorbed so far. */
-    numAbsorbedFields: number;
+    fields: number;
     /** Number of effects that will be absorbed. */
-    readonly numExpectedFields: number;
+    readonly expectedFields: number;
     constructor(
-    /** Sponge with absorbed fields that will go into one or more blobs. */
+    /** Sponge with absorbed tx effects that will go into a blob. */
     sponge: Poseidon2Sponge, 
     /** Number of effects absorbed so far. */
-    numAbsorbedFields: number, 
+    fields: number, 
     /** Number of effects that will be absorbed. */
-    numExpectedFields: number);
+    expectedFields: number);
     static fromBuffer(buffer: Buffer | BufferReader): SpongeBlob;
     toBuffer(): Buffer<ArrayBufferLike>;
     static getFields(fields: FieldsOf<SpongeBlob>): (number | Poseidon2Sponge)[];
@@ -28,11 +28,7 @@ export declare class SpongeBlob {
     absorb(fields: Fr[]): Promise<void>;
     squeeze(): Promise<Fr>;
     static empty(): SpongeBlob;
-    /**
-     * Initialize the sponge blob with the number of expected fields in the checkpoint and absorb it as the first field.
-     * Note: `numExpectedFields` includes the first field absorbed in this method.
-     */
-    static init(numExpectedFields: number): Promise<SpongeBlob>;
+    static init(expectedFields: number): SpongeBlob;
 }
 export declare class Poseidon2Sponge {
     cache: Tuple<Fr, 3>;
@@ -46,7 +42,7 @@ export declare class Poseidon2Sponge {
     toFields(): Fr[];
     static fromFields(fields: Fr[] | FieldReader): Poseidon2Sponge;
     static empty(): Poseidon2Sponge;
-    static init(numExpectedFields: number): Poseidon2Sponge;
+    static init(expectedFields: number): Poseidon2Sponge;
     performDuplex(): Promise<void>;
     absorb(fields: Fr[]): Promise<void>;
     squeeze(): Promise<Fr>;

package/dest/sponge_blob.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sponge_blob.d.ts","sourceRoot":"","sources":["../src/sponge_blob.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EACL,YAAY,EACZ,WAAW,EACX,KAAK,KAAK,EAGX,MAAM,6BAA6B,CAAC;AAErC;;;GAGG;AACH,qBAAa,UAAU;IAEnB,uEAAuE;aACvD,MAAM,EAAE,eAAe;IACvC,yCAAyC;IAClC,iBAAiB,EAAE,MAAM;IAChC,+CAA+C;aAC/B,iBAAiB,EAAE,MAAM;;IALzC,uEAAuE;IACvD,MAAM,EAAE,eAAe;IACvC,yCAAyC;IAClC,iBAAiB,EAAE,MAAM;IAChC,+CAA+C;IAC/B,iBAAiB,EAAE,MAAM;IAG3C,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,UAAU;IAK5D,QAAQ;IAIR,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC;IAI7C,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,UAAU;IASzD,KAAK;IAIC,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE;IAUnB,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC;IAS5B,MAAM,CAAC,KAAK,IAAI,UAAU;IAI1B;;;OAGG;WACU,IAAI,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;CAQlE;AAGD,qBAAa,eAAe;IAEjB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IACnB,SAAS,EAAE,MAAM;IACjB,WAAW,EAAE,OAAO;gBAHpB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EACnB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EACnB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,OAAO;IAG7B,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,eAAe;IAUjE,QAAQ;IAIR,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;IAIlD,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,eAAe;IAU9D,MAAM,CAAC,KAAK,IAAI,eAAe;IAS/B,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,GAAG,eAAe;IAUjD,aAAa;IAWb,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE;IAenB,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC;CAQ7B"}
+{"version":3,"file":"sponge_blob.d.ts","sourceRoot":"","sources":["../src/sponge_blob.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EACL,YAAY,EACZ,WAAW,EACX,KAAK,KAAK,EAGX,MAAM,6BAA6B,CAAC;AAErC;;;GAGG;AACH,qBAAa,UAAU;IAEnB,gEAAgE;aAChD,MAAM,EAAE,eAAe;IACvC,yCAAyC;IAClC,MAAM,EAAE,MAAM;IACrB,+CAA+C;aAC/B,cAAc,EAAE,MAAM;;IALtC,gEAAgE;IAChD,MAAM,EAAE,eAAe;IACvC,yCAAyC;IAClC,MAAM,EAAE,MAAM;IACrB,+CAA+C;IAC/B,cAAc,EAAE,MAAM;IAGxC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,UAAU;IAK5D,QAAQ;IAIR,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC;IAI7C,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,UAAU;IASzD,KAAK;IAIC,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE;IAUnB,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC;IAS5B,MAAM,CAAC,KAAK,IAAI,UAAU;IAI1B,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,UAAU;CAGhD;AAGD,qBAAa,eAAe;IAEjB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IACnB,SAAS,EAAE,MAAM;IACjB,WAAW,EAAE,OAAO;gBAHpB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EACnB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EACnB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,OAAO;IAG7B,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,eAAe;IAUjE,QAAQ;IAIR,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;IAIlD,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,eAAe;IAU9D,MAAM,CAAC,KAAK,IAAI,eAAe;IAS/B,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,eAAe;IAU9C,aAAa;IAWb,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE;IAenB,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC;CAQ7B"}