@aztec/blob-lib 3.0.0-nightly.20250926 → 3.0.0-nightly.20250927

package/dest/deserialize.js

@@ -1,6 +1,6 @@
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
-import { getLengthFromFirstField, isBlockEndMarker } from './encoding.js';
+import { getNumBlobFieldsFromTxStartMarker, isBlockEndMarker } from './encoding.js';
 /**
  * Deserializes a blob buffer into an array of field elements.
  *
@@ -51,7 +51,7 @@ import { getLengthFromFirstField, isBlockEndMarker } from './encoding.js';
             break;
         }
         // Skip the remaining fields in this transaction
-        const len = getLengthFromFirstField(currentField);
+        const len = getNumBlobFieldsFromTxStartMarker(currentField);
         fieldReader.skip(len);
     }
     // Return array up to last non-zero field

package/dest/encoding.d.ts

@@ -1,17 +1,21 @@
 import { Fr } from '@aztec/foundation/fields';
-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;
-/**
- * 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;
+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 isBlockEndMarker(field: Fr): boolean;
 export declare function getNumTxsFromBlockEndMarker(field: Fr): number;
+export declare function isBlockEndMarker(field: Fr): boolean;
 //# 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;AAG9C,eAAO,MAAM,4BAA4B,QAA0C,CAAC;AAEpF,eAAO,MAAM,4BAA4B,QAAmC,CAAC;AAC7E,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,EAAE,GAAG,MAAM,CAO9D;AA4BD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,MAGlD;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,EAAE,WAIzC;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,EAAE,UAEpD"}
+{"version":3,"file":"encoding.d.ts","sourceRoot":"","sources":["../src/encoding.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAY9C,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"}

package/dest/encoding.js

@@ -1,50 +1,88 @@
 import { BLOCK_END_PREFIX, TX_START_PREFIX } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
-// 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;
-/**
- * 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();
+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);
 }
-/**
- * Determines whether a field is the first field of a tx effect
- */ 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 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;
+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) {
-    // Should match the implementation in block_rollup_public_inputs_composer.nr > create_block_end_marker
+    // 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);
+}
 export function isBlockEndMarker(field) {
     const value = field.toBigInt();
     const numTxs = value & 0xffffn;
     return value - numTxs === BLOCK_END_PREFIX * 256n * 256n;
 }
-export function getNumTxsFromBlockEndMarker(field) {
-    return Number(field.toBigInt() & 0xffffn);
-}

package/dest/testing.d.ts

@@ -1,4 +1,3 @@
-import { Fr } from '@aztec/foundation/fields';
 import { Blob } from './blob.js';
 import { BatchedBlobAccumulator } from './blob_batching.js';
 import { SpongeBlob } from './sponge_blob.js';
@@ -25,12 +24,11 @@ export declare function makeBatchedBlobAccumulator(seed?: number): BatchedBlobAc
  */
 export declare function makeEncodedBlob(length: number): Promise<Blob>;
 /**
- * Make an unencoded blob with the given length
+ * Make a blob with random fields.
  *
  * This will fail deserialisation in the archiver
  * @param length
  * @returns
  */
-export declare function makeUnencodedBlob(length: number): Promise<Blob>;
-export declare function makeEncodedBlobFields(fields: Fr[]): Promise<Blob>;
+export declare function makeRandomBlob(length: number): Promise<Blob>;
 //# sourceMappingURL=testing.d.ts.map

package/dest/testing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,sBAAsB,EAA+B,MAAM,oBAAoB,CAAC;AAEzF,OAAO,EAAmB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE/D;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,SAAI,GAAG,UAAU,CAWnD;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,SAAI,GAAG,sBAAsB,CAW3E;AAmBD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE7D;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/D;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjE"}
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,sBAAsB,EAA+B,MAAM,oBAAoB,CAAC;AAEzF,OAAO,EAAmB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE/D;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,SAAI,GAAG,UAAU,CAWnD;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,SAAI,GAAG,sBAAsB,CAW3E;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkB7D;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE5D"}

package/dest/testing.js

@@ -1,10 +1,8 @@
-import { TX_START_PREFIX } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
-import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { BLS12Fr, BLS12Point, Fr } from '@aztec/foundation/fields';
 import { Blob } from './blob.js';
 import { BatchedBlobAccumulator, FinalBlobBatchingChallenges } from './blob_batching.js';
