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

spalladino · spalladino · commit f1fc731f0254 · 2026-07-28T09:24:58.000-03:00
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.
diff --git a/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.test.ts b/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.test.ts
@@ -249,7 +249,6 @@ describe('CheckpointProposalJob', () => {
     checkpointBuilder = checkpointsBuilder.createCheckpointBuilder(checkpointConstants, checkpointNumber);
 
     l1ToL2MessageSource = mock<L1ToL2MessageSource>();
-    l1ToL2MessageSource.getL1ToL2Messages.mockResolvedValue(Array(4).fill(Fr.ZERO));
     // Genesis bucket for the empty-tree cursor above; with no newer synced buckets mocked, block bundle
     // selection consumes nothing by default.
     l1ToL2MessageSource.getInboxBucketByTotalMsgCount.mockResolvedValue({
@@ -297,12 +296,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,
@@ -1445,8 +1443,7 @@ describe('CheckpointProposalJob', () => {
 
       expect(checkpoint).toBeDefined();
 
-      // Streaming skips the bulk per-checkpoint fetch; every message reaches the builder through a block.
-      expect(l1ToL2MessageSource.getL1ToL2Messages).not.toHaveBeenCalled();
+      // Streaming has no bulk per-checkpoint list; every message reaches the builder through a block.
       expect(checkpointsBuilder.startCheckpointCalls).toHaveLength(1);
 
       // The first block consumes the selected bundle; the second consumes nothing.
@@ -1455,7 +1452,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);
diff --git a/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.timing.test.ts b/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.timing.test.ts
@@ -455,7 +455,6 @@ describe('CheckpointProposalJob Timing Tests', () => {
     worldState.fork.mockResolvedValue(mockFork);
 
     l1ToL2MessageSource = mock<L1ToL2MessageSource>();
-    l1ToL2MessageSource.getL1ToL2Messages.mockResolvedValue(Array(4).fill(Fr.ZERO));
     l1ToL2MessageSource.getInboxBucketByTotalMsgCount.mockResolvedValue({
       seq: 0n,
       inboxRollingHash: Fr.ZERO,
diff --git a/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.ts b/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.ts
@@ -648,10 +648,6 @@ export class CheckpointProposalJob implements Traceable {
         this.checkpointSimulationOverridesPlan,
       );
 
-      // Under the streaming Inbox (AZIP-22 Fast Inbox) messages are selected per block, so the legacy inHash is fed
-      // zero; the running values are computed block by block.
-      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
       // splices in the parent's checkpointOutHash from the locally-known proposed checkpoint so
@@ -723,7 +719,6 @@ export class CheckpointProposalJob implements Traceable {
         const result = await this.buildBlocksForCheckpoint(
           checkpointBuilder,
           checkpointGlobalVariables.timestamp,
-          inHash,
           blockProposalOptions,
           streamingState,
         );
@@ -922,7 +917,6 @@ export class CheckpointProposalJob implements Traceable {
   private async buildBlocksForCheckpoint(
     checkpointBuilder: CheckpointBuilder,
     timestamp: bigint,
-    inHash: Fr,
     blockProposalOptions: BlockProposalOptions,
     streamingState?: StreamingCheckpointState,
   ): Promise<{
@@ -1020,9 +1014,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) {
@@ -1035,7 +1028,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,
@@ -1084,7 +1076,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,
@@ -1097,7 +1088,6 @@ export class CheckpointProposalJob implements Traceable {
       block.header,
       this.checkpointNumber,
       block.indexWithinCheckpoint,
-      inHash,
       block.archive.root,
       usedTxs,
       this.proposer,
diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts b/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 { NoCommitteeError, type RollupContract } from '@aztec/ethereum/contracts';
 import {
@@ -349,7 +348,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: {
diff --git a/yarn-project/sequencer-client/src/test/utils.ts b/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,
diff --git a/yarn-project/validator-client/src/duties/validation_service.test.ts b/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],
diff --git a/yarn-project/validator-client/src/duties/validation_service.ts b/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,
diff --git a/yarn-project/validator-client/src/metrics.ts b/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],
       },
     );
diff --git a/yarn-project/validator-client/src/proposal_handler.test.ts b/yarn-project/validator-client/src/proposal_handler.test.ts
@@ -66,7 +66,6 @@ describe('ProposalHandler checkpoint validation', () => {
     blockSource.syncImmediate.mockResolvedValue(undefined);
 
     l1ToL2MessageSource = mock<L1ToL2MessageSource>();
-    l1ToL2MessageSource.getL1ToL2Messages.mockResolvedValue([]);
 
     checkpointsBuilder = mock<FullNodeCheckpointsBuilder>();
     checkpointsBuilder.getConfig.mockReturnValue({
diff --git a/yarn-project/validator-client/src/proposal_handler.ts b/yarn-project/validator-client/src/proposal_handler.ts
@@ -72,7 +72,6 @@ export type BlockProposalValidationFailureReason =
   | 'invalid_proposal'
   | 'parent_block_not_found'
   | 'parent_block_wrong_slot'
-  | 'in_hash_mismatch'
   // Streaming Inbox per-block acceptance failures.
   | StreamingBlockCheckReason
   | 'global_variables_mismatch'
@@ -191,7 +190,6 @@ export const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT: BlockProposalValidation
   'global_variables_mismatch',
   'invalid_proposal',
   'parent_block_wrong_slot',
-  'in_hash_mismatch',
 ];
 
 /** Checkpoint-proposal validation failures that constitute a slashable invalid-checkpoint offense. */
diff --git a/yarn-project/validator-client/src/validator.ha.integration.test.ts b/yarn-project/validator-client/src/validator.ha.integration.test.ts
@@ -19,7 +19,6 @@ import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
 import { CheckpointReexecutionTracker } from '@aztec/stdlib/checkpoint';
 import type { SlasherConfig, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
-import { computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
 import {
   TEST_COORDINATION_SIGNATURE_CONTEXT,
@@ -115,7 +114,6 @@ describe('ValidatorClient HA Integration', () => {
     blockSource = mock<L2BlockSource & L2BlockSink>();
     l1ToL2MessageSource = mock<L1ToL2MessageSource>();
     txProvider = mock<TxProvider>();
-    l1ToL2MessageSource.getL1ToL2Messages.mockResolvedValue([]);
     dateProvider = new TestDateProvider();
     blobClient = mock<BlobClientInterface>();
     blobClient.canUpload.mockReturnValue(false);
@@ -306,7 +304,6 @@ describe('ValidatorClient HA Integration', () => {
       // Use all 5 validators - all try to create the same block proposal
       const blockHeader = makeBlockHeader(1);
       const indexWithinCheckpoint = IndexWithinCheckpoint(0);
-      const inHash = computeInHashFromL1ToL2Messages([]);
       const archive = Fr.random();
       const txs = await Promise.all([1, 2, 3].map(() => mockTx()));
       const proposerAddress = EthAddress.fromString(validatorAccounts[0].address);
@@ -318,7 +315,6 @@ describe('ValidatorClient HA Integration', () => {
             blockHeader,
             CheckpointNumber(1),
             indexWithinCheckpoint,
-            inHash,
             archive,
             txs,
             proposerAddress,
@@ -348,7 +344,6 @@ describe('ValidatorClient HA Integration', () => {
     it('should allow different validators to create proposals for different slots', async () => {
       const proposerAddress = EthAddress.fromString(validatorAccounts[0].address);
       const txs = await Promise.all([1, 2, 3].map(() => mockTx()));
-      const inHash = computeInHashFromL1ToL2Messages([]);
 
       // Each of the 5 validators creates a proposal for a different slot
       const proposals = await Promise.all(
@@ -359,7 +354,6 @@ describe('ValidatorClient HA Integration', () => {
             blockHeader,
             CheckpointNumber(1),
             IndexWithinCheckpoint(0),
-            inHash,
             archive,
             txs,
             proposerAddress,
diff --git a/yarn-project/validator-client/src/validator.integration.test.ts b/yarn-project/validator-client/src/validator.integration.test.ts
@@ -26,7 +26,7 @@ import { CheckpointReexecutionTracker, L1PublishedData, PublishedCheckpoint } fr
 import { type L1RollupConstants, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import { Gas, GasFees } from '@aztec/stdlib/gas';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
-import { InboxBucketRef, computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
+import { InboxBucketRef } from '@aztec/stdlib/messaging';
 import { type BlockProposal, CheckpointProposal } from '@aztec/stdlib/p2p';
 import { mockTx } from '@aztec/stdlib/testing';
 import { BlockHeader, type CheckpointGlobalVariables, Tx } from '@aztec/stdlib/tx';
@@ -240,15 +240,14 @@ describe('ValidatorClient Integration', () => {
 
   type BlockProposalResult = { block: L2Block; proposal: BlockProposal };
 
-  /** Builds a new block proposal with the given txs and l1-to-l2 messages */
+  /** Builds a new block proposal with the given txs and L1-to-L2 message bundle */
   const buildBlockProposal = async (
     checkpointBuilder: CheckpointBuilder,
     blockNumber: BlockNumber,
     cpNumber: CheckpointNumber,
     txs: Tx[] = [],
     l1ToL2Messages: Fr[] = [],
   ): Promise<{ block: L2Block; proposal: BlockProposal }> => {
-    const inHash = computeInHashFromL1ToL2Messages(l1ToL2Messages);
     const blockTimestamp = getTimestampForSlot(checkpointBuilder.getConstantData().slotNumber, l1Constants);
     const { block, usedTxs } = await checkpointBuilder.buildBlock(txs, blockNumber, blockTimestamp, {
       isBuildingProposal: true,
@@ -270,7 +269,6 @@ describe('ValidatorClient Integration', () => {
       block.header,
       cpNumber,
       block.indexWithinCheckpoint,
-      inHash,
       block.archive.root,
       usedTxs,
       proposerSigner.address,
@@ -478,7 +476,7 @@ describe('ValidatorClient Integration', () => {
 
     it('validates and attests with txs anchored to proposed blocks and non-empty l1-to-l2 messages', async () => {
       // Create l1 to l2 messages and seed them into the archivers
-      const l1ToL2Messages = makeInboxMessages(4, { messagesPerCheckpoint: 4 });
+      const l1ToL2Messages = makeInboxMessages(4);
       await proposer.archiver.dataStores.messages.addL1ToL2MessageBuckets(l1ToL2Messages);
       await attestor.archiver.dataStores.messages.addL1ToL2MessageBuckets(l1ToL2Messages);
 
@@ -678,10 +676,10 @@ describe('ValidatorClient Integration', () => {
     });
 
     it('refuses block proposal with mismatching l1 to l2 messages', async () => {
-      const l1ToL2Messages = makeInboxMessages(4, { messagesPerCheckpoint: 4 });
+      const l1ToL2Messages = makeInboxMessages(4);
       await proposer.archiver.dataStores.messages.addL1ToL2MessageBuckets(l1ToL2Messages);
 
-      const otherL1ToL2Messages = makeInboxMessages(4, { messagesPerCheckpoint: 4 });
+      const otherL1ToL2Messages = makeInboxMessages(4);
       await attestor.archiver.dataStores.messages.addL1ToL2MessageBuckets(otherL1ToL2Messages);
 
       const { blocks } = await buildCheckpoint(
diff --git a/yarn-project/validator-client/src/validator.test.ts b/yarn-project/validator-client/src/validator.test.ts
diff --git a/yarn-project/validator-client/src/validator.ts b/yarn-project/validator-client/src/validator.ts
