chore(fast-inbox): follow the checkpoint header inHash removal through stdlib and node (A-1387)

Mirror the consensus-format change in the stdlib CheckpointHeader (struct,
serialization, viem, hash fixtures) and the circuit-ABI stdlib types
(ParityPublicInputs, InboxParityPrivateInputs) and their noir conversion
mappings. Sweep the header-inHash populate/read sites: the lightweight
checkpoint builder, the checkpoint-proving orchestrator, the sequencer fixture
writer, and the checkpoint proposal (its block-level inHash now sources zero
rather than the removed header field). Regenerate the checkpoint p2p wire
fixture for the shorter header.

Replace NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP with MAX_L1_TO_L2_MSGS_PER_CHECKPOINT
across the TS consumers. The block-level inHash struct fields (BlockProposal,
L2Block) and stdlib/src/messaging/in_hash.ts remain for the node cleanup issue.

Author: spalladino

yarn-project/archiver/src/l1/calldata_retriever.test.ts

@@ -1248,7 +1248,7 @@ describe('CalldataRetriever', () => {
       expect(result.blockHash).toBe(tx.blockHash);
 
       // Verify all components are properly decoded
-      expect(result.header.inHash).toBeInstanceOf(Fr);
+      expect(result.header.inboxRollingHash).toBeInstanceOf(Fr);
       expect(result.header.gasFees).toBeInstanceOf(GasFees);
 
       // Verify instrumentation was called
@@ -1322,7 +1322,7 @@ describe('CalldataRetriever', () => {
       expect(result.blockHash).toBe(blockHash);
 
       // Verify all components are properly decoded
-      expect(result.header.inHash).toBeInstanceOf(Fr);
+      expect(result.header.inboxRollingHash).toBeInstanceOf(Fr);
       expect(result.header.gasFees).toBeInstanceOf(GasFees);
 
       // Verify proxy implementation was checked

yarn-project/archiver/src/store/message_store.test.ts

@@ -1,4 +1,4 @@
-import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
+import { MAX_L1_TO_L2_MSGS_PER_CHECKPOINT } from '@aztec/constants';
 import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
 import { Fr } from '@aztec/foundation/curves/bn254';
@@ -165,9 +165,9 @@ describe('MessageStore', () => {
 
       await checkMessages(msgs);
       const blockMessages = await messageStore.getL1ToL2Messages(CheckpointNumber(initialCheckpointNumber + 1));
-      expect(blockMessages).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+      expect(blockMessages).toHaveLength(MAX_L1_TO_L2_MSGS_PER_CHECKPOINT);
       expect(blockMessages).toEqual(
-        msgs.slice(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * 2).map(m => m.leaf),
+        msgs.slice(MAX_L1_TO_L2_MSGS_PER_CHECKPOINT, MAX_L1_TO_L2_MSGS_PER_CHECKPOINT * 2).map(m => m.leaf),
       );
     });
 
@@ -244,7 +244,7 @@ describe('MessageStore', () => {
         overrideFn: (msg, i) => ({
           ...msg,
           checkpointNumber: CheckpointNumber(2),
-          index: BigInt(i + NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * 2),
+          index: BigInt(i + MAX_L1_TO_L2_MSGS_PER_CHECKPOINT * 2),
         }),
       });
       msgs[1].index++;
@@ -257,31 +257,19 @@ describe('MessageStore', () => {
       await messageStore.addL1ToL2Messages(msgs);
       await checkMessages(msgs);
 
-      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(1))).toHaveLength(
-        NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-      );
-      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(2))).toHaveLength(
-        NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-      );
-      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(3))).toHaveLength(
-        NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-      );
-      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(4))).toHaveLength(
-        NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-      );
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(1))).toHaveLength(MAX_L1_TO_L2_MSGS_PER_CHECKPOINT);
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(2))).toHaveLength(MAX_L1_TO_L2_MSGS_PER_CHECKPOINT);
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(3))).toHaveLength(MAX_L1_TO_L2_MSGS_PER_CHECKPOINT);
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(4))).toHaveLength(MAX_L1_TO_L2_MSGS_PER_CHECKPOINT);
 
       await messageStore.rollbackL1ToL2MessagesToCheckpoint(CheckpointNumber(2));
 
