docs(fast-inbox): drop spec references from cleanup-era inbox comments (A-1388)

spalladino · spalladino · commit 2d04b54c072e · 2026-07-28T09:24:59.000-03:00
diff --git a/l1-contracts/src/core/interfaces/IRollup.sol b/l1-contracts/src/core/interfaces/IRollup.sol
@@ -27,7 +27,7 @@ struct PublicInputArgs {
   bytes32 previousArchive;
   bytes32 endArchive;
   bytes32 outHash;
-  // Inbox rolling-hash chain segment consumed across the proven epoch (AZIP-22 Fast Inbox). Both boundaries are
+  // Inbox rolling-hash chain segment consumed across the proven epoch. Both boundaries are
   // anchored at proof submission against the rolling hashes recorded at propose for checkpoints start - 1 and end.
   bytes32 previousInboxRollingHash;
   bytes32 endInboxRollingHash;
diff --git a/l1-contracts/src/core/libraries/rollup/ProposeLib.sol b/l1-contracts/src/core/libraries/rollup/ProposeLib.sol
@@ -401,8 +401,7 @@ library ProposeLib {
 
   /**
    * @notice Validates a checkpoint's Inbox consumption against the streaming inbox buckets and returns how
-   *         far consumption has reached. Called from propose() as the enforced consumption path (AZIP-22 Fast
-   *         Inbox).
+   *         far consumption has reached. Called from propose() as the enforced consumption path.
    *
    * @dev Read-only; performs no Inbox write. Checks, in order:
    *      1. The checkpoint header's `inboxRollingHash` must equal the rolling hash snapshotted in the Inbox
diff --git a/l1-contracts/src/core/messagebridge/Inbox.sol b/l1-contracts/src/core/messagebridge/Inbox.sol
@@ -38,7 +38,7 @@ contract Inbox is IInbox {
   uint256 public immutable BUCKET_RING_SIZE;
 
   // Ring of rolling-hash buckets, keyed by `bucketSeq % BUCKET_RING_SIZE`. Consumed by the streaming inbox
-  // checks at `propose` (AZIP-22 Fast Inbox).
+  // checks at `propose`.
   mapping(uint256 ringIndex => InboxBucket bucket) internal buckets;
 
   uint64 internal currentBucketSeq;
diff --git a/l1-contracts/test/fee_portal/depositToAztecPublic.t.sol b/l1-contracts/test/fee_portal/depositToAztecPublic.t.sol
@@ -63,7 +63,7 @@ contract DepositToAztecPublic is Test {
     uint256 amount = 100 ether;
 
     Inbox inbox = Inbox(address(Rollup(address(registry.getCanonicalRollup())).getInbox()));
-    // Compact cumulative index (AZIP-22 Fast Inbox): the first message against a fresh Inbox has index 0.
+    // Compact cumulative index: the first message against a fresh Inbox has index 0.
     uint256 expectedIndex = 0;
 
     // The purpose of including the function selector is to make the message unique to that specific call. Note that
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/checkpoint_root/components/checkpoint_rollup_public_inputs_composer.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/checkpoint_root/components/checkpoint_rollup_public_inputs_composer.nr
@@ -145,7 +145,7 @@ impl<let NumBlobs: u32> CheckpointRollupPublicInputsComposer<NumBlobs> {
             last_archive_root: merged_rollup.previous_archive.root,
             block_headers_hash: merged_rollup.block_headers_hash,
             blobs_hash: self.blobs_hash,
-            // Sourced from the inbox parity proof: the checkpoint's only inbox commitment (AZIP-22 Fast Inbox).
+            // Sourced from the inbox parity proof: the checkpoint's only inbox commitment.
             inbox_rolling_hash: self.parity.end_rolling_hash,
             epoch_out_hash,
             slot_number: constants.slot_number,
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/checkpoint_header.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/checkpoint_header.nr
@@ -14,8 +14,8 @@ pub struct CheckpointHeader {
     pub last_archive_root: Field,
     pub block_headers_hash: Field,
     pub blobs_hash: Field,
-    // Inbox rolling-hash chain value after consuming all L1-to-L2 messages bundled into this checkpoint (AZIP-22 Fast
-    // Inbox): the truncated-to-field sha256 chain the L1 Inbox accumulates. This is the checkpoint's only inbox
+    // Inbox rolling-hash chain value after consuming all L1-to-L2 messages bundled into this checkpoint:
+    // the truncated-to-field sha256 chain the L1 Inbox accumulates. This is the checkpoint's only inbox
     // commitment.
     pub inbox_rolling_hash: Field,
     // The root of the epoch out hash balanced tree. The out hash of the first checkpoint in the epoch is inserted at
diff --git a/yarn-project/archiver/src/modules/l1_synchronizer.ts b/yarn-project/archiver/src/modules/l1_synchronizer.ts
@@ -431,7 +431,7 @@ export class ArchiverL1Synchronizer implements Traceable {
     }
 
     // Compare local message store state with the remote. If they match, we just advance the match pointer. The
-    // remote state is the Inbox's current bucket (AZIP-22 Fast Inbox): its cumulative total and consensus rolling
+    // remote state is the Inbox's current bucket: its cumulative total and consensus rolling
     // hash are the Inbox's live chain position.
     const remoteBucket = await this.inbox.getCurrentBucket({ blockNumber: currentL1BlockNumber });
     const localLastMessage = await this.stores.messages.getLastMessage();
diff --git a/yarn-project/archiver/src/store/message_store.ts b/yarn-project/archiver/src/store/message_store.ts
@@ -218,7 +218,7 @@ export class MessageStore {
           );
         }
 
-        // Check the compact-indexed messages arrive contiguously (AZIP-22 Fast Inbox): the global insertion index of
+        // Check the compact-indexed messages arrive contiguously: the global insertion index of
         // each message is exactly one past the previous one.
         const expectedIndex = lastMessage === undefined ? 0n : lastMessage.index + 1n;
         if (message.index !== expectedIndex) {
@@ -229,7 +229,7 @@ export class MessageStore {
           );
         }
 
-        // Check the consensus rolling-hash chain is valid (AZIP-22 Fast Inbox): each message's rolling hash must
+        // Check the consensus rolling-hash chain is valid: each message's rolling hash must
         // continue the chain from the previously inserted message.
         const previousInboxRollingHash = lastMessage?.inboxRollingHash ?? Fr.ZERO;
         const expectedInboxRollingHash = updateInboxRollingHash(previousInboxRollingHash, message.leaf);
diff --git a/yarn-project/archiver/src/test/fake_l1_state.ts b/yarn-project/archiver/src/test/fake_l1_state.ts
@@ -172,7 +172,7 @@ export class FakeL1State {
   addMessages(_checkpointNumber: CheckpointNumber, l1BlockNumber: bigint, messageLeaves: Fr[]): void {
     const timestamp = this.getTimestampAtL1Block(l1BlockNumber);
     messageLeaves.forEach(leaf => {
-      // Compact global insertion index (AZIP-22 Fast Inbox): the position in the Inbox's insertion order.
+      // Compact global insertion index: the position in the Inbox's insertion order.
       const index = BigInt(this.messages.length);
       const { bucketSeq, inboxRollingHash } = this.absorbIntoBucket(leaf, timestamp);
 
@@ -507,7 +507,7 @@ export class FakeL1State {
     });
 
     // Mirror the on-chain Inbox current bucket: its consensus rolling hash and cumulative total are the live chain
-    // position the archiver's message sync compares against (AZIP-22 Fast Inbox).
+    // position the archiver's message sync compares against.
     mockInbox.getCurrentBucket.mockImplementation((opts: { blockTag?: string; blockNumber?: bigint } = {}) => {
       const blockNumber = opts.blockNumber ?? this.l1BlockNumber;
       const visibleMessages = this.messages.filter(m => m.l1BlockNumber <= blockNumber);
diff --git a/yarn-project/archiver/src/test/mock_structs.ts b/yarn-project/archiver/src/test/mock_structs.ts
@@ -47,7 +47,7 @@ export function makeInboxMessage(
 
 /**
  * Builds a contiguous run of `totalCount` inbox messages with compact global indices starting at `initialIndex`
- * and a chained consensus rolling hash starting from `initialInboxHash` (AZIP-22 Fast Inbox).
+ * and a chained consensus rolling hash starting from `initialInboxHash`.
  */
 export function makeInboxMessages(
   totalCount: number,
@@ -79,7 +79,7 @@ export function makeInboxMessages(
 
 /**
  * Creates `blockCount` full buckets of `MAX_L1_TO_L2_MSGS_PER_BLOCK` inbox messages each, with compact indices and one
- * bucket sequence per block (AZIP-22 Fast Inbox).
+ * bucket sequence per block.
  */
 export function makeInboxMessagesWithFullBlocks(blockCount: number): InboxMessage[] {
   return makeInboxMessages(MAX_L1_TO_L2_MSGS_PER_BLOCK * blockCount, {
diff --git a/yarn-project/ethereum/src/contracts/inbox.ts b/yarn-project/ethereum/src/contracts/inbox.ts
@@ -18,9 +18,9 @@ import { checkBlockTag } from './utils.js';
 export type MessageSentArgs = {
   index: bigint;
   leaf: Fr;
-  /** Consensus rolling hash (truncated sha256 chain) after this message (AZIP-22 Fast Inbox). */
+  /** Consensus rolling hash (truncated sha256 chain) after this message. */
   inboxRollingHash: Fr;
-  /** Sequence number of the Inbox bucket this message was absorbed into (AZIP-22 Fast Inbox). */
+  /** Sequence number of the Inbox bucket this message was absorbed into. */
   bucketSeq: bigint;
 };
 
@@ -73,13 +73,13 @@ export class InboxContract {
     };
   }
 
-  /** Returns the sequence number of the Inbox bucket currently accumulating messages (AZIP-22 Fast Inbox). */
+  /** Returns the sequence number of the Inbox bucket currently accumulating messages. */
   public async getCurrentBucketSeq(opts: { blockTag?: BlockTag; blockNumber?: bigint } = {}): Promise<bigint> {
     await checkBlockTag(opts.blockNumber, this.client);
     return this.inbox.read.getCurrentBucketSeq(opts);
   }
 
-  /** Returns the Inbox bucket with the given sequence number (AZIP-22 Fast Inbox). */
+  /** Returns the Inbox bucket with the given sequence number. */
   public async getBucket(
     seq: bigint,
     opts: { blockTag?: BlockTag; blockNumber?: bigint } = {},
@@ -96,8 +96,7 @@ export class InboxContract {
 
   /**
    * Returns the Inbox bucket currently accumulating messages: its consensus rolling hash and cumulative message
-   * total are the Inbox's live chain position, used by the archiver's message sync and L1-reorg detection (AZIP-22
-   * Fast Inbox).
+   * total are the Inbox's live chain position, used by the archiver's message sync and L1-reorg detection.
    */
   public async getCurrentBucket(
     opts: { blockTag?: BlockTag; blockNumber?: bigint } = {},
@@ -183,7 +182,7 @@ export type InboxContractState = {
   totalMessagesInserted: bigint;
 };
 
-/** A snapshot of an on-chain Inbox rolling-hash bucket (AZIP-22 Fast Inbox). */
+/** A snapshot of an on-chain Inbox rolling-hash bucket. */
 export type InboxContractBucket = {
   /** Consensus rolling hash (truncated sha256 chain) after the last message absorbed into this bucket. */
   rollingHash: Fr;
diff --git a/yarn-project/sequencer-client/src/publisher/l1_publisher.integration.test.ts b/yarn-project/sequencer-client/src/publisher/l1_publisher.integration.test.ts
@@ -116,7 +116,7 @@ const logger = createLogger('integration_l1_publisher');
 const config: SequencerClientConfig & L1ContractsConfig = { ...getL1ContractsConfigEnvVars(), ...getConfigEnvVars() };
 
 // Several consecutive checkpoints, each consuming the L1->L2 messages sent while it was being built, so real
-// messages are genuinely consumed and validated on L1 (AZIP-22 Fast Inbox).
+// messages are genuinely consumed and validated on L1.
 const numberOfConsecutiveBlocks = 3;
 
 jest.setTimeout(1000000);
@@ -144,7 +144,7 @@ describe('L1Publisher integration', () => {
   let builderDb: NativeWorldStateService;
 
   // Backs the blockSource mock's streaming L1->L2 message queries. The world-state synchronizer reconstructs each
-  // block's consumed message bundle from Inbox buckets (AZIP-22 Fast Inbox) when it syncs a block back, so the test
+  // block's consumed message bundle from Inbox buckets when it syncs a block back, so the test
   // registers one bucket per published block here (see buildAndPublishBlock).
   let messageSource: MockL1ToL2MessageSource;
 
@@ -373,7 +373,7 @@ describe('L1Publisher integration', () => {
       getBlockNumber(): Promise<BlockNumber> {
         return Promise.resolve(BlockNumber(blocks.at(-1)?.number ?? BlockNumber.ZERO));
       },
-      // Streaming L1->L2 message reconstruction (AZIP-22 Fast Inbox): the world-state synchronizer resolves each
+      // Streaming L1->L2 message reconstruction: the world-state synchronizer resolves each
       // block's consumed message bundle from the Inbox buckets registered per published block in buildAndPublishBlock.
       getInboxBucketByTotalMsgCount(totalMsgCount: bigint) {
         return messageSource.getInboxBucketByTotalMsgCount(totalMsgCount);
@@ -552,7 +552,7 @@ describe('L1Publisher integration', () => {
   describe('block building', () => {
     beforeEach(async () => {
       // This suite proposes consecutive checkpoints, each consuming the streaming-Inbox messages sent while it was
-      // being built (AZIP-22 Fast Inbox), so real messages are genuinely consumed and validated on L1.
+      // being built, so real messages are genuinely consumed and validated on L1.
       await setup();
     });
 
@@ -567,7 +567,7 @@ describe('L1Publisher integration', () => {
         '0x1647b194c649f5dd01d7c832f89b0f496043c9150797923ea89e93d5ac619a93',
       );
 
-      // Streaming Inbox consumption (AZIP-22 Fast Inbox): the L1 Rollup only lets a checkpoint consume Inbox buckets
+      // Streaming Inbox consumption: the L1 Rollup only lets a checkpoint consume Inbox buckets
       // that have aged past the censorship cutoff (`toTimestamp(slot - 1) - INBOX_LAG_SECONDS`), measured in L1 time,
       // not whole checkpoints. Each checkpoint mirrors the real Inbox buckets into messageSource, then reuses the
       // production `selectInboxBucketForBlock` (which mirrors `ProposeLib.validateInboxConsumption`) to pick exactly
diff --git a/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.ts b/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.ts
@@ -1014,8 +1014,7 @@ 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 (AZIP-22
-      // Fast Inbox).
+      // rolling-hash bucket reference. A block that consumed nothing reuses the parent bucket reference.
       let blockBucketRef: InboxBucketRef | undefined = undefined;
       if (streamingState && selection) {
         if (selection.consume) {
diff --git a/yarn-project/stdlib/src/p2p/block_proposal.ts b/yarn-project/stdlib/src/p2p/block_proposal.ts
@@ -268,7 +268,7 @@ export class BlockProposal extends Gossipable implements Signable {
     } else {
       buffer.push(0); // hasSignedTxs = false
     }
-    // Optional bucket-reference tail (AZIP-22 Fast Inbox). Appended only when set, so a proposal without a reference
+    // Optional bucket-reference tail. Appended only when set, so a proposal without a reference
     // serializes without the tail and a decoder that reaches EOF reads it as unset.
     if (this.bucketRef) {
       buffer.push(1); // hasBucketRef = true
@@ -299,7 +299,7 @@ export class BlockProposal extends Gossipable implements Signable {
       }
     }
 
-    // Optional bucket-reference tail (AZIP-22 Fast Inbox). A buffer that ends after the signedTxs flag decodes as
+    // Optional bucket-reference tail. A buffer that ends after the signedTxs flag decodes as
     // "no reference", so proposals written without the tail round-trip cleanly.
     let bucketRef: InboxBucketRef | undefined;
     if (!reader.isEmpty()) {
diff --git a/yarn-project/stdlib/src/p2p/checkpoint_proposal.ts b/yarn-project/stdlib/src/p2p/checkpoint_proposal.ts
@@ -110,8 +110,8 @@ export class CheckpointProposal extends Gossipable implements Signable {
   ) {
     super();
 
-    // Check that last block properties match those of the checkpoint. The last block's bucket reference (AZIP-22 Fast
-    // Inbox) commits to the same rolling hash as the checkpoint header. Only enforced when the reference is set.
+    // Check that last block properties match those of the checkpoint. The last block's bucket reference
+    // commits to the same rolling hash as the checkpoint header. Only enforced when the reference is set.
     if (lastBlock?.bucketRef && !lastBlock.bucketRef.inboxRollingHash.equals(checkpointHeader.inboxRollingHash)) {
       throw new Error(
         `CheckpointProposal lastBlock bucketRef rolling hash ${lastBlock.bucketRef.inboxRollingHash} does not match checkpoint inboxRollingHash ${checkpointHeader.inboxRollingHash}`,
@@ -294,7 +294,7 @@ export class CheckpointProposal extends Gossipable implements Signable {
       } else {
         buffer.push(0); // hasSignedTxs = false
       }
-      // Optional bucket-reference tail (AZIP-22 Fast Inbox). Appended only when set, so a proposal without a reference
+      // Optional bucket-reference tail. Appended only when set, so a proposal without a reference
       // serializes without the tail and a decoder that reaches EOF reads it as unset.
       if (this.lastBlock.bucketRef) {
         buffer.push(1); // hasBucketRef = true
@@ -336,7 +336,7 @@ export class CheckpointProposal extends Gossipable implements Signable {
         }
       }
 
-      // Optional bucket-reference tail (AZIP-22 Fast Inbox). A buffer that ends after the signedTxs flag decodes as
+      // Optional bucket-reference tail. A buffer that ends after the signedTxs flag decodes as
       // "no reference", so proposals written without the tail round-trip cleanly.
       let bucketRef: InboxBucketRef | undefined;
       if (!reader.isEmpty()) {
diff --git a/yarn-project/stdlib/src/p2p/wire_compat_fixtures.ts b/yarn-project/stdlib/src/p2p/wire_compat_fixtures.ts
@@ -1,7 +1,7 @@
 // Golden wire fixtures that pin the exact bytes a peer produces and consumes, so the optional bucket-reference tail
 // added to proposals stays wire compatible: an unset proposal must serialize to these bytes, and decoding these bytes
 // must yield no bucket reference. The block-proposal fixtures were refreshed for the removal of the legacy `inHash`
-// field (AZIP-22 Fast Inbox); the checkpoint-proposal fixture was refreshed for the checkpoint-header format change.
+// field; the checkpoint-proposal fixture was refreshed for the checkpoint-header format change.
 //
 // Both fixtures come from a deterministic proposal built with:
 //   BlockHeader.empty(), IndexWithinCheckpoint(3), archiveRoot=Fr(99),
diff --git a/yarn-project/stdlib/src/rollup/checkpoint_header.ts b/yarn-project/stdlib/src/rollup/checkpoint_header.ts
@@ -31,8 +31,8 @@ export class CheckpointHeader {
     /** Hash of the blobs in the checkpoint. */
     public blobsHash: Fr,
     /**
-     * Inbox rolling-hash chain value after consuming all L1-to-L2 messages bundled into this checkpoint (AZIP-22 Fast
-     * Inbox): the truncated-to-field sha256 chain the L1 Inbox accumulates. This is the checkpoint's only inbox
+     * Inbox rolling-hash chain value after consuming all L1-to-L2 messages bundled into this checkpoint:
+     * the truncated-to-field sha256 chain the L1 Inbox accumulates. This is the checkpoint's only inbox
      * commitment.
      */
     public inboxRollingHash: Fr,
diff --git a/yarn-project/stdlib/src/rollup/checkpoint_root_rollup_private_inputs.ts b/yarn-project/stdlib/src/rollup/checkpoint_root_rollup_private_inputs.ts
@@ -119,7 +119,7 @@ export class CheckpointRootRollupPrivateInputs {
       RollupHonkProofData<BlockRollupPublicInputs>,
     ],
     /**
-     * Inbox parity proof over the checkpoint's L1-to-L2 messages (AZIP-22 Fast Inbox): it commits to the checkpoint's
+     * Inbox parity proof over the checkpoint's L1-to-L2 messages: it commits to the checkpoint's
      * message list, and its message sponge is checked against the blocks' accumulated one.
      */
     public inboxParity: UltraHonkProofData<ParityPublicInputs>,
@@ -168,7 +168,7 @@ export class CheckpointRootSingleBlockRollupPrivateInputs {
   constructor(
     public previousRollup: RollupHonkProofData<BlockRollupPublicInputs>,
     /**
-     * Inbox parity proof over the checkpoint's L1-to-L2 messages (AZIP-22 Fast Inbox): it commits to the checkpoint's
+     * Inbox parity proof over the checkpoint's L1-to-L2 messages: it commits to the checkpoint's
      * message list, and its message sponge is checked against the block's accumulated one.
      */
     public inboxParity: UltraHonkProofData<ParityPublicInputs>,
diff --git a/yarn-project/world-state/src/world-state-db/merkle_tree_db.ts b/yarn-project/world-state/src/world-state-db/merkle_tree_db.ts
@@ -34,7 +34,7 @@ export interface MerkleTreeAdminDatabase extends ForkMerkleTreeOperations, Reado
    * Handles a single L2 block: inserts its note hashes, nullifiers, public data writes, and the block's L1-to-L2
    * message bundle into the merkle trees. Any block may carry a message bundle and transition the L1-to-L2 message
    * tree, not just the first block of a checkpoint. The bundle's real (unpadded, compact) leaves are appended as
-   * given, matching how the circuits build the tree (AZIP-22 Fast Inbox).
+   * given, matching how the circuits build the tree.
    * @param block - The L2 block to handle.
    * @param l1ToL2Messages - The L1 to L2 messages for the block.
    */

Original file line number	Diff line number	Diff line change
`@@ -401,8 +401,7 @@ library ProposeLib {`
`401`	`401`
`402`	`402`	`/**`
`403`	`403`	`* @notice Validates a checkpoint's Inbox consumption against the streaming inbox buckets and returns how`
`404`		`- * far consumption has reached. Called from propose() as the enforced consumption path (AZIP-22 Fast`
`405`		`- * Inbox).`
	`404`	`+ * far consumption has reached. Called from propose() as the enforced consumption path.`
`406`	`405`	`*`
`407`	`406`	`* @dev Read-only; performs no Inbox write. Checks, in order:`
`408`	`407`	* 1. The checkpoint header's `inboxRollingHash` must equal the rolling hash snapshotted in the Inbox
Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,7 @@ export class ArchiverL1Synchronizer implements Traceable {`
`431`	`431`	`}`
`432`	`432`
`433`	`433`	`// Compare local message store state with the remote. If they match, we just advance the match pointer. The`
`434`		`- // remote state is the Inbox's current bucket (AZIP-22 Fast Inbox): its cumulative total and consensus rolling`
	`434`	`+ // remote state is the Inbox's current bucket: its cumulative total and consensus rolling`
`435`	`435`	`// hash are the Inbox's live chain position.`
`436`	`436`	`const remoteBucket = await this.inbox.getCurrentBucket({ blockNumber: currentL1BlockNumber });`
`437`	`437`	`const localLastMessage = await this.stores.messages.getLastMessage();`