@aztec/sequencer-client 5.0.0-private.20260319 → 5.0.0-rc.2

package/dest/config.js

@@ -1,11 +1,12 @@
 import { l1ContractsConfigMappings } from '@aztec/ethereum/config';
 import { l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
-import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, pickConfigMappings } from '@aztec/foundation/config';
+import { booleanConfigHelper, floatConfigHelper, getConfigFromMappings, numberConfigHelper, optionalNumberConfigHelper, pickConfigMappings } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { keyStoreConfigMappings } from '@aztec/node-keystore/config';
 import { p2pConfigMappings } from '@aztec/p2p/config';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { chainConfigMappings, pipelineConfigMappings, sharedSequencerConfigMappings } from '@aztec/stdlib/config';
+import { DEFAULT_BLOCK_DURATION_MS, DEFAULT_MAX_BLOCKS_PER_CHECKPOINT, chainConfigMappings, sharedSequencerConfigMappings } from '@aztec/stdlib/config';
+import { MIN_PER_BLOCK_ALLOCATION_MULTIPLIER, MIN_PER_BLOCK_DA_ALLOCATION_MULTIPLIER } from '@aztec/stdlib/gas';
 import { DEFAULT_P2P_PROPAGATION_TIME } from '@aztec/stdlib/timetable';
 import { validatorClientConfigMappings } from '@aztec/validator-client/config';
 import { sequencerPublisherConfigMappings, sequencerTxSenderConfigMappings } from './publisher/config.js';
@@ -18,22 +19,28 @@ export * from './publisher/config.js';
     minTxsPerBlock: 1,
     buildCheckpointIfEmpty: false,
     publishTxsWithProposals: false,
-    perBlockAllocationMultiplier: 1.2,
+    perBlockAllocationMultiplier: MIN_PER_BLOCK_ALLOCATION_MULTIPLIER,
+    perBlockDAAllocationMultiplier: MIN_PER_BLOCK_DA_ALLOCATION_MULTIPLIER,
     redistributeCheckpointBudget: true,
-    enforceTimeTable: true,
+    blockDurationMs: DEFAULT_BLOCK_DURATION_MS,
+    l1PublishingTime: 12,
+    checkpointProposalSyncGraceSeconds: 2 * (DEFAULT_BLOCK_DURATION_MS / 1000),
     attestationPropagationTime: DEFAULT_P2P_PROPAGATION_TIME,
     secondsBeforeInvalidatingBlockAsCommitteeMember: 144,
     secondsBeforeInvalidatingBlockAsNonCommitteeMember: 432,
     skipCollectingAttestations: false,
     skipInvalidateBlockAsProposer: false,
+    skipWaitForValidParentCheckpointOnL1: false,
     broadcastInvalidBlockProposal: false,
+    broadcastInvalidCheckpointProposalOnly: false,
     injectFakeAttestation: false,
     injectHighSValueAttestation: false,
     injectUnrecoverableSignatureAttestation: false,
     fishermanMode: false,
     shuffleAttestationOrdering: false,
     skipPushProposedBlocksToArchiver: false,
