chore(fast-inbox): drop AZTEC_INBOX_LAG config and e2e plumbing (A-1388)

spalladino · spalladino · commit a00c13c13953 · 2026-07-19T17:45:33.000-03:00
Removes the legacy inboxLag / AZTEC_INBOX_LAG config field and env var from
ethereum config, foundation env vars, the network-consensus-config list, the
l1-contracts and spartan network defaults, and the e2e test option plumbing.
Also drops the removed inHash argument from the e2e web3signer createBlockProposal
wrapper.
diff --git a/l1-contracts/scripts/network-defaults.json b/l1-contracts/scripts/network-defaults.json
@@ -14,7 +14,6 @@
   "AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN": 48,
   "AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT": 2,
   "AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE": 48,
-  "AZTEC_INBOX_LAG": 1,
   "AZTEC_PROOF_SUBMISSION_EPOCHS": 1,
   "AZTEC_MANA_TARGET": 100000000,
   "AZTEC_PROVING_COST_PER_MANA": 100,
diff --git a/spartan/environments/network-defaults.yml b/spartan/environments/network-defaults.yml
@@ -59,8 +59,6 @@ l1-contracts: &l1-contracts-defaults
   #---------------------------------------------------------------------------
   # Proof & Block Configuration
   #---------------------------------------------------------------------------
-  # Checkpoints to lag in inbox (prevents sequencer DOS attacks).
-  AZTEC_INBOX_LAG: 2
   # Epochs after end that proofs are still accepted.
   AZTEC_PROOF_SUBMISSION_EPOCHS: 1
   # Target mana consumption per block.
diff --git a/spartan/scripts/deploy_network.sh b/spartan/scripts/deploy_network.sh
@@ -460,7 +460,6 @@ AZTEC_LAG_IN_EPOCHS_FOR_RANDAO = ${AZTEC_LAG_IN_EPOCHS_FOR_RANDAO:-null}
 AZTEC_SLOT_DURATION = ${AZTEC_SLOT_DURATION:-null}
 AZTEC_EPOCH_DURATION = ${AZTEC_EPOCH_DURATION:-null}
 AZTEC_TARGET_COMMITTEE_SIZE = ${AZTEC_TARGET_COMMITTEE_SIZE:-null}
-AZTEC_INBOX_LAG = ${AZTEC_INBOX_LAG:-null}
 AZTEC_PROOF_SUBMISSION_EPOCHS = ${AZTEC_PROOF_SUBMISSION_EPOCHS:-null}
 AZTEC_ACTIVATION_THRESHOLD = ${AZTEC_ACTIVATION_THRESHOLD:-null}
 AZTEC_EJECTION_THRESHOLD = ${AZTEC_EJECTION_THRESHOLD:-null}
