@aztec-labs/aztec-node 6.0.0 → 6.1.0-nightly.20261024

package/dest/sentinel/sentinel.js

@@ -1,14 +1,27 @@
+import { INITIAL_CHECKPOINT_NUMBER } from '@aztec-labs/constants';
 import { requireStableCommittee } from '@aztec-labs/epoch-cache';
-import { CheckpointProposalHash, EpochNumber, SlotNumber } from '@aztec-labs/foundation/branded-types';
+import { CheckpointNumber, CheckpointProposalHash, EpochNumber, SlotNumber } from '@aztec-labs/foundation/branded-types';
 import { countWhile, filterAsync, fromEntries, getEntries, mapValues } from '@aztec-labs/foundation/collection';
 import { EthAddress } from '@aztec-labs/foundation/eth-address';
 import { createLogger } from '@aztec-labs/foundation/log';
 import { RunningPromise } from '@aztec-labs/foundation/running-promise';
 import { OffenseType, WANT_TO_SLASH_EVENT, getOffenseTypeName } from '@aztec-labs/slasher';
 import { getAttestationInfoFromPublishedCheckpoint } from '@aztec-labs/stdlib/block';
-import { getEpochAtSlot, getSlotRangeForEpoch, getTimestampForSlot } from '@aztec-labs/stdlib/epoch-helpers';
+import { computeQuorum, getEpochAtSlot, getSlotRangeForEpoch, getTimestampForSlot } from '@aztec-labs/stdlib/epoch-helpers';
 import { ConsensusPayload } from '@aztec-labs/stdlib/p2p';
 import EventEmitter from 'node:events';
