chore(fast-inbox): follow the L1 inbox cleanup through the TS clients (A-1386)

Track the regenerated Inbox ABI after the legacy L1 path was removed
(AZIP-22 Fast Inbox):

- ethereum InboxContract: drop getLag() (the LAG getter is gone) and the
  MessageSent checkpointNumber decode; getState() no longer reads inProgress and
  InboxContractState.treeInProgress becomes optional (no longer tracked on-chain).
- Stop threading inboxLag through queries/getL1ContractsConfig and the L1 deploy
  env; the broader AZTEC_INBOX_LAG config removal is deferred to the node cleanup.
- archiver decode: derive the message's checkpoint number from the compact index
  (the event no longer carries it), keeping the legacy per-checkpoint store shape.
- Remove the obsolete advanceInboxInProgress cheat code and its inbox-drift tests;
  drop the orphaned archiver inHash-mismatch sync test (the cross-check was removed
  at the flip). Add the flip-stranded bucketHint to the propose-call test fixtures.

Author: spalladino

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

@@ -140,7 +140,7 @@ describe('CalldataRetriever', () => {
           archive,
           oracleInput: { feeAssetPriceModifier: BigInt(0) },
           header: viemHeader,
-          bucketHint: 0n,
+          bucketHint: BigInt(0),
         },
         attestations,
         signers,
@@ -369,7 +369,11 @@ describe('CalldataRetriever', () => {
             archive,
             oracleInput: { feeAssetPriceModifier },
             header,
+<<<<<<< HEAD
             bucketHint: 0n,
+=======
+            bucketHint: BigInt(0),
+>>>>>>> e74ca75577 (chore(fast-inbox): follow the L1 inbox cleanup through the TS clients (A-1386))
           },
           attestations,
           [], // signers

yarn-project/archiver/src/l1/data_retrieval.ts

@@ -24,6 +24,7 @@ import { type Logger, createLogger } from '@aztec/foundation/log';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import { Body, CommitteeAttestation, L2Block } from '@aztec/stdlib/block';
 import { Checkpoint, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+import { InboxLeaf } from '@aztec/stdlib/messaging';
 import { Proof } from '@aztec/stdlib/proofs';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
@@ -385,7 +386,9 @@ function mapLogInboxMessage(log: MessageSentLog): InboxMessage {
     leaf: log.args.leaf,
     l1BlockNumber: log.l1BlockNumber,
     l1BlockHash: log.l1BlockHash,
-    checkpointNumber: log.args.checkpointNumber,
+    // The Inbox no longer emits a checkpoint number (AZIP-22 Fast Inbox). Derive it from the compact index for the
+    // legacy per-checkpoint message store, which the node still keeps until it drops the per-checkpoint flow.
+    checkpointNumber: InboxLeaf.checkpointNumberFromIndex(log.args.index),
     rollingHash: log.args.rollingHash,
     inboxRollingHash: log.args.inboxRollingHash,
     bucketSeq: log.args.bucketSeq,

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

@@ -702,7 +702,6 @@ export class FakeL1State {
       l1TransactionHash: `0x${msg.l1BlockNumber.toString(16)}` as `0x${string}`,
       l1BlockTimestamp: this.getTimestampAtL1Block(msg.l1BlockNumber),
       args: {
-        checkpointNumber: msg.checkpointNumber,
         index: msg.index,
         leaf: msg.leaf,
         rollingHash: msg.rollingHash,

yarn-project/end-to-end/src/single-node/bot/bot.test.ts

@@ -28,9 +28,8 @@ import { NO_REORG_SUBMISSION_EPOCHS } from '../setup.js';
 // Tests the transaction bot implementations (transfer bot, AMM bot, cross-chain bot).
 // Uses setup(0, PIPELINING_SETUP_OPTS + aztecProofSubmissionEpochs:NO_REORG_SUBMISSION_EPOCHS) with one node, production
 // sequencer (ethereumSlotDuration=4s, aztecSlotDuration=12s, proofSubEpochs=NO_REORG_SUBMISSION_EPOCHS, minTxsPerBlock=0;
-// aztecEpochDuration is the setup() default). The bridge-resume, setup-via-bridging, and
-// cross-chain-bot subsuites actively drive L1 cross-chain bridging: fee-juice portal deposits,
-// advanceInboxInProgress, and L2→L1 messages via CrossChainBot.
+// aztecEpochDuration is the setup() default). The bridge-resume and cross-chain-bot subsuites actively
+// drive L1 cross-chain bridging: fee-juice portal deposits and L2→L1 messages via CrossChainBot.
 describe('single-node/bot/bot', () => {
   let wallet: EmbeddedWallet;
   let aztecNode: AztecNode;
@@ -263,30 +262,6 @@ describe('single-node/bot/bot', () => {
     });
   });
 
-  // Tests that Bot.create succeeds after the inbox drifts away from the rollup contract.
-  // Actively drives L1 via advanceInboxInProgress.
-  describe('setup via bridging funds cross-chain', () => {
-    beforeAll(() => {
-      config = {
-        ...getBotDefaultConfig(),
-        followChain: 'PROPOSED',
-        botMode: 'transfer',
-        senderPrivateKey: new SecretValue(Fr.random()),
-        l1PrivateKey: getPrivateKey(),
-        l1RpcUrls,
-        flushSetupTransactions: true,
-      };
-    });
-
-    // See 'can consume L1 to L2 message in %s after inbox drifts away from the rollup'
-    // in end-to-end/src/e2e_cross_chain_messaging/l1_to_l2.test.ts for context on this test.
-    // Advances inbox 4 slots then creates Bot; verifies it completes setup without error.
-    it('creates bot after inbox drift', async () => {
-      await cheatCodes.rollup.advanceInboxInProgress(4);
-      await Bot.create(config, wallet, aztecNode, aztecNodeAdmin, new BotStore(await openTmpStore('bot')));
-    }, 300_000);
-  });
-
   // Tests the CrossChainBot: seeds L1→L2 messages and on each tick consumes one while seeding
   // a replacement. Actively drives L1 portal contracts.
   describe('cross-chain-bot', () => {

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

@@ -1,6 +1,5 @@
 import { asyncPool } from '@aztec/foundation/async-pool';
 import { maxBigint } from '@aztec/foundation/bigint';
-import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -19,11 +18,11 @@ import { checkBlockTag } from './utils.js';
 export type MessageSentArgs = {
   index: bigint;
   leaf: Fr;
-  checkpointNumber: CheckpointNumber;
+  /** Legacy 128-bit keccak rolling hash of all messages inserted up to and including this one. */
   rollingHash: Buffer16;
-  /** Consensus rolling hash (truncated sha256 chain) after this message (AZIP-22 Fast Inbox). Not yet consumed by the node. */
+  /** Consensus rolling hash (truncated sha256 chain) after this message (AZIP-22 Fast Inbox). */
   inboxRollingHash: Fr;
-  /** Sequence number of the Inbox bucket this message was absorbed into (AZIP-22 Fast Inbox). Not yet consumed by the node. */
+  /** Sequence number of the Inbox bucket this message was absorbed into (AZIP-22 Fast Inbox). */
   bucketSeq: bigint;
 };
 
@@ -68,18 +67,12 @@ export class InboxContract {
     return this.inbox;
   }
 
-  public async getLag(opts: { blockTag?: BlockTag; blockNumber?: bigint } = {}): Promise<bigint> {
-    await checkBlockTag(opts.blockNumber, this.client);
-    return await this.inbox.read.LAG(opts);
-  }
-
   public async getState(opts: { blockTag?: BlockTag; blockNumber?: bigint } = {}): Promise<InboxContractState> {
     await checkBlockTag(opts.blockNumber, this.client);
     const state = await this.inbox.read.getState(opts);
     return {
       totalMessagesInserted: state.totalMessagesInserted,
       messagesRollingHash: Buffer16.fromString(state.rollingHash),
-      treeInProgress: state.inProgress,
     };
   }
 
@@ -133,7 +126,6 @@ export class InboxContract {
       args: {
         index?: bigint;
         hash?: `0x${string}`;
-        checkpointNumber?: bigint;
         rollingHash?: `0x${string}`;
         inboxRollingHash?: `0x${string}`;
         bucketSeq?: bigint;
@@ -149,7 +141,6 @@ export class InboxContract {
       args: {
         index: log.args.index!,
         leaf: Fr.fromString(log.args.hash!),
-        checkpointNumber: CheckpointNumber.fromBigInt(log.args.checkpointNumber!),
         rollingHash: Buffer16.fromString(log.args.rollingHash!),
         inboxRollingHash: Fr.fromString(log.args.inboxRollingHash!),
         bucketSeq: log.args.bucketSeq!,
@@ -161,5 +152,9 @@ export class InboxContract {
 export type InboxContractState = {
   totalMessagesInserted: bigint;
   messagesRollingHash: Buffer16;
-  treeInProgress: bigint;
+  /**
+   * Checkpoint currently accumulating messages, when known. No longer tracked on-chain post-flip (AZIP-22 Fast
+   * Inbox); used only by the legacy per-checkpoint message-readiness gate.
+   */
+  treeInProgress?: bigint;
 };

yarn-project/ethereum/src/deploy_aztec_l1_contracts.ts

@@ -572,7 +572,6 @@ export function getDeployRollupForUpgradeEnvVars(
     AZTEC_TARGET_COMMITTEE_SIZE: args.aztecTargetCommitteeSize.toString(),
     AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: args.lagInEpochsForValidatorSet.toString(),
     AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: args.lagInEpochsForRandao.toString(),
-    AZTEC_INBOX_LAG: args.inboxLag?.toString(),
     AZTEC_PROOF_SUBMISSION_EPOCHS: args.aztecProofSubmissionEpochs.toString(),
     AZTEC_LOCAL_EJECTION_THRESHOLD: args.localEjectionThreshold.toString(),
     AZTEC_SLASHING_LIFETIME_IN_ROUNDS: args.slashingLifetimeInRounds.toString(),

yarn-project/ethereum/src/queries.ts

@@ -5,7 +5,6 @@ import { BaseError, type Block } from 'viem';
 import { DefaultL1ContractsConfig, type L1ContractsConfig } from './config.js';
 import { ReadOnlyGovernanceContract } from './contracts/governance.js';
 import { GovernanceProposerContract } from './contracts/governance_proposer.js';
-import { InboxContract } from './contracts/inbox.js';
 import { RollupContract } from './contracts/rollup.js';
 import type { ViemClient, ViemPublicClient } from './types.js';
 
@@ -78,7 +77,7 @@ export async function getL1ContractsConfig(
   publicClient: ViemPublicClient,
   addresses: { governanceAddress: EthAddress; rollupAddress?: EthAddress },
 ): Promise<
-  Omit<L1ContractsConfig, 'ethereumSlotDuration'> & {
+  Omit<L1ContractsConfig, 'ethereumSlotDuration' | 'inboxLag'> & {
     l1StartBlock: bigint;
     l1GenesisTime: bigint;
     rollupVersion: number;
@@ -92,8 +91,6 @@ export async function getL1ContractsConfig(
   const rollup = new RollupContract(publicClient, rollupAddress.toString());
   const slasherProposer = await rollup.getSlashingProposer();
   const slasher = await rollup.getSlasherContract();
-  const rollupAddresses = await rollup.getRollupAddresses();
-  const inboxContract = new InboxContract(publicClient, rollupAddresses.inboxAddress.toString());
 
   const [
     l1StartBlock,
@@ -104,7 +101,6 @@ export async function getL1ContractsConfig(
     aztecTargetCommitteeSize,
     lagInEpochsForValidatorSet,
     lagInEpochsForRandao,
-    inboxLag,
     activationThreshold,
     ejectionThreshold,
     localEjectionThreshold,
@@ -132,7 +128,6 @@ export async function getL1ContractsConfig(
     rollup.getTargetCommitteeSize(),
     rollup.getLagInEpochsForValidatorSet(),
     rollup.getLagInEpochsForRandao(),
-    inboxContract.getLag(),
     rollup.getActivationThreshold(),
     rollup.getEjectionThreshold(),
     rollup.getLocalEjectionThreshold(),
@@ -162,7 +157,6 @@ export async function getL1ContractsConfig(
     aztecTargetCommitteeSize: Number(aztecTargetCommitteeSize),
     lagInEpochsForValidatorSet: Number(lagInEpochsForValidatorSet),
     lagInEpochsForRandao: Number(lagInEpochsForRandao),
-    inboxLag: Number(inboxLag),
     governanceProposerQuorum: Number(governanceProposerQuorum),
     governanceProposerRoundSize: Number(governanceProposerRoundSize),
     governanceVotingDuration: DefaultL1ContractsConfig.governanceVotingDuration,

yarn-project/ethereum/src/test/rollup_cheat_codes.test.ts

@@ -295,47 +295,6 @@ export class RollupCheatCodes {
     );
   }
 
-  /**
-   * Overrides the inProgress field of the Inbox contract state
-   * @param howMuch - How many checkpoints to move it forward
-   */
-  public advanceInboxInProgress(howMuch: number | bigint): Promise<bigint> {
-    return this.ethCheatCodes.execWithPausedAnvil(async () => {
-      // Storage slot 2 contains the InboxState struct
-      const inboxStateSlot = 2n;
-
-      // Get inbox and its current state values
-      const inboxAddress = await this.rollup.read.getInbox();
-      const currentStateValue = await this.ethCheatCodes.load(EthAddress.fromString(inboxAddress), inboxStateSlot);
-
-      // Extract current values from the packed storage slot
-      // Storage layout: rollingHash (128 bits) | totalMessagesInserted (64 bits) | inProgress (64 bits)
-      const currentRollingHash = currentStateValue & ((1n << 128n) - 1n);
-      const currentTotalMessages = (currentStateValue >> 128n) & ((1n << 64n) - 1n);
-      const currentInProgress = currentStateValue >> 192n;
-      const newInProgress = currentInProgress + BigInt(howMuch);
-
-      // Pack new values: rollingHash (low 128 bits) | totalMessages (middle 64 bits) | inProgress (high 64 bits)
-      const newValue = (BigInt(newInProgress) << 192n) | (currentTotalMessages << 128n) | currentRollingHash;
-
-      await this.ethCheatCodes.store(EthAddress.fromString(inboxAddress), inboxStateSlot, newValue, {
-        silent: true,
-      });
-
-      this.logger.warn(`Inbox inProgress advanced from ${currentInProgress} to ${newInProgress}`, {
-        inbox: inboxAddress,
-        oldValue: '0x' + currentStateValue.toString(16),
-        newValue: '0x' + newValue.toString(16),
-        rollingHash: currentRollingHash,
-        totalMessages: currentTotalMessages,
-        oldInProgress: currentInProgress,
-        newInProgress,
-      });
-
-      return newInProgress;
-    });
-  }
-
   public insertOutbox(epoch: EpochNumber, numCheckpointsInEpoch: number, outHash: bigint) {
     return this.ethCheatCodes.execWithPausedAnvil(async () => {
       const outboxAddress = await this.rollup.read.getOutbox();