diff --git a/spartan/terraform/deploy-rollup-contracts/main.tf b/spartan/terraform/deploy-rollup-contracts/main.tf
@@ -43,7 +43,6 @@ locals {
     AZTEC_SLOT_DURATION                      = var.AZTEC_SLOT_DURATION
     AZTEC_EPOCH_DURATION                     = var.AZTEC_EPOCH_DURATION
     AZTEC_TARGET_COMMITTEE_SIZE              = var.AZTEC_TARGET_COMMITTEE_SIZE
-    AZTEC_INBOX_LAG                          = var.AZTEC_INBOX_LAG
     AZTEC_PROOF_SUBMISSION_EPOCHS            = var.AZTEC_PROOF_SUBMISSION_EPOCHS
     AZTEC_ACTIVATION_THRESHOLD               = var.AZTEC_ACTIVATION_THRESHOLD
     AZTEC_EJECTION_THRESHOLD                 = var.AZTEC_EJECTION_THRESHOLD
diff --git a/spartan/terraform/deploy-rollup-contracts/variables.tf b/spartan/terraform/deploy-rollup-contracts/variables.tf
@@ -86,12 +86,6 @@ variable "AZTEC_PROOF_SUBMISSION_EPOCHS" {
   nullable    = true
 }
 
-variable "AZTEC_INBOX_LAG" {
-  description = "Checkpoints to lag in inbox (prevents sequencer DOS attacks)"
-  type        = string
-  nullable    = true
-}
-
 variable "AZTEC_ACTIVATION_THRESHOLD" {
   description = "Aztec activation threshold"
   type        = string
diff --git a/yarn-project/end-to-end/src/composed/web3signer/e2e_multi_validator_node_key_store.test.ts b/yarn-project/end-to-end/src/composed/web3signer/e2e_multi_validator_node_key_store.test.ts
@@ -376,7 +376,6 @@ describe('e2e_multi_validator_node', () => {
       blockHeader: BlockHeader,
       checkpointNumber: CheckpointNumber,
       indexWithinCheckpoint: number,
-      inHash: Fr,
       archive: Fr,
       txs: Tx[],
       proposerAddress: EthAddress | undefined,
@@ -397,7 +396,6 @@ describe('e2e_multi_validator_node', () => {
         blockHeader,
         checkpointNumber,
         IndexWithinCheckpoint(indexWithinCheckpoint),
-        inHash,
         archive,
         txs,
         proposerAddress,
diff --git a/yarn-project/end-to-end/src/fixtures/fixtures.ts b/yarn-project/end-to-end/src/fixtures/fixtures.ts
@@ -42,7 +42,6 @@ export const PIPELINED_FEE_PADDING = 30;
  * - `walletMinFeePadding: PIPELINED_FEE_PADDING` (30x) to absorb the wider fee evolution window.
  */
 export const PIPELINING_SETUP_OPTS = {
-  inboxLag: 2,
   minTxsPerBlock: 0,
   aztecSlotDuration: 12,
   ethereumSlotDuration: 4,
@@ -73,7 +72,6 @@ export const PIPELINING_SETUP_OPTS = {
  */
 export const AUTOMINE_E2E_OPTS = {
   useAutomineSequencer: true,
-  inboxLag: 1,
   minTxsPerBlock: 0,
   aztecSlotDuration: 12,
   ethereumSlotDuration: 4,
diff --git a/yarn-project/end-to-end/src/multi-node/block-production/multi_validator_node.parallel.test.ts b/yarn-project/end-to-end/src/multi-node/block-production/multi_validator_node.parallel.test.ts
@@ -57,7 +57,6 @@ describe('multi-node/block-production/multi_validator_node', () => {
       anvilSlotsInAnEpoch: 4,
       blockDurationMs: 2000,
       minTxsPerBlock: 0,
-      inboxLag: 2,
     });
 
     // All 5 validators in a single physical node.
diff --git a/yarn-project/end-to-end/src/multi-node/block-production/redistribution.parallel.test.ts b/yarn-project/end-to-end/src/multi-node/block-production/redistribution.parallel.test.ts
@@ -56,7 +56,6 @@ describe('multi-node/block-production/redistribution', () => {
     const test = await MultiNodeTestContext.setup({
       numberOfAccounts: 0,
       initialValidators: validators,
-      inboxLag: 2,
       mockGossipSubNetwork: true,
       startProverNode: true,
       aztecEpochDuration: 4,
diff --git a/yarn-project/end-to-end/src/multi-node/block-production/setup.ts b/yarn-project/end-to-end/src/multi-node/block-production/setup.ts
@@ -171,7 +171,6 @@ export async function setupBlockProductionWithProver(opts: {
       ...setupOpts,
       pxeOpts: { syncChainTip },
       skipInitialSequencer: true,
-      inboxLag: 2,
     },
     nodeOpts: (index: number) => ({
       dontStartSequencer: true,
diff --git a/yarn-project/end-to-end/src/multi-node/governance/add_rollup.test.ts b/yarn-project/end-to-end/src/multi-node/governance/add_rollup.test.ts
@@ -92,7 +92,6 @@ describe('multi-node/governance/add_rollup', () => {
       minTxsPerBlock: 0,
       // inboxLag: 2 sources L1->L2 messages from an already-sealed checkpoint under pipelining, avoiding
       // L1ToL2MessagesNotReadyError.
-      inboxLag: 2,
       // Fund the bridging accounts (and the sponsored FPC) at genesis. Skip the hardcoded-account
       // fast-path so our additionallyFundedAccounts are not clobbered.
       skipHardcodedAccount: true,
@@ -153,7 +152,6 @@ describe('multi-node/governance/add_rollup', () => {
         aztecTargetCommitteeSize: context.aztecNodeConfig.aztecTargetCommitteeSize,
         lagInEpochsForValidatorSet: context.aztecNodeConfig.lagInEpochsForValidatorSet,
         lagInEpochsForRandao: context.aztecNodeConfig.lagInEpochsForRandao,
-        inboxLag: context.aztecNodeConfig.inboxLag,
         aztecProofSubmissionEpochs: context.aztecNodeConfig.aztecProofSubmissionEpochs,
         slashingQuorum: context.aztecNodeConfig.slashingQuorum,
         slashingRoundSizeInEpochs: context.aztecNodeConfig.slashingRoundSizeInEpochs,
diff --git a/yarn-project/end-to-end/src/multi-node/governance/upgrade_governance_proposer.test.ts b/yarn-project/end-to-end/src/multi-node/governance/upgrade_governance_proposer.test.ts
@@ -38,7 +38,6 @@ describe('multi-node/governance/upgrade_governance_proposer', () => {
       governanceProposerRoundSize: 10,
       activationThreshold: 10n ** 22n,
       ejectionThreshold: 5n ** 22n,
-      inboxLag: 2,
       minTxsPerBlock: 0,
       initialValidators: buildMockGossipValidators(NUM_VALIDATORS),
     });
diff --git a/yarn-project/end-to-end/src/multi-node/slashing/broadcasted_invalid_block_proposal_slash.test.ts b/yarn-project/end-to-end/src/multi-node/slashing/broadcasted_invalid_block_proposal_slash.test.ts
@@ -49,7 +49,6 @@ describe('multi-node/slashing/broadcasted_invalid_block_proposal_slash', () => {
       sentinelEnabled: false, // reuse only the fast 8s-slot timing; this test does not use the sentinel
       blockDurationMs: 2000,
       aztecTargetCommitteeSize: COMMITTEE_SIZE,
-      inboxLag: 2,
       aztecProofSubmissionEpochs: 1024, // effectively do not reorg
       slashInactivityConsecutiveEpochThreshold: 32, // effectively do not slash for inactivity
       minTxsPerBlock: 0, // always be building
diff --git a/yarn-project/end-to-end/src/multi-node/slashing/broadcasted_invalid_checkpoint_proposal_slash.parallel.test.ts b/yarn-project/end-to-end/src/multi-node/slashing/broadcasted_invalid_checkpoint_proposal_slash.parallel.test.ts
@@ -240,7 +240,6 @@ describe('multi-node/slashing/broadcasted_invalid_checkpoint_proposal_slash', ()
       aztecTargetCommitteeSize: COMMITTEE_SIZE,
       aztecProofSubmissionEpochs: 1024,
       minTxsPerBlock: 0,
-      inboxLag: 2,
       slashingQuorum: SLASHING_QUORUM,
       slashingRoundSizeInEpochs: SLASHING_ROUND_SIZE / SENTINEL_TIMING.aztecEpochDuration,
       slashAmountSmall: slashingUnit,
diff --git a/yarn-project/end-to-end/src/multi-node/slashing/data_withholding_slash.test.ts b/yarn-project/end-to-end/src/multi-node/slashing/data_withholding_slash.test.ts
@@ -91,7 +91,6 @@ describe('multi-node/slashing/data_withholding_slash', () => {
       slashDataWithholdingToleranceSlots: TOLERANCE_SLOTS,
       slashDataWithholdingPenalty: slashingAmount,
       minTxsPerBlock: 1,
-      inboxLag: 2,
       initialValidators: buildMockGossipValidators(NUM_VALIDATORS),
     });
   });
diff --git a/yarn-project/end-to-end/src/multi-node/slashing/inactivity_setup.ts b/yarn-project/end-to-end/src/multi-node/slashing/inactivity_setup.ts
@@ -48,7 +48,6 @@ export class InactivityTest {
   private async run(opts: { slashInactivityConsecutiveEpochThreshold: number; inactiveNodeCount: number }) {
     this.test = await MultiNodeTestContext.setup({
       ...SLASHER_ENABLED_MULTI_VALIDATOR_OPTS,
-      inboxLag: 2,
       anvilSlotsInAnEpoch: 4,
       // A fake prover node is started by the context (realProofs:false); give it the multi-epoch
       // proving delay the inactivity scenario relied on, and keep enough broker history.
diff --git a/yarn-project/end-to-end/src/multi-node/slashing/multiple_validators_sentinel.parallel.test.ts b/yarn-project/end-to-end/src/multi-node/slashing/multiple_validators_sentinel.parallel.test.ts
@@ -47,7 +47,6 @@ describe('multi-node/slashing/multiple_validators_sentinel', () => {
       minTxsPerBlock: 0,
       slashingRoundSizeInEpochs: 2,
       slashInactivityPenalty: 0n, // Set to 0 to disable
-      inboxLag: 2,
       initialValidators: buildMockGossipValidators(NUM_VALIDATORS),
     });
 
diff --git a/yarn-project/end-to-end/src/multi-node/slashing/sentinel_status_slash.parallel.test.ts b/yarn-project/end-to-end/src/multi-node/slashing/sentinel_status_slash.parallel.test.ts
@@ -73,7 +73,6 @@ describe('multi-node/slashing/sentinel_status_slash', () => {
       blockDurationMs: 2000,
       aztecProofSubmissionEpochs: 1024,
       minTxsPerBlock: 0,
-      inboxLag: 2,
       // A single proposer-fault slot in an epoch gives missed/total = 1/6 ≈ 0.167; threshold
       // 0.1 lets that single fault trip inactivity.
       slashInactivityTargetPercentage: 0.1,
diff --git a/yarn-project/end-to-end/src/multi-node/slashing/slash_veto_demo.test.ts b/yarn-project/end-to-end/src/multi-node/slashing/slash_veto_demo.test.ts
@@ -71,7 +71,6 @@ describe('veto slash', () => {
       blockDurationMs: 2000,
       aztecProofSubmissionEpochs: 1024, // effectively do not reorg
       minTxsPerBlock: 0,
-      inboxLag: 2,
       aztecTargetCommitteeSize: NUM_VALIDATORS,
       slashSelfAllowed: true,
       slashingOffsetInRounds: SLASH_OFFSET_IN_ROUNDS,
diff --git a/yarn-project/end-to-end/src/multi-node/slashing/validators_sentinel.parallel.test.ts b/yarn-project/end-to-end/src/multi-node/slashing/validators_sentinel.parallel.test.ts
@@ -42,7 +42,6 @@ describe('multi-node/slashing/validators_sentinel', () => {
       minTxsPerBlock: 0,
       slashingRoundSizeInEpochs: 2,
       slashInactivityPenalty: 0n, // Set to 0 to disable
-      inboxLag: 2,
       initialValidators: buildMockGossipValidators(NUM_VALIDATORS),
     });
 
diff --git a/yarn-project/end-to-end/src/p2p/fee_asset_price_oracle_gossip.test.ts b/yarn-project/end-to-end/src/p2p/fee_asset_price_oracle_gossip.test.ts
@@ -48,7 +48,6 @@ describe('e2e_p2p_network', () => {
         listenAddress: '127.0.0.1',
         // Pipelining: target-slot is one ahead of build-slot; inboxLag sources L1->L2
         // messages from the previous checkpoint to avoid L1ToL2MessagesNotReadyError.
-        inboxLag: 2,
       },
     });
 
diff --git a/yarn-project/end-to-end/src/p2p/gossip_network.test.ts b/yarn-project/end-to-end/src/p2p/gossip_network.test.ts
@@ -65,7 +65,6 @@ describe('e2e_p2p_network', () => {
           slashingRoundSizeInEpochs: 2,
           slashingQuorum: 5,
           listenAddress: '127.0.0.1',
-          inboxLag: 2,
         },
       });
 
@@ -160,7 +159,6 @@ describe('e2e_p2p_network', () => {
           // Without this, no blocks are built until txs arrive, and a failed checkpoint during tx
           // submission causes block pruning that invalidates tx references.
           minTxsPerBlock: 0,
-          inboxLag: 2,
         },
       });
 
diff --git a/yarn-project/end-to-end/src/p2p/late_prover_tx_collection.test.ts b/yarn-project/end-to-end/src/p2p/late_prover_tx_collection.test.ts
@@ -52,7 +52,6 @@ describe('e2e_p2p_late_prover_tx_collection', () => {
         // Only build blocks that actually carry txs, so the chain idles after our block is mined and
         // the late prover is never auto-triggered to collect for a different block.
         minTxsPerBlock: 1,
-        inboxLag: 2,
       },
     });
 
diff --git a/yarn-project/end-to-end/src/p2p/preferred_gossip_network.test.ts b/yarn-project/end-to-end/src/p2p/preferred_gossip_network.test.ts
@@ -136,7 +136,6 @@ describe('e2e_p2p_preferred_network', () => {
         // Just for testing be aggressive here, don't allow any auth handshake failures
         p2pMaxFailedAuthAttemptsAllowed: 0,
         minTxsPerBlock: 0,
-        inboxLag: 2,
       },
     });
 
diff --git a/yarn-project/end-to-end/src/p2p/rediscovery.test.ts b/yarn-project/end-to-end/src/p2p/rediscovery.test.ts
@@ -33,7 +33,6 @@ describe('e2e_p2p_rediscovery', () => {
         aztecSlotDuration: 24,
         blockDurationMs: BLOCK_DURATION_MS,
         listenAddress: '127.0.0.1',
-        inboxLag: 2,
       },
     });
     await t.setup();
diff --git a/yarn-project/end-to-end/src/p2p/reqresp/utils.ts b/yarn-project/end-to-end/src/p2p/reqresp/utils.ts
@@ -45,7 +45,6 @@ export async function createReqrespTest(options: ReqrespOptions = {}): Promise<P
       aztecEpochDuration: 64, // stable committee
       // Pipelining: target-slot is one ahead of build-slot; inboxLag sources L1->L2
       // messages from the previous checkpoint to avoid L1ToL2MessagesNotReadyError.
-      inboxLag: 2,
     },
   });
   await t.setup();
diff --git a/yarn-project/end-to-end/src/single-node/block-building/debug_trace.test.ts b/yarn-project/end-to-end/src/single-node/block-building/debug_trace.test.ts
@@ -59,7 +59,6 @@ describe('single-node/block-building/debug_trace', () => {
       // enough to reach it, where the proposer selection changes and the propose silently reverts.
       aztecEpochDuration: 32,
       aztecProofSubmissionEpochs: NO_REORG_SUBMISSION_EPOCHS,
-      inboxLag: 2,
     });
     ({ aztecNode, logger, aztecNodeAdmin, config } = test.context);
     sequencer = test.context.sequencer! as TestSequencerClient;
diff --git a/yarn-project/end-to-end/src/single-node/fees/fee_settings.test.ts b/yarn-project/end-to-end/src/single-node/fees/fee_settings.test.ts
@@ -76,7 +76,6 @@ describe('single-node/fees/fee_settings', () => {
   // (Test-body txs explicitly call `wallet.setMinFeePadding(...)` so they don't use the wallet default.)
   const AZTEC_SLOT_DURATION = 12;
   const t = new FeesTest('fee_juice', 1, {
-    inboxLag: 2,
     minTxsPerBlock: 0,
     aztecSlotDuration: AZTEC_SLOT_DURATION,
     ethereumSlotDuration: 4,
diff --git a/yarn-project/end-to-end/src/single-node/sequencer/escape_hatch_vote_only.test.ts b/yarn-project/end-to-end/src/single-node/sequencer/escape_hatch_vote_only.test.ts
@@ -93,7 +93,6 @@ describe('single-node/sequencer/escape_hatch_vote_only', () => {
       automineL1Setup: true,
       // Pipelining opts — exercise the §6 B5 fix (tryVoteWhenEscapeHatchOpen signing/submitting for targetSlot).
       // inboxLag: 2 so the sequencer sources L1->L2 messages from a sealed checkpoint when building for slot+1.
-      inboxLag: 2,
     });
 
     ({
diff --git a/yarn-project/end-to-end/src/single-node/single_node_test_context.ts b/yarn-project/end-to-end/src/single-node/single_node_test_context.ts
@@ -252,7 +252,6 @@ export class SingleNodeTestContext {
         slasherEnabled: false,
         // `inboxLag: 2` is the intended value when running with pipelining (the production config
         // default of 1 is a separate bug). Set before `...opts` so tests can still override.
-        inboxLag: 2,
         ...opts,
         ...(hardcodedAccountData ? { additionallyFundedAccounts: [hardcodedAccountData], numberOfAccounts: 0 } : {}),
       },
diff --git a/yarn-project/ethereum/src/config.ts b/yarn-project/ethereum/src/config.ts
@@ -35,8 +35,6 @@ export type L1ContractsConfig = {
   lagInEpochsForValidatorSet: number;
   /** The number of epochs to lag behind the current epoch for randao selection. */
   lagInEpochsForRandao: number;
-  /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */
-  inboxLag: number;
   /** The number of epochs after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: number;
   /** The deposit amount for a validator */
@@ -129,11 +127,6 @@ export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> =
     description: 'The number of epochs to lag behind the current epoch for randao selection.',
     ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_LAG_IN_EPOCHS_FOR_RANDAO),
   },
-  inboxLag: {
-    env: 'AZTEC_INBOX_LAG',
-    description: 'The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks).',
-    ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_INBOX_LAG),
-  },
   aztecProofSubmissionEpochs: {
     env: 'AZTEC_PROOF_SUBMISSION_EPOCHS',
     description: 'The number of epochs after an epoch ends that proofs are still accepted.',
diff --git a/yarn-project/ethereum/src/queries.ts b/yarn-project/ethereum/src/queries.ts
@@ -77,7 +77,7 @@ export async function getL1ContractsConfig(
   publicClient: ViemPublicClient,
   addresses: { governanceAddress: EthAddress; rollupAddress?: EthAddress },
 ): Promise<
-  Omit<L1ContractsConfig, 'ethereumSlotDuration' | 'inboxLag'> & {
+  Omit<L1ContractsConfig, 'ethereumSlotDuration'> & {
     l1StartBlock: bigint;
     l1GenesisTime: bigint;
     rollupVersion: number;
diff --git a/yarn-project/foundation/src/config/env_var.ts b/yarn-project/foundation/src/config/env_var.ts
@@ -321,7 +321,6 @@ export type EnvVar =
   | 'AZTEC_TARGET_COMMITTEE_SIZE'
   | 'AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET'
   | 'AZTEC_LAG_IN_EPOCHS_FOR_RANDAO'
-  | 'AZTEC_INBOX_LAG'
   | 'AZTEC_PROOF_SUBMISSION_EPOCHS'
   | 'AZTEC_ACTIVATION_THRESHOLD'
   | 'AZTEC_EJECTION_THRESHOLD'
diff --git a/yarn-project/stdlib/src/config/network-consensus-config.ts b/yarn-project/stdlib/src/config/network-consensus-config.ts
@@ -47,7 +47,6 @@ export const NETWORK_CONSENSUS_ENV_VARS = [
   'AZTEC_EJECTION_THRESHOLD',
   'AZTEC_LOCAL_EJECTION_THRESHOLD',
   'AZTEC_EXIT_DELAY_SECONDS',
-  'AZTEC_INBOX_LAG',
   'AZTEC_PROOF_SUBMISSION_EPOCHS',
   'AZTEC_MANA_TARGET',
   'AZTEC_PROVING_COST_PER_MANA',