+const ORPHANED_PROPOSAL_REASON_DESCRIPTIONS = {
+    'parent-not-on-l1': 'the parent checkpoint it built on never landed on L1',
+    'parent-hash-mismatch': 'a different checkpoint landed on L1 in place of the parent it built on',
+    'unexpected-parent-appeared': 'a checkpoint from an earlier slot landed on L1 with its checkpoint number after it was built on the previous one'
+};
+/**
+ * Whether the classification shows the proposal conflicts with a checkpoint that landed on L1, either in its parent's
+ * position or in its own. A validator that already held the landed checkpoint's blocks rejects the proposal's blocks as
+ * conflicting, so it is right not to attest.
+ */ function excusesMissingAttestations(classification) {
+    return classification !== undefined && 'reason' in classification && (classification.reason === 'parent-hash-mismatch' || classification.reason === 'unexpected-parent-appeared');
+}
 /** Maps a validator status to its category: proposer or attestation. */ function statusToCategory(status) {
     switch(status){
         case 'attestation-sent':
@@ -47,12 +60,19 @@ import EventEmitter from 'node:events';
  * ## Six-case taxonomy in `getSlotActivity`
  *
  * For each slot, the sentinel assigns the proposer one of six statuses, ranked highest-confidence
- * first:
+ * first, with case 5 refined into 5a and 5b:
  *
  *  - `checkpoint-mined`        — a checkpoint covering this slot has landed on L1
  *                                (fetched on demand via `archiver.getCheckpoint({ slot })`).
+ *  - `checkpoint-unpublished`  — (5a) a valid checkpoint proposal built on a parent that is on L1
+ *                                reached quorum, yet the proposer did not land it.
+ *  - `checkpoint-orphaned`     — (5b) a valid checkpoint proposal could not land because the parent
+ *                                it built on never reached L1 (the proposer pipelining cascade), or
+ *                                because an earlier slot's checkpoint landed with its number after it
+ *                                had built on the previous one.
  *  - `checkpoint-valid`        — the local node re-executed a checkpoint proposal for this slot
- *                                successfully (consulted via `CheckpointReexecutionTracker`).
+ *                                successfully (consulted via `CheckpointReexecutionTracker`), and it
+ *                                could not be refined into 5a or 5b.
  *  - `checkpoint-invalid`      — the local node re-executed a checkpoint proposal for this slot
  *                                and rejected it (e.g. header/archive/out-hash mismatch, limit
  *                                breach). Proposer-fault.
@@ -62,9 +82,15 @@ import EventEmitter from 'node:events';
  *  - `checkpoint-missed`       — block proposals seen on P2P but no checkpoint proposal at all.
  *  - `blocks-missed`           — no block proposals seen for this slot.
  *
- * Missing-attestor faults are recorded only in `checkpoint-mined` and `checkpoint-valid`, where
- * the local node has positive evidence the checkpoint was canonical or valid. In the other four
- * cases the proposer is at fault and no attestor penalty applies.
+ * Missing-attestor faults are recorded only in `checkpoint-mined` and the three valid-proposal
+ * statuses (`checkpoint-unpublished`, `checkpoint-orphaned`, `checkpoint-valid`), where the local
+ * node has positive evidence the checkpoint was canonical or valid. In the other four cases the
+ * proposer is at fault and no attestor penalty applies. A valid proposal that conflicts with a checkpoint
+ * that landed on L1, in its parent's position or its own, is also exempt: a validator holding the landed
+ * checkpoint's blocks rightly refuses it.
+ *
+ * `checkpoint-unpublished` and `checkpoint-orphaned` are neutral for the proposer, like
+ * `checkpoint-valid`: neither counts toward `missedProposals` or inactivity slashing.
  *
  * ## Re-execution tracker
  *
@@ -100,8 +126,13 @@ import EventEmitter from 'node:events';
     initialSlot;
     lastProcessedSlot;
     /** Largest epoch number for which the end-of-epoch aggregator has run. */ lastEvaluatedEpoch;
+    /** Bumped on every history write so cached stats are never served from before the write. */ historyGeneration;
+    /**
+   * Stats for the default window, shared by every caller until the next processed slot or history write. Computing them
+   * scans and deserializes the full history of every validator, while the inputs only change once per slot.
+   */ defaultStatsCache;
     constructor(epochCache, archiver, p2p, store, reexecutionTracker, config, logger = createLogger('node:sentinel')){
-        super(), this.epochCache = epochCache, this.archiver = archiver, this.p2p = p2p, this.store = store, this.reexecutionTracker = reexecutionTracker, this.config = config, this.logger = logger;
+        super(), this.epochCache = epochCache, this.archiver = archiver, this.p2p = p2p, this.store = store, this.reexecutionTracker = reexecutionTracker, this.config = config, this.logger = logger, this.historyGeneration = 0;
         const interval = epochCache.getL1Constants().ethereumSlotDuration * 1000 / 4;
         this.runningPromise = new RunningPromise(this.work.bind(this), logger, interval);
     }
@@ -391,8 +422,12 @@ import EventEmitter from 'node:events';
    *
    * Proposer status:
    *  - case 6 `checkpoint-mined`        — a checkpoint covering this slot has landed on L1.
+   *  - case 5a `checkpoint-unpublished` — a valid proposal with its parent on L1 reached quorum but
+   *                                       was not landed by the proposer.
+   *  - case 5b `checkpoint-orphaned`    — a valid proposal could not land because its parent never
+   *                                       reached L1, or because an earlier slot took its checkpoint number.
    *  - case 5 `checkpoint-valid`        — the local node re-executed a checkpoint proposal for this
-   *                                       slot successfully.
+   *                                       slot successfully, and it could not be refined into 5a or 5b.
    *  - case 4 `checkpoint-invalid`      — the local node re-executed a checkpoint proposal for this
    *                                       slot and rejected it.
    *  - case 3 `checkpoint-unvalidated`  — the local node observed a checkpoint proposal for this
@@ -400,8 +435,9 @@ import EventEmitter from 'node:events';
    *  - case 2 `checkpoint-missed`       — block proposals seen on P2P but no checkpoint proposal.
    *  - case 1 `blocks-missed`           — no block proposals seen for this slot.
    *
-   * Missing-attestor penalties apply only in cases 5 and 6, where the local node has positive
-   * evidence the checkpoint was valid or has been canonicalised on L1.
+   * Missing-attestor penalties apply only in cases 5 (including 5a and 5b) and 6, where the local
+   * node has positive evidence the checkpoint was valid or has been canonicalised on L1, and never when
+   * the proposal conflicts with a checkpoint that landed in its parent's position or its own.
    */ async getSlotActivity(slot, epoch, proposer, committee) {
         this.logger.debug(`Computing stats for slot ${slot} at epoch ${epoch}`, {
             slot,
@@ -419,13 +455,16 @@ import EventEmitter from 'node:events';
             ...p2pAttestors.map((a)=>a.toString()),
             ...checkpoint?.attestors.map((a)=>a.toString()) ?? []
         ].filter((addr)=>proposer.toString() !== addr));
-        // Determine the proposer status from the six-case taxonomy.
+        // Determine the proposer status from the six-case taxonomy. A valid proposal that never reached L1 (case 5) is
+        // refined into `checkpoint-unpublished` (5a) or `checkpoint-orphaned` (5b) when the evidence allows it.
         const reexecutionOutcome = this.reexecutionTracker.getOutcomeForSlot(slot);
         let status;
+        let classification;
         if (checkpoint) {
             status = 'checkpoint-mined';
         } else if (reexecutionOutcome === 'valid') {
-            status = 'checkpoint-valid';
+            classification = await this.classifyUnpublishedProposal(slot, proposer, committee, p2pAttested);
+            status = classification.status;
         } else if (reexecutionOutcome === 'invalid') {
             status = 'checkpoint-invalid';
         } else if (reexecutionOutcome === 'unvalidated') {
@@ -444,9 +483,10 @@ import EventEmitter from 'node:events';
         // A local `invalid` verdict vetoes them even for a mined checkpoint (an honest validator refuses
         // to sign what it re-executed as invalid), and so does a proposal equivocation in the slot: with
         // two conflicting proposals an honest attestor may have seen an invalid one and correctly
-        // declined, so neither must count as a missed attestor (inactivity slashing).
+        // declined, so neither must count as a missed attestor (inactivity slashing). Nor does a proposal that conflicts
+        // with a checkpoint that landed on L1 (see excusesMissingAttestations).
         const hasEquivocation = this.reexecutionTracker.hasEquivocation(slot);
-        const attestorsExpected = (status === 'checkpoint-mined' || status === 'checkpoint-valid') && reexecutionOutcome !== 'invalid' && !hasEquivocation;
+        const attestorsExpected = (status === 'checkpoint-mined' || status === 'checkpoint-unpublished' || status === 'checkpoint-orphaned' || status === 'checkpoint-valid') && reexecutionOutcome !== 'invalid' && !hasEquivocation && !excusesMissingAttestations(classification);
         const missedAttestors = new Set(attestorsExpected ? committee.filter((v)=>!attestors.has(v.toString()) && !proposer.equals(v)).map((v)=>v.toString()) : []);
         this.logger.debug(`Retrieved ${attestors.size} attestors out of ${committee.length} for slot ${slot}`, {
             status,
@@ -478,10 +518,151 @@ import EventEmitter from 'node:events';
                 statusFor(who)
             ]));
     }
-    /** Push the status for each slot for each validator. */ updateValidators(slot, stats) {
-        return this.store.updateValidators(slot, stats);
+    /**
+   * Refines case 5 (a checkpoint proposal for the slot re-executed as valid, with no checkpoint for the slot on L1)
+   * into whose fault it was that the proposal did not land:
+   *
+   *  - `checkpoint-orphaned` (5b) when other proposers prevented it: the parent it built on never landed on L1 (it is
+   *    missing, or a different checkpoint holds the parent's position), or, with a quorum of attestations, an earlier
+   *    slot's checkpoint landed with its number after it built on the previous one (`unexpected-parent-appeared`).
+   *    The latter happens when the earlier slot's proposal reached this proposer too late to build on.
+   *  - `checkpoint-unpublished` (5a) when its parent is on L1 and a quorum of the committee attested, so the proposer
+   *    had everything it needed to publish. A later slot that lands the same checkpoint number does not exempt it:
+   *    that slot only got the number because this proposer failed to land it.
+   *  - `checkpoint-valid` (5) otherwise: the slot had an equivocation, the tracker has no parent or payload data to
+   *    judge by, or attestations fell short of quorum. Short of quorum is a fault of the attestors, who are tagged
+   *    `attestation-missed`, except after an unexpected parent appeared (`unexpected-parent-appeared`), when
+   *    refusing to attest was correct.
+   *
+   * Only attestations for the proposal's own payload count toward quorum, since those are the only ones its proposer
+   * could have published.
+   */ async classifyUnpublishedProposal(slot, proposer, committee, p2pAttested) {
+        if (this.reexecutionTracker.hasEquivocation(slot)) {
+            return {
+                status: 'checkpoint-valid',
+                reason: 'equivocation'
+            };
+        }
+        const record = this.reexecutionTracker.getRecordForSlot(slot);
+        const checkpointNumber = record?.checkpointNumber;
+        const lastArchiveRoot = record?.lastArchiveRoot;
+        const payloadHash = record?.payloadHash;
+        if (checkpointNumber === undefined || lastArchiveRoot === undefined || payloadHash === undefined) {
+            return {
+                status: 'checkpoint-valid',
+                reason: 'no-proposal-data'
+            };
+        }
+        const logData = {
+            slot,
+            proposer: proposer.toString(),
+            checkpointNumber
+        };
+        const orphaned = (reason, extra = {})=>{
+            this.logger.verbose(`Valid checkpoint proposal for slot ${slot} was orphaned (${reason}): ${ORPHANED_PROPOSAL_REASON_DESCRIPTIONS[reason]}`, {
+                ...logData,
+                ...extra,
+                reason
+            });
+            return {
+                status: 'checkpoint-orphaned',
+                reason
+            };
+        };
+        // The first checkpoint builds on genesis, which is always on L1.
+        const parentNumber = checkpointNumber - 1;
+        if (parentNumber >= INITIAL_CHECKPOINT_NUMBER) {
+            const parent = await this.archiver.getCheckpointData({
+                number: CheckpointNumber(parentNumber)
+            });
+            if (!parent) {
+                return orphaned('parent-not-on-l1');
+            }
+            if (parent.archive.root.toString() !== lastArchiveRoot) {
+                return orphaned('parent-hash-mismatch');
+            }
+        }
+        // The proposer's own attestation counts, as it does when its sequencer collects attestations for L1.
+        const committeeMembers = new Set(committee.map((member)=>member.toString()));
+        const attestationCount = new Set(p2pAttested.filter((attestation)=>attestation.getPayloadHash() === payloadHash).map((attestation)=>attestation.getSender()?.toString()).filter((attestor)=>attestor !== undefined && committeeMembers.has(attestor))).size;
+        const quorum = computeQuorum(committee.length);
+        // A checkpoint landed for the slot itself would have made this case 6, so a holder of the same number comes from
+        // an earlier or a later slot. Only an earlier one can have stopped this proposal from landing.
+        const sameNumber = await this.archiver.getCheckpointData({
+            number: checkpointNumber
+        });
+        const sameNumberSlot = sameNumber?.header.slotNumber;
+        if (sameNumberSlot !== undefined && sameNumberSlot < slot) {
+            const conflictData = {
+                takenBySlot: sameNumberSlot,
+                attestationCount,
+                quorum
+            };
+            if (attestationCount < quorum) {
+                this.logger.verbose(`Valid checkpoint proposal for slot ${slot} fell short of quorum after checkpoint ${checkpointNumber} landed ` + `from earlier slot ${sameNumberSlot} (unexpected-parent-appeared), so missing attestations are not counted`, {
+                    ...logData,
+                    ...conflictData,
+                    reason: 'unexpected-parent-appeared'
+                });
+                return {
+                    status: 'checkpoint-valid',
+                    reason: 'unexpected-parent-appeared'
+                };
+            }
+            return orphaned('unexpected-parent-appeared', conflictData);
+        }
+        if (attestationCount < quorum) {
+            return {
+                status: 'checkpoint-valid',
+                reason: 'below-quorum'
+            };
+        }
+        this.logger.info(`Proposer did not publish checkpoint ${checkpointNumber} for slot ${slot} despite quorum`, {
+            ...logData,
+            attestationCount,
+            quorum
+        });
+        return {
+            status: 'checkpoint-unpublished'
+        };
+    }
+    /** Push the status for each slot for each validator. */ async updateValidators(slot, stats) {
+        this.historyGeneration++;
+        try {
+            await this.store.updateValidators(slot, stats);
+        } finally{
+            this.historyGeneration++;
+        }
+    }
+    /**
+   * Computes stats to be returned based on stored data. Calls without arguments cover the default window ending at the
+   * last processed slot and are served from a cache that is refreshed whenever that slot or the stored history changes.
+   */ computeStats(args = {}) {
+        const isDefaultWindow = args.fromSlot === undefined && args.toSlot === undefined && args.validators === undefined;
+        // Before the first processed slot the default window ends at the wall-clock slot, which moves without any write.
+        if (!isDefaultWindow || this.lastProcessedSlot === undefined) {
+            return this.computeStatsUncached(args);
+        }
+        const { lastProcessedSlot, initialSlot, historyGeneration } = this;
+        if (this.defaultStatsCache?.lastProcessedSlot !== lastProcessedSlot || this.defaultStatsCache.initialSlot !== initialSlot || this.defaultStatsCache.historyGeneration !== historyGeneration) {
+            const stats = this.computeStatsUncached(args);
+            const entry = {
+                lastProcessedSlot,
+                initialSlot,
+                historyGeneration,
+                stats
+            };
+            this.defaultStatsCache = entry;
+            // A failed computation is dropped so the next caller retries instead of receiving the cached rejection.
+            stats.catch(()=>{
+                if (this.defaultStatsCache === entry) {
+                    this.defaultStatsCache = undefined;
+                }
+            });
+        }
+        return this.defaultStatsCache.stats;
     }
-    /** Computes stats to be returned based on stored data. */ async computeStats({ fromSlot, toSlot, validators } = {}) {
+    async computeStatsUncached({ fromSlot, toSlot, validators }) {
         const histories = validators ? fromEntries(await Promise.all(validators.map(async (v)=>[
                 v.toString(),
                 await this.store.getHistory(v)
@@ -551,7 +732,7 @@ import EventEmitter from 'node:events';
     computeStatsForValidator(address, allHistory, fromSlot, toSlot) {
         let history = fromSlot ? allHistory.filter((h)=>BigInt(h.slot) >= fromSlot) : allHistory;
         history = toSlot ? history.filter((h)=>BigInt(h.slot) <= toSlot) : history;
-        const lastProposal = history.filter((h)=>h.status === 'checkpoint-valid' || h.status === 'checkpoint-mined').at(-1);
+        const lastProposal = history.filter((h)=>h.status === 'checkpoint-valid' || h.status === 'checkpoint-unpublished' || h.status === 'checkpoint-orphaned' || h.status === 'checkpoint-mined').at(-1);
         const lastAttestation = history.filter((h)=>h.status === 'attestation-sent').at(-1);
         return {
             address: EthAddress.fromString(address),

package/dest/sentinel/store.d.ts

@@ -40,4 +40,4 @@ export declare class SentinelStore {
     private statusToNumber;
     private statusFromNumber;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZW50aW5lbC9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBQy9FLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxzQkFBc0IsQ0FBQztBQUM3RSxPQUFPLEtBQUssRUFDVixzQkFBc0IsRUFDdEIscUJBQXFCLEVBQ3JCLDBCQUEwQixFQUMzQixNQUFNLCtCQUErQixDQUFDO0FBRXZDLHFCQUFhLGFBQWE7SUFXdEIsT0FBTyxDQUFDLEtBQUs7SUFDYixPQUFPLENBQUMsTUFBTTtJQVhoQixnQkFBdUIsY0FBYyxLQUFLO0lBRzFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUF1QztJQUlsRSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBdUM7SUFFaEUsWUFDVSxLQUFLLEVBQUUsaUJBQWlCLEVBQ3hCLE1BQU0sRUFBRTtRQUFFLGFBQWEsRUFBRSxNQUFNLENBQUM7UUFBQyw4QkFBOEIsRUFBRSxNQUFNLENBQUE7S0FBRSxFQUlsRjtJQUVNLGdCQUFnQixXQUV0QjtJQUVNLGlDQUFpQyxXQUV2QztJQUVZLHNCQUFzQixDQUFDLEtBQUssRUFBRSxXQUFXLEVBQUUsV0FBVyxFQUFFLDBCQUEwQixpQkFNOUY7SUFFWSxtQkFBbUIsQ0FBQyxHQUFHLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQztRQUFFLE1BQU0sRUFBRSxNQUFNLENBQUM7UUFBQyxLQUFLLEVBQUUsTUFBTSxDQUFDO1FBQUMsS0FBSyxFQUFFLFdBQVcsQ0FBQTtLQUFFLEVBQUUsQ0FBQyxDQUdsSDtJQUVELDhHQUE4RztJQUNqRyx3QkFBd0IsQ0FDbkMsU0FBUyxFQUFFLFVBQVUsRUFBRSxHQUN0QixPQUFPLENBQUM7UUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDO1FBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQztRQUFDLEtBQUssRUFBRSxXQUFXLENBQUE7S0FBRSxFQUFFLEVBQUUsQ0FBQyxDQUdwRTtZQUVhLDZCQUE2QjtJQTZCOUIsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDLEtBQUssTUFBTSxFQUFFLEVBQUUscUJBQXFCLEdBQUcsU0FBUyxDQUFDLGlCQVFqSDtZQUVhLDBCQUEwQjtJQVEzQixZQUFZLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLE1BQU0sRUFBRSxFQUFFLHNCQUFzQixDQUFDLENBQUMsQ0FNbEY7SUFFWSxVQUFVLENBQUMsT0FBTyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsc0JBQXNCLEdBQUcsU0FBUyxDQUFDLENBR3hGO0lBRUQsMEZBQTBGO0lBQzdFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsVUFBVSxFQUFFLEdBQUcsT0FBTyxDQUFDLENBQUMsc0JBQXNCLEdBQUcsU0FBUyxDQUFDLEVBQUUsQ0FBQyxDQUdyRztJQUVELE9BQU8sQ0FBQyxvQkFBb0I7SUFNNUIsT0FBTyxDQUFDLHNCQUFzQjtJQWE5QixPQUFPLENBQUMsZ0JBQWdCO0lBTXhCLE9BQU8sQ0FBQyxrQkFBa0I7SUFXMUIsT0FBTyxDQUFDLGNBQWM7SUF5QnRCLE9BQU8sQ0FBQyxnQkFBZ0I7Q0FzQnpCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZW50aW5lbC9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBQy9FLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxzQkFBc0IsQ0FBQztBQUM3RSxPQUFPLEtBQUssRUFDVixzQkFBc0IsRUFDdEIscUJBQXFCLEVBQ3JCLDBCQUEwQixFQUMzQixNQUFNLCtCQUErQixDQUFDO0FBRXZDLHFCQUFhLGFBQWE7SUFXdEIsT0FBTyxDQUFDLEtBQUs7SUFDYixPQUFPLENBQUMsTUFBTTtJQVhoQixnQkFBdUIsY0FBYyxLQUFLO0lBRzFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUF1QztJQUlsRSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBdUM7SUFFaEUsWUFDVSxLQUFLLEVBQUUsaUJBQWlCLEVBQ3hCLE1BQU0sRUFBRTtRQUFFLGFBQWEsRUFBRSxNQUFNLENBQUM7UUFBQyw4QkFBOEIsRUFBRSxNQUFNLENBQUE7S0FBRSxFQUlsRjtJQUVNLGdCQUFnQixXQUV0QjtJQUVNLGlDQUFpQyxXQUV2QztJQUVZLHNCQUFzQixDQUFDLEtBQUssRUFBRSxXQUFXLEVBQUUsV0FBVyxFQUFFLDBCQUEwQixpQkFNOUY7SUFFWSxtQkFBbUIsQ0FBQyxHQUFHLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQztRQUFFLE1BQU0sRUFBRSxNQUFNLENBQUM7UUFBQyxLQUFLLEVBQUUsTUFBTSxDQUFDO1FBQUMsS0FBSyxFQUFFLFdBQVcsQ0FBQTtLQUFFLEVBQUUsQ0FBQyxDQUdsSDtJQUVELDhHQUE4RztJQUNqRyx3QkFBd0IsQ0FDbkMsU0FBUyxFQUFFLFVBQVUsRUFBRSxHQUN0QixPQUFPLENBQUM7UUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDO1FBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQztRQUFDLEtBQUssRUFBRSxXQUFXLENBQUE7S0FBRSxFQUFFLEVBQUUsQ0FBQyxDQUdwRTtZQUVhLDZCQUE2QjtJQTZCOUIsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDLEtBQUssTUFBTSxFQUFFLEVBQUUscUJBQXFCLEdBQUcsU0FBUyxDQUFDLGlCQVFqSDtZQUVhLDBCQUEwQjtJQVEzQixZQUFZLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLE1BQU0sRUFBRSxFQUFFLHNCQUFzQixDQUFDLENBQUMsQ0FNbEY7SUFFWSxVQUFVLENBQUMsT0FBTyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsc0JBQXNCLEdBQUcsU0FBUyxDQUFDLENBR3hGO0lBRUQsMEZBQTBGO0lBQzdFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsVUFBVSxFQUFFLEdBQUcsT0FBTyxDQUFDLENBQUMsc0JBQXNCLEdBQUcsU0FBUyxDQUFDLEVBQUUsQ0FBQyxDQUdyRztJQUVELE9BQU8sQ0FBQyxvQkFBb0I7SUFNNUIsT0FBTyxDQUFDLHNCQUFzQjtJQWE5QixPQUFPLENBQUMsZ0JBQWdCO0lBTXhCLE9BQU8sQ0FBQyxrQkFBa0I7SUFXMUIsT0FBTyxDQUFDLGNBQWM7SUE2QnRCLE9BQU8sQ0FBQyxnQkFBZ0I7Q0EwQnpCIn0=

package/dest/sentinel/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/sentinel/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EACV,sBAAsB,EACtB,qBAAqB,EACrB,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AAEvC,qBAAa,aAAa;IAWtB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,MAAM;IAXhB,gBAAuB,cAAc,KAAK;IAG1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAuC;IAIlE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAuC;IAEhE,YACU,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,8BAA8B,EAAE,MAAM,CAAA;KAAE,EAIlF;IAEM,gBAAgB,WAEtB;IAEM,iCAAiC,WAEvC;IAEY,sBAAsB,CAAC,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,0BAA0B,iBAM9F;IAEY,mBAAmB,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,WAAW,CAAA;KAAE,EAAE,CAAC,CAGlH;IAED,8GAA8G;IACjG,wBAAwB,CACnC,SAAS,EAAE,UAAU,EAAE,GACtB,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,WAAW,CAAA;KAAE,EAAE,EAAE,CAAC,CAGpE;YAEa,6BAA6B;IA6B9B,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,qBAAqB,GAAG,SAAS,CAAC,iBAQjH;YAEa,0BAA0B;IAQ3B,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC,CAMlF;IAEY,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CAGxF;IAED,0FAA0F;IAC7E,eAAe,CAAC,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,CAAC,sBAAsB,GAAG,SAAS,CAAC,EAAE,CAAC,CAGrG;IAED,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,sBAAsB;IAa9B,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,cAAc;IAyBtB,OAAO,CAAC,gBAAgB;CAsBzB"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/sentinel/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EACV,sBAAsB,EACtB,qBAAqB,EACrB,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AAEvC,qBAAa,aAAa;IAWtB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,MAAM;IAXhB,gBAAuB,cAAc,KAAK;IAG1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAuC;IAIlE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAuC;IAEhE,YACU,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,8BAA8B,EAAE,MAAM,CAAA;KAAE,EAIlF;IAEM,gBAAgB,WAEtB;IAEM,iCAAiC,WAEvC;IAEY,sBAAsB,CAAC,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,0BAA0B,iBAM9F;IAEY,mBAAmB,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,WAAW,CAAA;KAAE,EAAE,CAAC,CAGlH;IAED,8GAA8G;IACjG,wBAAwB,CACnC,SAAS,EAAE,UAAU,EAAE,GACtB,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,WAAW,CAAA;KAAE,EAAE,EAAE,CAAC,CAGpE;YAEa,6BAA6B;IA6B9B,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,qBAAqB,GAAG,SAAS,CAAC,iBAQjH;YAEa,0BAA0B;IAQ3B,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC,CAMlF;IAEY,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CAGxF;IAED,0FAA0F;IAC7E,eAAe,CAAC,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,CAAC,sBAAsB,GAAG,SAAS,CAAC,EAAE,CAAC,CAGrG;IAED,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,sBAAsB;IAa9B,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,cAAc;IA6BtB,OAAO,CAAC,gBAAgB;CA0BzB"}

package/dest/sentinel/store.js

@@ -158,6 +158,10 @@ export class SentinelStore {
                 return 7;
             case 'checkpoint-unvalidated':
                 return 8;
+            case 'checkpoint-unpublished':
+                return 9;
+            case 'checkpoint-orphaned':
+                return 10;
             default:
                 {
                     const _exhaustive = status;
@@ -183,6 +187,10 @@ export class SentinelStore {
                 return 'checkpoint-invalid';
             case 8:
                 return 'checkpoint-unvalidated';
+            case 9:
+                return 'checkpoint-unpublished';
+            case 10:
+                return 'checkpoint-orphaned';
             default:
                 throw new Error(`Unknown status: ${status}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec-labs/aztec-node",
-  "version": "6.0.0",
+  "version": "6.1.0-nightly.20261024",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
@@ -65,38 +65,38 @@
     ]
   },
   "dependencies": {
-    "@aztec-foundation/bb.js": "6.0.0",
-    "@aztec-labs/archiver": "6.0.0",
-    "@aztec-labs/bb-prover": "6.0.0",
-    "@aztec-labs/blob-client": "6.0.0",
-    "@aztec-labs/blob-lib": "6.0.0",
-    "@aztec-labs/constants": "6.0.0",
-    "@aztec-labs/epoch-cache": "6.0.0",
-    "@aztec-labs/ethereum": "6.0.0",
-    "@aztec-labs/foundation": "6.0.0",
-    "@aztec-labs/kv-store": "6.0.0",
-    "@aztec-labs/node-keystore": "6.0.0",
-    "@aztec-labs/node-lib": "6.0.0",
-    "@aztec-labs/p2p": "6.0.0",
-    "@aztec-labs/protocol-contracts": "6.0.0",
-    "@aztec-labs/prover-client": "6.0.0",
-    "@aztec-labs/prover-node": "6.0.0",
-    "@aztec-labs/sequencer-client": "6.0.0",
-    "@aztec-labs/simulator": "6.0.0",
-    "@aztec-labs/slasher": "6.0.0",
-    "@aztec-labs/standard-contracts": "6.0.0",
-    "@aztec-labs/stdlib": "6.0.0",
-    "@aztec-labs/telemetry-client": "6.0.0",
-    "@aztec-labs/validator-client": "6.0.0",
-    "@aztec-labs/validator-ha-signer": "6.0.0",
-    "@aztec-labs/world-state": "6.0.0",
+    "@aztec-foundation/bb.js": "6.0.0-rc.7",
+    "@aztec-labs/archiver": "6.1.0-nightly.20261024",
+    "@aztec-labs/bb-prover": "6.1.0-nightly.20261024",
+    "@aztec-labs/blob-client": "6.1.0-nightly.20261024",
+    "@aztec-labs/blob-lib": "6.1.0-nightly.20261024",
+    "@aztec-labs/constants": "6.1.0-nightly.20261024",
+    "@aztec-labs/epoch-cache": "6.1.0-nightly.20261024",
+    "@aztec-labs/ethereum": "6.1.0-nightly.20261024",
+    "@aztec-labs/foundation": "6.1.0-nightly.20261024",
+    "@aztec-labs/kv-store": "6.1.0-nightly.20261024",
+    "@aztec-labs/node-keystore": "6.1.0-nightly.20261024",
+    "@aztec-labs/node-lib": "6.1.0-nightly.20261024",
+    "@aztec-labs/p2p": "6.1.0-nightly.20261024",
+    "@aztec-labs/protocol-contracts": "6.1.0-nightly.20261024",
+    "@aztec-labs/prover-client": "6.1.0-nightly.20261024",
+    "@aztec-labs/prover-node": "6.1.0-nightly.20261024",
+    "@aztec-labs/sequencer-client": "6.1.0-nightly.20261024",
+    "@aztec-labs/simulator": "6.1.0-nightly.20261024",
+    "@aztec-labs/slasher": "6.1.0-nightly.20261024",
+    "@aztec-labs/standard-contracts": "6.1.0-nightly.20261024",
+    "@aztec-labs/stdlib": "6.1.0-nightly.20261024",
+    "@aztec-labs/telemetry-client": "6.1.0-nightly.20261024",
+    "@aztec-labs/validator-client": "6.1.0-nightly.20261024",
+    "@aztec-labs/validator-ha-signer": "6.1.0-nightly.20261024",
+    "@aztec-labs/world-state": "6.1.0-nightly.20261024",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
     "tslib": "^2.4.0",
     "viem": "2.57.1"
   },
   "devDependencies": {
-    "@aztec-labs/noir-protocol-circuits-types": "6.0.0",
+    "@aztec-labs/noir-protocol-circuits-types": "6.1.0-nightly.20261024",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",

package/src/aztec-node/next_block/next_block_fee_cache.ts

@@ -275,6 +275,17 @@ export class NextBlockFeeCache {
       return pinnedTips();
     }
 
+    // The plan's L1 reads are pinned to the archiver's sync point, which only exists once the archiver has run a
+    // sync pass. Until then there is no L1 block to read the parent's fee header at, so price on the checkpointed tip,
+    // as the fee simulation itself falls back to L1's head.
+    const l1SyncPoint = frontier.l1SyncPoint;
+    if (l1SyncPoint === undefined) {
+      this.log.debug(
+        `Pricing the next-block boundary on checkpointed tip ${checkpointedCheckpointNumber}: no L1 sync point yet`,
+      );
+      return pinnedTips();
+    }
+
     // The helper treats pipelining and invalidation as mutually exclusive; a proposed parent takes precedence.
     const validationStatus = frontier.pendingChainValidationStatus;
     const invalidateToPendingCheckpointNumber =
@@ -287,6 +298,8 @@ export class NextBlockFeeCache {
       invalidateToPendingCheckpointNumber,
       checkpointedCheckpointNumber,
       rollup,
+      // The same L1 block the fee simulation is pinned to, so the parent's fee header and the fee agree.
+      l1BlockNumber: l1SyncPoint.blockNumber,
       signatureContext: this.signatureContext,
       log: this.log,
     });

package/src/aztec-node/server.ts

@@ -54,7 +54,12 @@ import type {
   ProtocolContractAddresses,
 } from '@aztec-labs/stdlib/contract';
 import type { L1RollupConstants } from '@aztec-labs/stdlib/epoch-helpers';
-import { GasFees, type ManaUsageEstimate, getNetworkTxGasLimits } from '@aztec-labs/stdlib/gas';
+import {
+  GasFees,
+  type ManaUsageEstimate,
+  type RollupFeeConfigProvider,
+  getNetworkTxGasLimits,
+} from '@aztec-labs/stdlib/gas';
 import type {
   AztecNode,
   AztecNodeAdmin,
@@ -146,6 +151,8 @@ export interface AztecNodeServiceDeps {
   rollupContract: RollupContract | undefined;
   feeProvider: FeeProvider;
   nextBlockPredictor: NextBlockPredictor;
+  /** Live rollup fee settings, for the mana limit tx gas limits are derived from. Stopped with the node. */
+  feeConfigProvider: RollupFeeConfigProvider;
   epochCache: EpochCacheInterface;
   packageVersion: string;
   peerProofVerifier: ClientProtocolCircuitVerifier;
@@ -199,6 +206,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
   protected readonly rollupContract: RollupContract | undefined;
   protected readonly feeProvider: FeeProvider;
   protected readonly nextBlockPredictor: NextBlockPredictor;
+  protected readonly feeConfigProvider: RollupFeeConfigProvider;
   protected readonly epochCache: EpochCacheInterface;
   protected readonly packageVersion: string;
   private peerProofVerifier: ClientProtocolCircuitVerifier;
@@ -231,6 +239,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     this.rollupContract = deps.rollupContract;
     this.feeProvider = deps.feeProvider;
     this.nextBlockPredictor = deps.nextBlockPredictor;
+    this.feeConfigProvider = deps.feeConfigProvider;
     this.epochCache = deps.epochCache;
     this.packageVersion = deps.packageVersion;
     this.peerProofVerifier = deps.peerProofVerifier;
@@ -313,8 +322,15 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     return this.blockSource.getL2Tips();
   }
 
-  public getL1Constants(): Promise<L1RollupConstants> {
-    return this.blockSource.getL1Constants();
+  public async getL1Constants(): Promise<L1RollupConstants> {
+    const constants = await this.blockSource.getL1Constants();
+    // Older clients' schemas still require `rollupManaLimit`, so keep sending it, now with the live value. Newer
+    // clients' schemas strip the extra key.
+    const response: L1RollupConstants & { rollupManaLimit: number } = {
+      ...constants,
+      rollupManaLimit: Number(this.feeConfigProvider.getFeeConfig().manaLimit),
+    };
+    return response;
   }
 
   public getSyncedL2SlotNumber() {
@@ -465,7 +481,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     // timetable's blocks-per-checkpoint and the network-minimum per-block multipliers) — never this node's
     // local caps or configured multipliers, which can make the node stricter at block-building time but
     // cannot define what the network accepts for relay. Clients read txsLimits to set fallback gas limits.
-    const maxTxGas = getNetworkTxGasLimits(this.config, l1Constants);
+    const maxTxGas = getNetworkTxGasLimits(this.config, l1Constants, this.feeConfigProvider.getFeeConfig());
 
     const nodeInfo: NodeInfo = {
       nodeVersion,
@@ -632,6 +648,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     await tryStop(this.p2pClient);
     await tryStop(this.nextBlockPredictor);
     await tryStop(this.feeProvider);
+    await tryStop(this.feeConfigProvider);
     // Dispose the AVM backend before world state: it kills the bb-avm-sim processes and closes the CDB IPC
     // server, releasing their connections to the WSDB so it shuts down cleanly (and freeing the
     // Server/Socket/ChildProcess handles that would otherwise keep the process alive after teardown).
@@ -827,7 +844,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     const l1Constants = await this.blockSource.getL1Constants();
     // Enforce the same network admission limit the node advertises in getNodeInfo (network-wide, not this
     // node's local caps), so a tx the wallet sized against txsLimits is not rejected here.
-    const networkTxGasLimits = getNetworkTxGasLimits(this.config, l1Constants);
+    const networkTxGasLimits = getNetworkTxGasLimits(this.config, l1Constants, this.feeConfigProvider.getFeeConfig());
     const validator = createTxValidatorForAcceptingTxsOverRPC(
       db,
       this.contractDataSource,

package/src/factory.ts

@@ -39,6 +39,7 @@ import {
   createSlasher,
 } from '@aztec-labs/slasher';
 import { CheckpointReexecutionTracker } from '@aztec-labs/stdlib/checkpoint';
+import { RollupFeeConfigTracker } from '@aztec-labs/stdlib/gas';
 import { type ClientProtocolCircuitVerifier, tryStop } from '@aztec-labs/stdlib/interfaces/server';
 import { type DebugLogStore, InMemoryDebugLogStore, NullDebugLogStore } from '@aztec-labs/stdlib/logs';
 import { getPackageVersion } from '@aztec-labs/stdlib/update-checker';
@@ -185,12 +186,11 @@ export async function createAztecNodeService(
   // Read-only Inbox handle: proposal validation confirms a checkpoint's final message position against the live
   // bucket ring before accepting it, so every node needs one, validator or not.
   const inboxContract = new InboxContract(publicClient, config.inboxAddress);
-  const [l1GenesisTime, slotDuration, epochDuration, rollupVersionFromRollup, rollupManaLimit] = await Promise.all([
+  const [l1GenesisTime, slotDuration, epochDuration, rollupVersionFromRollup] = await Promise.all([
     rollupContract.getL1GenesisTime(),
     rollupContract.getSlotDuration(),
     rollupContract.getEpochDuration(),
     rollupContract.getVersion(),
-    rollupContract.getManaLimit().then(Number),
   ] as const);
 
   config.rollupVersion ??= Number(rollupVersionFromRollup);
@@ -211,6 +211,14 @@ export async function createAztecNodeService(
   // Track started resources so we can clean up on partial failure during node creation.
   const started: { stop?(): Promise<void> | void }[] = [];
   try {
+    // Governance can change the rollup's fee settings (the mana target and limit among them) at any time, so every
+    // component that needs them reads them from this tracker rather than from a copy taken at startup.
+    const feeConfigTracker = await RollupFeeConfigTracker.create(rollupContract, {
+      logger: log.createChild('rollup-fee-config'),
+    });
+    feeConfigTracker.start();
+    started.push(feeConfigTracker);
+
     config.skipOrphanProposedBlockPruning ||= !!config.useAutomineSequencer;
 
     checkConfigMatchesRollup(config, {
@@ -234,7 +242,7 @@ export async function createAztecNodeService(
     started.push({ stop: () => avmSimulator[Symbol.asyncDispose]() });
     const archiver = await createArchiver(
       config,
-      { blobClient, epochCache, telemetry, dateProvider },
+      { blobClient, epochCache, telemetry, dateProvider, feeConfigProvider: feeConfigTracker },
       { blockUntilSync: !config.skipArchiverInitialSync },
       initialHeader,
       initialBlockHash,
@@ -321,6 +329,7 @@ export async function createAztecNodeService(
       worldStateSynchronizer,
       epochCache,
       new AdmissionMinFeesProvider(nextBlockPredictor, feeProvider),
+      feeConfigTracker,
       packageVersion,
       dateProvider,
       telemetry,
@@ -340,13 +349,13 @@ export async function createAztecNodeService(
         ...config,
         l1GenesisTime,
         slotDuration: Number(slotDuration),
-        rollupManaLimit,
         maxTxsPerCheckpoint: config.validateMaxTxsPerCheckpoint,
       },
       worldStateSynchronizer,
       archiver,
       dateProvider,
       avmSimulator,
+      feeConfigTracker,
       telemetry,
     );
 
@@ -563,11 +572,12 @@ export async function createAztecNodeService(
 
       // Create and start the sequencer client
       const checkpointsBuilder = new CheckpointsBuilder(
-        { ...config, l1GenesisTime, slotDuration: Number(slotDuration), rollupManaLimit },
+        { ...config, l1GenesisTime, slotDuration: Number(slotDuration) },
         worldStateSynchronizer,
         archiver,
         dateProvider,
         avmSimulator,
+        feeConfigTracker,
         telemetry,
         debugLogStore,
       );
@@ -596,7 +606,6 @@ export async function createAztecNodeService(
             l1GenesisTime,
             slotDuration: Number(slotDuration),
             ethereumSlotDuration: config.ethereumSlotDuration,
-            rollupManaLimit,
           },
           autoSettle: config.automineEnableProveEpoch,
           log,
@@ -612,6 +621,7 @@ export async function createAztecNodeService(
           worldStateSynchronizer,
           slasherClient,
           checkpointsBuilder,
+          feeConfigProvider: feeConfigTracker,
           l2BlockSource: archiver,
           l1ToL2MessageSource: archiver,
           telemetry,
@@ -683,6 +693,7 @@ export async function createAztecNodeService(
       rollupContract,
       feeProvider,
       nextBlockPredictor,
+      feeConfigProvider: feeConfigTracker,
       epochCache,
       packageVersion,
       peerProofVerifier,