@aztec-labs/aztec-node 6.1.0-nightly.20261102 → 6.1.0-nightly.20261104

package/dest/aztec-node/next_block/next_block_fee_cache.d.ts

@@ -1,10 +1,13 @@
 import type { EpochCacheInterface } from '@aztec-labs/epoch-cache';
 import { type RollupContract } from '@aztec-labs/ethereum/contracts';
+import { type SlotNumber } from '@aztec-labs/foundation/branded-types';
 import { type Logger } from '@aztec-labs/foundation/log';
 import { type DateProvider } from '@aztec-labs/foundation/timer';
-import type { L2BlockSource, L2Frontier } from '@aztec-labs/stdlib/block';
+import type { L2BlockId, L2BlockSource, L2Frontier } from '@aztec-labs/stdlib/block';
+import type { GasFees } from '@aztec-labs/stdlib/gas';
 import type { CoordinationSignatureContext } from '@aztec-labs/stdlib/p2p';
 import type { CheckpointGlobalVariables, GlobalVariableBuilder } from '@aztec-labs/stdlib/tx';
+import type { CheckpointOpeningFeeSource } from '@aztec-labs/validator-client';
 import { type BoundaryFeeKey } from './next_block_planner.js';
 /** Default interval for the background refresh, well below L1's block time. */
 export declare const DEFAULT_REFRESH_INTERVAL_MS = 1000;
