@aztec/stdlib 3.0.0-nightly.20251121 → 3.0.0-nightly.20251123

package/src/kernel/private_circuit_public_inputs.ts

@@ -35,7 +35,7 @@ import {
   ClaimedLengthArrayFromBuffer,
   ClaimedLengthArrayFromFields,
 } from './claimed_length_array.js';
-import { ReadRequest } from './hints/read_request.js';
+import { ScopedReadRequest } from './hints/read_request.js';
 import { NoteHash } from './note_hash.js';
 import { Nullifier } from './nullifier.js';
 import { CountedPublicCallRequest, PublicCallRequest } from './public_call_request.js';
@@ -72,11 +72,11 @@ export class PrivateCircuitPublicInputs {
     /**
      * Read requests created by the corresponding function call.
      */
-    public noteHashReadRequests: ClaimedLengthArray<ReadRequest, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>,
+    public noteHashReadRequests: ClaimedLengthArray<ScopedReadRequest, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>,
     /**
      * Nullifier read requests created by the corresponding function call.
      */
-    public nullifierReadRequests: ClaimedLengthArray<ReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_CALL>,
+    public nullifierReadRequests: ClaimedLengthArray<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_CALL>,
     /**
      * Key validation requests and generators created by the corresponding function call.
      */
@@ -169,8 +169,8 @@ export class PrivateCircuitPublicInputs {
       reader.readObject(Fr),
       reader.readBoolean(),
       reader.readUInt64(),
-      reader.readObject(ClaimedLengthArrayFromBuffer(ReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL)),
-      reader.readObject(ClaimedLengthArrayFromBuffer(ReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL)),
+      reader.readObject(ClaimedLengthArrayFromBuffer(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL)),
+      reader.readObject(ClaimedLengthArrayFromBuffer(ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL)),
       reader.readObject(
         ClaimedLengthArrayFromBuffer(KeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_CALL),
       ),
@@ -200,8 +200,8 @@ export class PrivateCircuitPublicInputs {
       reader.readField(),
       reader.readBoolean(),
       reader.readU64(),
-      reader.readObject(ClaimedLengthArrayFromFields(ReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL)),
-      reader.readObject(ClaimedLengthArrayFromFields(ReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL)),
+      reader.readObject(ClaimedLengthArrayFromFields(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL)),
+      reader.readObject(ClaimedLengthArrayFromFields(ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL)),
       reader.readObject(
         ClaimedLengthArrayFromFields(KeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_CALL),
       ),
@@ -234,8 +234,8 @@ export class PrivateCircuitPublicInputs {
       Fr.ZERO,
       false,
       0n,
-      ClaimedLengthArray.empty(ReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL),
-      ClaimedLengthArray.empty(ReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL),
+      ClaimedLengthArray.empty(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL),
+      ClaimedLengthArray.empty(ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL),
       ClaimedLengthArray.empty(KeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_CALL),
       ClaimedLengthArray.empty(NoteHash, MAX_NOTE_HASHES_PER_CALL),
       ClaimedLengthArray.empty(Nullifier, MAX_NULLIFIERS_PER_CALL),

package/src/messaging/in_hash.ts

@@ -1,15 +1,10 @@
 import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { sha256Trunc } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
-import { MerkleTreeCalculator } from '@aztec/foundation/trees';
+import { computeBalancedShaRoot } from '@aztec/foundation/trees';
 
 /** Computes the inHash for a block's ContentCommitment given its l1 to l2 messages. */
-export async function computeInHashFromL1ToL2Messages(unpaddedL1ToL2Messages: Fr[]): Promise<Fr> {
+export function computeInHashFromL1ToL2Messages(unpaddedL1ToL2Messages: Fr[]): Fr {
   const l1ToL2Messages = padArrayEnd<Fr, number>(unpaddedL1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-  const hasher = (left: Buffer, right: Buffer) =>
-    Promise.resolve(sha256Trunc(Buffer.concat([left, right])) as Buffer<ArrayBuffer>);
-  const parityHeight = Math.ceil(Math.log2(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP));
-  const parityCalculator = await MerkleTreeCalculator.create(parityHeight, Fr.ZERO.toBuffer(), hasher);
-  return new Fr(await parityCalculator.computeTreeRoot(l1ToL2Messages.map(msg => msg.toBuffer())));
+  return new Fr(computeBalancedShaRoot(l1ToL2Messages.map(msg => msg.toBuffer())));
 }

package/src/messaging/l2_to_l1_membership.ts

@@ -1,5 +1,5 @@
 import { Fr } from '@aztec/foundation/fields';
-import { SiblingPath, UnbalancedMerkleTreeCalculator, computeUnbalancedMerkleTreeRoot } from '@aztec/foundation/trees';
+import { SiblingPath, UnbalancedMerkleTreeCalculator, computeUnbalancedShaRoot } from '@aztec/foundation/trees';
 
 export interface MessageRetrieval {
   getL2ToL1Messages(l2BlockNumber: number): Promise<Fr[][] | undefined>;
@@ -58,7 +58,7 @@ export function computeL2ToL1MembershipWitnessFromMessagesForAllTxs(
       return Fr.fromBuffer(txOutHash);
     }
 
-    const root = computeUnbalancedMerkleTreeRoot(messages.map(msg => msg.toBuffer()));
+    const root = computeUnbalancedShaRoot(messages.map(msg => msg.toBuffer()));
     return Fr.fromBuffer(root);
   });
 

package/src/messaging/out_hash.ts

@@ -1,5 +1,5 @@
 import { Fr } from '@aztec/foundation/fields';
-import { UnbalancedMerkleTreeCalculator, computeUnbalancedMerkleTreeRoot } from '@aztec/foundation/trees';
+import { UnbalancedMerkleTreeCalculator, computeUnbalancedShaRoot } from '@aztec/foundation/trees';
 
 export function computeTxOutHash(messages: Fr[]): Fr {
   if (!messages.length) {
@@ -7,7 +7,7 @@ export function computeTxOutHash(messages: Fr[]): Fr {
   }
   // Tx out hash is the root of the unbalanced merkle tree of all the messages.
   // Zero hashes (which should not happen) are not compressed.
-  return Fr.fromBuffer(computeUnbalancedMerkleTreeRoot(messages.map(msg => msg.toBuffer())));
+  return Fr.fromBuffer(computeUnbalancedShaRoot(messages.map(msg => msg.toBuffer())));
 }
 
 export function computeBlockOutHash(messagesPerBlock: Fr[][]): Fr {

package/src/rollup/block_headers_hash.ts

@@ -0,0 +1,12 @@
+import { Fr } from '@aztec/foundation/fields';
+import { computeUnbalancedPoseidonRoot } from '@aztec/foundation/trees';
+
+import type { BlockHeader } from '../tx/block_header.js';
+
+export async function computeBlockHeadersHash(blockHeaders: BlockHeader[]): Promise<Fr> {
+  const blockHeaderHashes = await Promise.all(blockHeaders.map(header => header.hash()));
+  // Must match the implementation in merge_block_rollups.nr, with the **wonky** rollup structure
+  // (see validate_consecutive_block_rollups.nr > assert_rollups_filled_greedily.nr).
+  const blockHeadersHash = await computeUnbalancedPoseidonRoot(blockHeaderHashes.map(hash => hash.toBuffer()));
+  return Fr.fromBuffer(blockHeadersHash);
+}

package/src/rollup/block_rollup_public_inputs.ts

@@ -50,6 +50,12 @@ export class BlockRollupPublicInputs {
      * Timestamp of the last block in this block range.
      */
     public endTimestamp: UInt64,
+    /**
+     * Hash of the headers of all blocks in this block range. It will be combined with the `blockHeadersHash` from
+     * other blocks in the same checkpoint to form a wonky tree. The root of that tree becomes the final hash stored in
+     * the checkpoint header, enabling validation of the blocks included in a checkpoint given their headers.
+     */
+    public blockHeadersHash: Fr,
     /**
      * SHA256 hash of l1 to l2 messages.
      */
@@ -84,6 +90,7 @@ export class BlockRollupPublicInputs {
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
+      Fr.fromBuffer(reader),
     );
   }
 
@@ -98,6 +105,7 @@ export class BlockRollupPublicInputs {
       this.endSpongeBlob,
       bigintToUInt64BE(this.startTimestamp),
       bigintToUInt64BE(this.endTimestamp),
+      this.blockHeadersHash,
       this.inHash,
       this.outHash,
       this.accumulatedFees,

package/src/rollup/block_root_rollup_private_inputs.ts

@@ -1,4 +1,3 @@
-import { SpongeBlob } from '@aztec/blob-lib/types';
 import { ARCHIVE_HEIGHT, L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
@@ -157,11 +156,6 @@ export class BlockRootEmptyTxFirstRollupPrivateInputs {
      * The constants of the checkpoint.
      */
     public constants: CheckpointConstantData,
-    /**
-     * The start sponge blob of this block. No data has been absorbed into it yet, since it's the first block. But the
-     * number of expected fields must be set to the total number of fields in the entire checkpoint.
-     */
-    public startSpongeBlob: SpongeBlob,
     /**
      * The timestamp of this block.
      */
@@ -186,7 +180,6 @@ export class BlockRootEmptyTxFirstRollupPrivateInputs {
       fields.previousArchive,
       fields.previousState,
       fields.constants,
-      fields.startSpongeBlob,
       fields.timestamp,
       fields.newL1ToL2MessageSubtreeRootSiblingPath,
       fields.newArchiveSiblingPath,
@@ -199,7 +192,6 @@ export class BlockRootEmptyTxFirstRollupPrivateInputs {
       this.previousArchive,
       this.previousState,
       this.constants,
-      this.startSpongeBlob,
       bigintToUInt64BE(this.timestamp),
       this.newL1ToL2MessageSubtreeRootSiblingPath,
       this.newArchiveSiblingPath,
@@ -213,7 +205,6 @@ export class BlockRootEmptyTxFirstRollupPrivateInputs {
       AppendOnlyTreeSnapshot.fromBuffer(reader),
       StateReference.fromBuffer(reader),
       CheckpointConstantData.fromBuffer(reader),
-      SpongeBlob.fromBuffer(reader),
       reader.readUInt64(),
       reader.readArray(L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH, Fr),
       reader.readArray(ARCHIVE_HEIGHT, Fr),

package/src/rollup/checkpoint_header.ts

@@ -20,6 +20,8 @@ export class CheckpointHeader {
   constructor(
     /** Root of the archive tree before this block is added. */
     public lastArchiveRoot: Fr,
+    /** Hash of the headers of all blocks in this checkpoint. */
+    public blockHeadersHash: Fr,
     /** Content commitment of the L2 block. */
     public contentCommitment: ContentCommitment,
     /** Slot number of the L2 block */
@@ -40,6 +42,7 @@ export class CheckpointHeader {
     return z
       .object({
         lastArchiveRoot: schemas.Fr,
+        blockHeadersHash: schemas.Fr,
         contentCommitment: ContentCommitment.schema,
         slotNumber: schemas.Fr,
         timestamp: schemas.BigInt,
@@ -54,6 +57,7 @@ export class CheckpointHeader {
   static getFields(fields: FieldsOf<CheckpointHeader>) {
     return [
       fields.lastArchiveRoot,
+      fields.blockHeadersHash,
       fields.contentCommitment,
       fields.slotNumber,
       fields.timestamp,
@@ -72,6 +76,7 @@ export class CheckpointHeader {
     const reader = BufferReader.asReader(buffer);
 
     return new CheckpointHeader(
+      reader.readObject(Fr),
       reader.readObject(Fr),
       reader.readObject(ContentCommitment),
       Fr.fromBuffer(reader),
@@ -86,6 +91,7 @@ export class CheckpointHeader {
   equals(other: CheckpointHeader) {
     return (
       this.lastArchiveRoot.equals(other.lastArchiveRoot) &&
+      this.blockHeadersHash.equals(other.blockHeadersHash) &&
       this.contentCommitment.equals(other.contentCommitment) &&
       this.slotNumber.equals(other.slotNumber) &&
       this.timestamp === other.timestamp &&
@@ -100,6 +106,7 @@ export class CheckpointHeader {
     // Note: The order here must match the order in the ProposedHeaderLib solidity library.
     return serializeToBuffer([
       this.lastArchiveRoot,
+      this.blockHeadersHash,
       this.contentCommitment,
       this.slotNumber,
       bigintToUInt64BE(this.timestamp),
@@ -117,6 +124,7 @@ export class CheckpointHeader {
   static empty(fields: Partial<FieldsOf<CheckpointHeader>> = {}) {
     return CheckpointHeader.from({
       lastArchiveRoot: Fr.ZERO,
+      blockHeadersHash: Fr.ZERO,
       contentCommitment: ContentCommitment.empty(),
       slotNumber: Fr.ZERO,
       timestamp: 0n,
@@ -130,6 +138,7 @@ export class CheckpointHeader {
 
   static random(): CheckpointHeader {
     return new CheckpointHeader(
+      Fr.random(),
       Fr.random(),
       ContentCommitment.random(),
       new Fr(BigInt(Math.floor(Math.random() * 1000) + 1)),
@@ -144,6 +153,7 @@ export class CheckpointHeader {
   isEmpty(): boolean {
     return (
       this.lastArchiveRoot.isZero() &&
+      this.blockHeadersHash.isZero() &&
       this.contentCommitment.isEmpty() &&
       this.slotNumber.isZero() &&
       this.timestamp === 0n &&
@@ -169,6 +179,7 @@ export class CheckpointHeader {
   static fromViem(header: ViemHeader) {
     return new CheckpointHeader(
       Fr.fromString(header.lastArchiveRoot),
+      Fr.fromString(header.blockHeadersHash),
       ContentCommitment.fromViem(header.contentCommitment),
       new Fr(header.slotNumber),
       header.timestamp,
@@ -182,6 +193,7 @@ export class CheckpointHeader {
   toViem(): ViemHeader {
     return {
       lastArchiveRoot: this.lastArchiveRoot.toString(),
+      blockHeadersHash: this.blockHeadersHash.toString(),
       contentCommitment: this.contentCommitment.toViem(),
       slotNumber: this.slotNumber.toBigInt(),
       timestamp: this.timestamp,
@@ -198,6 +210,7 @@ export class CheckpointHeader {
   toInspect() {
     return {
       lastArchive: this.lastArchiveRoot.toString(),
+      blockHeadersHash: this.blockHeadersHash.toString(),
       contentCommitment: this.contentCommitment.toInspect(),
       slotNumber: this.slotNumber.toBigInt(),
       timestamp: this.timestamp,
@@ -212,6 +225,7 @@ export class CheckpointHeader {
     const gasfees = `da:${this.gasFees.feePerDaGas}, l2:${this.gasFees.feePerL2Gas}`;
     return `Header {
   lastArchiveRoot: ${this.lastArchiveRoot.toString()},
+  blockHeadersHash: ${this.blockHeadersHash.toString()},
   contentCommitment: ${inspect(this.contentCommitment)},
   slotNumber: ${this.slotNumber.toBigInt()},
   timestamp: ${this.timestamp},

package/src/rollup/index.ts

@@ -1,6 +1,7 @@
 export * from './avm_proof_data.js';
 export * from './base_rollup_hints.js';
 export * from './block_constant_data.js';
+export * from './block_headers_hash.js';
 export * from './block_merge_rollup_private_inputs.js';
 export * from './block_rollup_public_inputs.js';
 export * from './block_root_rollup_private_inputs.js';

package/src/tests/factories.ts

@@ -93,7 +93,7 @@ import { Gas, GasFees, GasSettings } from '../gas/index.js';
 import { computeCalldataHash } from '../hash/hash.js';
 import { KeyValidationRequest } from '../kernel/hints/key_validation_request.js';
 import { KeyValidationRequestAndGenerator } from '../kernel/hints/key_validation_request_and_generator.js';
-import { ReadRequest } from '../kernel/hints/read_request.js';
+import { ReadRequest, ScopedReadRequest } from '../kernel/hints/read_request.js';
 import {
   ClaimedLengthArray,
   PartialPrivateTailPublicInputsForPublic,
@@ -234,8 +234,8 @@ export function makeSelector(seed: number): FunctionSelector {
   return new FunctionSelector(seed);
 }
 
-function makeReadRequest(n: number): ReadRequest {
-  return new ReadRequest(new Fr(BigInt(n)), n + 1);
+function makeScopedReadRequest(n: number): ScopedReadRequest {
+  return new ScopedReadRequest(new ReadRequest(new Fr(BigInt(n)), n + 1), makeAztecAddress(n + 2));
 }
 
 /**
@@ -642,8 +642,16 @@ export function makePrivateCircuitPublicInputs(seed = 0): PrivateCircuitPublicIn
     argsHash: fr(seed + 0x100),
     returnsHash: fr(seed + 0x200),
     minRevertibleSideEffectCounter: fr(0),
-    noteHashReadRequests: makeClaimedLengthArray(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, makeReadRequest, seed + 0x300),
-    nullifierReadRequests: makeClaimedLengthArray(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, makeReadRequest, seed + 0x310),
+    noteHashReadRequests: makeClaimedLengthArray(
+      MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
+      makeScopedReadRequest,
+      seed + 0x300,
+    ),
+    nullifierReadRequests: makeClaimedLengthArray(
+      MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
+      makeScopedReadRequest,
+      seed + 0x310,
+    ),
     keyValidationRequestsAndGenerators: makeClaimedLengthArray(
       MAX_KEY_VALIDATION_REQUESTS_PER_CALL,
       makeKeyValidationRequestAndGenerators,
@@ -806,8 +814,9 @@ export function makeBlockRollupPublicInputs(seed = 0): BlockRollupPublicInputs {
     makeStateReference(seed + 0x500),
     makeSpongeBlob(seed + 0x600),
     makeSpongeBlob(seed + 0x700),
+    BigInt(seed + 0x800),
     BigInt(seed + 0x810),
-    BigInt(seed + 0x820),
+    fr(seed + 0x820),
     fr(seed + 0x830),
     fr(seed + 0x840),
     fr(seed + 0x850),
@@ -911,12 +920,14 @@ export function makeL2BlockHeader(
     new Fr(seed + 0x800),
     new Fr(seed + 0x900),
     new Fr(seed + 0xa00),
+    new Fr(seed + 0xb00),
   );
 }
 
 export function makeCheckpointHeader(seed = 0) {
   return CheckpointHeader.from({
     lastArchiveRoot: fr(seed + 0x100),
+    blockHeadersHash: fr(seed + 0x150),
     contentCommitment: makeContentCommitment(seed + 0x200),
     slotNumber: new Fr(seed + 0x300),
     timestamp: BigInt(seed + 0x400),

package/src/tx/tx_effect.ts

@@ -265,10 +265,6 @@ export class TxEffect {
     };
   }
 
-  /**
-   * Returns a flat packed array of fields of all tx effects, to be appended to blobs.
-   * Must match the implementation in noir-protocol-circuits/crates/rollup-lib/src/tx_base/components/tx_blob_data.nr
-   */
   toTxBlobData(): TxBlobData {
     return {
       txStartMarker: this.getTxStartMarker(),