-import { TX_START_PREFIX_BYTES_LENGTH } from './encoding.js';
+import { encodeTxStartMarker } from './encoding.js';
 import { Poseidon2Sponge, SpongeBlob } from './sponge_blob.js';
 /**
  * Makes arbitrary poseidon sponge for blob inputs.
@@ -22,22 +20,6 @@ import { Poseidon2Sponge, SpongeBlob } from './sponge_blob.js';
  */ export function makeBatchedBlobAccumulator(seed = 1) {
     return new BatchedBlobAccumulator(new Fr(seed), new Fr(seed + 1), new BLS12Fr(seed + 2), BLS12Point.random(), BLS12Point.random(), new Fr(seed + 3), new BLS12Fr(seed + 4), new FinalBlobBatchingChallenges(new Fr(seed + 5), new BLS12Fr(seed + 6)));
 }
-// TODO: copied form stdlib tx effect
-function encodeFirstField(length) {
-    const lengthBuf = Buffer.alloc(2);
-    lengthBuf.writeUInt16BE(length, 0);
-    return new Fr(Buffer.concat([
-        toBufferBE(TX_START_PREFIX, TX_START_PREFIX_BYTES_LENGTH),
-        Buffer.alloc(1),
-        lengthBuf,
-        Buffer.alloc(1),
-        Buffer.from([
-            1
-        ]),
-        Buffer.alloc(1),
-        Buffer.alloc(1)
-    ]));
-}
 /**
  * Make an encoded blob with the given length
  *
@@ -45,29 +27,36 @@ function encodeFirstField(length) {
  * @param length
  * @returns
  */ export function makeEncodedBlob(length) {
+    const txStartMarker = {
+        numBlobFields: length,
+        // The rest of the values don't matter. The test components using it only look at `numBlobFields` to split the blobs
+        // into fields for tx effects.
+        revertCode: 0,
+        numNoteHashes: 0,
+        numNullifiers: 0,
+        numL2ToL1Msgs: 0,
+        numPublicDataWrites: 0,
+        numPrivateLogs: 0,
+        publicLogsLength: 0,
+        contractClassLogLength: 0
+    };
     return Blob.fromFields([
-        encodeFirstField(length + 1),
+        encodeTxStartMarker(txStartMarker),
         ...Array.from({
-            length: length
+            length: length - 1
         }, ()=>Fr.random())
     ]);
 }
 /**
- * Make an unencoded blob with the given length
+ * Make a blob with random fields.
  *
  * This will fail deserialisation in the archiver
  * @param length
  * @returns
- */ export function makeUnencodedBlob(length) {
+ */ export function makeRandomBlob(length) {
     return Blob.fromFields([
         ...Array.from({
             length: length
         }, ()=>Fr.random())
     ]);
 }
-export function makeEncodedBlobFields(fields) {
-    return Blob.fromFields([
-        encodeFirstField(fields.length + 1),
-        ...fields
-    ]);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/blob-lib",
-  "version": "3.0.0-nightly.20250926",
+  "version": "3.0.0-nightly.20250927",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -27,8 +27,8 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/constants": "3.0.0-nightly.20250926",
-    "@aztec/foundation": "3.0.0-nightly.20250926",
+    "@aztec/constants": "3.0.0-nightly.20250927",
+    "@aztec/foundation": "3.0.0-nightly.20250927",
     "c-kzg": "4.0.0-alpha.1",
     "tslib": "^2.4.0"
   },

package/src/deserialize.ts

@@ -3,7 +3,7 @@ import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 
 import type { Blob as BlobBuffer } from 'c-kzg';
 
-import { getLengthFromFirstField, isBlockEndMarker } from './encoding.js';
+import { getNumBlobFieldsFromTxStartMarker, isBlockEndMarker } from './encoding.js';
 
 /**
  * Deserializes a blob buffer into an array of field elements.
@@ -60,7 +60,7 @@ export function deserializeEncodedBlobToFields(blob: BlobBuffer): Fr[] {
     }
 
     // Skip the remaining fields in this transaction
-    const len = getLengthFromFirstField(currentField);
+    const len = getNumBlobFieldsFromTxStartMarker(currentField);
     fieldReader.skip(len);
   }
 

package/src/encoding.ts

@@ -1,66 +1,109 @@
 import { BLOCK_END_PREFIX, TX_START_PREFIX } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 
-// 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;
+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;
 
-/**
- * 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: Fr): number {
-  // 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();
+export interface TxStartMarker {
+  prefix: bigint;
+  numBlobFields: number;
+  revertCode: number;
+  numNoteHashes: number;
+  numNullifiers: number;
+  numL2ToL1Msgs: number;
+  numPublicDataWrites: number;
+  numPrivateLogs: number;
+  publicLogsLength: number;
+  contractClassLogLength: number;
 }
 
-/**
- * Determines whether a field is the first field of a tx effect
- */
-function isValidFirstField(field: Fr): boolean {
-  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 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;
+// Must match the implementation in `noir-protocol-circuits/crates/rollup-lib/src/tx_base/components/tx_blob_data.nr`.
+export function encodeTxStartMarker(txStartMarker: Omit<TxStartMarker, 'prefix'>) {
+  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: Fr): TxStartMarker {
+  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: Fr) {
+  return Number(field.toBigInt() & (2n ** NUM_BLOB_FIELDS_BIT_SIZE - 1n));
+}
+
+export function isValidTxStartMarker(txStartMarker: TxStartMarker) {
+  return txStartMarker.prefix === TX_START_PREFIX;
 }
 
 export function createBlockEndMarker(numTxs: number) {
-  // Should match the implementation in block_rollup_public_inputs_composer.nr > create_block_end_marker
+  // 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: Fr) {
+  return Number(field.toBigInt() & 0xffffn);
+}
+
 export function isBlockEndMarker(field: Fr) {
   const value = field.toBigInt();
   const numTxs = value & 0xffffn;
   return value - numTxs === BLOCK_END_PREFIX * 256n * 256n;
 }
-
-export function getNumTxsFromBlockEndMarker(field: Fr) {
-  return Number(field.toBigInt() & 0xffffn);
-}

package/src/testing.ts

@@ -1,11 +1,9 @@
-import { TX_START_PREFIX } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
-import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { BLS12Fr, BLS12Point, Fr } from '@aztec/foundation/fields';
 
 import { Blob } from './blob.js';
 import { BatchedBlobAccumulator, FinalBlobBatchingChallenges } from './blob_batching.js';
-import { TX_START_PREFIX_BYTES_LENGTH } from './encoding.js';
+import { encodeTxStartMarker } from './encoding.js';
 import { Poseidon2Sponge, SpongeBlob } from './sponge_blob.js';
 
 /**
@@ -46,23 +44,6 @@ export function makeBatchedBlobAccumulator(seed = 1): BatchedBlobAccumulator {
   );
 }
 
-// TODO: copied form stdlib tx effect
-function encodeFirstField(length: number): Fr {
-  const lengthBuf = Buffer.alloc(2);
-  lengthBuf.writeUInt16BE(length, 0);
-  return new Fr(
-    Buffer.concat([
-      toBufferBE(TX_START_PREFIX, TX_START_PREFIX_BYTES_LENGTH),
-      Buffer.alloc(1),
-      lengthBuf,
-      Buffer.alloc(1),
-      Buffer.from([1]),
-      Buffer.alloc(1),
-      Buffer.alloc(1),
-    ]),
-  );
-}
-
 /**
  * Make an encoded blob with the given length
  *
@@ -71,20 +52,32 @@ function encodeFirstField(length: number): Fr {
  * @returns
  */
 export function makeEncodedBlob(length: number): Promise<Blob> {
-  return Blob.fromFields([encodeFirstField(length + 1), ...Array.from({ length: length }, () => Fr.random())]);
+  const txStartMarker = {
+    numBlobFields: length,
+    // The rest of the values don't matter. The test components using it only look at `numBlobFields` to split the blobs
+    // into fields for tx effects.
+    revertCode: 0,
+    numNoteHashes: 0,
+    numNullifiers: 0,
+    numL2ToL1Msgs: 0,
+    numPublicDataWrites: 0,
+    numPrivateLogs: 0,
+    publicLogsLength: 0,
+    contractClassLogLength: 0,
+  };
+  return Blob.fromFields([
+    encodeTxStartMarker(txStartMarker),
+    ...Array.from({ length: length - 1 }, () => Fr.random()),
+  ]);
 }
 
 /**
- * Make an unencoded blob with the given length
+ * Make a blob with random fields.
  *
  * This will fail deserialisation in the archiver
  * @param length
  * @returns
  */
-export function makeUnencodedBlob(length: number): Promise<Blob> {
+export function makeRandomBlob(length: number): Promise<Blob> {
   return Blob.fromFields([...Array.from({ length: length }, () => Fr.random())]);
 }
-
-export function makeEncodedBlobFields(fields: Fr[]): Promise<Blob> {
-  return Blob.fromFields([encodeFirstField(fields.length + 1), ...fields]);
-}