@@ -51,7 +54,7 @@ export interface NextBlockFeeCacheDeps {
  * Before {@link start} (or after {@link stop}) requests still price inline through the same refresh path, which
  * is what tests and TXE-like environments rely on.
  */
-export declare class NextBlockFeeCache {
+export declare class NextBlockFeeCache implements CheckpointOpeningFeeSource {
     private readonly blockSource;
     private readonly globalVariableBuilder;
     private readonly rollupContract;
@@ -83,17 +86,47 @@ export declare class NextBlockFeeCache {
     getBoundaryGlobals(key: BoundaryFeeKey, frontier: L2Frontier, opts?: {
         maxWaitMs?: number;
     }): Promise<CheckpointGlobalVariables | undefined>;
+    /**
+     * The gas fees the first block of a checkpoint at `slot` built on `parent` must carry, for checking a block proposal
+     * against. Keyed on the proposal's slot and parent rather than on the slot this node's clock would plan: the frontier
+     * must end at `parent`, and the boundary is planned for `slot` from it. A matching record is served from memory; on
+     * a miss the request joins the refresh in flight and then runs a pass planned on `slot`, so it gets the exact price
+     * and not a fallback.
+     *
+     * Undefined when this node's view does not hold the data to produce the price the proposer computes yet: the
+     * frontier does not end at `parent` (the parent's checkpoint proposal has not been processed, or the chain moved
+     * on), or the checkpointed tip has not reached the parent's parent, whose fee state the pipelined plan reads from
+     * L1 (see {@link pricesAsProposer}). The caller waits for a later archiver sync rather than accepting the pinned-tips
+     * approximation. Throws when the L1 read fails.
+     *
+     * Only a record priced at the frontier's L1 block, or at a later one, is served. The L1 fee oracle can change without
+     * moving the frontier (anyone may call its update), and the background loop only catches up within a refresh
+     * interval, so an older record could carry a price the proposer has already moved past.
+     */
+    getCheckpointOpeningGasFees(slot: SlotNumber, parent: L2BlockId): Promise<GasFees | undefined>;
     /**
      * Runs one refresh pass, or joins the one already running. Single-flight is what keeps a burst of requests
      * during a transition down to a single L1 round trip, shared with the background loop.
      * @param frontier - Snapshot to plan from; read fresh from the archiver when omitted, as the loop does.
+     * @param slot - Slot to plan the boundary for in place of this node's clock slot.
      */
-    refresh(frontier?: L2Frontier): Promise<void>;
+    refresh(frontier?: L2Frontier, slot?: SlotNumber): Promise<void>;
+    private findOrPrice;
     private runRefresh;
-    /** The freshest record matching `key`, or undefined when none is recent enough to trust. */
+    /**
+     * The freshest record matching `key`, or undefined when none is recent enough to trust. With `minL1SyncPoint`, a
+     * record also has to be priced at that L1 block or a later one.
+     */
     private findRecord;
     /** Awaits `promise` for at most `maxWaitMs`, swallowing both a timeout and the promise's own failure. */
     private waitFor;
+    /**
+     * Whether {@link buildOverridesPlan} prices `newCheckpoint` with the plan its proposer uses, rather than with the
+     * pinned-tips fallback. The sequencer never builds on a proposed parent more than one checkpoint ahead of its
+     * checkpointed tip, so a frontier in that state trails L1: the parent's parent, whose fee header the pipelined plan
+     * reads, is not checkpointed in it yet, and the fallback price is not one a proposer would have used.
+     */
+    private pricesAsProposer;
     /**
      * Builds the chain-state overrides plan passed to `buildCheckpointGlobalVariables`, mirroring the sequencer
      * (which always pins tips to neutralize prunes). When pipelining, the plan carries the proposed parent's
@@ -107,4 +140,4 @@ export declare class NextBlockFeeCache {
      */
     private buildOverridesPlan;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV4dF9ibG9ja19mZWVfY2FjaGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9henRlYy1ub2RlL25leHRfYmxvY2svbmV4dF9ibG9ja19mZWVfY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNuRSxPQUFPLEVBQ0wsS0FBSyxjQUFjLEVBR3BCLE1BQU0sZ0NBQWdDLENBQUM7QUFHeEMsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLDRCQUE0QixDQUFDO0FBRXZFLE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBa0IsTUFBTSw4QkFBOEIsQ0FBQztBQUVqRixPQUFPLEtBQUssRUFBZSxhQUFhLEVBQUUsVUFBVSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFdkYsT0FBTyxLQUFLLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMzRSxPQUFPLEtBQUssRUFBRSx5QkFBeUIsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTlGLE9BQU8sRUFDTCxLQUFLLGNBQWMsRUFNcEIsTUFBTSx5QkFBeUIsQ0FBQztBQUVqQywrRUFBK0U7QUFDL0UsZUFBTyxNQUFNLDJCQUEyQixPQUFPLENBQUM7QUFFaEQ7Ozs7R0FJRztBQUNILGVBQU8sTUFBTSxpQkFBaUIsS0FBSyxDQUFDO0FBYXBDLGtFQUFrRTtBQUNsRSxNQUFNLFdBQVcscUJBQXFCO0lBQ3BDLFdBQVcsRUFBRSxhQUFhLENBQUM7SUFDM0IscUJBQXFCLEVBQUUscUJBQXFCLENBQUM7SUFDN0M7Ozs7O09BS0c7SUFDSCxjQUFjLENBQUMsRUFBRSxjQUFjLENBQUM7SUFDaEMsVUFBVSxFQUFFLG1CQUFtQixDQUFDO0lBQ2hDLGdCQUFnQixFQUFFLDRCQUE0QixDQUFDO0lBQy9DLFlBQVksRUFBRSxZQUFZLENBQUM7SUFDM0IsR0FBRyxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ2Q7QUFFRDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FvQkc7QUFDSCxxQkFBYSxpQkFBaUI7SUFDNUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQWdCO0lBQzVDLE9BQU8sQ0FBQyxRQUFRLENBQUMscUJBQXFCLENBQXdCO0lBQzlELE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUE2QjtJQUM1RCxPQUFPLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBc0I7SUFDakQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBK0I7SUFDaEUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQWU7SUFDNUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQVM7SUFFN0IsT0FBTyxDQUFDLE9BQU8sQ0FBZ0M7SUFDL0MsT0FBTyxDQUFDLFFBQVEsQ0FBZ0M7SUFDaEQsT0FBTyxDQUFDLGlCQUFpQixDQUErQjtJQUN4RCxPQUFPLENBQUMsV0FBVyxDQUE2QjtJQUNoRCxPQUFPLENBQUMsZUFBZSxDQUE0QjtJQUVuRCxZQUFZLElBQUksRUFBRSxxQkFBcUIsRUFRdEM7SUFFRDs7Ozs7T0FLRztJQUNJLEtBQUssQ0FBQyxpQkFBaUIsU0FBOEIsR0FBRyxJQUFJLENBTWxFO0lBRVksSUFBSSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FNakM7SUFFRDs7Ozs7O09BTUc7SUFDVSxrQkFBa0IsQ0FDN0IsR0FBRyxFQUFFLGNBQWMsRUFDbkIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsSUFBSSxDQUFDLEVBQUU7UUFBRSxTQUFTLENBQUMsRUFBRSxNQUFNLENBQUE7S0FBRSxHQUM1QixPQUFPLENBQUMseUJBQXlCLEdBQUcsU0FBUyxDQUFDLENBY2hEO0lBRUQ7Ozs7T0FJRztJQUNJLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVluRDtZQUVhLFVBQVU7SUF1Q3hCLDRGQUE0RjtJQUM1RixPQUFPLENBQUMsVUFBVTtJQVFsQix5R0FBeUc7SUFDekcsT0FBTyxDQUFDLE9BQU87SUFNZjs7Ozs7Ozs7OztPQVVHO0lBQ0gsT0FBTyxDQUFDLGtCQUFrQjtDQThEM0IifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV4dF9ibG9ja19mZWVfY2FjaGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9henRlYy1ub2RlL25leHRfYmxvY2svbmV4dF9ibG9ja19mZWVfY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNuRSxPQUFPLEVBQ0wsS0FBSyxjQUFjLEVBR3BCLE1BQU0sZ0NBQWdDLENBQUM7QUFDeEMsT0FBTyxFQUFvQixLQUFLLFVBQVUsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBRXpGLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSw0QkFBNEIsQ0FBQztBQUV2RSxPQUFPLEVBQUUsS0FBSyxZQUFZLEVBQWtCLE1BQU0sOEJBQThCLENBQUM7QUFFakYsT0FBTyxLQUFLLEVBQWUsU0FBUyxFQUFFLGFBQWEsRUFBRSxVQUFVLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUVsRyxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN0RCxPQUFPLEtBQUssRUFBRSw0QkFBNEIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzNFLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLHFCQUFxQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDOUYsT0FBTyxLQUFLLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUUvRSxPQUFPLEVBQ0wsS0FBSyxjQUFjLEVBTXBCLE1BQU0seUJBQXlCLENBQUM7QUFFakMsK0VBQStFO0FBQy9FLGVBQU8sTUFBTSwyQkFBMkIsT0FBTyxDQUFDO0FBRWhEOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0saUJBQWlCLEtBQUssQ0FBQztBQWFwQyxrRUFBa0U7QUFDbEUsTUFBTSxXQUFXLHFCQUFxQjtJQUNwQyxXQUFXLEVBQUUsYUFBYSxDQUFDO0lBQzNCLHFCQUFxQixFQUFFLHFCQUFxQixDQUFDO0lBQzdDOzs7OztPQUtHO0lBQ0gsY0FBYyxDQUFDLEVBQUUsY0FBYyxDQUFDO0lBQ2hDLFVBQVUsRUFBRSxtQkFBbUIsQ0FBQztJQUNoQyxnQkFBZ0IsRUFBRSw0QkFBNEIsQ0FBQztJQUMvQyxZQUFZLEVBQUUsWUFBWSxDQUFDO0lBQzNCLEdBQUcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNkO0FBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JHO0FBQ0gscUJBQWEsaUJBQWtCLFlBQVcsMEJBQTBCO0lBQ2xFLE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFnQjtJQUM1QyxPQUFPLENBQUMsUUFBUSxDQUFDLHFCQUFxQixDQUF3QjtJQUM5RCxPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBNkI7SUFDNUQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQXNCO0lBQ2pELE9BQU8sQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLENBQStCO0lBQ2hFLE9BQU8sQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFlO0lBQzVDLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFTO0lBRTdCLE9BQU8sQ0FBQyxPQUFPLENBQWdDO0lBQy9DLE9BQU8sQ0FBQyxRQUFRLENBQWdDO0lBQ2hELE9BQU8sQ0FBQyxpQkFBaUIsQ0FBK0I7SUFDeEQsT0FBTyxDQUFDLFdBQVcsQ0FBNkI7SUFDaEQsT0FBTyxDQUFDLGVBQWUsQ0FBNEI7SUFFbkQsWUFBWSxJQUFJLEVBQUUscUJBQXFCLEVBUXRDO0lBRUQ7Ozs7O09BS0c7SUFDSSxLQUFLLENBQUMsaUJBQWlCLFNBQThCLEdBQUcsSUFBSSxDQU1sRTtJQUVZLElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBTWpDO0lBRUQ7Ozs7OztPQU1HO0lBQ0ksa0JBQWtCLENBQ3ZCLEdBQUcsRUFBRSxjQUFjLEVBQ25CLFFBQVEsRUFBRSxVQUFVLEVBQ3BCLElBQUksQ0FBQyxFQUFFO1FBQUUsU0FBUyxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsR0FDNUIsT0FBTyxDQUFDLHlCQUF5QixHQUFHLFNBQVMsQ0FBQyxDQUVoRDtJQUVEOzs7Ozs7Ozs7Ozs7Ozs7O09BZ0JHO0lBQ1UsMkJBQTJCLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsU0FBUyxHQUFHLE9BQU8sQ0FBQyxPQUFPLEdBQUcsU0FBUyxDQUFDLENBeUIxRztJQUVEOzs7OztPQUtHO0lBQ0ksT0FBTyxDQUFDLFFBQVEsQ0FBQyxFQUFFLFVBQVUsRUFBRSxJQUFJLENBQUMsRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVl0RTtZQU9hLFdBQVc7WUFxQlgsVUFBVTtJQXVDeEI7OztPQUdHO0lBQ0gsT0FBTyxDQUFDLFVBQVU7SUFZbEIseUdBQXlHO0lBQ3pHLE9BQU8sQ0FBQyxPQUFPO0lBTWY7Ozs7O09BS0c7SUFDSCxPQUFPLENBQUMsZ0JBQWdCO0lBWXhCOzs7Ozs7Ozs7O09BVUc7SUFDSCxPQUFPLENBQUMsa0JBQWtCO0NBOEQzQiJ9

package/dest/aztec-node/next_block/next_block_fee_cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"next_block_fee_cache.d.ts","sourceRoot":"","sources":["../../../src/aztec-node/next_block/next_block_fee_cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EACL,KAAK,cAAc,EAGpB,MAAM,gCAAgC,CAAC;AAGxC,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,4BAA4B,CAAC;AAEvE,OAAO,EAAE,KAAK,YAAY,EAAkB,MAAM,8BAA8B,CAAC;AAEjF,OAAO,KAAK,EAAe,aAAa,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEvF,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,KAAK,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9F,OAAO,EACL,KAAK,cAAc,EAMpB,MAAM,yBAAyB,CAAC;AAEjC,+EAA+E;AAC/E,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAEhD;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAapC,kEAAkE;AAClE,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,aAAa,CAAC;IAC3B,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C;;;;;OAKG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,EAAE,mBAAmB,CAAC;IAChC,gBAAgB,EAAE,4BAA4B,CAAC;IAC/C,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgB;IAC5C,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAwB;IAC9D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6B;IAC5D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAsB;IACjD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;IAChE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAE7B,OAAO,CAAC,OAAO,CAAgC;IAC/C,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,WAAW,CAA6B;IAChD,OAAO,CAAC,eAAe,CAA4B;IAEnD,YAAY,IAAI,EAAE,qBAAqB,EAQtC;IAED;;;;;OAKG;IACI,KAAK,CAAC,iBAAiB,SAA8B,GAAG,IAAI,CAMlE;IAEY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAMjC;IAED;;;;;;OAMG;IACU,kBAAkB,CAC7B,GAAG,EAAE,cAAc,EACnB,QAAQ,EAAE,UAAU,EACpB,IAAI,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAC5B,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC,CAchD;IAED;;;;OAIG;IACI,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAYnD;YAEa,UAAU;IAuCxB,4FAA4F;IAC5F,OAAO,CAAC,UAAU;IAQlB,yGAAyG;IACzG,OAAO,CAAC,OAAO;IAMf;;;;;;;;;;OAUG;IACH,OAAO,CAAC,kBAAkB;CA8D3B"}
+{"version":3,"file":"next_block_fee_cache.d.ts","sourceRoot":"","sources":["../../../src/aztec-node/next_block/next_block_fee_cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EACL,KAAK,cAAc,EAGpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAoB,KAAK,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAEzF,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,4BAA4B,CAAC;AAEvE,OAAO,EAAE,KAAK,YAAY,EAAkB,MAAM,8BAA8B,CAAC;AAEjF,OAAO,KAAK,EAAe,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAElG,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,KAAK,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9F,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAE/E,OAAO,EACL,KAAK,cAAc,EAMpB,MAAM,yBAAyB,CAAC;AAEjC,+EAA+E;AAC/E,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAEhD;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAapC,kEAAkE;AAClE,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,aAAa,CAAC;IAC3B,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C;;;;;OAKG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,EAAE,mBAAmB,CAAC;IAChC,gBAAgB,EAAE,4BAA4B,CAAC;IAC/C,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,iBAAkB,YAAW,0BAA0B;IAClE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgB;IAC5C,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAwB;IAC9D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6B;IAC5D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAsB;IACjD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;IAChE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAE7B,OAAO,CAAC,OAAO,CAAgC;IAC/C,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,WAAW,CAA6B;IAChD,OAAO,CAAC,eAAe,CAA4B;IAEnD,YAAY,IAAI,EAAE,qBAAqB,EAQtC;IAED;;;;;OAKG;IACI,KAAK,CAAC,iBAAiB,SAA8B,GAAG,IAAI,CAMlE;IAEY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAMjC;IAED;;;;;;OAMG;IACI,kBAAkB,CACvB,GAAG,EAAE,cAAc,EACnB,QAAQ,EAAE,UAAU,EACpB,IAAI,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAC5B,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC,CAEhD;IAED;;;;;;;;;;;;;;;;OAgBG;IACU,2BAA2B,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAyB1G;IAED;;;;;OAKG;IACI,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAYtE;YAOa,WAAW;YAqBX,UAAU;IAuCxB;;;OAGG;IACH,OAAO,CAAC,UAAU;IAYlB,yGAAyG;IACzG,OAAO,CAAC,OAAO;IAMf;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAYxB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,kBAAkB;CA8D3B"}

package/dest/aztec-node/next_block/next_block_fee_cache.js

@@ -81,30 +81,61 @@ import { boundaryFeeKeyEquals, computeBoundaryFeeKey, getClockSlot, planNextBloc
    * A matching record under the staleness cutoff is served straight away. Otherwise the caller joins the single
    * shared refresh: a simulation waits for it and surfaces its failure, while a quote passes `maxWaitMs` and
    * falls back to whatever the cache already holds rather than turning an L1 outage into a multi-second RPC.
-   */ async getBoundaryGlobals(key, frontier, opts) {
-        const maxWaitMs = opts?.maxWaitMs;
-        // An uncapped reader gets more than one attempt because the refresh it joins may be one that started from an
-        // older frontier and therefore priced a different boundary; the next pass is its own. Still never concurrent.
-        const attempts = maxWaitMs === undefined ? MAX_REFRESH_ATTEMPTS : 1;
-        for(let attempt = 0; attempt < attempts; attempt++){
-            const hit = this.findRecord(key);
-            if (hit) {
-                return hit.globals;
-            }
-            const refresh = this.refresh(frontier);
-            await (maxWaitMs === undefined ? refresh : this.waitFor(refresh, maxWaitMs));
+   */ getBoundaryGlobals(key, frontier, opts) {
+        return this.findOrPrice(key, frontier, opts?.maxWaitMs);
+    }
+    /**
+   * The gas fees the first block of a checkpoint at `slot` built on `parent` must carry, for checking a block proposal
+   * against. Keyed on the proposal's slot and parent rather than on the slot this node's clock would plan: the frontier
+   * must end at `parent`, and the boundary is planned for `slot` from it. A matching record is served from memory; on
+   * a miss the request joins the refresh in flight and then runs a pass planned on `slot`, so it gets the exact price
+   * and not a fallback.
+   *
+   * Undefined when this node's view does not hold the data to produce the price the proposer computes yet: the
+   * frontier does not end at `parent` (the parent's checkpoint proposal has not been processed, or the chain moved
+   * on), or the checkpointed tip has not reached the parent's parent, whose fee state the pipelined plan reads from
+   * L1 (see {@link pricesAsProposer}). The caller waits for a later archiver sync rather than accepting the pinned-tips
+   * approximation. Throws when the L1 read fails.
+   *
+   * Only a record priced at the frontier's L1 block, or at a later one, is served. The L1 fee oracle can change without
+   * moving the frontier (anyone may call its update), and the background loop only catches up within a refresh
+   * interval, so an older record could carry a price the proposer has already moved past.
+   */ async getCheckpointOpeningGasFees(slot, parent) {
+        const frontier = await this.blockSource.getL2Frontier();
+        const tip = frontier.tips.proposed;
+        if (tip.number !== parent.number || tip.hash !== parent.hash) {
+            this.log.debug(`Cannot price the checkpoint opened at slot ${slot}: the proposed tip is not its parent`, {
+                slot,
+                parent,
+                tip
+            });
+            return undefined;
         }
-        return this.findRecord(key)?.globals;
+        const plan = planNextBlock(frontier, slot);
+        const newCheckpoint = plan.newCheckpoint;
+        if (!newCheckpoint || newCheckpoint.targetSlot !== slot || !this.pricesAsProposer(frontier, newCheckpoint)) {
+            this.log.debug(`Cannot price the checkpoint opened at slot ${slot} as its proposer does from this frontier`, {
+                slot,
+                parent,
+                targetSlot: newCheckpoint?.targetSlot,
+                proposedCheckpointNumber: newCheckpoint?.proposedCheckpointData?.checkpointNumber,
+                checkpointedCheckpointNumber: newCheckpoint?.checkpointedCheckpointNumber
+            });
+            return undefined;
+        }
+        const key = computeBoundaryFeeKey(plan, frontier.pendingChainValidationStatus);
+        return key && (await this.findOrPrice(key, frontier, undefined, slot, frontier.l1SyncPoint))?.gasFees;
     }
     /**
    * Runs one refresh pass, or joins the one already running. Single-flight is what keeps a burst of requests
    * during a transition down to a single L1 round trip, shared with the background loop.
    * @param frontier - Snapshot to plan from; read fresh from the archiver when omitted, as the loop does.
-   */ refresh(frontier) {
+   * @param slot - Slot to plan the boundary for in place of this node's clock slot.
+   */ refresh(frontier, slot) {
         if (this.inFlightRefresh) {
             return this.inFlightRefresh;
         }
-        const refresh = this.runRefresh(frontier).finally(()=>{
+        const refresh = this.runRefresh(frontier, slot).finally(()=>{
             this.inFlightRefresh = undefined;
         });
         // Every caller awaits the returned promise and reports its failure, but the stored copy may only be awaited by
@@ -113,9 +144,27 @@ import { boundaryFeeKeyEquals, computeBoundaryFeeKey, getClockSlot, planNextBloc
         this.inFlightRefresh = refresh;
         return refresh;
     }
-    async runRefresh(frontier) {
+    /**
+   * Serves the record matching `key`, or joins the shared refresh to produce it, as {@link getBoundaryGlobals}
+   * describes. `slot` plans a refresh this reader starts for that slot rather than for the clock slot.
+   * `minL1SyncPoint`, when set, skips records priced before that L1 block (see {@link pricedAtOrAfter}).
+   */ async findOrPrice(key, frontier, maxWaitMs, slot, minL1SyncPoint) {
+        // An uncapped reader gets more than one attempt because the refresh it joins may be one that started from an
+        // older frontier and therefore priced a different boundary; the next pass is its own. Still never concurrent.
+        const attempts = maxWaitMs === undefined ? MAX_REFRESH_ATTEMPTS : 1;
+        for(let attempt = 0; attempt < attempts; attempt++){
+            const hit = this.findRecord(key, minL1SyncPoint);
+            if (hit) {
+                return hit.globals;
+            }
+            const refresh = this.refresh(frontier, slot);
+            await (maxWaitMs === undefined ? refresh : this.waitFor(refresh, maxWaitMs));
+        }
+        return this.findRecord(key, minL1SyncPoint)?.globals;
+    }
+    async runRefresh(frontier, slot) {
         const snapshot = frontier ?? await this.blockSource.getL2Frontier();
-        const plan = planNextBlock(snapshot, getClockSlot(this.epochCache));
+        const plan = planNextBlock(snapshot, slot ?? getClockSlot(this.epochCache));
         const key = computeBoundaryFeeKey(plan, snapshot.pendingChainValidationStatus);
         if (!key || !plan.newCheckpoint) {
             // Mid-checkpoint: the fee is frozen in the in-progress checkpoint's header, so there is nothing to price.
@@ -152,18 +201,34 @@ import { boundaryFeeKeyEquals, computeBoundaryFeeKey, getClockSlot, planNextBloc
         }
         this.current = record;
     }
-    /** The freshest record matching `key`, or undefined when none is recent enough to trust. */ findRecord(key) {
+    /**
+   * The freshest record matching `key`, or undefined when none is recent enough to trust. With `minL1SyncPoint`, a
+   * record also has to be priced at that L1 block or a later one.
+   */ findRecord(key, minL1SyncPoint) {
         const maxAgeMs = MAX_AGE_INTERVALS * this.refreshIntervalMs;
         const now = this.dateProvider.now();
         return [
             this.current,
             this.previous
-        ].find((record)=>record !== undefined && boundaryFeeKeyEquals(record.key, key) && now - record.refreshedAtMs < maxAgeMs);
+        ].find((record)=>record !== undefined && boundaryFeeKeyEquals(record.key, key) && now - record.refreshedAtMs < maxAgeMs && (minL1SyncPoint === undefined || pricedAtOrAfter(record.l1SyncPoint, minL1SyncPoint)));
     }
     /** Awaits `promise` for at most `maxWaitMs`, swallowing both a timeout and the promise's own failure. */ waitFor(promise, maxWaitMs) {
         return executeTimeout(()=>promise, maxWaitMs).catch((err)=>this.log.debug(`Refreshing the next-block boundary fee failed or timed out`, err));
     }
     /**
+   * Whether {@link buildOverridesPlan} prices `newCheckpoint` with the plan its proposer uses, rather than with the
+   * pinned-tips fallback. The sequencer never builds on a proposed parent more than one checkpoint ahead of its
+   * checkpointed tip, so a frontier in that state trails L1: the parent's parent, whose fee header the pipelined plan
+   * reads, is not checkpointed in it yet, and the fallback price is not one a proposer would have used.
+   */ pricesAsProposer(frontier, newCheckpoint) {
+        const { proposedCheckpointData, checkpointedCheckpointNumber } = newCheckpoint;
+        if (proposedCheckpointData) {
+            return this.rollupContract !== undefined && proposedCheckpointData.checkpointNumber === checkpointedCheckpointNumber + 1;
+        }
+        // On a valid chain with no proposed parent the pinned-tips plan is the one the proposer builds.
+        return this.rollupContract !== undefined || frontier.pendingChainValidationStatus.valid;
+    }
+    /**
    * Builds the chain-state overrides plan passed to `buildCheckpointGlobalVariables`, mirroring the sequencer
    * (which always pins tips to neutralize prunes). When pipelining, the plan carries the proposed parent's
    * archive, temp-checkpoint-log cell, and locally-derived fee header; when the pending chain is invalid, it
@@ -223,3 +288,12 @@ import { boundaryFeeKeyEquals, computeBoundaryFeeKey, getClockSlot, planNextBloc
 function l1SyncPointEquals(a, b) {
     return a === undefined || b === undefined ? a === b : a.blockHash.equals(b.blockHash);
 }
+/**
+ * Whether a record priced at `pricedAt` reflects L1 at least as recent as `min`. At the same height the hashes must
+ * match, since a reorg that replaces that block can carry different fee state.
+ */ function pricedAtOrAfter(pricedAt, min) {
+    if (pricedAt === undefined || pricedAt.blockNumber < min.blockNumber) {
+        return false;
+    }
+    return pricedAt.blockNumber > min.blockNumber || pricedAt.blockHash.equals(min.blockHash);
+}

package/dest/factory.d.ts

@@ -42,4 +42,4 @@ export interface CreateAztecNodeOptions {
  * @returns A fully synced Aztec Node for use in development/testing.
  */
 export declare function createAztecNodeService(inputConfig: AztecNodeConfig, deps?: CreateAztecNodeDeps, options?: CreateAztecNodeOptions): Promise<AztecNodeService>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBYUEsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLDRCQUE0QixDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUk1RCxPQUFPLEVBQUUsS0FBSyxhQUFhLEVBQW1CLE1BQU0saUJBQWlCLENBQUM7QUFDdEUsT0FBTyxFQUFtQixLQUFLLGNBQWMsRUFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUVqRyxPQUFPLEVBQ0wsS0FBSyw4QkFBOEIsRUFJbkMsS0FBSyxrQkFBa0IsRUFDeEIsTUFBTSw4QkFBOEIsQ0FBQztBQWtCdEMsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDbEUsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFzQixNQUFNLDhCQUE4QixDQUFDO0FBQ3hGLE9BQU8sRUFDTCxLQUFLLHNCQUFzQixFQVE1QixNQUFNLDhCQUE4QixDQUFDO0FBQ3RDLE9BQU8sS0FBSyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFJeEYsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUE4QixNQUFNLHdCQUF3QixDQUFDO0FBRTFGLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRzFELG9HQUFvRztBQUNwRyxNQUFNLFdBQVcsbUJBQW1CO0lBQ2xDLFNBQVMsQ0FBQyxFQUFFLGVBQWUsQ0FBQztJQUM1QixNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDaEIsU0FBUyxDQUFDLEVBQUUsa0JBQWtCLENBQUM7SUFDL0IsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFDO0lBQzVCLGFBQWEsQ0FBQyxFQUFFLGFBQWEsQ0FBQztJQUM5QixjQUFjLENBQUMsRUFBRSxPQUFPLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDekMsb0JBQW9CLENBQUMsRUFBRSwwQkFBMEIsQ0FBQztJQUNsRDs7O09BR0c7SUFDSCw4QkFBOEIsQ0FBQyxFQUFFLDhCQUE4QixDQUFDO0lBQ2hFOzs7O09BSUc7SUFDSCxzQkFBc0IsQ0FBQyxFQUFFLHNCQUFzQixDQUFDO0NBQ2pEO0FBRUQsNkVBQTZFO0FBQzdFLE1BQU0sV0FBVyxzQkFBc0I7SUFDckMsT0FBTyxDQUFDLEVBQUUsV0FBVyxDQUFDO0lBQ3RCLGtCQUFrQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQzdCLG1CQUFtQixDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQy9CO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFzQixzQkFBc0IsQ0FDMUMsV0FBVyxFQUFFLGVBQWUsRUFDNUIsSUFBSSxHQUFFLG1CQUF3QixFQUM5QixPQUFPLEdBQUUsc0JBQTJCLEdBQ25DLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQXNtQjNCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBYUEsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLDRCQUE0QixDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUk1RCxPQUFPLEVBQUUsS0FBSyxhQUFhLEVBQW1CLE1BQU0saUJBQWlCLENBQUM7QUFDdEUsT0FBTyxFQUFtQixLQUFLLGNBQWMsRUFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUVqRyxPQUFPLEVBQ0wsS0FBSyw4QkFBOEIsRUFJbkMsS0FBSyxrQkFBa0IsRUFDeEIsTUFBTSw4QkFBOEIsQ0FBQztBQWtCdEMsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDbEUsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFzQixNQUFNLDhCQUE4QixDQUFDO0FBQ3hGLE9BQU8sRUFDTCxLQUFLLHNCQUFzQixFQVE1QixNQUFNLDhCQUE4QixDQUFDO0FBQ3RDLE9BQU8sS0FBSyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFJeEYsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUE4QixNQUFNLHdCQUF3QixDQUFDO0FBRTFGLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRzFELG9HQUFvRztBQUNwRyxNQUFNLFdBQVcsbUJBQW1CO0lBQ2xDLFNBQVMsQ0FBQyxFQUFFLGVBQWUsQ0FBQztJQUM1QixNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDaEIsU0FBUyxDQUFDLEVBQUUsa0JBQWtCLENBQUM7SUFDL0IsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFDO0lBQzVCLGFBQWEsQ0FBQyxFQUFFLGFBQWEsQ0FBQztJQUM5QixjQUFjLENBQUMsRUFBRSxPQUFPLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDekMsb0JBQW9CLENBQUMsRUFBRSwwQkFBMEIsQ0FBQztJQUNsRDs7O09BR0c7SUFDSCw4QkFBOEIsQ0FBQyxFQUFFLDhCQUE4QixDQUFDO0lBQ2hFOzs7O09BSUc7SUFDSCxzQkFBc0IsQ0FBQyxFQUFFLHNCQUFzQixDQUFDO0NBQ2pEO0FBRUQsNkVBQTZFO0FBQzdFLE1BQU0sV0FBVyxzQkFBc0I7SUFDckMsT0FBTyxDQUFDLEVBQUUsV0FBVyxDQUFDO0lBQ3RCLGtCQUFrQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQzdCLG1CQUFtQixDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQy9CO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFzQixzQkFBc0IsQ0FDMUMsV0FBVyxFQUFFLGVBQWUsRUFDNUIsSUFBSSxHQUFFLG1CQUF3QixFQUM5QixPQUFPLEdBQUUsc0JBQTJCLEdBQ25DLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQWluQjNCIn0=

package/dest/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAI5D,OAAO,EAAE,KAAK,aAAa,EAAmB,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAmB,KAAK,cAAc,EAAoB,MAAM,yBAAyB,CAAC;AAEjG,OAAO,EACL,KAAK,8BAA8B,EAInC,KAAK,kBAAkB,EACxB,MAAM,8BAA8B,CAAC;AAkBtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,8BAA8B,CAAC;AACxF,OAAO,EACL,KAAK,sBAAsB,EAQ5B,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AAIxF,OAAO,EAAE,KAAK,eAAe,EAA8B,MAAM,wBAAwB,CAAC;AAE1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG1D,oGAAoG;AACpG,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,cAAc,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IACzC,oBAAoB,CAAC,EAAE,0BAA0B,CAAC;IAClD;;;OAGG;IACH,8BAA8B,CAAC,EAAE,8BAA8B,CAAC;IAChE;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD;AAED,6EAA6E;AAC7E,MAAM,WAAW,sBAAsB;IACrC,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,eAAe,EAC5B,IAAI,GAAE,mBAAwB,EAC9B,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,gBAAgB,CAAC,CAsmB3B"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAI5D,OAAO,EAAE,KAAK,aAAa,EAAmB,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAmB,KAAK,cAAc,EAAoB,MAAM,yBAAyB,CAAC;AAEjG,OAAO,EACL,KAAK,8BAA8B,EAInC,KAAK,kBAAkB,EACxB,MAAM,8BAA8B,CAAC;AAkBtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,8BAA8B,CAAC;AACxF,OAAO,EACL,KAAK,sBAAsB,EAQ5B,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AAIxF,OAAO,EAAE,KAAK,eAAe,EAA8B,MAAM,wBAAwB,CAAC;AAE1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG1D,oGAAoG;AACpG,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,cAAc,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IACzC,oBAAoB,CAAC,EAAE,0BAA0B,CAAC;IAClD;;;OAGG;IACH,8BAA8B,CAAC,EAAE,8BAA8B,CAAC;IAChE;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD;AAED,6EAA6E;AAC7E,MAAM,WAAW,sBAAsB;IACrC,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,eAAe,EAC5B,IAAI,GAAE,mBAAwB,EAC9B,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,gBAAgB,CAAC,CAinB3B"}

package/dest/factory.js

@@ -32,7 +32,7 @@ import { FullNodeCheckpointsBuilder as CheckpointsBuilder, FullNodeCheckpointsBu
 import { createWorldState, createWorldStateSynchronizer } from '@aztec-labs/world-state';
 import { createPublicClient } from 'viem';
 import { createKeyStoreForValidator } from './aztec-node/config.js';
-import { AdmissionMinFeesProvider, NextBlockPredictor } from './aztec-node/next_block/index.js';
+import { AdmissionMinFeesProvider, NextBlockFeeCache, NextBlockPredictor } from './aztec-node/next_block/index.js';
 import { AztecNodeService } from './aztec-node/server.js';
 import { createSentinel } from './sentinel/factory.js';
 /**
@@ -200,7 +200,10 @@ import { createSentinel } from './sentinel/factory.js';
         const feeProvider = new FeeProviderImpl(dateProvider, publicClient, globalVariableBuilderConfig, archiver);
         await feeProvider.start();
         started.push(feeProvider);
-        const nextBlockPredictor = NextBlockPredictor.create({
+        // One fee cache serves both the RPC-side predictor and the proposal handler, which checks a checkpoint's first
+        // block against the same L1 price.
+        const nextBlockLog = log.createChild('next-block-predictor');
+        const nextBlockFeeCache = new NextBlockFeeCache({
             blockSource: archiver,
             globalVariableBuilder,
             rollupContract,
@@ -210,7 +213,13 @@ import { createSentinel } from './sentinel/factory.js';
                 rollupAddress: config.rollupAddress
             },
             dateProvider,
-            log: log.createChild('next-block-predictor')
+            log: nextBlockLog.createChild('fee-cache')
+        });
+        const nextBlockPredictor = new NextBlockPredictor({
+            blockSource: archiver,
+            feeCache: nextBlockFeeCache,
+            epochCache,
+            log: nextBlockLog
         });
         nextBlockPredictor.start();
         started.push(nextBlockPredictor);
@@ -263,6 +272,7 @@ import { createSentinel } from './sentinel/factory.js';
                 keyStoreManager,
                 blobClient,
                 reexecutionTracker,
+                checkpointFeeSource: nextBlockFeeCache,
                 slashingProtectionDb: deps.slashingProtectionDb,
                 blockProposalObservers: deps.blockProposalObservers
             });
@@ -299,6 +309,7 @@ import { createSentinel } from './sentinel/factory.js';
                 dateProvider,
                 telemetry,
                 reexecutionTracker,
+                checkpointFeeSource: nextBlockFeeCache,
                 blockProposalObservers: deps.blockProposalObservers
             });
             proposalHandler.register(p2pClient, reexecute, archiver);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec-labs/aztec-node",
-  "version": "6.1.0-nightly.20261102",
+  "version": "6.1.0-nightly.20261104",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
@@ -66,37 +66,37 @@
   },
   "dependencies": {
     "@aztec-foundation/bb.js": "6.0.0-rc.7",
-    "@aztec-labs/archiver": "6.1.0-nightly.20261102",
-    "@aztec-labs/bb-prover": "6.1.0-nightly.20261102",
-    "@aztec-labs/blob-client": "6.1.0-nightly.20261102",
-    "@aztec-labs/blob-lib": "6.1.0-nightly.20261102",
-    "@aztec-labs/constants": "6.1.0-nightly.20261102",
-    "@aztec-labs/epoch-cache": "6.1.0-nightly.20261102",
-    "@aztec-labs/ethereum": "6.1.0-nightly.20261102",
-    "@aztec-labs/foundation": "6.1.0-nightly.20261102",
-    "@aztec-labs/kv-store": "6.1.0-nightly.20261102",
-    "@aztec-labs/node-keystore": "6.1.0-nightly.20261102",
-    "@aztec-labs/node-lib": "6.1.0-nightly.20261102",
-    "@aztec-labs/p2p": "6.1.0-nightly.20261102",
-    "@aztec-labs/protocol-contracts": "6.1.0-nightly.20261102",
-    "@aztec-labs/prover-client": "6.1.0-nightly.20261102",
-    "@aztec-labs/prover-node": "6.1.0-nightly.20261102",
-    "@aztec-labs/sequencer-client": "6.1.0-nightly.20261102",
-    "@aztec-labs/simulator": "6.1.0-nightly.20261102",
-    "@aztec-labs/slasher": "6.1.0-nightly.20261102",
-    "@aztec-labs/standard-contracts": "6.1.0-nightly.20261102",
-    "@aztec-labs/stdlib": "6.1.0-nightly.20261102",
-    "@aztec-labs/telemetry-client": "6.1.0-nightly.20261102",
-    "@aztec-labs/validator-client": "6.1.0-nightly.20261102",
-    "@aztec-labs/validator-ha-signer": "6.1.0-nightly.20261102",
-    "@aztec-labs/world-state": "6.1.0-nightly.20261102",
+    "@aztec-labs/archiver": "6.1.0-nightly.20261104",
+    "@aztec-labs/bb-prover": "6.1.0-nightly.20261104",
+    "@aztec-labs/blob-client": "6.1.0-nightly.20261104",
+    "@aztec-labs/blob-lib": "6.1.0-nightly.20261104",
+    "@aztec-labs/constants": "6.1.0-nightly.20261104",
+    "@aztec-labs/epoch-cache": "6.1.0-nightly.20261104",
+    "@aztec-labs/ethereum": "6.1.0-nightly.20261104",
+    "@aztec-labs/foundation": "6.1.0-nightly.20261104",
+    "@aztec-labs/kv-store": "6.1.0-nightly.20261104",
+    "@aztec-labs/node-keystore": "6.1.0-nightly.20261104",
+    "@aztec-labs/node-lib": "6.1.0-nightly.20261104",
+    "@aztec-labs/p2p": "6.1.0-nightly.20261104",
+    "@aztec-labs/protocol-contracts": "6.1.0-nightly.20261104",
+    "@aztec-labs/prover-client": "6.1.0-nightly.20261104",
+    "@aztec-labs/prover-node": "6.1.0-nightly.20261104",
+    "@aztec-labs/sequencer-client": "6.1.0-nightly.20261104",
+    "@aztec-labs/simulator": "6.1.0-nightly.20261104",
+    "@aztec-labs/slasher": "6.1.0-nightly.20261104",
+    "@aztec-labs/standard-contracts": "6.1.0-nightly.20261104",
+    "@aztec-labs/stdlib": "6.1.0-nightly.20261104",
+    "@aztec-labs/telemetry-client": "6.1.0-nightly.20261104",
+    "@aztec-labs/validator-client": "6.1.0-nightly.20261104",
+    "@aztec-labs/validator-ha-signer": "6.1.0-nightly.20261104",
+    "@aztec-labs/world-state": "6.1.0-nightly.20261104",
     "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.1.0-nightly.20261102",
+    "@aztec-labs/noir-protocol-circuits-types": "6.1.0-nightly.20261104",
     "@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

@@ -4,16 +4,18 @@ import {
   SimulationOverridesBuilder,
   type SimulationOverridesPlan,
 } from '@aztec-labs/ethereum/contracts';
-import { CheckpointNumber } from '@aztec-labs/foundation/branded-types';
+import { CheckpointNumber, type SlotNumber } from '@aztec-labs/foundation/branded-types';
 import { EthAddress } from '@aztec-labs/foundation/eth-address';
 import { type Logger, createLogger } from '@aztec-labs/foundation/log';
 import { RunningPromise } from '@aztec-labs/foundation/promise';
 import { type DateProvider, executeTimeout } from '@aztec-labs/foundation/timer';
 import { AztecAddress } from '@aztec-labs/stdlib/aztec-address';
-import type { L1SyncPoint, L2BlockSource, L2Frontier } from '@aztec-labs/stdlib/block';
+import type { L1SyncPoint, L2BlockId, L2BlockSource, L2Frontier } from '@aztec-labs/stdlib/block';
 import { buildCheckpointSimulationOverridesPlan } from '@aztec-labs/stdlib/checkpoint';
+import type { GasFees } from '@aztec-labs/stdlib/gas';
 import type { CoordinationSignatureContext } from '@aztec-labs/stdlib/p2p';
 import type { CheckpointGlobalVariables, GlobalVariableBuilder } from '@aztec-labs/stdlib/tx';
+import type { CheckpointOpeningFeeSource } from '@aztec-labs/validator-client';
 
 import {
   type BoundaryFeeKey,
@@ -83,7 +85,7 @@ export interface NextBlockFeeCacheDeps {
  * Before {@link start} (or after {@link stop}) requests still price inline through the same refresh path, which
  * is what tests and TXE-like environments rely on.
  */
-export class NextBlockFeeCache {
+export class NextBlockFeeCache implements CheckpointOpeningFeeSource {
   private readonly blockSource: L2BlockSource;
   private readonly globalVariableBuilder: GlobalVariableBuilder;
   private readonly rollupContract: RollupContract | undefined;
@@ -137,36 +139,69 @@ export class NextBlockFeeCache {
    * shared refresh: a simulation waits for it and surfaces its failure, while a quote passes `maxWaitMs` and
    * falls back to whatever the cache already holds rather than turning an L1 outage into a multi-second RPC.
    */
-  public async getBoundaryGlobals(
+  public getBoundaryGlobals(
     key: BoundaryFeeKey,
     frontier: L2Frontier,
     opts?: { maxWaitMs?: number },
   ): Promise<CheckpointGlobalVariables | undefined> {
-    const maxWaitMs = opts?.maxWaitMs;
-    // An uncapped reader gets more than one attempt because the refresh it joins may be one that started from an
-    // older frontier and therefore priced a different boundary; the next pass is its own. Still never concurrent.
-    const attempts = maxWaitMs === undefined ? MAX_REFRESH_ATTEMPTS : 1;
-    for (let attempt = 0; attempt < attempts; attempt++) {
-      const hit = this.findRecord(key);
-      if (hit) {
-        return hit.globals;
-      }
-      const refresh = this.refresh(frontier);
-      await (maxWaitMs === undefined ? refresh : this.waitFor(refresh, maxWaitMs));
+    return this.findOrPrice(key, frontier, opts?.maxWaitMs);
+  }
+
+  /**
+   * The gas fees the first block of a checkpoint at `slot` built on `parent` must carry, for checking a block proposal
+   * against. Keyed on the proposal's slot and parent rather than on the slot this node's clock would plan: the frontier
+   * must end at `parent`, and the boundary is planned for `slot` from it. A matching record is served from memory; on
+   * a miss the request joins the refresh in flight and then runs a pass planned on `slot`, so it gets the exact price
+   * and not a fallback.
+   *
+   * Undefined when this node's view does not hold the data to produce the price the proposer computes yet: the
+   * frontier does not end at `parent` (the parent's checkpoint proposal has not been processed, or the chain moved
+   * on), or the checkpointed tip has not reached the parent's parent, whose fee state the pipelined plan reads from
+   * L1 (see {@link pricesAsProposer}). The caller waits for a later archiver sync rather than accepting the pinned-tips
+   * approximation. Throws when the L1 read fails.
+   *
+   * Only a record priced at the frontier's L1 block, or at a later one, is served. The L1 fee oracle can change without
+   * moving the frontier (anyone may call its update), and the background loop only catches up within a refresh
+   * interval, so an older record could carry a price the proposer has already moved past.
+   */
+  public async getCheckpointOpeningGasFees(slot: SlotNumber, parent: L2BlockId): Promise<GasFees | undefined> {
+    const frontier = await this.blockSource.getL2Frontier();
+    const tip = frontier.tips.proposed;
+    if (tip.number !== parent.number || tip.hash !== parent.hash) {
+      this.log.debug(`Cannot price the checkpoint opened at slot ${slot}: the proposed tip is not its parent`, {
+        slot,
+        parent,
+        tip,
+      });
+      return undefined;
     }
-    return this.findRecord(key)?.globals;
+    const plan = planNextBlock(frontier, slot);
+    const newCheckpoint = plan.newCheckpoint;
+    if (!newCheckpoint || newCheckpoint.targetSlot !== slot || !this.pricesAsProposer(frontier, newCheckpoint)) {
+      this.log.debug(`Cannot price the checkpoint opened at slot ${slot} as its proposer does from this frontier`, {
+        slot,
+        parent,
+        targetSlot: newCheckpoint?.targetSlot,
+        proposedCheckpointNumber: newCheckpoint?.proposedCheckpointData?.checkpointNumber,
+        checkpointedCheckpointNumber: newCheckpoint?.checkpointedCheckpointNumber,
+      });
+      return undefined;
+    }
+    const key = computeBoundaryFeeKey(plan, frontier.pendingChainValidationStatus);
+    return key && (await this.findOrPrice(key, frontier, undefined, slot, frontier.l1SyncPoint))?.gasFees;
   }
 
   /**
    * Runs one refresh pass, or joins the one already running. Single-flight is what keeps a burst of requests
    * during a transition down to a single L1 round trip, shared with the background loop.
    * @param frontier - Snapshot to plan from; read fresh from the archiver when omitted, as the loop does.
+   * @param slot - Slot to plan the boundary for in place of this node's clock slot.
    */
-  public refresh(frontier?: L2Frontier): Promise<void> {
+  public refresh(frontier?: L2Frontier, slot?: SlotNumber): Promise<void> {
     if (this.inFlightRefresh) {
       return this.inFlightRefresh;
     }
-    const refresh = this.runRefresh(frontier).finally(() => {
+    const refresh = this.runRefresh(frontier, slot).finally(() => {
       this.inFlightRefresh = undefined;
     });
     // Every caller awaits the returned promise and reports its failure, but the stored copy may only be awaited by
@@ -176,9 +211,35 @@ export class NextBlockFeeCache {
     return refresh;
   }
 
-  private async runRefresh(frontier?: L2Frontier): Promise<void> {
+  /**
+   * Serves the record matching `key`, or joins the shared refresh to produce it, as {@link getBoundaryGlobals}
+   * describes. `slot` plans a refresh this reader starts for that slot rather than for the clock slot.
+   * `minL1SyncPoint`, when set, skips records priced before that L1 block (see {@link pricedAtOrAfter}).
+   */
+  private async findOrPrice(
+    key: BoundaryFeeKey,
+    frontier: L2Frontier,
+    maxWaitMs: number | undefined,
+    slot?: SlotNumber,
+    minL1SyncPoint?: L1SyncPoint,
+  ): Promise<CheckpointGlobalVariables | undefined> {
+    // An uncapped reader gets more than one attempt because the refresh it joins may be one that started from an
+    // older frontier and therefore priced a different boundary; the next pass is its own. Still never concurrent.
+    const attempts = maxWaitMs === undefined ? MAX_REFRESH_ATTEMPTS : 1;
+    for (let attempt = 0; attempt < attempts; attempt++) {
+      const hit = this.findRecord(key, minL1SyncPoint);
+      if (hit) {
+        return hit.globals;
+      }
+      const refresh = this.refresh(frontier, slot);
+      await (maxWaitMs === undefined ? refresh : this.waitFor(refresh, maxWaitMs));
+    }
+    return this.findRecord(key, minL1SyncPoint)?.globals;
+  }
+
+  private async runRefresh(frontier?: L2Frontier, slot?: SlotNumber): Promise<void> {
     const snapshot = frontier ?? (await this.blockSource.getL2Frontier());
-    const plan = planNextBlock(snapshot, getClockSlot(this.epochCache));
+    const plan = planNextBlock(snapshot, slot ?? getClockSlot(this.epochCache));
     const key = computeBoundaryFeeKey(plan, snapshot.pendingChainValidationStatus);
     if (!key || !plan.newCheckpoint) {
       // Mid-checkpoint: the fee is frozen in the in-progress checkpoint's header, so there is nothing to price.
@@ -215,12 +276,19 @@ export class NextBlockFeeCache {
     this.current = record;
   }
 
-  /** The freshest record matching `key`, or undefined when none is recent enough to trust. */
-  private findRecord(key: BoundaryFeeKey): BoundaryFeeRecord | undefined {
+  /**
+   * The freshest record matching `key`, or undefined when none is recent enough to trust. With `minL1SyncPoint`, a
+   * record also has to be priced at that L1 block or a later one.
+   */
+  private findRecord(key: BoundaryFeeKey, minL1SyncPoint?: L1SyncPoint): BoundaryFeeRecord | undefined {
     const maxAgeMs = MAX_AGE_INTERVALS * this.refreshIntervalMs;
     const now = this.dateProvider.now();
     return [this.current, this.previous].find(
-      record => record !== undefined && boundaryFeeKeyEquals(record.key, key) && now - record.refreshedAtMs < maxAgeMs,
+      record =>
+        record !== undefined &&
+        boundaryFeeKeyEquals(record.key, key) &&
+        now - record.refreshedAtMs < maxAgeMs &&
+        (minL1SyncPoint === undefined || pricedAtOrAfter(record.l1SyncPoint, minL1SyncPoint)),
     );
   }
 
@@ -231,6 +299,24 @@ export class NextBlockFeeCache {
     );
   }
 
+  /**
+   * Whether {@link buildOverridesPlan} prices `newCheckpoint` with the plan its proposer uses, rather than with the
+   * pinned-tips fallback. The sequencer never builds on a proposed parent more than one checkpoint ahead of its
+   * checkpointed tip, so a frontier in that state trails L1: the parent's parent, whose fee header the pipelined plan
+   * reads, is not checkpointed in it yet, and the fallback price is not one a proposer would have used.
+   */
+  private pricesAsProposer(frontier: L2Frontier, newCheckpoint: NewCheckpointPlan): boolean {
+    const { proposedCheckpointData, checkpointedCheckpointNumber } = newCheckpoint;
+    if (proposedCheckpointData) {
+      return (
+        this.rollupContract !== undefined &&
+        proposedCheckpointData.checkpointNumber === checkpointedCheckpointNumber + 1
+      );
+    }
+    // On a valid chain with no proposed parent the pinned-tips plan is the one the proposer builds.
+    return this.rollupContract !== undefined || frontier.pendingChainValidationStatus.valid;
+  }
+
   /**
    * Builds the chain-state overrides plan passed to `buildCheckpointGlobalVariables`, mirroring the sequencer
    * (which always pins tips to neutralize prunes). When pipelining, the plan carries the proposed parent's
@@ -309,3 +395,14 @@ export class NextBlockFeeCache {
 function l1SyncPointEquals(a: L1SyncPoint | undefined, b: L1SyncPoint | undefined): boolean {
   return a === undefined || b === undefined ? a === b : a.blockHash.equals(b.blockHash);
 }
+
+/**
+ * Whether a record priced at `pricedAt` reflects L1 at least as recent as `min`. At the same height the hashes must
+ * match, since a reorg that replaces that block can carry different fee state.
+ */
+function pricedAtOrAfter(pricedAt: L1SyncPoint | undefined, min: L1SyncPoint): boolean {
+  if (pricedAt === undefined || pricedAt.blockNumber < min.blockNumber) {
+    return false;
+  }
+  return pricedAt.blockNumber > min.blockNumber || pricedAt.blockHash.equals(min.blockHash);
+}

package/src/factory.ts

@@ -60,7 +60,7 @@ import { createWorldState, createWorldStateSynchronizer } from '@aztec-labs/worl
 import { createPublicClient } from 'viem';
 
 import { type AztecNodeConfig, createKeyStoreForValidator } from './aztec-node/config.js';
-import { AdmissionMinFeesProvider, NextBlockPredictor } from './aztec-node/next_block/index.js';
+import { AdmissionMinFeesProvider, NextBlockFeeCache, NextBlockPredictor } from './aztec-node/next_block/index.js';
 import { AztecNodeService } from './aztec-node/server.js';
 import { createSentinel } from './sentinel/factory.js';
 
@@ -290,14 +290,23 @@ export async function createAztecNodeService(
     await feeProvider.start();
     started.push(feeProvider);
 
-    const nextBlockPredictor = NextBlockPredictor.create({
+    // One fee cache serves both the RPC-side predictor and the proposal handler, which checks a checkpoint's first
+    // block against the same L1 price.
+    const nextBlockLog = log.createChild('next-block-predictor');
+    const nextBlockFeeCache = new NextBlockFeeCache({
       blockSource: archiver,
       globalVariableBuilder,
       rollupContract,
       epochCache,
       signatureContext: { chainId: ethereumChain.chainInfo.id, rollupAddress: config.rollupAddress },
       dateProvider,
-      log: log.createChild('next-block-predictor'),
+      log: nextBlockLog.createChild('fee-cache'),
+    });
+    const nextBlockPredictor = new NextBlockPredictor({
+      blockSource: archiver,
+      feeCache: nextBlockFeeCache,
+      epochCache,
+      log: nextBlockLog,
     });
     nextBlockPredictor.start();
     started.push(nextBlockPredictor);
@@ -383,6 +392,7 @@ export async function createAztecNodeService(
         keyStoreManager,
         blobClient,
         reexecutionTracker,
+        checkpointFeeSource: nextBlockFeeCache,
         slashingProtectionDb: deps.slashingProtectionDb,
         blockProposalObservers: deps.blockProposalObservers,
       });
@@ -423,6 +433,7 @@ export async function createAztecNodeService(
         dateProvider,
         telemetry,
         reexecutionTracker,
+        checkpointFeeSource: nextBlockFeeCache,
         blockProposalObservers: deps.blockProposalObservers,
       });
       proposalHandler.register(p2pClient, reexecute, archiver);