chore(fast-inbox): drop legacy inHash threading from sequencer and validator (A-1388)

Removes the dead inHash=Fr.ZERO plumbing through the checkpoint proposal job and
the validator/validation-service createBlockProposal path, and deletes the dead
in_hash_mismatch validation-failure reason from proposal_handler, validator, and
metrics. Updates the sequencer/validator test mocks and callers for the dropped
inHash argument and the removed getL1ToL2Messages message source member.

Author: spalladino

yarn-project/sequencer-client/src/publisher/l1_publisher.integration.test.ts

@@ -503,7 +503,6 @@ describe('L1Publisher integration', () => {
       new GasFees(0, await rollup.getManaMinFeeAt(timestamp, true)),
     );
     const checkpoint = await buildCheckpoint(globalVariables, txs, l1ToL2Messages);
-    blockSource.getL1ToL2Messages.mockResolvedValueOnce(l1ToL2Messages);
     return { checkpoint, l1ToL2Messages };
   };
 
@@ -535,10 +534,10 @@ describe('L1Publisher integration', () => {
         '0x1647b194c649f5dd01d7c832f89b0f496043c9150797923ea89e93d5ac619a93',
       );
 
-      // The deployed rollup consumes L1->L2 messages with a lag of `inboxLag` checkpoints: a message
-      // inserted while building checkpoint N is only consumable at checkpoint N + inboxLag. Model that
-      // with a shift register so a real message is genuinely consumed and validated on L1.
-      const inboxLag = getL1ContractsConfigEnvVars().inboxLag;
+      // Legacy per-checkpoint lag model: a message inserted while building checkpoint N was only consumable at
+      // checkpoint N + inboxLag. Modeled with a shift register so a real message is genuinely consumed and validated
+      // on L1. Retained here for the integration flow; the streaming Inbox (AZIP-22) consumes per block instead.
+      const inboxLag = 2;
       const messagesInFlight: Fr[][] = Array.from({ length: inboxLag }, () => []);
       const blobFieldsPerCheckpoint: Fr[][] = [];
       // The below batched blob is used for testing different epochs with 1..numberOfConsecutiveBlocks blocks on L1.
@@ -587,7 +586,6 @@ describe('L1Publisher integration', () => {
         expect(totalManaUsed.toBigInt()).toEqual(block.header.totalManaUsed.toBigInt());
 
         prevHeader = block.header;
-        blockSource.getL1ToL2Messages.mockResolvedValueOnce(currentL1ToL2Messages);
 
         const checkpointBlobFields = checkpoint.toBlobFields();
         const blockBlobs = await getBlobsPerL1Block(checkpointBlobFields);

yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.test.ts

@@ -245,7 +245,6 @@ describe('CheckpointProposalJob', () => {
     checkpointBuilder = checkpointsBuilder.createCheckpointBuilder(checkpointConstants, checkpointNumber);
 
     l1ToL2MessageSource = mock<L1ToL2MessageSource>();
-    l1ToL2MessageSource.getL1ToL2Messages.mockResolvedValue(Array(4).fill(Fr.ZERO));
 
     l2BlockSource = mock<L2BlockSource>();
     l2BlockSource.getCheckpointsData.mockResolvedValue([]);
@@ -278,12 +277,11 @@ describe('CheckpointProposalJob', () => {
     validatorClient = mock<ValidatorClient>();
     validatorClient.collectAttestations.mockImplementation(() => Promise.resolve([]));
     validatorClient.createBlockProposal.mockImplementation(
-      async (blockHeader, _checkpointNumber, indexWithinCheckpoint, inHash, archiveRoot, txs) => {
+      async (blockHeader, _checkpointNumber, indexWithinCheckpoint, archiveRoot, txs) => {
         const txHashes = await Promise.all((txs ?? []).map((tx: Tx) => tx.getTxHash()));
         return new BlockProposal(
           blockHeader,
           IndexWithinCheckpoint(indexWithinCheckpoint),
-          inHash,
           archiveRoot,
           txHashes,
           mockedSig,
@@ -1423,8 +1421,7 @@ describe('CheckpointProposalJob', () => {
 
       expect(checkpoint).toBeDefined();
 
-      // Streaming skips the bulk per-checkpoint fetch and tells the builder to insert messages per block.
-      expect(l1ToL2MessageSource.getL1ToL2Messages).not.toHaveBeenCalled();
+      // Streaming tells the builder to insert messages per block instead of a bulk per-checkpoint list.
       expect(checkpointsBuilder.startCheckpointCalls).toHaveLength(1);
       expect(checkpointsBuilder.startCheckpointCalls[0].l1ToL2Messages).toEqual([]);
       expect(checkpointsBuilder.startCheckpointCalls[0].insertMessagesPerBlock).toBe(true);
@@ -1435,7 +1432,7 @@ describe('CheckpointProposalJob', () => {
       expect(checkpointBuilder.buildBlockCalls[1].opts.l1ToL2Messages).toEqual([]);
 
       // Both block proposals carry the selected bucket reference (the second reuses the first's).
-      const bucketRefArgs = validatorClient.createBlockProposal.mock.calls.map(call => call[8]);
+      const bucketRefArgs = validatorClient.createBlockProposal.mock.calls.map(call => call[7]);
       expect(bucketRefArgs).toHaveLength(2);
       expect(bucketRefArgs[0]?.bucketSeq).toBe(2n);
       expect(bucketRefArgs[1]?.bucketSeq).toBe(2n);

yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.timing.test.ts

@@ -451,7 +451,6 @@ describe('CheckpointProposalJob Timing Tests', () => {
     worldState.fork.mockResolvedValue(mockFork);
 
     l1ToL2MessageSource = mock<L1ToL2MessageSource>();
-    l1ToL2MessageSource.getL1ToL2Messages.mockResolvedValue(Array(4).fill(Fr.ZERO));
 
     l2BlockSource = mock<L2BlockSource>();
     l2BlockSource.getCheckpointsData.mockResolvedValue([]);

yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.ts

@@ -639,9 +639,8 @@ export class CheckpointProposalJob implements Traceable {
       );
 
       // Under the streaming Inbox (AZIP-22 Fast Inbox) messages are selected per block, so the checkpoint-level bulk
-      // list stays empty and the legacy inHash is fed zero; the running values are computed block by block.
+      // list stays empty; the running values are computed block by block.
       const l1ToL2Messages: Fr[] = [];
-      const inHash = Fr.ZERO;
 
       // Collect the out hashes of all the checkpoints before this one in the same epoch.
       // Under pipelining the parent checkpoint may not be on L1 yet at build time, so the helper
@@ -716,7 +715,6 @@ export class CheckpointProposalJob implements Traceable {
         const result = await this.buildBlocksForCheckpoint(
           checkpointBuilder,
           checkpointGlobalVariables.timestamp,
-          inHash,
           blockProposalOptions,
           streamingState,
         );
@@ -908,7 +906,6 @@ export class CheckpointProposalJob implements Traceable {
   private async buildBlocksForCheckpoint(
     checkpointBuilder: CheckpointBuilder,
     timestamp: bigint,
-    inHash: Fr,
     blockProposalOptions: BlockProposalOptions,
     streamingState?: StreamingCheckpointState,
   ): Promise<{
@@ -1006,9 +1003,8 @@ export class CheckpointProposalJob implements Traceable {
       usedTxs.forEach(tx => txHashesAlreadyIncluded.add(tx.txHash.toString()));
 
       // Streaming Inbox: the block built successfully, so advance the consumption cursor and carry this block's
-      // rolling-hash bucket reference. A block that consumed nothing reuses the parent bucket reference. The legacy
-      // inHash is dead post-flip; block proposals carry zero (AZIP-22 Fast Inbox).
-      const blockInHash = inHash;
+      // rolling-hash bucket reference. A block that consumed nothing reuses the parent bucket reference (AZIP-22
+      // Fast Inbox).
       let blockBucketRef: InboxBucketRef | undefined = undefined;
       if (streamingState && selection) {
         if (selection.consume) {
@@ -1021,7 +1017,6 @@ export class CheckpointProposalJob implements Traceable {
       // Sign the block proposal. This will throw if HA signing fails.
       const proposal = await this.createBlockProposal(
         block,
-        blockInHash,
         usedTxs,
         {
           ...blockProposalOptions,
@@ -1070,7 +1065,6 @@ export class CheckpointProposalJob implements Traceable {
   /** Creates a block proposal for a given block via the validator client (unless in fisherman mode) */
   private createBlockProposal(
     block: L2Block,
-    inHash: Fr,
     usedTxs: Tx[],
     blockProposalOptions: BlockProposalOptions,
     bucketRef?: InboxBucketRef,
@@ -1083,7 +1077,6 @@ export class CheckpointProposalJob implements Traceable {
       block.header,
       this.checkpointNumber,
       block.indexWithinCheckpoint,
-      inHash,
       block.archive.root,
       usedTxs,
       this.proposer,

yarn-project/sequencer-client/src/sequencer/sequencer.test.ts

@@ -1,4 +1,3 @@
-import { MAX_L1_TO_L2_MSGS_PER_CHECKPOINT } from '@aztec/constants';
 import { type EpochCache, type EpochCommitteeInfo, PROPOSER_PIPELINING_SLOT_OFFSET } from '@aztec/epoch-cache';
 import type { RollupContract } from '@aztec/ethereum/contracts';
 import {
@@ -338,7 +337,6 @@ describe('sequencer', () => {
     });
 
     l1ToL2MessageSource = mock<L1ToL2MessageSource>({
-      getL1ToL2Messages: () => Promise.resolve(Array(MAX_L1_TO_L2_MSGS_PER_CHECKPOINT).fill(Fr.ZERO)),
       getL2Tips: mockFn().mockResolvedValue({
         proposed: { number: lastBlockNumber, hash },
         checkpointed: {

yarn-project/sequencer-client/src/test/utils.ts

@@ -142,7 +142,6 @@ export function createBlockProposal(block: L2Block, signature: Signature): Block
   return new BlockProposal(
     block.header,
     block.indexWithinCheckpoint,
-    Fr.ZERO, // inHash - using zero for testing
     block.archive.root,
     txHashes,
     signature,

yarn-project/validator-client/src/duties/validation_service.test.ts

@@ -34,14 +34,12 @@ describe('ValidationService', () => {
     const txs = await Promise.all([Tx.random(), Tx.random()]);
     const blockHeader = makeBlockHeader(1);
     const indexWithinCheckpoint = IndexWithinCheckpoint(0);
-    const inHash = Fr.random();
     const archive = Fr.random();
 
     const proposal = await service.createBlockProposal(
       blockHeader,
       CheckpointNumber(1),
       indexWithinCheckpoint,
-      inHash,
       archive,
       txs,
       addresses[0],
@@ -56,14 +54,12 @@ describe('ValidationService', () => {
     const txs = await Promise.all([Tx.random(), Tx.random()]);
     const blockHeader = makeBlockHeader(1);
     const indexWithinCheckpoint = IndexWithinCheckpoint(0);
-    const inHash = Fr.random();
     const archive = Fr.random();
 
     const proposal = await service.createBlockProposal(
       blockHeader,
       CheckpointNumber(1),
       indexWithinCheckpoint,
-      inHash,
       archive,
       txs,
       addresses[0],
@@ -90,12 +86,11 @@ describe('ValidationService', () => {
     const checkpointHeader = makeCheckpointHeader(1);
 
     // Create the block proposal first (as the sequencer would) so that getSender() can verify the block proposal
-    // sender matches. The block-level inHash is dead post-flip (AZIP-22 Fast Inbox), so it carries zero.
+    // sender matches.
     const blockProposal = await service.createBlockProposal(
       blockHeader,
       CheckpointNumber(1),
       indexWithinCheckpoint,
-      Fr.ZERO,
       archive,
       txs,
       addresses[0],

yarn-project/validator-client/src/duties/validation_service.ts

@@ -35,7 +35,6 @@ export class ValidationService {
    *
    * @param blockHeader - The block header
    * @param blockIndexWithinCheckpoint - The block index within checkpoint for HA signing context
-   * @param inHash - Hash of L1 to L2 messages for this checkpoint
    * @param archive - The archive of the current block
    * @param txs - Ordered list of transactions (Tx[])
    * @param proposerAttesterAddress - The address of the proposer/attester, or undefined
@@ -49,7 +48,6 @@ export class ValidationService {
     blockHeader: BlockHeader,
     checkpointNumber: CheckpointNumber,
     blockIndexWithinCheckpoint: IndexWithinCheckpoint,
-    inHash: Fr,
     archive: Fr,
     txs: Tx[],
     proposerAttesterAddress: EthAddress | undefined,
@@ -77,7 +75,6 @@ export class ValidationService {
       blockHeader,
       checkpointNumber,
       blockIndexWithinCheckpoint,
-      inHash,
       archive,
       txs.map(tx => tx.getTxHash()),
       options.publishFullTxs ? txs : undefined,

yarn-project/validator-client/src/metrics.ts

@@ -43,13 +43,7 @@ export class ValidatorMetrics {
       meter,
       Metrics.VALIDATOR_ATTESTATION_FAILED_BAD_PROPOSAL_COUNT,
       {
-        [Attributes.ERROR_TYPE]: [
-          'invalid_proposal',
-          'state_mismatch',
-          'failed_txs',
-          'in_hash_mismatch',
-          'parent_block_wrong_slot',
-        ],
+        [Attributes.ERROR_TYPE]: ['invalid_proposal', 'state_mismatch', 'failed_txs', 'parent_block_wrong_slot'],
         [Attributes.IS_COMMITTEE_MEMBER]: [true, false],
       },
     );

yarn-project/validator-client/src/proposal_handler.test.ts

@@ -65,7 +65,6 @@ describe('ProposalHandler checkpoint validation', () => {
     blockSource.syncImmediate.mockResolvedValue(undefined);
 
     l1ToL2MessageSource = mock<L1ToL2MessageSource>();
-    l1ToL2MessageSource.getL1ToL2Messages.mockResolvedValue([]);
 
     checkpointsBuilder = mock<FullNodeCheckpointsBuilder>();
     checkpointsBuilder.getConfig.mockReturnValue({