-    skipPublishingCheckpointsPercent: 0
+    skipPublishingCheckpointsPercent: 0,
+    maxBlocksPerCheckpoint: DEFAULT_MAX_BLOCKS_PER_CHECKPOINT
 };
 export const sequencerConfigMappings = {
     sequencerPollingIntervalMS: {
@@ -44,7 +51,7 @@ export const sequencerConfigMappings = {
     maxTxsPerCheckpoint: {
         env: 'SEQ_MAX_TX_PER_CHECKPOINT',
         description: 'The maximum number of txs across all blocks in a checkpoint.',
-        parseEnv: (val)=>val ? parseInt(val, 10) : undefined
+        ...optionalNumberConfigHelper()
     },
     minTxsPerBlock: {
         env: 'SEQ_MIN_TX_PER_BLOCK',
@@ -62,17 +69,22 @@ export const sequencerConfigMappings = {
     maxL2BlockGas: {
         env: 'SEQ_MAX_L2_BLOCK_GAS',
         description: 'The maximum L2 block gas.',
-        parseEnv: (val)=>val ? parseInt(val, 10) : undefined
+        ...optionalNumberConfigHelper()
     },
     maxDABlockGas: {
         env: 'SEQ_MAX_DA_BLOCK_GAS',
         description: 'The maximum DA block gas.',
-        parseEnv: (val)=>val ? parseInt(val, 10) : undefined
+        ...optionalNumberConfigHelper()
     },
     perBlockAllocationMultiplier: {
         env: 'SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER',
         description: 'Per-block gas budget multiplier for both L2 and DA gas. Budget per block is (checkpointLimit / maxBlocks) * multiplier.' + ' Values greater than one allow early blocks to use more than their even share, relying on checkpoint-level capping for later blocks.',
-        ...numberConfigHelper(DefaultSequencerConfig.perBlockAllocationMultiplier)
+        ...floatConfigHelper(DefaultSequencerConfig.perBlockAllocationMultiplier)
+    },
+    perBlockDAAllocationMultiplier: {
+        env: 'SEQ_PER_BLOCK_DA_ALLOCATION_MULTIPLIER',
+        description: 'Per-block budget multiplier applied to DA gas and blob fields in place of perBlockAllocationMultiplier.' + ' Defaults higher than the general multiplier so the largest contract class deploy fits a single block.',
+        ...numberConfigHelper(DefaultSequencerConfig.perBlockDAAllocationMultiplier)
     },
     redistributeCheckpointBudget: {
         env: 'SEQ_REDISTRIBUTE_CHECKPOINT_BUDGET',
@@ -81,12 +93,12 @@ export const sequencerConfigMappings = {
     },
     coinbase: {
         env: 'COINBASE',
-        parseEnv: (val)=>val ? EthAddress.fromString(val) : undefined,
+        parseEnv: (val)=>EthAddress.fromString(val),
         description: 'Recipient of block reward.'
     },
     feeRecipient: {
         env: 'FEE_RECIPIENT',
-        parseEnv: (val)=>AztecAddress.fromString(val),
+        parseEnv: (val)=>AztecAddress.fromStringUnsafe(val),
         description: 'Address to receive fees.'
     },
     acvmWorkingDirectory: {
@@ -97,11 +109,6 @@ export const sequencerConfigMappings = {
         env: 'ACVM_BINARY_PATH',
         description: 'The path to the ACVM binary'
     },
-    enforceTimeTable: {
-        env: 'SEQ_ENFORCE_TIME_TABLE',
-        description: 'Whether to enforce the time table when building blocks',
-        ...booleanConfigHelper(DefaultSequencerConfig.enforceTimeTable)
-    },
     governanceProposerPayload: {
         env: 'GOVERNANCE_PROPOSER_PAYLOAD_ADDRESS',
         description: 'The address of the payload for the governanceProposer',
@@ -109,13 +116,8 @@ export const sequencerConfigMappings = {
     },
     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)=>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)
+        description: 'How much time in seconds to allow in the slot for publishing the L1 transaction.',
+        ...numberConfigHelper(DefaultSequencerConfig.l1PublishingTime)
     },
     fakeProcessingDelayPerTxMs: {
         description: 'Used for testing to introduce a fake delay after processing each tx'
@@ -141,10 +143,22 @@ export const sequencerConfigMappings = {
         description: 'Do not invalidate the previous block if invalid when we are the proposer (for testing only)',
         ...booleanConfigHelper(DefaultSequencerConfig.skipInvalidateBlockAsProposer)
     },
+    skipWaitForValidParentCheckpointOnL1: {
+        description: 'Bypass the parent checkpoint validity check before submitting a pipelined checkpoint, ' + 'allowing the proposer to publish even when the parent landed on L1 with invalid attestations (for testing only)',
+        ...booleanConfigHelper(DefaultSequencerConfig.skipWaitForValidParentCheckpointOnL1)
+    },
     broadcastInvalidBlockProposal: {
         description: 'Broadcast invalid block proposals with corrupted state (for testing only)',
         ...booleanConfigHelper(DefaultSequencerConfig.broadcastInvalidBlockProposal)
     },
+    invalidBlockProposalIndexWithinCheckpoint: {
+        description: 'Broadcast an invalid block proposal only at this indexWithinCheckpoint (for testing only)',
+        ...optionalNumberConfigHelper()
+    },
+    broadcastInvalidCheckpointProposalOnly: {
+        description: 'Broadcast invalid checkpoint proposals while keeping the underlying block proposals valid (for testing only). When unset, the checkpoint follows broadcastInvalidBlockProposal.',
+        ...booleanConfigHelper(DefaultSequencerConfig.broadcastInvalidCheckpointProposalOnly)
+    },
     injectFakeAttestation: {
         description: 'Inject a fake attestation (for testing only)',
         ...booleanConfigHelper(DefaultSequencerConfig.injectFakeAttestation)
@@ -184,19 +198,29 @@ export const sequencerConfigMappings = {
         description: 'Percent probability (0 - 100) of sequencer skipping checkpoint publishing (testing only)',
         ...numberConfigHelper(DefaultSequencerConfig.skipPublishingCheckpointsPercent)
     },
+    skipBroadcastProposals: {
+        description: 'Skip broadcasting checkpoint and block proposals via gossipsub when proposer (for testing only)',
+        ...booleanConfigHelper(false)
+    },
+    skipBroadcastCheckpointProposal: {
+        description: 'Skip broadcasting only the CheckpointProposal via gossipsub when proposer; the held last block is broadcast ' + 'standalone instead so peers still receive it as a proposed-but-uncheckpointed tip (for testing only)',
+        ...booleanConfigHelper(false)
+    },
+    pauseProposingForSlots: {
+        description: 'List of slots for which the sequencer will not produce a proposal (for testing only). Attestation paths are unaffected.'
+    },
     ...pickConfigMappings(p2pConfigMappings, [
         'txPublicSetupAllowListExtend'
     ])
 };
 export const sequencerClientConfigMappings = {
+    ...chainConfigMappings,
     ...validatorClientConfigMappings,
     ...sequencerConfigMappings,
     ...keyStoreConfigMappings,
     ...l1ReaderConfigMappings,
     ...sequencerTxSenderConfigMappings,
     ...sequencerPublisherConfigMappings,
-    ...chainConfigMappings,
-    ...pipelineConfigMappings,
     ...pickConfigMappings(l1ContractsConfigMappings, [
         'ethereumSlotDuration',
         'aztecSlotDuration',

package/dest/global_variable_builder/fee_predictor.d.ts

@@ -0,0 +1,37 @@
+import { type RollupContract } from '@aztec/ethereum/contracts';
+import type { DateProvider } from '@aztec/foundation/timer';
+import { GasFees, ManaUsageEstimate } from '@aztec/stdlib/gas';
+/**
+ * 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 declare class FeePredictor {
+    private readonly rollupContract;
+    private readonly publicClient;
+    private readonly dateProvider;
+    private cachedState;
+    private cachedL1BlockNumber;
+    private readonly slotDuration;
+    private readonly l1GenesisTime;
+    private readonly ethereumSlotDuration;
+    constructor(rollupContract: RollupContract, publicClient: {
+        getBlockNumber: (opts?: {
+            cacheTime?: number;
+        }) => Promise<bigint>;
+    }, dateProvider: DateProvider, config: {
+        slotDuration: number;
+        l1GenesisTime: bigint;
+        ethereumSlotDuration: number;
+    });
+    /** Returns predicted min fees for each slot in the prediction window. */
+    getPredictedMinFees(manaUsage: ManaUsageEstimate): Promise<GasFees[]>;
+    private getState;
+    private fetchState;
+    /** Computes per-slot fee predictions given cached state and a mana usage assumption. */
+    private computePredictions;
+    private getAssumedManaUsed;
+    private computeGasFees;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3ByZWRpY3Rvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2dsb2JhbF92YXJpYWJsZV9idWlsZGVyL2ZlZV9wcmVkaWN0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFvRCxLQUFLLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBR2xILE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTVELE9BQU8sRUFFTCxPQUFPLEVBRVAsaUJBQWlCLEVBR2xCLE1BQU0sbUJBQW1CLENBQUM7QUFlM0I7Ozs7O0dBS0c7QUFDSCxxQkFBYSxZQUFZO0lBU3JCLE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYztJQUMvQixPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZO0lBVi9CLE9BQU8sQ0FBQyxXQUFXLENBQXNDO0lBQ3pELE9BQU8sQ0FBQyxtQkFBbUIsQ0FBcUI7SUFFaEQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQVM7SUFDdEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQVM7SUFDdkMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBUztJQUU5QyxZQUNtQixjQUFjLEVBQUUsY0FBYyxFQUM5QixZQUFZLEVBQUU7UUFBRSxjQUFjLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUFFLFNBQVMsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtTQUFFLEtBQUssT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0tBQUUsRUFDcEYsWUFBWSxFQUFFLFlBQVksRUFDM0MsTUFBTSxFQUFFO1FBQUUsWUFBWSxFQUFFLE1BQU0sQ0FBQztRQUFDLGFBQWEsRUFBRSxNQUFNLENBQUM7UUFBQyxvQkFBb0IsRUFBRSxNQUFNLENBQUE7S0FBRSxFQUt0RjtJQUVELHlFQUF5RTtJQUNuRSxtQkFBbUIsQ0FBQyxTQUFTLEVBQUUsaUJBQWlCLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBRzFFO1lBR2EsUUFBUTtZQVNSLFVBQVU7SUFpRHhCLHdGQUF3RjtJQUN4RixPQUFPLENBQUMsa0JBQWtCO0lBdUIxQixPQUFPLENBQUMsa0JBQWtCO0lBVzFCLE9BQU8sQ0FBQyxjQUFjO0NBbUJ2QiJ9

package/dest/global_variable_builder/fee_predictor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fee_predictor.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/fee_predictor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoD,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGlH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAEL,OAAO,EAEP,iBAAiB,EAGlB,MAAM,mBAAmB,CAAC;AAe3B;;;;;GAKG;AACH,qBAAa,YAAY;IASrB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAV/B,OAAO,CAAC,WAAW,CAAsC;IACzD,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAE9C,YACmB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE;QAAE,cAAc,EAAE,CAAC,IAAI,CAAC,EAAE;YAAE,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,EACpF,YAAY,EAAE,YAAY,EAC3C,MAAM,EAAE;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAA;KAAE,EAKtF;IAED,yEAAyE;IACnE,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAG1E;YAGa,QAAQ;YASR,UAAU;IAiDxB,wFAAwF;IACxF,OAAO,CAAC,kBAAkB;IAuB1B,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,cAAc;CAmBvB"}

package/dest/global_variable_builder/fee_predictor.js

@@ -0,0 +1,128 @@
+import { MAX_FEE_ASSET_PRICE_MODIFIER_BPS } from '@aztec/ethereum/contracts';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { times } from '@aztec/foundation/collection';
+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';
+/**
+ * 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 {
+    rollupContract;
+    publicClient;
+    dateProvider;
+    cachedState;
+    cachedL1BlockNumber;
+    slotDuration;
+    l1GenesisTime;
+    ethereumSlotDuration;
+    constructor(rollupContract, publicClient, dateProvider, config){
+        this.rollupContract = rollupContract;
+        this.publicClient = publicClient;
+        this.dateProvider = dateProvider;
+        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) {
+        const state = await this.getState();
+        return this.computePredictions(state, manaUsage);
+    }
+    /** Fetches and caches rollup state. Refreshes when L1 block number advances. */ async getState() {
+        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;
+    }
+    async fetchState(blockNumber) {
+        // 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. */ computePredictions(state, manaUsage) {
+        const assumedManaUsed = this.getAssumedManaUsed(state, manaUsage);
+        const result = [];
+        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;
+    }
+    getAssumedManaUsed(state, manaUsage) {
+        switch(manaUsage){
+            case ManaUsageEstimate.None:
+                return 0n;
+            case ManaUsageEstimate.Target:
+                return state.manaTarget;
+            case ManaUsageEstimate.Limit:
+                return state.manaLimit;
+        }
+    }
+    computeGasFees(state, excessMana, ethPerFeeAsset, l1Fees) {
+        return new GasFees(0, computeManaMinFee({
+            l1BaseFee: l1Fees.baseFee,
+            l1BlobFee: l1Fees.blobFee,
+            manaTarget: state.manaTarget,
+            epochDuration: state.epochDuration,
+            provingCostPerManaEth: state.provingCostPerManaEth,
+            excessMana,
+            ethPerFeeAsset
+        }));
+    }
+}

package/dest/global_variable_builder/fee_provider.d.ts

@@ -0,0 +1,21 @@
+import type { ViemPublicClient } from '@aztec/ethereum/types';
+import type { DateProvider } from '@aztec/foundation/timer';
+import { GasFees, ManaUsageEstimate } from '@aztec/stdlib/gas';
+import type { FeeProvider } from '@aztec/stdlib/tx';
+import type { GlobalVariableBuilderConfig } from './global_builder.js';
+/** Provides current and predicted fee information based on on-chain state. */
+export declare class FeeProviderImpl implements FeeProvider {
+    private readonly dateProvider;
+    private readonly publicClient;
+    private currentMinFees;
+    private currentL1BlockNumber;
+    private readonly rollupContract;
+    private readonly feePredictor;
+    private readonly ethereumSlotDuration;
+    private readonly l1GenesisTime;
+    constructor(dateProvider: DateProvider, publicClient: ViemPublicClient, config: GlobalVariableBuilderConfig);
+    private computeCurrentMinFees;
+    getCurrentMinFees(): Promise<GasFees>;
+    getPredictedMinFees(manaUsage?: ManaUsageEstimate): Promise<GasFees[]>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3Byb3ZpZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZ2xvYmFsX3ZhcmlhYmxlX2J1aWxkZXIvZmVlX3Byb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFNUQsT0FBTyxFQUFFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBR3BELE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFdkUsOEVBQThFO0FBQzlFLHFCQUFhLGVBQWdCLFlBQVcsV0FBVztJQVUvQyxPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZO0lBVi9CLE9BQU8sQ0FBQyxjQUFjLENBQXdEO0lBQzlFLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBaUM7SUFFN0QsT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQWlCO0lBQ2hELE9BQU8sQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFlO0lBQzVDLE9BQU8sQ0FBQyxRQUFRLENBQUMsb0JBQW9CLENBQVM7SUFDOUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQVM7SUFFdkMsWUFDbUIsWUFBWSxFQUFFLFlBQVksRUFDMUIsWUFBWSxFQUFFLGdCQUFnQixFQUMvQyxNQUFNLEVBQUUsMkJBQTJCLEVBV3BDO1lBTWEscUJBQXFCO0lBa0J0QixpQkFBaUIsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBVWpEO0lBRVksbUJBQW1CLENBQUMsU0FBUyxDQUFDLEVBQUUsaUJBQWlCLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBT2xGO0NBQ0YifQ==

package/dest/global_variable_builder/fee_provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fee_provider.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/fee_provider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAEvE,8EAA8E;AAC9E,qBAAa,eAAgB,YAAW,WAAW;IAU/C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAV/B,OAAO,CAAC,cAAc,CAAwD;IAC9E,OAAO,CAAC,oBAAoB,CAAiC;IAE7D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC,YACmB,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,gBAAgB,EAC/C,MAAM,EAAE,2BAA2B,EAWpC;YAMa,qBAAqB;IAkBtB,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAUjD;IAEY,mBAAmB,CAAC,SAAS,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAOlF;CACF"}

package/dest/global_variable_builder/fee_provider.js

@@ -0,0 +1,67 @@
+import { RollupContract } from '@aztec/ethereum/contracts';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { getNextL1SlotTimestamp } from '@aztec/stdlib/epoch-helpers';
+import { GasFees, ManaUsageEstimate } from '@aztec/stdlib/gas';
+import { FeePredictor } from './fee_predictor.js';
+/** Provides current and predicted fee information based on on-chain state. */ export class FeeProviderImpl {
+    dateProvider;
+    publicClient;
+    currentMinFees;
+    currentL1BlockNumber;
+    rollupContract;
+    feePredictor;
+    ethereumSlotDuration;
+    l1GenesisTime;
+    constructor(dateProvider, publicClient, config){
+        this.dateProvider = dateProvider;
+        this.publicClient = publicClient;
+        this.currentMinFees = Promise.resolve(new GasFees(0, 0));
+        this.currentL1BlockNumber = undefined;
+        this.ethereumSlotDuration = config.ethereumSlotDuration;
+        this.l1GenesisTime = config.l1GenesisTime;
+        this.rollupContract = new RollupContract(this.publicClient, config.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
+   */ async computeCurrentMinFees() {
+        // 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));
+    }
+    async getCurrentMinFees() {
+        // Get the current block number
+        const blockNumber = await this.publicClient.getBlockNumber({
+            cacheTime: 0
+        });
+        // 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;
+    }
+    async getPredictedMinFees(manaUsage) {
+        const [currentMinFees, predictedMinFees] = await Promise.all([
+            this.getCurrentMinFees(),
+            this.feePredictor.getPredictedMinFees(manaUsage ?? ManaUsageEstimate.Target)
+        ]);
+        return [
+            currentMinFees,
+            ...predictedMinFees
+        ];
+    }
+}

package/dest/global_variable_builder/global_builder.d.ts

@@ -1,41 +1,28 @@
-import type { L1ContractsConfig } from '@aztec/ethereum/config';
-import type { L1ReaderConfig } from '@aztec/ethereum/l1-reader';
-import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { type SimulationOverridesPlan } from '@aztec/ethereum/contracts';
+import type { ViemPublicClient } from '@aztec/ethereum/types';
+import type { SlotNumber } from '@aztec/foundation/branded-types';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
-import { GasFees } from '@aztec/stdlib/gas';
 import type { CheckpointGlobalVariables, GlobalVariableBuilder as GlobalVariableBuilderInterface } from '@aztec/stdlib/tx';
-import { GlobalVariables } from '@aztec/stdlib/tx';
+/** Configuration for the GlobalVariableBuilder (excludes L1 client config). */
+export type GlobalVariableBuilderConfig = {
+    rollupAddress: EthAddress;
+    ethereumSlotDuration: number;
+    rollupVersion: bigint;
+} & Pick<L1RollupConstants, 'slotDuration' | 'l1GenesisTime'>;
 /**
  * Simple global variables builder.
  */
 export declare class GlobalVariableBuilder implements GlobalVariableBuilderInterface {
-    private log;
-    private currentMinFees;
-    private currentL1BlockNumber;
-    private readonly rollupContract;
     private readonly publicClient;
-    private readonly ethereumSlotDuration;
+    private readonly rollupContract;
     private readonly aztecSlotDuration;
     private readonly l1GenesisTime;
     private chainId;
     private version;
-    constructor(config: L1ReaderConfig & Pick<L1ContractsConfig, 'ethereumSlotDuration'> & Pick<L1RollupConstants, 'slotDuration' | 'l1GenesisTime'> & {
-        rollupVersion: bigint;
-    });
-    private computeCurrentMinFees;
-    getCurrentMinFees(): Promise<GasFees>;
-    /**
-     * Simple builder of global variables.
-     * @param blockNumber - The block number to build global variables for.
-     * @param coinbase - The address to receive block reward.
-     * @param feeRecipient - The address to receive fees.
-     * @param slotNumber - The slot number to use for the global variables, if undefined it will be calculated.
-     * @returns The global variables for the given block number.
-     */
-    buildGlobalVariables(blockNumber: BlockNumber, coinbase: EthAddress, feeRecipient: AztecAddress, maybeSlot?: SlotNumber): Promise<GlobalVariables>;
+    constructor(publicClient: ViemPublicClient, config: GlobalVariableBuilderConfig);
     /** Builds global variables that are constant throughout a checkpoint. */
-    buildCheckpointGlobalVariables(coinbase: EthAddress, feeRecipient: AztecAddress, slotNumber: SlotNumber): Promise<CheckpointGlobalVariables>;
+    buildCheckpointGlobalVariables(coinbase: EthAddress, feeRecipient: AztecAddress, slotNumber: SlotNumber, simulationOverridesPlan?: SimulationOverridesPlan): Promise<CheckpointGlobalVariables>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2xvYmFsX2J1aWxkZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9nbG9iYWxfdmFyaWFibGVfYnVpbGRlci9nbG9iYWxfYnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRWhFLE9BQU8sRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFMUUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxFQUFFLEtBQUssaUJBQWlCLEVBQXVCLE1BQU0sNkJBQTZCLENBQUM7QUFDMUYsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUNWLHlCQUF5QixFQUN6QixxQkFBcUIsSUFBSSw4QkFBOEIsRUFDeEQsTUFBTSxrQkFBa0IsQ0FBQztBQUMxQixPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFJbkQ7O0dBRUc7QUFDSCxxQkFBYSxxQkFBc0IsWUFBVyw4QkFBOEI7SUFDMUUsT0FBTyxDQUFDLEdBQUcsQ0FBcUQ7SUFDaEUsT0FBTyxDQUFDLGNBQWMsQ0FBd0Q7SUFDOUUsT0FBTyxDQUFDLG9CQUFvQixDQUFpQztJQUU3RCxPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBaUI7SUFDaEQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQW1CO0lBQ2hELE9BQU8sQ0FBQyxRQUFRLENBQUMsb0JBQW9CLENBQVM7SUFDOUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBUztJQUMzQyxPQUFPLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBUztJQUV2QyxPQUFPLENBQUMsT0FBTyxDQUFLO0lBQ3BCLE9BQU8sQ0FBQyxPQUFPLENBQUs7SUFFcEIsWUFDRSxNQUFNLEVBQUUsY0FBYyxHQUNwQixJQUFJLENBQUMsaUJBQWlCLEVBQUUsc0JBQXNCLENBQUMsR0FDL0MsSUFBSSxDQUFDLGlCQUFpQixFQUFFLGNBQWMsR0FBRyxlQUFlLENBQUMsR0FBRztRQUFFLGFBQWEsRUFBRSxNQUFNLENBQUE7S0FBRSxFQW9CeEY7WUFNYSxxQkFBcUI7SUFldEIsaUJBQWlCLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVVqRDtJQUVEOzs7Ozs7O09BT0c7SUFDVSxvQkFBb0IsQ0FDL0IsV0FBVyxFQUFFLFdBQVcsRUFDeEIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksRUFDMUIsU0FBUyxDQUFDLEVBQUUsVUFBVSxHQUNyQixPQUFPLENBQUMsZUFBZSxDQUFDLENBUzFCO0lBRUQseUVBQXlFO0lBQzVELDhCQUE4QixDQUN6QyxRQUFRLEVBQUUsVUFBVSxFQUNwQixZQUFZLEVBQUUsWUFBWSxFQUMxQixVQUFVLEVBQUUsVUFBVSxHQUNyQixPQUFPLENBQUMseUJBQXlCLENBQUMsQ0FhcEM7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2xvYmFsX2J1aWxkZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9nbG9iYWxfdmFyaWFibGVfYnVpbGRlci9nbG9iYWxfYnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBRUwsS0FBSyx1QkFBdUIsRUFFN0IsTUFBTSwyQkFBMkIsQ0FBQztBQUNuQyxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRWxFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUF1QixNQUFNLDZCQUE2QixDQUFDO0FBRTFGLE9BQU8sS0FBSyxFQUNWLHlCQUF5QixFQUN6QixxQkFBcUIsSUFBSSw4QkFBOEIsRUFDeEQsTUFBTSxrQkFBa0IsQ0FBQztBQUUxQiwrRUFBK0U7QUFDL0UsTUFBTSxNQUFNLDJCQUEyQixHQUFHO0lBQ3hDLGFBQWEsRUFBRSxVQUFVLENBQUM7SUFDMUIsb0JBQW9CLEVBQUUsTUFBTSxDQUFDO0lBQzdCLGFBQWEsRUFBRSxNQUFNLENBQUM7Q0FDdkIsR0FBRyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsY0FBYyxHQUFHLGVBQWUsQ0FBQyxDQUFDO0FBRTlEOztHQUVHO0FBQ0gscUJBQWEscUJBQXNCLFlBQVcsOEJBQThCO0lBU3hFLE9BQU8sQ0FBQyxRQUFRLENBQUMsWUFBWTtJQVIvQixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBaUI7SUFDaEQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBUztJQUMzQyxPQUFPLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBUztJQUV2QyxPQUFPLENBQUMsT0FBTyxDQUFLO0lBQ3BCLE9BQU8sQ0FBQyxPQUFPLENBQUs7SUFFcEIsWUFDbUIsWUFBWSxFQUFFLGdCQUFnQixFQUMvQyxNQUFNLEVBQUUsMkJBQTJCLEVBU3BDO0lBRUQseUVBQXlFO0lBQzVELDhCQUE4QixDQUN6QyxRQUFRLEVBQUUsVUFBVSxFQUNwQixZQUFZLEVBQUUsWUFBWSxFQUMxQixVQUFVLEVBQUUsVUFBVSxFQUN0Qix1QkFBdUIsQ0FBQyxFQUFFLHVCQUF1QixHQUNoRCxPQUFPLENBQUMseUJBQXlCLENBQUMsQ0FZcEM7Q0FDRiJ9

package/dest/global_variable_builder/global_builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global_builder.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/global_builder.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,KAAK,iBAAiB,EAAuB,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EACV,yBAAyB,EACzB,qBAAqB,IAAI,8BAA8B,EACxD,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAInD;;GAEG;AACH,qBAAa,qBAAsB,YAAW,8BAA8B;IAC1E,OAAO,CAAC,GAAG,CAAqD;IAChE,OAAO,CAAC,cAAc,CAAwD;IAC9E,OAAO,CAAC,oBAAoB,CAAiC;IAE7D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAmB;IAChD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,OAAO,CAAK;IAEpB,YACE,MAAM,EAAE,cAAc,GACpB,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,GAC/C,IAAI,CAAC,iBAAiB,EAAE,cAAc,GAAG,eAAe,CAAC,GAAG;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE,EAoBxF;YAMa,qBAAqB;IAetB,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAUjD;IAED;;;;;;;OAOG;IACU,oBAAoB,CAC/B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,SAAS,CAAC,EAAE,UAAU,GACrB,OAAO,CAAC,eAAe,CAAC,CAS1B;IAED,yEAAyE;IAC5D,8BAA8B,CACzC,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,yBAAyB,CAAC,CAapC;CACF"}
+{"version":3,"file":"global_builder.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/global_builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,uBAAuB,EAE7B,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,KAAK,iBAAiB,EAAuB,MAAM,6BAA6B,CAAC;AAE1F,OAAO,KAAK,EACV,yBAAyB,EACzB,qBAAqB,IAAI,8BAA8B,EACxD,MAAM,kBAAkB,CAAC;AAE1B,+EAA+E;AAC/E,MAAM,MAAM,2BAA2B,GAAG;IACxC,aAAa,EAAE,UAAU,CAAC;IAC1B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,IAAI,CAAC,iBAAiB,EAAE,cAAc,GAAG,eAAe,CAAC,CAAC;AAE9D;;GAEG;AACH,qBAAa,qBAAsB,YAAW,8BAA8B;IASxE,OAAO,CAAC,QAAQ,CAAC,YAAY;IAR/B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,OAAO,CAAK;IAEpB,YACmB,YAAY,EAAE,gBAAgB,EAC/C,MAAM,EAAE,2BAA2B,EASpC;IAED,yEAAyE;IAC5D,8BAA8B,CACzC,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU,EACtB,uBAAuB,CAAC,EAAE,uBAAuB,GAChD,OAAO,CAAC,yBAAyB,CAAC,CAYpC;CACF"}

package/dest/global_variable_builder/global_builder.js

@@ -1,90 +1,32 @@
-import { createEthereumChain } from '@aztec/ethereum/chain';
-import { makeL1HttpTransport } from '@aztec/ethereum/client';
-import { RollupContract } from '@aztec/ethereum/contracts';
-import { SlotNumber } from '@aztec/foundation/branded-types';
+import { RollupContract, buildSimulationOverridesStateOverride } from '@aztec/ethereum/contracts';
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { createLogger } from '@aztec/foundation/log';
 import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import { GasFees } from '@aztec/stdlib/gas';
-import { GlobalVariables } from '@aztec/stdlib/tx';
-import { createPublicClient } from 'viem';
 /**
  * Simple global variables builder.
  */ export class GlobalVariableBuilder {
-    log = createLogger('sequencer:global_variable_builder');
-    currentMinFees = Promise.resolve(new GasFees(0, 0));
-    currentL1BlockNumber = undefined;
-    rollupContract;
     publicClient;
-    ethereumSlotDuration;
+    rollupContract;
     aztecSlotDuration;
     l1GenesisTime;
     chainId;
     version;
-    constructor(config){
-        const { l1RpcUrls, l1ChainId: chainId, l1Contracts } = config;
-        const chain = createEthereumChain(l1RpcUrls, chainId);
+    constructor(publicClient, config){
+        this.publicClient = publicClient;
         this.version = new Fr(config.rollupVersion);
-        this.chainId = new Fr(chainId);
-        this.ethereumSlotDuration = config.ethereumSlotDuration;
+        this.chainId = new Fr(this.publicClient.chain.id);
         this.aztecSlotDuration = config.slotDuration;
         this.l1GenesisTime = config.l1GenesisTime;
-        this.publicClient = createPublicClient({
-            chain: chain.chainInfo,
-            transport: makeL1HttpTransport(chain.rpcUrls, {
-                timeout: config.l1HttpTimeoutMS
-            }),
-            pollingInterval: config.viemPollingIntervalMS
-        });
-        this.rollupContract = new RollupContract(this.publicClient, l1Contracts.rollupAddress);
-    }
-    /**
-   * 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
-   */ async computeCurrentMinFees() {
-        // 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 = BigInt((await this.publicClient.getBlock()).timestamp + BigInt(this.ethereumSlotDuration));
-        const timestamp = earliestTimestamp > nextEthTimestamp ? earliestTimestamp : nextEthTimestamp;
-        return new GasFees(0, await this.rollupContract.getManaMinFeeAt(timestamp, true));
-    }
-    async getCurrentMinFees() {
-        // 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;
-    }
-    /**
-   * Simple builder of global variables.
-   * @param blockNumber - The block number to build global variables for.
-   * @param coinbase - The address to receive block reward.
-   * @param feeRecipient - The address to receive fees.
-   * @param slotNumber - The slot number to use for the global variables, if undefined it will be calculated.
-   * @returns The global variables for the given block number.
-   */ async buildGlobalVariables(blockNumber, coinbase, feeRecipient, maybeSlot) {
-        const slot = maybeSlot ?? await this.rollupContract.getSlotAt(BigInt((await this.publicClient.getBlock()).timestamp + BigInt(this.ethereumSlotDuration)));
-        const checkpointGlobalVariables = await this.buildCheckpointGlobalVariables(coinbase, feeRecipient, slot);
-        return GlobalVariables.from({
-            blockNumber,
-            ...checkpointGlobalVariables
-        });
+        this.rollupContract = new RollupContract(this.publicClient, config.rollupAddress);
     }
-    /** Builds global variables that are constant throughout a checkpoint. */ async buildCheckpointGlobalVariables(coinbase, feeRecipient, slotNumber) {
+    /** Builds global variables that are constant throughout a checkpoint. */ async buildCheckpointGlobalVariables(coinbase, feeRecipient, slotNumber, simulationOverridesPlan) {
         const { chainId, version } = this;
         const timestamp = getTimestampForSlot(slotNumber, {
             slotDuration: this.aztecSlotDuration,
             l1GenesisTime: this.l1GenesisTime
         });
-        // We can skip much of the logic in getCurrentMinFees since it we already check that we are not within a slot elsewhere.
-        // TODO(palla/mbps): Can we use a cached value here?
-        const gasFees = new GasFees(0, await this.rollupContract.getManaMinFeeAt(timestamp, true));
+        const stateOverride = await buildSimulationOverridesStateOverride(this.rollupContract, simulationOverridesPlan);
+        const gasFees = new GasFees(0, await this.rollupContract.getManaMinFeeAt(timestamp, true, stateOverride));
         return {
             chainId,
             version,

package/dest/global_variable_builder/index.d.ts

@@ -1,2 +1,4 @@
-export { GlobalVariableBuilder } from './global_builder.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9nbG9iYWxfdmFyaWFibGVfYnVpbGRlci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQyJ9
+export { FeeProviderImpl } from './fee_provider.js';
+export { GlobalVariableBuilder, type GlobalVariableBuilderConfig } from './global_builder.js';
+export { FeePredictor } from './fee_predictor.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9nbG9iYWxfdmFyaWFibGVfYnVpbGRlci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDcEQsT0FBTyxFQUFFLHFCQUFxQixFQUFFLEtBQUssMkJBQTJCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUM5RixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUMifQ==

package/dest/global_variable_builder/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,KAAK,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAC9F,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC"}

package/dest/global_variable_builder/index.js

@@ -1 +1,3 @@
+export { FeeProviderImpl } from './fee_provider.js';
 export { GlobalVariableBuilder } from './global_builder.js';
+export { FeePredictor } from './fee_predictor.js';