-      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(1))).toHaveLength(
-        NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-      );
-      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(2))).toHaveLength(
-        NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-      );
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(1))).toHaveLength(MAX_L1_TO_L2_MSGS_PER_CHECKPOINT);
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(2))).toHaveLength(MAX_L1_TO_L2_MSGS_PER_CHECKPOINT);
       expect(await messageStore.getL1ToL2Messages(CheckpointNumber(3))).toHaveLength(0);
       expect(await messageStore.getL1ToL2Messages(CheckpointNumber(4))).toHaveLength(0);
 
-      await checkMessages(msgs.slice(0, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * 2));
+      await checkMessages(msgs.slice(0, MAX_L1_TO_L2_MSGS_PER_CHECKPOINT * 2));
     });
 
     it('removes messages starting with the given index', async () => {

yarn-project/archiver/src/test/mock_structs.ts

@@ -1,8 +1,4 @@
-import {
-  MAX_NOTE_HASHES_PER_TX,
-  NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-  PRIVATE_LOG_SIZE_IN_FIELDS,
-} from '@aztec/constants';
+import { MAX_L1_TO_L2_MSGS_PER_CHECKPOINT, MAX_NOTE_HASHES_PER_TX, PRIVATE_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
 import { BlockNumber, CheckpointNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
@@ -101,13 +97,13 @@ export function makeInboxMessagesWithFullBlocks(
   opts: { initialCheckpointNumber?: CheckpointNumber } = {},
 ): InboxMessage[] {
   const { initialCheckpointNumber = CheckpointNumber(13) } = opts;
-  return makeInboxMessages(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * blockCount, {
+  return makeInboxMessages(MAX_L1_TO_L2_MSGS_PER_CHECKPOINT * blockCount, {
     overrideFn: (msg, i) => {
       const checkpointNumber = CheckpointNumber(
-        initialCheckpointNumber + Math.floor(i / NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP),
+        initialCheckpointNumber + Math.floor(i / MAX_L1_TO_L2_MSGS_PER_CHECKPOINT),
       );
       const index =
-        InboxLeaf.smallestIndexForCheckpoint(checkpointNumber) + BigInt(i % NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+        InboxLeaf.smallestIndexForCheckpoint(checkpointNumber) + BigInt(i % MAX_L1_TO_L2_MSGS_PER_CHECKPOINT);
       return { ...msg, checkpointNumber, index };
     },
   });

yarn-project/ethereum/src/contracts/rollup.ts

@@ -79,7 +79,6 @@ export type ViemHeader = {
   lastArchiveRoot: `0x${string}`;
   blockHeadersHash: `0x${string}`;
   blobsHash: `0x${string}`;
-  inHash: `0x${string}`;
   inboxRollingHash: `0x${string}`;
   outHash: `0x${string}`;
   slotNumber: bigint;

yarn-project/ivc-integration/src/base_parity_inputs.test.ts

@@ -15,7 +15,7 @@ import { createLogger } from '@aztec/foundation/log';
 import { Noir } from '@aztec/noir-noir_js';
 import { ServerCircuitArtifacts } from '@aztec/noir-protocol-circuits-types/server';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { L1ToL2MessageSponge, computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
+import { L1ToL2MessageSponge } from '@aztec/stdlib/messaging';
 import { InboxParityPrivateInputs } from '@aztec/stdlib/parity';
 
 import { jest } from '@jest/globals';
@@ -47,7 +47,6 @@ describe('Inbox Parity Benchmark Inputs', () => {
       l1ToL2Messages,
       Fr.ZERO,
       L1ToL2MessageSponge.empty(),
-      computeInHashFromL1ToL2Messages(l1ToL2Messages),
       vkTreeRoot,
       Fr.random(),
     );
@@ -75,8 +74,6 @@ describe('Inbox Parity Benchmark Inputs', () => {
         num_absorbed: startSponge.numAbsorbed,
       },
       // eslint-disable-next-line camelcase
-      in_hash: inputs.inHash.toString(),
-      // eslint-disable-next-line camelcase
       vk_tree_root: inputs.vkTreeRoot.toString(),
       // eslint-disable-next-line camelcase
       prover_id: inputs.proverId.toString(),

yarn-project/ivc-integration/src/bb_js_debug.test.ts

@@ -12,7 +12,7 @@ import { createLogger } from '@aztec/foundation/log';
 import { Noir } from '@aztec/noir-noir_js';
 import { ServerCircuitArtifacts } from '@aztec/noir-protocol-circuits-types/server';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { L1ToL2MessageSponge, computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
+import { L1ToL2MessageSponge } from '@aztec/stdlib/messaging';
 import { InboxParityPrivateInputs } from '@aztec/stdlib/parity';
 
 import { jest } from '@jest/globals';
@@ -62,7 +62,6 @@ describe('BB.js Debug Wrapper', () => {
       l1ToL2Messages,
       Fr.ZERO,
       L1ToL2MessageSponge.empty(),
-      computeInHashFromL1ToL2Messages(l1ToL2Messages),
       vkTreeRoot,
       Fr.random(),
     );
@@ -88,8 +87,6 @@ describe('BB.js Debug Wrapper', () => {
         num_absorbed: startSponge.numAbsorbed,
       },
       // eslint-disable-next-line camelcase
-      in_hash: inboxParityInputs.inHash.toString(),
-      // eslint-disable-next-line camelcase
       vk_tree_root: inboxParityInputs.vkTreeRoot.toString(),
       // eslint-disable-next-line camelcase
       prover_id: inboxParityInputs.proverId.toString(),

yarn-project/noir-protocol-circuits-types/src/conversion/server.ts

@@ -481,7 +481,6 @@ export function mapAvmProofDataToNoir(
 
 function mapParityPublicInputsToNoir(parityPublicInputs: ParityPublicInputs): ParityPublicInputsNoir {
   return {
-    in_hash: mapFieldToNoir(parityPublicInputs.inHash),
     start_rolling_hash: mapFieldToNoir(parityPublicInputs.startRollingHash),
     end_rolling_hash: mapFieldToNoir(parityPublicInputs.endRollingHash),
     start_sponge: mapL1ToL2MessageSpongeToNoir(parityPublicInputs.startSponge),
@@ -520,7 +519,6 @@ export function mapRootRollupPublicInputsFromNoir(
  */
 export function mapParityPublicInputsFromNoir(parityPublicInputs: ParityPublicInputsNoir): ParityPublicInputs {
   return new ParityPublicInputs(
-    mapFieldFromNoir(parityPublicInputs.in_hash),
     mapFieldFromNoir(parityPublicInputs.start_rolling_hash),
     mapFieldFromNoir(parityPublicInputs.end_rolling_hash),
     mapL1ToL2MessageSpongeFromNoir(parityPublicInputs.start_sponge),
@@ -739,7 +737,6 @@ export function mapInboxParityPrivateInputsToNoir(inputs: InboxParityPrivateInpu
     num_msgs: mapNumberToNoir(inputs.numMessages),
     start_rolling_hash: mapFieldToNoir(inputs.startRollingHash),
     start_sponge: mapL1ToL2MessageSpongeToNoir(inputs.startSponge),
-    in_hash: mapFieldToNoir(inputs.inHash),
     vk_tree_root: mapFieldToNoir(inputs.vkTreeRoot),
     prover_id: mapFieldToNoir(inputs.proverId),
   };

yarn-project/prover-client/src/light/lightweight_checkpoint_builder.ts

@@ -209,10 +209,10 @@ export class LightweightCheckpointBuilder {
 
     // Streaming Inbox (AZIP-22 Fast Inbox): insert this block's L1-to-L2 message bundle before reading the end state,
     // so the block header's L1-to-L2 tree snapshot reflects it. First-in-checkpoint bundles are padded to
-    // NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP (matching the legacy per-checkpoint insertion and the world-state
+    // MAX_L1_TO_L2_MSGS_PER_CHECKPOINT (matching the legacy per-checkpoint insertion and the world-state
     // synchronizer); non-first bundles are appended compactly. The logical (unpadded) messages are accumulated only
-    // once the block is fully built (below), so a mid-build failure does not pollute the checkpoint's inHash/rolling
-    // hash; the rolling hash and inHash are recomputed over them at checkpoint completion.
+    // once the block is fully built (below), so a mid-build failure does not pollute the checkpoint's rolling hash;
+    // the rolling hash is recomputed over them at checkpoint completion.
     if (opts.l1ToL2Messages !== undefined) {
       if (isFirstBlock) {
         await appendL1ToL2MessagesToTree(this.db, opts.l1ToL2Messages);
@@ -257,7 +257,7 @@ export class LightweightCheckpointBuilder {
     this.blocks.push(block);
 
     // Accumulate the streaming bundle now that the block is fully built, so a mid-build throw above leaves the
-    // checkpoint's message list (and thus its inHash/rolling hash) consistent with the blocks actually built.
+    // checkpoint's message list (and thus its rolling hash) consistent with the blocks actually built.
     if (opts.l1ToL2Messages !== undefined) {
       this.l1ToL2Messages.push(...opts.l1ToL2Messages);
     }
@@ -294,9 +294,6 @@ export class LightweightCheckpointBuilder {
     const blobs = await getBlobsPerL1Block(this.blobFields);
     const blobsHash = computeBlobsHashFromBlobs(blobs);
 
-    // Legacy inHash is dead post-flip; the checkpoint header carries zero (AZIP-22 Fast Inbox). The consensus
-    // rolling hash over the consumed messages is the authoritative Inbox commitment.
-    const inHash = Fr.ZERO;
     const inboxRollingHash = accumulateInboxRollingHash(this.previousInboxRollingHash, this.l1ToL2Messages);
 
     const { slotNumber, coinbase, feeRecipient, gasFees } = this.constants;
@@ -314,7 +311,6 @@ export class LightweightCheckpointBuilder {
     const header = CheckpointHeader.from({
       lastArchiveRoot: this.lastArchives[0].root,
       blobsHash,
-      inHash,
       inboxRollingHash,
       epochOutHash,
       blockHeadersHash,

yarn-project/prover-client/src/orchestrator/checkpoint-proving-state.ts

@@ -151,15 +151,13 @@ export class CheckpointProvingState {
   /**
    * Builds the checkpoint's single InboxParity input. The circuit is sized to the smallest ladder rung that fits the
    * message count; the rolling hash starts from the previous checkpoint's end and the message sponge starts empty (it
-   * resets per checkpoint). `in_hash` (the L1 frontier root) is supplied as an unconstrained pass-through hint.
+   * resets per checkpoint).
    */
   public getInboxParityInputs(): InboxParityPrivateInputs {
     return InboxParityPrivateInputs.fromMessages(
       this.l1ToL2Messages,
       this.startInboxRollingHash,
       L1ToL2MessageSponge.empty(),
-      // Legacy in_hash is dead post-flip; the InboxParity pass-through hint carries zero (AZIP-22 Fast Inbox).
-      Fr.ZERO,
       this.constants.vkTreeRoot,
       this.constants.proverId,
     );

yarn-project/prover-client/src/test/bb_prover_full_rollup.test.ts

@@ -1,5 +1,5 @@
 import { BBNativeRollupProver, type BBProverConfig } from '@aztec/bb-prover';
-import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, PAIRING_POINTS_SIZE } from '@aztec/constants';
+import { MAX_L1_TO_L2_MSGS_PER_CHECKPOINT, PAIRING_POINTS_SIZE } from '@aztec/constants';
 import { EpochNumber } from '@aztec/foundation/branded-types';
 import { timesAsync } from '@aztec/foundation/collection';
 import { parseBooleanEnv } from '@aztec/foundation/config';
@@ -52,7 +52,7 @@ describe('prover/bb_prover/full-rollup', () => {
       const checkpoints = await timesAsync(numCheckpoints, () =>
         context.makeCheckpoint(numBlockPerCheckpoint, {
           numTxsPerBlock,
-          numL1ToL2Messages: NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
+          numL1ToL2Messages: MAX_L1_TO_L2_MSGS_PER_CHECKPOINT,
           makeProcessedTxOpts: (_, txIndex) => ({ privateOnly: txIndex % 2 === 0 }),
         }),
       );