feat: merge-train/spartan (#22457)

BEGIN_COMMIT_OVERRIDE
fix(p2p): back off on repeated auth handshake failures (#22435)
chore(pipeline): add metrics for pipeling building timelines (#21591)
fix: no division by zero in sentinel (#22467)
chore(pipelining): update next net  (#22466)
feat(claude): add skill to read gists (#22471)
feat(node): add fee prediction API for upcoming L2 slots (#22116)
fix: lower EXPECTED_BLOCKS_PER_CHECKPOINT for CI stability (#22480)
END_COMMIT_OVERRIDE

Author: alexghr

spartan/environments/mbps-pipeline.env

@@ -23,13 +23,15 @@ VERIFY_CONTRACTS=false
 DESTROY_AZTEC_INFRA=true
 
 SEQ_BUILD_CHECKPOINT_IF_EMPTY=true
-SEQ_BLOCK_DURATION_MS=6000
+SEQ_BLOCK_DURATION_MS=5500
+SEQ_MAX_TX_PER_CHECKPOINT=96
 SEQ_ENABLE_PROPOSER_PIPELINING=true
-SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER=1.1
+SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER=1
 LOG_LEVEL=verbose
 
 AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET=2
 AZTEC_LAG_IN_EPOCHS_FOR_RANDAO=2
+AZTEC_INBOX_LAG=2
 
 AZTEC_TARGET_COMMITTEE_SIZE=24
 

spartan/environments/next-net.env

@@ -29,16 +29,17 @@ L1_TX_FAILED_STORE=gs://aztec-develop/next-net/failed-l1-txs
 TEST_ACCOUNTS=true
 SPONSORED_FPC=true
 
+SEQ_ENABLE_PROPOSER_PIPELINING=true
 SEQ_MIN_TX_PER_BLOCK=1
-
-SEQ_MAX_TX_PER_CHECKPOINT=7
+SEQ_MAX_TX_PER_CHECKPOINT=12
 
 # Build checkpoint even if block is empty.
 SEQ_BUILD_CHECKPOINT_IF_EMPTY=true
-SEQ_BLOCK_DURATION_MS=6000
+SEQ_BLOCK_DURATION_MS=5500
 
 AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET=2
 AZTEC_LAG_IN_EPOCHS_FOR_RANDAO=2
+AZTEC_INBOX_LAG=2
 
 VALIDATOR_REPLICAS=4
 VALIDATORS_PER_NODE=12

spartan/scripts/deploy_network.sh

@@ -126,6 +126,7 @@ SEQ_BLOCK_DURATION_MS=${SEQ_BLOCK_DURATION_MS:-}
 SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT=${SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT:-}
 SEQ_BUILD_CHECKPOINT_IF_EMPTY=${SEQ_BUILD_CHECKPOINT_IF_EMPTY:-}
 SEQ_ENABLE_PROPOSER_PIPELINING=${SEQ_ENABLE_PROPOSER_PIPELINING:-false}
+AZTEC_EPOCHS_LAG=${AZTEC_EPOCHS_LAG:-}
 SEQ_ENFORCE_TIME_TABLE=${SEQ_ENFORCE_TIME_TABLE:-}
 SEQ_SKIP_CHECKPOINT_PUBLISH_PERCENT=${SEQ_SKIP_CHECKPOINT_PUBLISH_PERCENT:-0}
 PROVER_REPLICAS=${PROVER_REPLICAS:-4}
@@ -420,6 +421,7 @@ 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}
@@ -558,6 +560,7 @@ SEQ_BLOCK_DURATION_MS = ${SEQ_BLOCK_DURATION_MS:-null}
 SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT = ${SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT:-null}
 SEQ_BUILD_CHECKPOINT_IF_EMPTY = ${SEQ_BUILD_CHECKPOINT_IF_EMPTY:-null}
 SEQ_ENABLE_PROPOSER_PIPELINING = ${SEQ_ENABLE_PROPOSER_PIPELINING}
+AZTEC_EPOCHS_LAG = ${AZTEC_EPOCHS_LAG:-null}
 SEQ_ENFORCE_TIME_TABLE = ${SEQ_ENFORCE_TIME_TABLE:-null}
 SEQ_SKIP_CHECKPOINT_PUBLISH_PERCENT = ${SEQ_SKIP_CHECKPOINT_PUBLISH_PERCENT}
 PROVER_MNEMONIC = "${LABS_INFRA_MNEMONIC}"
@@ -729,4 +732,3 @@ echo "${BENCH_JSON}" | jq '.' > "${BENCH_OUTPUT}"
 log "Benchmark JSON written to ${BENCH_OUTPUT}"
 
 log "Total deployment time: ${TOTAL_DEPLOY_TIME} seconds"
-

spartan/terraform/deploy-aztec-infra/main.tf

@@ -225,6 +225,7 @@ locals {
     "validator.node.env.SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT" = var.SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT
     "validator.node.env.SEQ_BUILD_CHECKPOINT_IF_EMPTY"            = var.SEQ_BUILD_CHECKPOINT_IF_EMPTY
     "validator.node.env.SEQ_ENABLE_PROPOSER_PIPELINING"           = var.SEQ_ENABLE_PROPOSER_PIPELINING
+    "validator.node.env.AZTEC_EPOCHS_LAG"                         = var.AZTEC_EPOCHS_LAG
     "validator.node.env.SEQ_ENFORCE_TIME_TABLE"                   = var.SEQ_ENFORCE_TIME_TABLE
     "validator.node.env.P2P_TX_POOL_DELETE_TXS_AFTER_REORG"       = var.P2P_TX_POOL_DELETE_TXS_AFTER_REORG
     "validator.node.env.L1_PRIORITY_FEE_BUMP_PERCENTAGE"          = var.VALIDATOR_L1_PRIORITY_FEE_BUMP_PERCENTAGE

spartan/terraform/deploy-aztec-infra/variables.tf

@@ -435,6 +435,13 @@ variable "SEQ_ENABLE_PROPOSER_PIPELINING" {
   default     = "false"
 }
 
+variable "AZTEC_EPOCHS_LAG" {
+  description = "Epoch lag override for validator nodes"
+  type        = string
+  nullable    = true
+  default     = null
+}
+
 variable "SENTINEL_ENABLED" {
   description = "Whether to enable sentinel"
   type        = string

spartan/terraform/deploy-rollup-contracts/main.tf

@@ -42,6 +42,7 @@ 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

spartan/terraform/deploy-rollup-contracts/variables.tf

@@ -86,6 +86,12 @@ 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

yarn-project/.claude/skills/read-gist/SKILL.md

@@ -0,0 +1,40 @@
+---
+name: read-gist
+description: Fetch and display a GitHub gist. Triggers when the user asks to read, fetch, or view a URL from gist.github.com.
+argument-hint: "<gist URL or ID>"
+allowed-tools: Bash(gh gist *), WebFetch
+---
+
+# Read Gist
+
+Fetch and display the contents of a GitHub gist.
+
+## Trigger
+
+Activate this skill when the user provides a URL matching `gist.github.com` or asks to fetch/read a gist by ID.
+
+## Parameters
+
+The argument is a gist URL or gist ID: $ARGUMENTS
+
+## Steps
+
+1. **Extract the gist ID** from the input. It can be:
+   - A full URL like `https://gist.github.com/<user>/<id>` -> extract `<id>`
+   - A full URL like `https://gist.github.com/<id>` -> extract `<id>`
+   - A raw URL like `https://gist.githubusercontent.com/...` -> extract the gist ID segment
+   - A bare gist ID (hex string)
+
+2. **Try `gh gist view`** first (preferred):
+
+   ```bash
+   gh gist view <id> --raw
+   ```
+
+   If the gist has multiple files, list them first with `gh gist view <id>` (without `--raw`) to show filenames, then fetch with `--raw` or specify a filename with `-f <filename>` if the user asked for a specific file.
+
+3. **Fallback to WebFetch** only if `gh` is not available or the command fails with an auth/install error:
+   - Fetch `https://gist.githubusercontent.com/<user>/<id>/raw` for single-file gists
+   - Or fetch the gist API endpoint `https://api.github.com/gists/<id>` and extract file contents from the JSON response
+
+4. **Return the contents** to the caller. If there are multiple files, show each file with its filename as a header.

yarn-project/aztec-node/src/aztec-node/server.test.ts

@@ -25,6 +25,7 @@ import type { L2LogsSource, MerkleTreeReadOperations, WorldStateSynchronizer } f
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
 import { mockTx } from '@aztec/stdlib/testing';
 import { MerkleTreeId, PublicDataTreeLeaf, PublicDataTreeLeafPreimage } from '@aztec/stdlib/trees';
+import type { FeeProvider } from '@aztec/stdlib/tx';
 import {
   BlockHeader,
   GlobalVariables,
@@ -73,6 +74,7 @@ class TestAztecNodeService extends AztecNodeService {
 describe('aztec node', () => {
   let p2p: MockProxy<P2P>;
   let globalVariablesBuilder: MockProxy<GlobalVariableBuilder>;
+  let feeProvider: MockProxy<FeeProvider>;
   let merkleTreeOps: MockProxy<MerkleTreeReadOperations>;
   let worldState: MockProxy<WorldStateSynchronizer>;
   let l2BlockSource: MockProxy<L2BlockSource>;
@@ -108,7 +110,8 @@ describe('aztec node', () => {
     p2p = mock<P2P>();
 
     globalVariablesBuilder = mock<GlobalVariableBuilder>();
-    globalVariablesBuilder.getCurrentMinFees.mockResolvedValue(new GasFees(0, BlockNumber.ZERO));
+    feeProvider = mock<FeeProvider>();
+    feeProvider.getCurrentMinFees.mockResolvedValue(new GasFees(0, BlockNumber.ZERO));
 
     merkleTreeOps = mock<MerkleTreeReadOperations>();
     merkleTreeOps.findLeafIndices.mockImplementation((treeId: MerkleTreeId, _value: any[]) => {
@@ -196,6 +199,7 @@ describe('aztec node', () => {
       12345,
       rollupVersion.toNumber(),
       globalVariablesBuilder,
+      feeProvider,
       epochCache,
       getPackageVersion() ?? '',
       new TestCircuitVerifier(),
@@ -738,6 +742,7 @@ describe('aztec node', () => {
           12345,
           rollupVersion.toNumber(),
           globalVariablesBuilder,
+          feeProvider,
           epochCache,
           getPackageVersion() ?? '',
           new TestCircuitVerifier(),
@@ -927,6 +932,7 @@ describe('aztec node', () => {
           12345,
           rollupVersion.toNumber(),
           globalVariablesBuilder,
+          feeProvider,
           epochCache,
           getPackageVersion() ?? '',
           new TestCircuitVerifier(),
@@ -997,6 +1003,7 @@ describe('aztec node', () => {
         12345,
         rollupVersion.toNumber(),
         globalVariablesBuilder,
+        mock<FeeProvider>(),
         epochCache,
         getPackageVersion() ?? '',
         new TestCircuitVerifier(),

yarn-project/aztec-node/src/aztec-node/server.ts

@@ -33,7 +33,12 @@ import {
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { type ProverNode, type ProverNodeDeps, createProverNode } from '@aztec/prover-node';
 import { createKeyStoreForProver } from '@aztec/prover-node/config';
-import { GlobalVariableBuilder, SequencerClient, type SequencerPublisher } from '@aztec/sequencer-client';
+import {
+  FeeProviderImpl,
+  GlobalVariableBuilder,
+  SequencerClient,
+  type SequencerPublisher,
+} from '@aztec/sequencer-client';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
 import {
   AttestationsBlockWatcher,
@@ -60,7 +65,7 @@ import type {
   NodeInfo,
   ProtocolContractAddresses,
 } from '@aztec/stdlib/contract';
-import { GasFees } from '@aztec/stdlib/gas';
+import { GasFees, type ManaUsageEstimate } from '@aztec/stdlib/gas';
 import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
 import {
   type AztecNode,
@@ -88,6 +93,7 @@ import type { NullifierLeafPreimage, PublicDataTreeLeafPreimage } from '@aztec/s
 import { MerkleTreeId, NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
 import {
   type BlockHeader,
+  type FeeProvider,
   type GlobalVariableBuilder as GlobalVariableBuilderInterface,
   type IndexedTxEffect,
   PublicSimulationOutput,
@@ -154,6 +160,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     protected readonly l1ChainId: number,
     protected readonly version: number,
     protected readonly globalVariableBuilder: GlobalVariableBuilderInterface,
+    protected readonly feeProvider: FeeProvider,
     protected readonly epochCache: EpochCacheInterface,
     protected readonly packageVersion: string,
     private peerProofVerifier: ClientProtocolCircuitVerifier,
@@ -475,13 +482,16 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
       })
       .catch(err => log.error('Failed to start p2p services after archiver sync', err));
 
-    const globalVariableBuilder = new GlobalVariableBuilder(dateProvider, publicClient, {
+    const globalVariableBuilderConfig = {
       l1Contracts: config.l1Contracts,
       ethereumSlotDuration: config.ethereumSlotDuration,
       rollupVersion: BigInt(config.rollupVersion),
       l1GenesisTime,
       slotDuration: Number(slotDuration),
-    });
+    };
+
+    const globalVariableBuilder = new GlobalVariableBuilder(dateProvider, publicClient, globalVariableBuilderConfig);
+    const feeProvider = new FeeProviderImpl(dateProvider, publicClient, globalVariableBuilderConfig);
 
     // Validator enabled, create/start relevant service
     let sequencer: SequencerClient | undefined;
@@ -609,6 +619,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
       ethereumChain.chainInfo.id,
       config.rollupVersion,
       globalVariableBuilder,
+      feeProvider,
       epochCache,
       packageVersion,
       peerProofVerifier,
@@ -761,12 +772,13 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     return this.blockSource.getCheckpointsDataForEpoch(epochNumber);
   }
 
-  /**
-   * Method to fetch the current min L2 fees.
-   * @returns The current min L2 fees.
-   */
   public async getCurrentMinFees(): Promise<GasFees> {
-    return await this.globalVariableBuilder.getCurrentMinFees();
+    return await this.feeProvider.getCurrentMinFees();
+  }
+
+  /** Returns predicted min fees for the current slot and next N slots. */
+  public async getPredictedMinFees(manaUsage?: ManaUsageEstimate): Promise<GasFees[]> {
+    return await this.feeProvider.getPredictedMinFees(manaUsage);
   }
 
   public async getMaxPriorityFees(): Promise<GasFees> {