@aztec/sequencer-client 0.0.1-commit.f650c0a5c → 0.0.1-commit.f7ea82942

package/dest/sequencer/timetable.js

@@ -1,9 +1,10 @@
-import { CHECKPOINT_ASSEMBLE_TIME, CHECKPOINT_INITIALIZATION_TIME, DEFAULT_P2P_PROPAGATION_TIME, MIN_EXECUTION_TIME } from '@aztec/stdlib/timetable';
+import { CHECKPOINT_ASSEMBLE_TIME, CHECKPOINT_INITIALIZATION_TIME, DEFAULT_P2P_PROPAGATION_TIME, MIN_EXECUTION_TIME, createCheckpointTimingModel } from '@aztec/stdlib/timetable';
 import { SequencerTooSlowError } from './errors.js';
 import { SequencerState } from './utils.js';
 export class SequencerTimetable {
     metrics;
     log;
+    checkpointTiming;
     /**
    * How late into the slot can we be to start working. Computed as the total time needed for assembling and publishing a block,
    * assuming an execution time equal to `minExecutionTime`, subtracted from the slot duration. This means that, if the proposer
@@ -38,6 +39,10 @@ export class SequencerTimetable {
     /** Duration per block when building multiple blocks per slot (undefined = single block per slot) */ blockDuration;
     /** Maximum number of blocks that can be built in this slot configuration */ maxNumberOfBlocks;
     /** Whether pipelining is enabled (checkpoint finalization deferred to next slot). */ pipelining;
+    /**
+   * How far into the target slot attestation collection can extend when pipelining.
+   * Covers validator re-execution (one block duration) plus one-way attestation return.
+   */ pipeliningAttestationGracePeriod;
     constructor(opts, metrics, log){
         this.metrics = metrics;
         this.log = log;
@@ -47,48 +52,28 @@ export class SequencerTimetable {
         this.ethereumSlotDuration = opts.ethereumSlotDuration;
         this.aztecSlotDuration = opts.aztecSlotDuration;
         this.l1PublishingTime = opts.l1PublishingTime;
-        this.p2pPropagationTime = opts.p2pPropagationTime ?? DEFAULT_P2P_PROPAGATION_TIME;
         this.blockDuration = opts.blockDurationMs ? opts.blockDurationMs / 1000 : undefined;
         this.enforce = opts.enforce;
         this.pipelining = opts.pipelining ?? false;
-        // Assume zero-cost propagation time and faster runs in test environments where L1 slot duration is shortened
-        if (this.ethereumSlotDuration < 8) {
-            this.p2pPropagationTime = 0;
-            this.checkpointAssembleTime = 0.5;
-            this.checkpointInitializationTime = 0.5;
-            this.minExecutionTime = 1;
-        }
-        // Min execution time cannot be less than the block duration if set
-        if (this.blockDuration !== undefined && this.minExecutionTime > this.blockDuration) {
-            this.minExecutionTime = this.blockDuration;
-        }
+        this.checkpointTiming = createCheckpointTimingModel({
+            aztecSlotDuration: this.aztecSlotDuration,
+            ethereumSlotDuration: this.ethereumSlotDuration,
+            blockDuration: this.blockDuration,
+            l1PublishingTime: this.l1PublishingTime,
+            p2pPropagationTime: opts.p2pPropagationTime ?? DEFAULT_P2P_PROPAGATION_TIME,
+            pipelining: this.pipelining
+        });
+        this.p2pPropagationTime = this.checkpointTiming.p2pPropagationTime;
+        this.checkpointAssembleTime = this.checkpointTiming.checkpointAssembleTime;
+        this.checkpointInitializationTime = this.checkpointTiming.checkpointInitializationTime;
+        this.minExecutionTime = this.checkpointTiming.minExecutionTime;
         // Calculate initialization offset - estimate of time needed for sync + proposer check
         // This is the baseline for all sub-slot deadlines
-        this.initializationOffset = this.checkpointInitializationTime;
-        // Calculate total checkpoint finalization time (assembly + attestations + L1 publishing)
-        this.checkpointFinalizationTime = this.checkpointAssembleTime + this.p2pPropagationTime * 2 + // Round-trip propagation
-        this.l1PublishingTime; // L1 publishing
-        // Calculate maximum number of blocks that fit in this slot
-        if (!this.blockDuration) {
-            this.maxNumberOfBlocks = 1; // Single block per slot
-        } else {
-            // When pipelining, finalization is deferred to the next slot, but we still need
-            // a sub-slot for validator re-execution so they can produce attestations.
-            let timeReservedAtEnd = this.blockDuration; // Validatior re-execution only
-            if (!this.pipelining) {
-                timeReservedAtEnd += this.checkpointFinalizationTime;
-            }
-            const timeAvailableForBlocks = this.aztecSlotDuration - this.initializationOffset - timeReservedAtEnd;
-            this.maxNumberOfBlocks = Math.floor(timeAvailableForBlocks / this.blockDuration);
-        }
-        // Minimum work to do within a slot for building a block with the minimum time for execution and publishing its checkpoint.
-        // When pipelining, finalization is deferred, but we still need time for execution and validator re-execution.
-        let minWorkToDo = this.initializationOffset + this.minExecutionTime * 2;
-        if (!this.pipelining) {
-            minWorkToDo += this.checkpointFinalizationTime;
-        }
-        const initializeDeadline = this.aztecSlotDuration - minWorkToDo;
-        this.initializeDeadline = initializeDeadline;
+        this.initializationOffset = this.checkpointTiming.checkpointInitializationTime;
+        this.checkpointFinalizationTime = this.checkpointTiming.checkpointFinalizationTime;
+        this.pipeliningAttestationGracePeriod = this.checkpointTiming.pipeliningAttestationGracePeriod;
+        this.maxNumberOfBlocks = this.checkpointTiming.calculateMaxBlocksPerSlot();
+        this.initializeDeadline = this.checkpointTiming.initializeDeadline;
         this.log?.info(`Sequencer timetable initialized with ${this.maxNumberOfBlocks} blocks per slot (${this.enforce ? 'enforced' : 'not enforced'})`, {
             ethereumSlotDuration: this.ethereumSlotDuration,
             aztecSlotDuration: this.aztecSlotDuration,
@@ -100,14 +85,27 @@ export class SequencerTimetable {
             initializeDeadline: this.initializeDeadline,
             enforce: this.enforce,
             pipelining: this.pipelining,
-            minWorkToDo,
+            pipeliningAttestationGracePeriod: this.pipeliningAttestationGracePeriod,
+            minWorkToDo: this.checkpointTiming.minimumBuildSlotWork,
             blockDuration: this.blockDuration,
             maxNumberOfBlocks: this.maxNumberOfBlocks
         });
-        if (initializeDeadline <= 0) {
-            throw new Error(`Block proposal initialize deadline cannot be negative (got ${initializeDeadline} from total time needed ${minWorkToDo} and a slot duration of ${this.aztecSlotDuration}).`);
+        if (this.initializeDeadline <= 0) {
+            throw new Error(`Block proposal initialize deadline cannot be negative (got ${this.initializeDeadline} from total time needed ${this.checkpointTiming.minimumBuildSlotWork} and a slot duration of ${this.aztecSlotDuration}).`);
         }
     }
+    getCheckpointAssemblyDeadline() {
+        return this.checkpointTiming.checkpointAssemblyDeadline;
+    }
+    getCheckpointAttestationDeadline() {
+        return this.checkpointTiming.checkpointAttestationDeadline;
+    }
+    getCheckpointAttestationStartDeadline() {
+        return this.checkpointTiming.checkpointAttestationStartDeadline;
+    }
+    getCheckpointPublishingDeadline() {
+        return this.checkpointTiming.checkpointPublishingDeadline;
+    }
     getMaxAllowedTime(state) {
         switch(state){
             case SequencerState.STOPPED:
@@ -123,10 +121,11 @@ export class SequencerTimetable {
             case SequencerState.WAITING_UNTIL_NEXT_BLOCK:
                 return this.initializeDeadline + this.checkpointInitializationTime;
             case SequencerState.ASSEMBLING_CHECKPOINT:
+                return this.getCheckpointAssemblyDeadline();
             case SequencerState.COLLECTING_ATTESTATIONS:
-                return this.aztecSlotDuration - this.l1PublishingTime - 2 * this.p2pPropagationTime;
+                return this.getCheckpointAttestationStartDeadline();
             case SequencerState.PUBLISHING_CHECKPOINT:
-                return this.aztecSlotDuration - this.l1PublishingTime;
+                return this.getCheckpointPublishingDeadline();
             default:
                 {
                     const _exhaustiveCheck = state;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/sequencer-client",
-  "version": "0.0.1-commit.f650c0a5c",
+  "version": "0.0.1-commit.f7ea82942",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -26,37 +26,37 @@
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
   },
   "dependencies": {
-    "@aztec/aztec.js": "0.0.1-commit.f650c0a5c",
-    "@aztec/bb-prover": "0.0.1-commit.f650c0a5c",
-    "@aztec/blob-client": "0.0.1-commit.f650c0a5c",
-    "@aztec/blob-lib": "0.0.1-commit.f650c0a5c",
-    "@aztec/constants": "0.0.1-commit.f650c0a5c",
-    "@aztec/epoch-cache": "0.0.1-commit.f650c0a5c",
-    "@aztec/ethereum": "0.0.1-commit.f650c0a5c",
-    "@aztec/foundation": "0.0.1-commit.f650c0a5c",
-    "@aztec/l1-artifacts": "0.0.1-commit.f650c0a5c",
-    "@aztec/node-keystore": "0.0.1-commit.f650c0a5c",
-    "@aztec/noir-acvm_js": "0.0.1-commit.f650c0a5c",
-    "@aztec/noir-contracts.js": "0.0.1-commit.f650c0a5c",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.f650c0a5c",
-    "@aztec/noir-types": "0.0.1-commit.f650c0a5c",
-    "@aztec/p2p": "0.0.1-commit.f650c0a5c",
-    "@aztec/protocol-contracts": "0.0.1-commit.f650c0a5c",
-    "@aztec/prover-client": "0.0.1-commit.f650c0a5c",
-    "@aztec/simulator": "0.0.1-commit.f650c0a5c",
-    "@aztec/slasher": "0.0.1-commit.f650c0a5c",
-    "@aztec/stdlib": "0.0.1-commit.f650c0a5c",
-    "@aztec/telemetry-client": "0.0.1-commit.f650c0a5c",
-    "@aztec/validator-client": "0.0.1-commit.f650c0a5c",
-    "@aztec/validator-ha-signer": "0.0.1-commit.f650c0a5c",
-    "@aztec/world-state": "0.0.1-commit.f650c0a5c",
+    "@aztec/aztec.js": "0.0.1-commit.f7ea82942",
+    "@aztec/bb-prover": "0.0.1-commit.f7ea82942",
+    "@aztec/blob-client": "0.0.1-commit.f7ea82942",
+    "@aztec/blob-lib": "0.0.1-commit.f7ea82942",
+    "@aztec/constants": "0.0.1-commit.f7ea82942",
+    "@aztec/epoch-cache": "0.0.1-commit.f7ea82942",
+    "@aztec/ethereum": "0.0.1-commit.f7ea82942",
+    "@aztec/foundation": "0.0.1-commit.f7ea82942",
+    "@aztec/l1-artifacts": "0.0.1-commit.f7ea82942",
+    "@aztec/node-keystore": "0.0.1-commit.f7ea82942",
+    "@aztec/noir-acvm_js": "0.0.1-commit.f7ea82942",
+    "@aztec/noir-contracts.js": "0.0.1-commit.f7ea82942",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.f7ea82942",
+    "@aztec/noir-types": "0.0.1-commit.f7ea82942",
+    "@aztec/p2p": "0.0.1-commit.f7ea82942",
+    "@aztec/protocol-contracts": "0.0.1-commit.f7ea82942",
+    "@aztec/prover-client": "0.0.1-commit.f7ea82942",
+    "@aztec/simulator": "0.0.1-commit.f7ea82942",
+    "@aztec/slasher": "0.0.1-commit.f7ea82942",
+    "@aztec/stdlib": "0.0.1-commit.f7ea82942",
+    "@aztec/telemetry-client": "0.0.1-commit.f7ea82942",
+    "@aztec/validator-client": "0.0.1-commit.f7ea82942",
+    "@aztec/validator-ha-signer": "0.0.1-commit.f7ea82942",
+    "@aztec/world-state": "0.0.1-commit.f7ea82942",
     "lodash.chunk": "^4.2.0",
     "tslib": "^2.4.0",
     "viem": "npm:@aztec/viem@2.38.2"
   },
   "devDependencies": {
-    "@aztec/archiver": "0.0.1-commit.f650c0a5c",
-    "@aztec/kv-store": "0.0.1-commit.f650c0a5c",
+    "@aztec/archiver": "0.0.1-commit.f7ea82942",
+    "@aztec/kv-store": "0.0.1-commit.f7ea82942",
     "@electric-sql/pglite": "^0.3.14",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",

package/src/client/sequencer-client.ts

@@ -202,6 +202,11 @@ export class SequencerClient {
     this.l1Metrics?.stop();
   }
 
+  /** Triggers an immediate run of the sequencer, bypassing the polling interval. */
+  public trigger() {
+    return this.sequencer.trigger();
+  }
+
   public getSequencer(): Sequencer {
     return this.sequencer;
   }

package/src/config.ts

@@ -83,7 +83,7 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
   maxTxsPerCheckpoint: {
     env: 'SEQ_MAX_TX_PER_CHECKPOINT',
     description: 'The maximum number of txs across all blocks in a checkpoint.',
-    parseEnv: (val: string) => (val ? parseInt(val, 10) : undefined),
+    parseEnv: (val: string) => parseInt(val, 10),
   },
   minTxsPerBlock: {
     env: 'SEQ_MIN_TX_PER_BLOCK',
@@ -102,12 +102,12 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
   maxL2BlockGas: {
     env: 'SEQ_MAX_L2_BLOCK_GAS',
     description: 'The maximum L2 block gas.',
-    parseEnv: (val: string) => (val ? parseInt(val, 10) : undefined),
+    parseEnv: (val: string) => parseInt(val, 10),
   },
   maxDABlockGas: {
     env: 'SEQ_MAX_DA_BLOCK_GAS',
     description: 'The maximum DA block gas.',
-    parseEnv: (val: string) => (val ? parseInt(val, 10) : undefined),
+    parseEnv: (val: string) => parseInt(val, 10),
   },
   perBlockAllocationMultiplier: {
     env: 'SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER',
@@ -124,7 +124,7 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
   },
   coinbase: {
     env: 'COINBASE',
-    parseEnv: (val: string) => (val ? EthAddress.fromString(val) : undefined),
+    parseEnv: (val: string) => EthAddress.fromString(val),
     description: 'Recipient of block reward.',
   },
   feeRecipient: {
@@ -153,12 +153,7 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
   l1PublishingTime: {
     env: 'SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT',
     description: 'How much time (in seconds) we allow in the slot for publishing the L1 tx (defaults to 1 L1 slot).',
-    parseEnv: (val: string) => (val ? parseInt(val, 10) : undefined),
-  },
-  attestationPropagationTime: {
-    env: 'SEQ_ATTESTATION_PROPAGATION_TIME',
-    description: 'How many seconds it takes for proposals and attestations to travel across the p2p layer (one-way)',
-    ...numberConfigHelper(DefaultSequencerConfig.attestationPropagationTime),
+    parseEnv: (val: string) => parseInt(val, 10),
   },
   fakeProcessingDelayPerTxMs: {
     description: 'Used for testing to introduce a fake delay after processing each tx',
@@ -237,13 +232,15 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
 };
 
 export const sequencerClientConfigMappings: ConfigMappingsType<SequencerClientConfig> = {
+  // chainConfigMappings must come first: its l1Contracts only maps rollupAddress,
+  // while l1ReaderConfigMappings (spread later) maps all L1 contract addresses.
+  ...chainConfigMappings,
   ...validatorClientConfigMappings,
   ...sequencerConfigMappings,
   ...keyStoreConfigMappings,
   ...l1ReaderConfigMappings,
   ...sequencerTxSenderConfigMappings,
   ...sequencerPublisherConfigMappings,
-  ...chainConfigMappings,
   ...pipelineConfigMappings,
   ...pickConfigMappings(l1ContractsConfigMappings, ['ethereumSlotDuration', 'aztecSlotDuration', 'aztecEpochDuration']),
 };

package/src/global_variable_builder/README.md

@@ -0,0 +1,44 @@
+# Fee Prediction
+
+The `FeePredictor` predicts min fees for upcoming L2 slots based on the current L1
+oracle state and an assumed mana usage pattern.
+
+## Prediction Window
+
+The prediction covers `LAG = 2` entries (the next available slot plus 1 more).
+A new oracle update can activate at `startSlot + LAG`, so only the first LAG entries
+are guaranteed stable. Beyond that, L1 fees could change unpredictably.
+
+Each entry uses:
+
+- The **actual L1 fees** the oracle would return for that slot's timestamp (pre or post,
+  depending on whether the slot is before or after `slotOfChange`).
+- A **configurable congestion assumption** (`ManaUsageEstimate`): none (0 mana), target
+  (steady state), or limit (worst case, 2x target).
+
+The client picks `max(predicted[0..LAG-1])` as their `maxFeesPerGas`.
+
+```
+predicted[0]  →  fee at next slot     (current oracle + current congestion)
+predicted[1]  →  fee at next slot + 1 (congestion may change based on usage estimate)
+```
+
+## Why LAG and not LIFETIME?
+
+The L1 gas oracle has two timing constants:
+
+- **LAG = 2 slots**: when new fees are queued, they activate LAG slots later
+- **LIFETIME = 5 slots**: after an oracle update, the next update is rejected until
+  `slotOfChange + (LIFETIME - LAG)` slots have passed
+
+If the oracle cooldown has already elapsed (i.e., no recent update), a new update can
+be enqueued at any moment. Its new values would activate LAG slots later. This means
+predictions beyond LAG slots could be invalidated by an oracle update that happens
+right after we query.
+
+With a LIFETIME-sized window, we'd give a false sense of coverage: the prediction
+would look like it covers 6 slots, but slots beyond LAG could be wrong if an update
+is enqueued after the prediction is computed.
+
+By limiting to LAG entries, we guarantee that all predicted L1 fees are the ones that
+will actually be used — no oracle update can change them within this window.

package/src/global_variable_builder/fee_predictor.ts

@@ -0,0 +1,172 @@
+import { type L1FeeData, MAX_FEE_ASSET_PRICE_MODIFIER_BPS, type RollupContract } from '@aztec/ethereum/contracts';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { times } from '@aztec/foundation/collection';
+import type { DateProvider } from '@aztec/foundation/timer';
+import { getSlotAtNextL1Block, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
+import {
+  FEE_ORACLE_LAG,
+  GasFees,
+  MIN_ETH_PER_FEE_ASSET,
+  ManaUsageEstimate,
+  computeExcessMana,
+  computeManaMinFee,
+} from '@aztec/stdlib/gas';
+
+/** Cached rollup state for fee prediction. Refreshed once per L1 block. */
+type FeeOracleState = {
+  lastSlot: SlotNumber;
+  excessMana: bigint;
+  ethPerFeeAsset: bigint;
+  manaTarget: bigint;
+  manaLimit: bigint;
+  provingCostPerManaEth: bigint;
+  epochDuration: bigint;
+  /** Pre-resolved L1 fees for each slot in the prediction window. */
+  l1FeesBySlot: L1FeeData[];
+};
+
+/**
+ * Predicts min fees for LAG upcoming slots based on the L1 oracle state.
+ * A new oracle update can activate at startSlot + LAG, so only the first LAG entries
+ * are guaranteed stable. Caches L1 queries per L1 block and recomputes predictions
+ * for each mana usage estimate.
+ */
+export class FeePredictor {
+  private cachedState: Promise<FeeOracleState> | undefined;
+  private cachedL1BlockNumber: bigint | undefined;
+
+  private readonly slotDuration: number;
+  private readonly l1GenesisTime: bigint;
+  private readonly ethereumSlotDuration: number;
+
+  constructor(
+    private readonly rollupContract: RollupContract,
+    private readonly publicClient: { getBlockNumber: (opts?: { cacheTime?: number }) => Promise<bigint> },
+    private readonly dateProvider: DateProvider,
+    config: { slotDuration: number; l1GenesisTime: bigint; ethereumSlotDuration: number },
+  ) {
+    this.slotDuration = config.slotDuration;
+    this.l1GenesisTime = config.l1GenesisTime;
+    this.ethereumSlotDuration = config.ethereumSlotDuration;
+  }
+
+  /** Returns predicted min fees for each slot in the prediction window. */
+  async getPredictedMinFees(manaUsage: ManaUsageEstimate): Promise<GasFees[]> {
+    const state = await this.getState();
+    return this.computePredictions(state, manaUsage);
+  }
+
+  /** Fetches and caches rollup state. Refreshes when L1 block number advances. */
+  private async getState(): Promise<FeeOracleState> {
+    const blockNumber = await this.publicClient.getBlockNumber({ cacheTime: 0 });
+    if (this.cachedL1BlockNumber === undefined || blockNumber > this.cachedL1BlockNumber) {
+      this.cachedL1BlockNumber = blockNumber;
+      this.cachedState = this.fetchState(blockNumber);
+    }
+    return this.cachedState!;
+  }
+
+  private async fetchState(blockNumber: bigint): Promise<FeeOracleState> {
+    // Pin all non-constant queries to this L1 block number for a consistent snapshot.
+    const opts = { blockNumber };
+
+    // Cached constants don't need pinning
+    const [manaTarget, manaLimit, provingCostPerManaEth, epochDuration] = await Promise.all([
+      this.rollupContract.getManaTarget(),
+      this.rollupContract.getManaLimit(),
+      this.rollupContract.getProvingCostPerMana(),
+      this.rollupContract.getEpochDuration(),
+    ]);
+
+    // First, compute the earliest possible nextSlot independently of the checkpoint, so we can
+    // evaluate pruneability at the prediction start timestamp instead of the current L1 block time.
+    // This avoids an epoch-boundary edge case where the effective parent differs between now and nextSlot.
+    const slotConfig = { slotDuration: this.slotDuration, l1GenesisTime: this.l1GenesisTime };
+    const currentSlot = await this.rollupContract.getSlotNumber(opts);
+
+    const slotAtNextL1Block = getSlotAtNextL1Block(BigInt(this.dateProvider.nowInSeconds()), {
+      l1GenesisTime: this.l1GenesisTime,
+      slotDuration: this.slotDuration,
+      ethereumSlotDuration: this.ethereumSlotDuration,
+    });
+    const preliminaryNextSlot = SlotNumber(Math.max(currentSlot, slotAtNextL1Block));
+    const nextSlotTimestamp = getTimestampForSlot(preliminaryNextSlot, slotConfig);
+
+    // Resolve the effective checkpoint at the prediction start timestamp
+    const lastCheckpoint = await this.rollupContract.getEffectivePendingCheckpoint(nextSlotTimestamp, opts);
+    const lastSlot = lastCheckpoint.slotNumber;
+    // Refine nextSlot: also account for the slot after the last checkpoint
+    const nextSlot = SlotNumber(Math.max(SlotNumber.add(lastSlot, 1), preliminaryNextSlot));
+    const feeHeader = lastCheckpoint.feeHeader;
+
+    const slotCount = FEE_ORACLE_LAG;
+    const timestamps = times(slotCount, i => getTimestampForSlot(SlotNumber.add(nextSlot, i), slotConfig));
+    const l1FeesBySlot = await Promise.all(timestamps.map(ts => this.rollupContract.getL1FeesAt(ts, opts)));
+
+    return {
+      lastSlot,
+      excessMana: computeExcessMana(feeHeader.excessMana, feeHeader.manaUsed, manaTarget),
+      ethPerFeeAsset: feeHeader.ethPerFeeAsset,
+      manaTarget,
+      manaLimit,
+      provingCostPerManaEth,
+      epochDuration: BigInt(epochDuration),
+      l1FeesBySlot,
+    };
+  }
+
+  /** Computes per-slot fee predictions given cached state and a mana usage assumption. */
+  private computePredictions(state: FeeOracleState, manaUsage: ManaUsageEstimate): GasFees[] {
+    const assumedManaUsed = this.getAssumedManaUsed(state, manaUsage);
+
+    const result: GasFees[] = [];
+    let { excessMana } = state;
+    let { ethPerFeeAsset } = state;
+
+    // Slot 0: current state (next available slot after last checkpoint)
+    result.push(this.computeGasFees(state, excessMana, ethPerFeeAsset, state.l1FeesBySlot[0]));
+
+    // Slots 1..LAG-1: advance excessMana with the assumed mana usage per checkpoint,
+    // and decay ethPerFeeAsset by MAX_FEE_ASSET_PRICE_MODIFIER_BPS per slot for conservative estimates.
+    // Lower ethPerFeeAsset means higher fees in fee asset terms.
+    for (let i = 1; i < state.l1FeesBySlot.length; i++) {
+      excessMana = computeExcessMana(excessMana, assumedManaUsed, state.manaTarget);
+      const decayed = (ethPerFeeAsset * (10000n - MAX_FEE_ASSET_PRICE_MODIFIER_BPS)) / 10000n;
+      ethPerFeeAsset = decayed < MIN_ETH_PER_FEE_ASSET ? MIN_ETH_PER_FEE_ASSET : decayed;
+      result.push(this.computeGasFees(state, excessMana, ethPerFeeAsset, state.l1FeesBySlot[i]));
+    }
+
+    return result;
+  }
+
+  private getAssumedManaUsed(state: FeeOracleState, manaUsage: ManaUsageEstimate): bigint {
+    switch (manaUsage) {
+      case ManaUsageEstimate.None:
+        return 0n;
+      case ManaUsageEstimate.Target:
+        return state.manaTarget;
+      case ManaUsageEstimate.Limit:
+        return state.manaLimit;
+    }
+  }
+
+  private computeGasFees(
+    state: FeeOracleState,
+    excessMana: bigint,
+    ethPerFeeAsset: bigint,
+    l1Fees: L1FeeData,
+  ): GasFees {
+    return new GasFees(
+      0,
+      computeManaMinFee({
+        l1BaseFee: l1Fees.baseFee,
+        l1BlobFee: l1Fees.blobFee,
+        manaTarget: state.manaTarget,
+        epochDuration: state.epochDuration,
+        provingCostPerManaEth: state.provingCostPerManaEth,
+        excessMana,
+        ethPerFeeAsset,
+      }),
+    );
+  }
+}

package/src/global_variable_builder/fee_provider.ts

@@ -0,0 +1,75 @@
+import { RollupContract } from '@aztec/ethereum/contracts';
+import type { ViemPublicClient } from '@aztec/ethereum/types';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import type { DateProvider } from '@aztec/foundation/timer';
+import { getNextL1SlotTimestamp } from '@aztec/stdlib/epoch-helpers';
+import { GasFees, ManaUsageEstimate } from '@aztec/stdlib/gas';
+import type { FeeProvider } from '@aztec/stdlib/tx';
+
+import { FeePredictor } from './fee_predictor.js';
+import type { GlobalVariableBuilderConfig } from './global_builder.js';
+
+/** Provides current and predicted fee information based on on-chain state. */
+export class FeeProviderImpl implements FeeProvider {
+  private currentMinFees: Promise<GasFees> = Promise.resolve(new GasFees(0, 0));
+  private currentL1BlockNumber: bigint | undefined = undefined;
+
+  private readonly rollupContract: RollupContract;
+  private readonly feePredictor: FeePredictor;
+  private readonly ethereumSlotDuration: number;
+  private readonly l1GenesisTime: bigint;
+
+  constructor(
+    private readonly dateProvider: DateProvider,
+    private readonly publicClient: ViemPublicClient,
+    config: GlobalVariableBuilderConfig,
+  ) {
+    this.ethereumSlotDuration = config.ethereumSlotDuration;
+    this.l1GenesisTime = config.l1GenesisTime;
+
+    this.rollupContract = new RollupContract(this.publicClient, config.l1Contracts.rollupAddress);
+    this.feePredictor = new FeePredictor(this.rollupContract, this.publicClient, this.dateProvider, {
+      slotDuration: config.slotDuration,
+      l1GenesisTime: config.l1GenesisTime,
+      ethereumSlotDuration: config.ethereumSlotDuration,
+    });
+  }
+
+  /**
+   * Computes the "current" min fees, e.g., the price that you currently should pay to get include in the next block
+   * @returns Min fees for the next block
+   */
+  private async computeCurrentMinFees(): Promise<GasFees> {
+    // Since this might be called in the middle of a slot where a block might have been published,
+    // we need to fetch the last block written, and estimate the earliest timestamp for the next block.
+    // The timestamp of that last block will act as a lower bound for the next block.
+
+    const lastCheckpoint = await this.rollupContract.getPendingCheckpoint();
+    const earliestTimestamp = await this.rollupContract.getTimestampForSlot(
+      SlotNumber.fromBigInt(BigInt(lastCheckpoint.slotNumber) + 1n),
+    );
+    const nextEthTimestamp = getNextL1SlotTimestamp(this.dateProvider.nowInSeconds(), {
+      l1GenesisTime: this.l1GenesisTime,
+      ethereumSlotDuration: this.ethereumSlotDuration,
+    });
+    const timestamp = earliestTimestamp > nextEthTimestamp ? earliestTimestamp : nextEthTimestamp;
+
+    return new GasFees(0, await this.rollupContract.getManaMinFeeAt(timestamp, true));
+  }
+
+  public async getCurrentMinFees(): Promise<GasFees> {
+    // Get the current block number
+    const blockNumber = await this.publicClient.getBlockNumber();
+
+    // If the L1 block number has changed then chain a new promise to get the current min fees
+    if (this.currentL1BlockNumber === undefined || blockNumber > this.currentL1BlockNumber) {
+      this.currentL1BlockNumber = blockNumber;
+      this.currentMinFees = this.currentMinFees.then(() => this.computeCurrentMinFees());
+    }
+    return this.currentMinFees;
+  }
+
+  public getPredictedMinFees(manaUsage?: ManaUsageEstimate): Promise<GasFees[]> {
+    return this.feePredictor.getPredictedMinFees(manaUsage ?? ManaUsageEstimate.Target);
+  }
+}