@aztec/sequencer-client 0.0.1-commit.fce3e4f → 0.0.1-commit.ffe5b04ea

package/dest/sequencer/timetable.d.ts

@@ -1,50 +1,88 @@
+import type { Logger } from '@aztec/foundation/log';
 import type { SequencerMetrics } from './metrics.js';
 import { SequencerState } from './utils.js';
 export declare class SequencerTimetable {
     private readonly metrics?;
-    private readonly log;
+    private readonly log?;
     /**
      * How late into the slot can we be to start working. Computed as the total time needed for assembling and publishing a block,
      * assuming an execution time equal to `minExecutionTime`, subtracted from the slot duration. This means that, if the proposer
      * starts building at this time, and all times hold, it will have at least `minExecutionTime` to execute txs for the block.
      */
     readonly initializeDeadline: number;
+    /**
+     * Fixed time offset (in seconds) when the first sub-slot starts, used as baseline for all block deadlines.
+     * This is an estimate of how long initialization (sync + proposer check) typically takes.
+     * If actual initialization takes longer/shorter, blocks just get less/more time accordingly.
+     */
+    readonly initializationOffset: number;
+    /**
+     * Total time needed to finalize and publish a checkpoint, including:
+     * - Assembling the checkpoint
+     * - Round-trip p2p propagation for the checkpoint proposal and its corresponding attestations
+     * - Publishing to L1
+     */
+    readonly checkpointFinalizationTime: number;
     /**
      * How long it takes to get a published block into L1. L1 builders typically accept txs up to 4 seconds into their slot,
      * but we'll timeout sooner to give it more time to propagate (remember we also have blobs!). Still, when working in anvil,
      * we can just post in the very last second of the L1 slot and still expect the tx to be accepted.
      */
     readonly l1PublishingTime: number;
-    /** What's the minimum time we want to leave available for execution and reexecution (used to derive init deadline) */
+    /**
+     * What's the minimum time we want to leave available for execution and reexecution (used to derive init deadline)
+     * Defaults to half of the block duration if set, otherwise a constant.
+     */
     readonly minExecutionTime: number;
     /** How long it takes to get ready to start building */
-    readonly blockPrepareTime: number;
+    readonly checkpointInitializationTime: number;
     /** How long it takes to for proposals and attestations to travel across the p2p layer (one-way) */
-    readonly attestationPropagationTime: number;
-    /** How much time we spend validating and processing a block after building it, and assembling the proposal to send to attestors */
-    readonly blockValidationTime: number;
+    readonly p2pPropagationTime: number;
+    /** How much time we spend assembling a checkpoint after building the last block */
+    readonly checkpointAssembleTime: number;
     /** Ethereum slot duration in seconds */
     readonly ethereumSlotDuration: number;
     /** Aztec slot duration in seconds (must be multiple of ethereum slot duration) */
     readonly aztecSlotDuration: number;
-    /** How late into an L1 slot we can send a tx to make sure it gets included in the immediate next block. Complement of l1PublishingTime. */
-    readonly maxL1TxInclusionTimeIntoSlot: number;
     /** Whether assertTimeLeft will throw if not enough time. */
     readonly enforce: boolean;
+    /** Duration per block when building multiple blocks per slot (undefined = single block per slot) */
+    readonly blockDuration: number | undefined;
+    /** Maximum number of blocks that can be built in this slot configuration */
+    readonly maxNumberOfBlocks: number;
     constructor(opts: {
         ethereumSlotDuration: number;
         aztecSlotDuration: number;
-        maxL1TxInclusionTimeIntoSlot: number;
-        attestationPropagationTime?: number;
+        l1PublishingTime: number;
+        p2pPropagationTime?: number;
+        blockDurationMs?: number;
         enforce: boolean;
-    }, metrics?: SequencerMetrics | undefined, log?: import("@aztec/aztec.js/log").Logger);
-    private get afterBlockBuildingTimeNeededWithoutReexec();
-    getBlockProposalExecTimeEnd(secondsIntoSlot: number): number;
-    private get afterBlockReexecTimeNeeded();
-    getValidatorReexecTimeEnd(secondsIntoSlot?: number): number;
+    }, metrics?: SequencerMetrics | undefined, log?: Logger | undefined);
     getMaxAllowedTime(state: Extract<SequencerState, SequencerState.STOPPED | SequencerState.IDLE | SequencerState.SYNCHRONIZING>): undefined;
     getMaxAllowedTime(state: Exclude<SequencerState, SequencerState.STOPPED | SequencerState.IDLE | SequencerState.SYNCHRONIZING>): number;
     getMaxAllowedTime(state: SequencerState): number | undefined;
     assertTimeLeft(newState: SequencerState, secondsIntoSlot: number): void;
+    /**
+     * Determines if we can start building the next block and returns its deadline.
+     *
+     * The timetable divides the slot into fixed sub-slots. This method finds the next
+     * available sub-slot that has enough time remaining to build a block.
+     *
+     * @param secondsIntoSlot - Current time (seconds into the slot)
+     * @returns Object with canStart flag, deadline, and whether this is the last block
+     */
+    canStartNextBlock(secondsIntoSlot: number): {
+        canStart: true;
+        deadline: undefined;
+        isLastBlock: true;
+    } | {
+        canStart: false;
+        deadline: undefined;
+        isLastBlock: false;
+    } | {
+        canStart: boolean;
+        deadline: number;
+        isLastBlock: boolean;
+    };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGltZXRhYmxlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VxdWVuY2VyL3RpbWV0YWJsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUNyRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBTTVDLHFCQUFhLGtCQUFrQjtJQStDM0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUM7SUFDekIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHO0lBL0N0Qjs7OztPQUlHO0lBQ0gsU0FBZ0Isa0JBQWtCLEVBQUUsTUFBTSxDQUFDO0lBRTNDOzs7O09BSUc7SUFDSCxTQUFnQixnQkFBZ0IsU0FBQztJQUVqQyxzSEFBc0g7SUFDdEgsU0FBZ0IsZ0JBQWdCLEVBQUUsTUFBTSxDQUFzQjtJQUU5RCx1REFBdUQ7SUFDdkQsU0FBZ0IsZ0JBQWdCLEVBQUUsTUFBTSxDQUFzQjtJQUU5RCxtR0FBbUc7SUFDbkcsU0FBZ0IsMEJBQTBCLEVBQUUsTUFBTSxDQUFDO0lBRW5ELG1JQUFtSTtJQUNuSSxTQUFnQixtQkFBbUIsRUFBRSxNQUFNLENBQXlCO0lBRXBFLHdDQUF3QztJQUN4QyxTQUFnQixvQkFBb0IsRUFBRSxNQUFNLENBQUM7SUFFN0Msa0ZBQWtGO0lBQ2xGLFNBQWdCLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUUxQywySUFBMkk7SUFDM0ksU0FBZ0IsNEJBQTRCLEVBQUUsTUFBTSxDQUFDO0lBRXJELDREQUE0RDtJQUM1RCxTQUFnQixPQUFPLEVBQUUsT0FBTyxDQUFDO0lBRWpDLFlBQ0UsSUFBSSxFQUFFO1FBQ0osb0JBQW9CLEVBQUUsTUFBTSxDQUFDO1FBQzdCLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztRQUMxQiw0QkFBNEIsRUFBRSxNQUFNLENBQUM7UUFDckMsMEJBQTBCLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDcEMsT0FBTyxFQUFFLE9BQU8sQ0FBQztLQUNsQixFQUNnQixPQUFPLENBQUMsOEJBQWtCLEVBQzFCLEdBQUcsdUNBQXNDLEVBNkMzRDtJQUVELE9BQU8sS0FBSyx5Q0FBeUMsR0FFcEQ7SUFFTSwyQkFBMkIsQ0FBQyxlQUFlLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FhbEU7SUFFRCxPQUFPLEtBQUssMEJBQTBCLEdBRXJDO0lBRU0seUJBQXlCLENBQUMsZUFBZSxDQUFDLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FRakU7SUFFTSxpQkFBaUIsQ0FDdEIsS0FBSyxFQUFFLE9BQU8sQ0FBQyxjQUFjLEVBQUUsY0FBYyxDQUFDLE9BQU8sR0FBRyxjQUFjLENBQUMsSUFBSSxHQUFHLGNBQWMsQ0FBQyxhQUFhLENBQUMsR0FDMUcsU0FBUyxDQUFDO0lBQ04saUJBQWlCLENBQ3RCLEtBQUssRUFBRSxPQUFPLENBQUMsY0FBYyxFQUFFLGNBQWMsQ0FBQyxPQUFPLEdBQUcsY0FBYyxDQUFDLElBQUksR0FBRyxjQUFjLENBQUMsYUFBYSxDQUFDLEdBQzFHLE1BQU0sQ0FBQztJQUNILGlCQUFpQixDQUFDLEtBQUssRUFBRSxjQUFjLEdBQUcsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQXdCN0QsY0FBYyxDQUFDLFFBQVEsRUFBRSxjQUFjLEVBQUUsZUFBZSxFQUFFLE1BQU0sUUFpQnRFO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGltZXRhYmxlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VxdWVuY2VyL3RpbWV0YWJsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQVNwRCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUNyRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRTVDLHFCQUFhLGtCQUFrQjtJQXFFM0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUM7SUFDekIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUM7SUFyRXZCOzs7O09BSUc7SUFDSCxTQUFnQixrQkFBa0IsRUFBRSxNQUFNLENBQUM7SUFFM0M7Ozs7T0FJRztJQUNILFNBQWdCLG9CQUFvQixFQUFFLE1BQU0sQ0FBQztJQUU3Qzs7Ozs7T0FLRztJQUNILFNBQWdCLDBCQUEwQixFQUFFLE1BQU0sQ0FBQztJQUVuRDs7OztPQUlHO0lBQ0gsU0FBZ0IsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDO0lBRXpDOzs7T0FHRztJQUNILFNBQWdCLGdCQUFnQixFQUFFLE1BQU0sQ0FBc0I7SUFFOUQsdURBQXVEO0lBQ3ZELFNBQWdCLDRCQUE0QixFQUFFLE1BQU0sQ0FBa0M7SUFFdEYsbUdBQW1HO0lBQ25HLFNBQWdCLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztJQUUzQyxtRkFBbUY7SUFDbkYsU0FBZ0Isc0JBQXNCLEVBQUUsTUFBTSxDQUE0QjtJQUUxRSx3Q0FBd0M7SUFDeEMsU0FBZ0Isb0JBQW9CLEVBQUUsTUFBTSxDQUFDO0lBRTdDLGtGQUFrRjtJQUNsRixTQUFnQixpQkFBaUIsRUFBRSxNQUFNLENBQUM7SUFFMUMsNERBQTREO0lBQzVELFNBQWdCLE9BQU8sRUFBRSxPQUFPLENBQUM7SUFFakMsb0dBQW9HO0lBQ3BHLFNBQWdCLGFBQWEsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBRWxELDRFQUE0RTtJQUM1RSxTQUFnQixpQkFBaUIsRUFBRSxNQUFNLENBQUM7SUFFMUMsWUFDRSxJQUFJLEVBQUU7UUFDSixvQkFBb0IsRUFBRSxNQUFNLENBQUM7UUFDN0IsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO1FBQzFCLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztRQUN6QixrQkFBa0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUM1QixlQUFlLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDekIsT0FBTyxFQUFFLE9BQU8sQ0FBQztLQUNsQixFQUNnQixPQUFPLENBQUMsOEJBQWtCLEVBQzFCLEdBQUcsQ0FBQyxvQkFBUSxFQTJFOUI7SUFFTSxpQkFBaUIsQ0FDdEIsS0FBSyxFQUFFLE9BQU8sQ0FBQyxjQUFjLEVBQUUsY0FBYyxDQUFDLE9BQU8sR0FBRyxjQUFjLENBQUMsSUFBSSxHQUFHLGNBQWMsQ0FBQyxhQUFhLENBQUMsR0FDMUcsU0FBUyxDQUFDO0lBQ04saUJBQWlCLENBQ3RCLEtBQUssRUFBRSxPQUFPLENBQUMsY0FBYyxFQUFFLGNBQWMsQ0FBQyxPQUFPLEdBQUcsY0FBYyxDQUFDLElBQUksR0FBRyxjQUFjLENBQUMsYUFBYSxDQUFDLEdBQzFHLE1BQU0sQ0FBQztJQUNILGlCQUFpQixDQUFDLEtBQUssRUFBRSxjQUFjLEdBQUcsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQTJCN0QsY0FBYyxDQUFDLFFBQVEsRUFBRSxjQUFjLEVBQUUsZUFBZSxFQUFFLE1BQU0sUUFpQnRFO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSSxpQkFBaUIsQ0FDdEIsZUFBZSxFQUFFLE1BQU0sR0FFckI7UUFBRSxRQUFRLEVBQUUsSUFBSSxDQUFDO1FBQUMsUUFBUSxFQUFFLFNBQVMsQ0FBQztRQUFDLFdBQVcsRUFBRSxJQUFJLENBQUE7S0FBRSxHQUMxRDtRQUFFLFFBQVEsRUFBRSxLQUFLLENBQUM7UUFBQyxRQUFRLEVBQUUsU0FBUyxDQUFDO1FBQUMsV0FBVyxFQUFFLEtBQUssQ0FBQTtLQUFFLEdBQzVEO1FBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQztRQUFDLFFBQVEsRUFBRSxNQUFNLENBQUM7UUFBQyxXQUFXLEVBQUUsT0FBTyxDQUFBO0tBQUUsQ0F3RGhFO0NBQ0YifQ==

package/dest/sequencer/timetable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timetable.d.ts","sourceRoot":"","sources":["../../src/sequencer/timetable.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAM5C,qBAAa,kBAAkB;IA+C3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG;IA/CtB;;;;OAIG;IACH,SAAgB,kBAAkB,EAAE,MAAM,CAAC;IAE3C;;;;OAIG;IACH,SAAgB,gBAAgB,SAAC;IAEjC,sHAAsH;IACtH,SAAgB,gBAAgB,EAAE,MAAM,CAAsB;IAE9D,uDAAuD;IACvD,SAAgB,gBAAgB,EAAE,MAAM,CAAsB;IAE9D,mGAAmG;IACnG,SAAgB,0BAA0B,EAAE,MAAM,CAAC;IAEnD,mIAAmI;IACnI,SAAgB,mBAAmB,EAAE,MAAM,CAAyB;IAEpE,wCAAwC;IACxC,SAAgB,oBAAoB,EAAE,MAAM,CAAC;IAE7C,kFAAkF;IAClF,SAAgB,iBAAiB,EAAE,MAAM,CAAC;IAE1C,2IAA2I;IAC3I,SAAgB,4BAA4B,EAAE,MAAM,CAAC;IAErD,4DAA4D;IAC5D,SAAgB,OAAO,EAAE,OAAO,CAAC;IAEjC,YACE,IAAI,EAAE;QACJ,oBAAoB,EAAE,MAAM,CAAC;QAC7B,iBAAiB,EAAE,MAAM,CAAC;QAC1B,4BAA4B,EAAE,MAAM,CAAC;QACrC,0BAA0B,CAAC,EAAE,MAAM,CAAC;QACpC,OAAO,EAAE,OAAO,CAAC;KAClB,EACgB,OAAO,CAAC,8BAAkB,EAC1B,GAAG,uCAAsC,EA6C3D;IAED,OAAO,KAAK,yCAAyC,GAEpD;IAEM,2BAA2B,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAalE;IAED,OAAO,KAAK,0BAA0B,GAErC;IAEM,yBAAyB,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,CAQjE;IAEM,iBAAiB,CACtB,KAAK,EAAE,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,IAAI,GAAG,cAAc,CAAC,aAAa,CAAC,GAC1G,SAAS,CAAC;IACN,iBAAiB,CACtB,KAAK,EAAE,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,IAAI,GAAG,cAAc,CAAC,aAAa,CAAC,GAC1G,MAAM,CAAC;IACH,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,GAAG,SAAS,CAAC;IAwB7D,cAAc,CAAC,QAAQ,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,QAiBtE;CACF"}
+{"version":3,"file":"timetable.d.ts","sourceRoot":"","sources":["../../src/sequencer/timetable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AASpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,qBAAa,kBAAkB;IAqE3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;IArEvB;;;;OAIG;IACH,SAAgB,kBAAkB,EAAE,MAAM,CAAC;IAE3C;;;;OAIG;IACH,SAAgB,oBAAoB,EAAE,MAAM,CAAC;IAE7C;;;;;OAKG;IACH,SAAgB,0BAA0B,EAAE,MAAM,CAAC;IAEnD;;;;OAIG;IACH,SAAgB,gBAAgB,EAAE,MAAM,CAAC;IAEzC;;;OAGG;IACH,SAAgB,gBAAgB,EAAE,MAAM,CAAsB;IAE9D,uDAAuD;IACvD,SAAgB,4BAA4B,EAAE,MAAM,CAAkC;IAEtF,mGAAmG;IACnG,SAAgB,kBAAkB,EAAE,MAAM,CAAC;IAE3C,mFAAmF;IACnF,SAAgB,sBAAsB,EAAE,MAAM,CAA4B;IAE1E,wCAAwC;IACxC,SAAgB,oBAAoB,EAAE,MAAM,CAAC;IAE7C,kFAAkF;IAClF,SAAgB,iBAAiB,EAAE,MAAM,CAAC;IAE1C,4DAA4D;IAC5D,SAAgB,OAAO,EAAE,OAAO,CAAC;IAEjC,oGAAoG;IACpG,SAAgB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAElD,4EAA4E;IAC5E,SAAgB,iBAAiB,EAAE,MAAM,CAAC;IAE1C,YACE,IAAI,EAAE;QACJ,oBAAoB,EAAE,MAAM,CAAC;QAC7B,iBAAiB,EAAE,MAAM,CAAC;QAC1B,gBAAgB,EAAE,MAAM,CAAC;QACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,OAAO,EAAE,OAAO,CAAC;KAClB,EACgB,OAAO,CAAC,8BAAkB,EAC1B,GAAG,CAAC,oBAAQ,EA2E9B;IAEM,iBAAiB,CACtB,KAAK,EAAE,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,IAAI,GAAG,cAAc,CAAC,aAAa,CAAC,GAC1G,SAAS,CAAC;IACN,iBAAiB,CACtB,KAAK,EAAE,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,IAAI,GAAG,cAAc,CAAC,aAAa,CAAC,GAC1G,MAAM,CAAC;IACH,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,GAAG,SAAS,CAAC;IA2B7D,cAAc,CAAC,QAAQ,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,QAiBtE;IAED;;;;;;;;OAQG;IACI,iBAAiB,CACtB,eAAe,EAAE,MAAM,GAErB;QAAE,QAAQ,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,SAAS,CAAC;QAAC,WAAW,EAAE,IAAI,CAAA;KAAE,GAC1D;QAAE,QAAQ,EAAE,KAAK,CAAC;QAAC,QAAQ,EAAE,SAAS,CAAC;QAAC,WAAW,EAAE,KAAK,CAAA;KAAE,GAC5D;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,CAwDhE;CACF"}

package/dest/sequencer/timetable.js

@@ -1,10 +1,6 @@
-import { createLogger } from '@aztec/aztec.js/log';
-import { DEFAULT_ATTESTATION_PROPAGATION_TIME } from '../config.js';
+import { CHECKPOINT_ASSEMBLE_TIME, CHECKPOINT_INITIALIZATION_TIME, DEFAULT_P2P_PROPAGATION_TIME, MIN_EXECUTION_TIME } from '@aztec/stdlib/timetable';
 import { SequencerTooSlowError } from './errors.js';
 import { SequencerState } from './utils.js';
-const MIN_EXECUTION_TIME = 1;
-const BLOCK_PREPARE_TIME = 1;
-const BLOCK_VALIDATION_TIME = 1;
 export class SequencerTimetable {
     metrics;
     log;
@@ -14,85 +10,94 @@ export class SequencerTimetable {
    * starts building at this time, and all times hold, it will have at least `minExecutionTime` to execute txs for the block.
    */ initializeDeadline;
     /**
+   * Fixed time offset (in seconds) when the first sub-slot starts, used as baseline for all block deadlines.
+   * This is an estimate of how long initialization (sync + proposer check) typically takes.
+   * If actual initialization takes longer/shorter, blocks just get less/more time accordingly.
+   */ initializationOffset;
+    /**
+   * Total time needed to finalize and publish a checkpoint, including:
+   * - Assembling the checkpoint
+   * - Round-trip p2p propagation for the checkpoint proposal and its corresponding attestations
+   * - Publishing to L1
+   */ checkpointFinalizationTime;
+    /**
    * How long it takes to get a published block into L1. L1 builders typically accept txs up to 4 seconds into their slot,
    * but we'll timeout sooner to give it more time to propagate (remember we also have blobs!). Still, when working in anvil,
    * we can just post in the very last second of the L1 slot and still expect the tx to be accepted.
    */ l1PublishingTime;
-    /** What's the minimum time we want to leave available for execution and reexecution (used to derive init deadline) */ minExecutionTime;
-    /** How long it takes to get ready to start building */ blockPrepareTime;
-    /** How long it takes to for proposals and attestations to travel across the p2p layer (one-way) */ attestationPropagationTime;
-    /** How much time we spend validating and processing a block after building it, and assembling the proposal to send to attestors */ blockValidationTime;
+    /**
+   * What's the minimum time we want to leave available for execution and reexecution (used to derive init deadline)
+   * Defaults to half of the block duration if set, otherwise a constant.
+   */ minExecutionTime;
+    /** How long it takes to get ready to start building */ checkpointInitializationTime;
+    /** How long it takes to for proposals and attestations to travel across the p2p layer (one-way) */ p2pPropagationTime;
+    /** How much time we spend assembling a checkpoint after building the last block */ checkpointAssembleTime;
     /** Ethereum slot duration in seconds */ ethereumSlotDuration;
     /** Aztec slot duration in seconds (must be multiple of ethereum slot duration) */ aztecSlotDuration;
-    /** How late into an L1 slot we can send a tx to make sure it gets included in the immediate next block. Complement of l1PublishingTime. */ maxL1TxInclusionTimeIntoSlot;
     /** Whether assertTimeLeft will throw if not enough time. */ enforce;
-    constructor(opts, metrics, log = createLogger('sequencer:timetable')){
+    /** Duration per block when building multiple blocks per slot (undefined = single block per slot) */ blockDuration;
+    /** Maximum number of blocks that can be built in this slot configuration */ maxNumberOfBlocks;
+    constructor(opts, metrics, log){
         this.metrics = metrics;
         this.log = log;
         this.minExecutionTime = MIN_EXECUTION_TIME;
-        this.blockPrepareTime = BLOCK_PREPARE_TIME;
-        this.blockValidationTime = BLOCK_VALIDATION_TIME;
+        this.checkpointInitializationTime = CHECKPOINT_INITIALIZATION_TIME;
+        this.checkpointAssembleTime = CHECKPOINT_ASSEMBLE_TIME;
         this.ethereumSlotDuration = opts.ethereumSlotDuration;
         this.aztecSlotDuration = opts.aztecSlotDuration;
-        this.maxL1TxInclusionTimeIntoSlot = opts.maxL1TxInclusionTimeIntoSlot;
-        this.attestationPropagationTime = opts.attestationPropagationTime ?? DEFAULT_ATTESTATION_PROPAGATION_TIME;
-        this.l1PublishingTime = this.ethereumSlotDuration - this.maxL1TxInclusionTimeIntoSlot;
+        this.l1PublishingTime = opts.l1PublishingTime;
+        this.p2pPropagationTime = opts.p2pPropagationTime ?? DEFAULT_P2P_PROPAGATION_TIME;
+        this.blockDuration = opts.blockDurationMs ? opts.blockDurationMs / 1000 : undefined;
         this.enforce = opts.enforce;
         // Assume zero-cost propagation time and faster runs in test environments where L1 slot duration is shortened
         if (this.ethereumSlotDuration < 8) {
-            this.attestationPropagationTime = 0;
-            this.blockValidationTime = 0.5;
-            this.blockPrepareTime = 0.5;
+            this.p2pPropagationTime = 0;
+            this.checkpointAssembleTime = 0.5;
+            this.checkpointInitializationTime = 0.5;
+            this.minExecutionTime = 1;
         }
-        const allWorkToDo = this.blockPrepareTime + this.minExecutionTime * 2 + this.attestationPropagationTime * 2 + this.blockValidationTime + this.l1PublishingTime;
-        const initializeDeadline = this.aztecSlotDuration - allWorkToDo;
+        // Min execution time cannot be less than the block duration if set
+        if (this.blockDuration !== undefined && this.minExecutionTime > this.blockDuration) {
+            this.minExecutionTime = this.blockDuration;
+        }
+        // Calculate initialization offset - estimate of time needed for sync + proposer check
+        // This is the baseline for all sub-slot deadlines
+        this.initializationOffset = this.checkpointInitializationTime;
+        // Calculate total checkpoint finalization time (assembly + attestations + L1 publishing)
+        this.checkpointFinalizationTime = this.checkpointAssembleTime + this.p2pPropagationTime * 2 + // Round-trip propagation
+        this.l1PublishingTime; // L1 publishing
+        // Calculate maximum number of blocks that fit in this slot
+        if (!this.blockDuration) {
+            this.maxNumberOfBlocks = 1; // Single block per slot
+        } else {
+            const timeReservedAtEnd = this.blockDuration + // Last sub-slot for validator re-execution
+            this.checkpointFinalizationTime; // Checkpoint finalization
+            const timeAvailableForBlocks = this.aztecSlotDuration - this.initializationOffset - timeReservedAtEnd;
+            this.maxNumberOfBlocks = Math.floor(timeAvailableForBlocks / this.blockDuration);
+        }
+        // Minimum work to do within a slot for building a block with the minimum time for execution and publishing its checkpoint
+        const minWorkToDo = this.initializationOffset + this.minExecutionTime * 2 + // Execution and reexecution
+        this.checkpointFinalizationTime;
+        const initializeDeadline = this.aztecSlotDuration - minWorkToDo;
         this.initializeDeadline = initializeDeadline;
-        this.log.verbose(`Sequencer timetable initialized (${this.enforce ? 'enforced' : 'not enforced'})`, {
+        this.log?.info(`Sequencer timetable initialized with ${this.maxNumberOfBlocks} blocks per slot (${this.enforce ? 'enforced' : 'not enforced'})`, {
             ethereumSlotDuration: this.ethereumSlotDuration,
             aztecSlotDuration: this.aztecSlotDuration,
-            maxL1TxInclusionTimeIntoSlot: this.maxL1TxInclusionTimeIntoSlot,
             l1PublishingTime: this.l1PublishingTime,
             minExecutionTime: this.minExecutionTime,
-            blockPrepareTime: this.blockPrepareTime,
-            attestationPropagationTime: this.attestationPropagationTime,
-            blockValidationTime: this.blockValidationTime,
+            blockPrepareTime: this.checkpointInitializationTime,
+            p2pPropagationTime: this.p2pPropagationTime,
+            blockAssembleTime: this.checkpointAssembleTime,
             initializeDeadline: this.initializeDeadline,
             enforce: this.enforce,
-            allWorkToDo
+            minWorkToDo,
+            blockDuration: this.blockDuration,
+            maxNumberOfBlocks: this.maxNumberOfBlocks
         });
         if (initializeDeadline <= 0) {
-            throw new Error(`Block proposal initialize deadline cannot be negative (got ${initializeDeadline} from total time needed ${allWorkToDo} and a slot duration of ${this.aztecSlotDuration}).`);
+            throw new Error(`Block proposal initialize deadline cannot be negative (got ${initializeDeadline} from total time needed ${minWorkToDo} and a slot duration of ${this.aztecSlotDuration}).`);
         }
     }
-    get afterBlockBuildingTimeNeededWithoutReexec() {
-        return this.blockValidationTime + this.attestationPropagationTime * 2 + this.l1PublishingTime;
-    }
-    getBlockProposalExecTimeEnd(secondsIntoSlot) {
-        // We are N seconds into the slot. We need to account for `afterBlockBuildingTimeNeededWithoutReexec` seconds,
-        // send then split the remaining time between the re-execution and the block building.
-        const maxAllowed = this.aztecSlotDuration - this.afterBlockBuildingTimeNeededWithoutReexec;
-        const available = maxAllowed - secondsIntoSlot;
-        const executionTimeEnd = secondsIntoSlot + available / 2;
-        this.log.debug(`Block proposal execution time deadline is ${executionTimeEnd}`, {
-            secondsIntoSlot,
-            maxAllowed,
-            available,
-            executionTimeEnd
-        });
-        return executionTimeEnd;
-    }
-    get afterBlockReexecTimeNeeded() {
-        return this.attestationPropagationTime + this.l1PublishingTime;
-    }
-    getValidatorReexecTimeEnd(secondsIntoSlot) {
-        // We need to leave for `afterBlockReexecTimeNeeded` seconds available.
-        const validationTimeEnd = this.aztecSlotDuration - this.afterBlockReexecTimeNeeded;
-        this.log.debug(`Validator re-execution time deadline is ${validationTimeEnd}`, {
-            secondsIntoSlot,
-            validationTimeEnd
-        });
-        return validationTimeEnd;
-    }
     getMaxAllowedTime(state) {
         switch(state){
             case SequencerState.STOPPED:
@@ -101,13 +106,16 @@ export class SequencerTimetable {
             case SequencerState.SYNCHRONIZING:
                 return; // We don't really care about times for this states
             case SequencerState.PROPOSER_CHECK:
-            case SequencerState.INITIALIZING_PROPOSAL:
+            case SequencerState.INITIALIZING_CHECKPOINT:
                 return this.initializeDeadline;
+            case SequencerState.WAITING_FOR_TXS:
             case SequencerState.CREATING_BLOCK:
-                return this.initializeDeadline + this.blockPrepareTime;
+            case SequencerState.WAITING_UNTIL_NEXT_BLOCK:
+                return this.initializeDeadline + this.checkpointInitializationTime;
+            case SequencerState.ASSEMBLING_CHECKPOINT:
             case SequencerState.COLLECTING_ATTESTATIONS:
-                return this.aztecSlotDuration - this.l1PublishingTime - 2 * this.attestationPropagationTime;
-            case SequencerState.PUBLISHING_BLOCK:
+                return this.aztecSlotDuration - this.l1PublishingTime - 2 * this.p2pPropagationTime;
+            case SequencerState.PUBLISHING_CHECKPOINT:
                 return this.aztecSlotDuration - this.l1PublishingTime;
             default:
                 {
@@ -129,9 +137,86 @@ export class SequencerTimetable {
             throw new SequencerTooSlowError(newState, maxAllowedTime, secondsIntoSlot);
         }
         this.metrics?.recordStateTransitionBufferMs(Math.floor(bufferSeconds * 1000), newState);
-        this.log.trace(`Enough time to transition to ${newState}`, {
+        this.log?.trace(`Enough time to transition to ${newState}`, {
             maxAllowedTime,
             secondsIntoSlot
         });
     }
+    /**
+   * Determines if we can start building the next block and returns its deadline.
+   *
+   * The timetable divides the slot into fixed sub-slots. This method finds the next
+   * available sub-slot that has enough time remaining to build a block.
+   *
+   * @param secondsIntoSlot - Current time (seconds into the slot)
+   * @returns Object with canStart flag, deadline, and whether this is the last block
+   */ canStartNextBlock(secondsIntoSlot) {
+        // When timetable enforcement is disabled, always allow starting,
+        // and build a single block with no deadline. This is here just to
+        // satisfy a subset of e2e tests and the sandbox that assume that the
+        // sequencer is permanently mining every tx sent.
+        if (!this.enforce) {
+            return {
+                canStart: true,
+                deadline: undefined,
+                isLastBlock: true
+            };
+        }
+        // If no block duration is set, then we're in single-block mode, which
+        // is handled for backwards compatibility towards another subset of e2e tests.
+        if (this.blockDuration === undefined) {
+            // In single block mode, execution and re-execution happen sequentially, so we need to
+            // split the available time between them. After building, we need time for attestations and L1.
+            const maxAllowed = this.aztecSlotDuration - this.checkpointFinalizationTime;
+            const available = (maxAllowed - secondsIntoSlot) / 2; // Split remaining time: half for execution, half for re-execution
+            const canStart = available >= this.minExecutionTime;
+            const deadline = secondsIntoSlot + available;
+            this.log?.verbose(`${canStart ? 'Can' : 'Cannot'} start single-block checkpoint at ${secondsIntoSlot}s into slot`, {
+                secondsIntoSlot,
+                maxAllowed,
+                available,
+                deadline
+            });
+            return {
+                canStart,
+                deadline,
+                isLastBlock: true
+            };
+        }
+        // Otherwise, we're in multi-block-per-slot mode, the default when running in production
+        // Find the next available sub-slot that has enough time remaining
+        for(let subSlot = 1; subSlot <= this.maxNumberOfBlocks; subSlot++){
+            // Calculate end for this sub-slot
+            const deadline = this.initializationOffset + subSlot * this.blockDuration;
+            // Check if we have enough time to build a block with this deadline
+            const timeUntilDeadline = deadline - secondsIntoSlot;
+            if (timeUntilDeadline >= this.minExecutionTime) {
+                // Found an available sub-slot! Is this the last one?
+                const isLastBlock = subSlot === this.maxNumberOfBlocks;
+                this.log?.verbose(`Can start ${isLastBlock ? 'last block' : 'block'} in sub-slot ${subSlot} with deadline ${deadline}s`, {
+                    secondsIntoSlot,
+                    deadline,
+                    timeUntilDeadline,
+                    subSlot,
+                    maxBlocks: this.maxNumberOfBlocks
+                });
+                return {
+                    canStart: true,
+                    deadline,
+                    isLastBlock
+                };
+            }
+        }
+        // No sub-slots available with enough time
+        this.log?.verbose(`No time left to start any more blocks`, {
+            secondsIntoSlot,
+            maxBlocks: this.maxNumberOfBlocks,
+            initializationOffset: this.initializationOffset
+        });
+        return {
+            canStart: false,
+            deadline: undefined,
+            isLastBlock: false
+        };
+    }
 }

package/dest/sequencer/types.d.ts

@@ -0,0 +1,6 @@
+import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
+export type SequencerRollupConstants = Pick<L1RollupConstants, 'ethereumSlotDuration' | 'l1GenesisTime' | 'slotDuration'> & {
+    /** Total L2 gas (mana) allowed per checkpoint. Fetched from L1 getManaLimit(). */
+    rollupManaLimit: number;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXF1ZW5jZXIvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVyRSxNQUFNLE1BQU0sd0JBQXdCLEdBQUcsSUFBSSxDQUN6QyxpQkFBaUIsRUFDakIsc0JBQXNCLEdBQUcsZUFBZSxHQUFHLGNBQWMsQ0FDMUQsR0FBRztJQUNGLGtGQUFrRjtJQUNsRixlQUFlLEVBQUUsTUFBTSxDQUFDO0NBQ3pCLENBQUMifQ==

package/dest/sequencer/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/sequencer/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAErE,MAAM,MAAM,wBAAwB,GAAG,IAAI,CACzC,iBAAiB,EACjB,sBAAsB,GAAG,eAAe,GAAG,cAAc,CAC1D,GAAG;IACF,kFAAkF;IAClF,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC"}

package/dest/sequencer/types.js

@@ -0,0 +1 @@
+export { };

package/dest/sequencer/utils.d.ts

@@ -9,16 +9,22 @@ export declare enum SequencerState {
     SYNCHRONIZING = "SYNCHRONIZING",
     /** Checking if we are the proposer for the current slot. */
     PROPOSER_CHECK = "PROPOSER_CHECK",
-    /** Initializing the block proposal. Will move to CREATING_BLOCK if there are valid txs to include, or back to SYNCHRONIZING otherwise. */
-    INITIALIZING_PROPOSAL = "INITIALIZING_PROPOSAL",
-    /** Creating a new L2 block. Includes processing public function calls and running rollup circuits. Will move to PUBLISHING_CONTRACT_DATA. */
+    /** Initializing the checkpoint proposal. */
+    INITIALIZING_CHECKPOINT = "INITIALIZING_CHECKPOINT",
+    /** Waiting for transactions to arrive in the pool. */
+    WAITING_FOR_TXS = "WAITING_FOR_TXS",
+    /** Creating a new L2 block. Includes processing public function calls. */
     CREATING_BLOCK = "CREATING_BLOCK",
-    /** Collecting attestations from its peers. Will move to PUBLISHING_BLOCK. */
+    /** Waiting until the next block can be created. */
+    WAITING_UNTIL_NEXT_BLOCK = "WAITING_UNTIL_NEXT_BLOCK",
+    /** Assembling and broadcasting the checkpoint. */
+    ASSEMBLING_CHECKPOINT = "ASSEMBLING_CHECKPOINT",
+    /** Collecting attestations from its peers. */
     COLLECTING_ATTESTATIONS = "COLLECTING_ATTESTATIONS",
-    /** Sending the tx to L1 with the L2 block data and awaiting it to be mined. Will move to SYNCHRONIZING. */
-    PUBLISHING_BLOCK = "PUBLISHING_BLOCK"
+    /** Sending the tx to L1 with the L2 checkpoint data and awaiting it to be mined.. */
+    PUBLISHING_CHECKPOINT = "PUBLISHING_CHECKPOINT"
 }
-export type SequencerStateWithSlot = SequencerState.INITIALIZING_PROPOSAL | SequencerState.CREATING_BLOCK | SequencerState.COLLECTING_ATTESTATIONS | SequencerState.PUBLISHING_BLOCK | SequencerState.PROPOSER_CHECK;
+export type SequencerStateWithSlot = SequencerState.INITIALIZING_CHECKPOINT | SequencerState.WAITING_FOR_TXS | SequencerState.CREATING_BLOCK | SequencerState.WAITING_UNTIL_NEXT_BLOCK | SequencerState.COLLECTING_ATTESTATIONS | SequencerState.PUBLISHING_CHECKPOINT | SequencerState.PROPOSER_CHECK | SequencerState.ASSEMBLING_CHECKPOINT;
 export type SequencerStateCallback = () => SequencerState;
 export declare function sequencerStateToNumber(state: SequencerState): number;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXF1ZW5jZXIvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQVksY0FBYztJQUN4QixxRUFBcUU7SUFDckUsT0FBTyxZQUFZO0lBQ25CLGdFQUFnRTtJQUNoRSxRQUFRLGFBQWE7SUFDckIscURBQXFEO0lBQ3JELElBQUksU0FBUztJQUNiLHVDQUF1QztJQUN2QyxhQUFhLGtCQUFrQjtJQUMvQiw0REFBNEQ7SUFDNUQsY0FBYyxtQkFBbUI7SUFDakMsMElBQTBJO0lBQzFJLHFCQUFxQiwwQkFBMEI7SUFDL0MsNklBQTZJO0lBQzdJLGNBQWMsbUJBQW1CO0lBQ2pDLDZFQUE2RTtJQUM3RSx1QkFBdUIsNEJBQTRCO0lBQ25ELDJHQUEyRztJQUMzRyxnQkFBZ0IscUJBQXFCO0NBQ3RDO0FBRUQsTUFBTSxNQUFNLHNCQUFzQixHQUM5QixjQUFjLENBQUMscUJBQXFCLEdBQ3BDLGNBQWMsQ0FBQyxjQUFjLEdBQzdCLGNBQWMsQ0FBQyx1QkFBdUIsR0FDdEMsY0FBYyxDQUFDLGdCQUFnQixHQUMvQixjQUFjLENBQUMsY0FBYyxDQUFDO0FBRWxDLE1BQU0sTUFBTSxzQkFBc0IsR0FBRyxNQUFNLGNBQWMsQ0FBQztBQUUxRCx3QkFBZ0Isc0JBQXNCLENBQUMsS0FBSyxFQUFFLGNBQWMsR0FBRyxNQUFNLENBRXBFIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXF1ZW5jZXIvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQVksY0FBYztJQUN4QixxRUFBcUU7SUFDckUsT0FBTyxZQUFZO0lBQ25CLGdFQUFnRTtJQUNoRSxRQUFRLGFBQWE7SUFDckIscURBQXFEO0lBQ3JELElBQUksU0FBUztJQUNiLHVDQUF1QztJQUN2QyxhQUFhLGtCQUFrQjtJQUMvQiw0REFBNEQ7SUFDNUQsY0FBYyxtQkFBbUI7SUFDakMsNENBQTRDO0lBQzVDLHVCQUF1Qiw0QkFBNEI7SUFDbkQsc0RBQXNEO0lBQ3RELGVBQWUsb0JBQW9CO0lBQ25DLDBFQUEwRTtJQUMxRSxjQUFjLG1CQUFtQjtJQUNqQyxtREFBbUQ7SUFDbkQsd0JBQXdCLDZCQUE2QjtJQUNyRCxrREFBa0Q7SUFDbEQscUJBQXFCLDBCQUEwQjtJQUMvQyw4Q0FBOEM7SUFDOUMsdUJBQXVCLDRCQUE0QjtJQUNuRCxxRkFBcUY7SUFDckYscUJBQXFCLDBCQUEwQjtDQUNoRDtBQUVELE1BQU0sTUFBTSxzQkFBc0IsR0FDOUIsY0FBYyxDQUFDLHVCQUF1QixHQUN0QyxjQUFjLENBQUMsZUFBZSxHQUM5QixjQUFjLENBQUMsY0FBYyxHQUM3QixjQUFjLENBQUMsd0JBQXdCLEdBQ3ZDLGNBQWMsQ0FBQyx1QkFBdUIsR0FDdEMsY0FBYyxDQUFDLHFCQUFxQixHQUNwQyxjQUFjLENBQUMsY0FBYyxHQUM3QixjQUFjLENBQUMscUJBQXFCLENBQUM7QUFFekMsTUFBTSxNQUFNLHNCQUFzQixHQUFHLE1BQU0sY0FBYyxDQUFDO0FBRTFELHdCQUFnQixzQkFBc0IsQ0FBQyxLQUFLLEVBQUUsY0FBYyxHQUFHLE1BQU0sQ0FFcEUifQ==

package/dest/sequencer/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/sequencer/utils.ts"],"names":[],"mappings":"AAAA,oBAAY,cAAc;IACxB,qEAAqE;IACrE,OAAO,YAAY;IACnB,gEAAgE;IAChE,QAAQ,aAAa;IACrB,qDAAqD;IACrD,IAAI,SAAS;IACb,uCAAuC;IACvC,aAAa,kBAAkB;IAC/B,4DAA4D;IAC5D,cAAc,mBAAmB;IACjC,0IAA0I;IAC1I,qBAAqB,0BAA0B;IAC/C,6IAA6I;IAC7I,cAAc,mBAAmB;IACjC,6EAA6E;IAC7E,uBAAuB,4BAA4B;IACnD,2GAA2G;IAC3G,gBAAgB,qBAAqB;CACtC;AAED,MAAM,MAAM,sBAAsB,GAC9B,cAAc,CAAC,qBAAqB,GACpC,cAAc,CAAC,cAAc,GAC7B,cAAc,CAAC,uBAAuB,GACtC,cAAc,CAAC,gBAAgB,GAC/B,cAAc,CAAC,cAAc,CAAC;AAElC,MAAM,MAAM,sBAAsB,GAAG,MAAM,cAAc,CAAC;AAE1D,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAEpE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/sequencer/utils.ts"],"names":[],"mappings":"AAAA,oBAAY,cAAc;IACxB,qEAAqE;IACrE,OAAO,YAAY;IACnB,gEAAgE;IAChE,QAAQ,aAAa;IACrB,qDAAqD;IACrD,IAAI,SAAS;IACb,uCAAuC;IACvC,aAAa,kBAAkB;IAC/B,4DAA4D;IAC5D,cAAc,mBAAmB;IACjC,4CAA4C;IAC5C,uBAAuB,4BAA4B;IACnD,sDAAsD;IACtD,eAAe,oBAAoB;IACnC,0EAA0E;IAC1E,cAAc,mBAAmB;IACjC,mDAAmD;IACnD,wBAAwB,6BAA6B;IACrD,kDAAkD;IAClD,qBAAqB,0BAA0B;IAC/C,8CAA8C;IAC9C,uBAAuB,4BAA4B;IACnD,qFAAqF;IACrF,qBAAqB,0BAA0B;CAChD;AAED,MAAM,MAAM,sBAAsB,GAC9B,cAAc,CAAC,uBAAuB,GACtC,cAAc,CAAC,eAAe,GAC9B,cAAc,CAAC,cAAc,GAC7B,cAAc,CAAC,wBAAwB,GACvC,cAAc,CAAC,uBAAuB,GACtC,cAAc,CAAC,qBAAqB,GACpC,cAAc,CAAC,cAAc,GAC7B,cAAc,CAAC,qBAAqB,CAAC;AAEzC,MAAM,MAAM,sBAAsB,GAAG,MAAM,cAAc,CAAC;AAE1D,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAEpE"}

package/dest/sequencer/utils.js

@@ -4,10 +4,13 @@ export var SequencerState = /*#__PURE__*/ function(SequencerState) {
     /** Sequencer is awaiting the next call to work(). */ SequencerState["IDLE"] = "IDLE";
     /** Synchronizing with the L2 chain. */ SequencerState["SYNCHRONIZING"] = "SYNCHRONIZING";
     /** Checking if we are the proposer for the current slot. */ SequencerState["PROPOSER_CHECK"] = "PROPOSER_CHECK";
-    /** Initializing the block proposal. Will move to CREATING_BLOCK if there are valid txs to include, or back to SYNCHRONIZING otherwise. */ SequencerState["INITIALIZING_PROPOSAL"] = "INITIALIZING_PROPOSAL";
-    /** Creating a new L2 block. Includes processing public function calls and running rollup circuits. Will move to PUBLISHING_CONTRACT_DATA. */ SequencerState["CREATING_BLOCK"] = "CREATING_BLOCK";
-    /** Collecting attestations from its peers. Will move to PUBLISHING_BLOCK. */ SequencerState["COLLECTING_ATTESTATIONS"] = "COLLECTING_ATTESTATIONS";
-    /** Sending the tx to L1 with the L2 block data and awaiting it to be mined. Will move to SYNCHRONIZING. */ SequencerState["PUBLISHING_BLOCK"] = "PUBLISHING_BLOCK";
+    /** Initializing the checkpoint proposal. */ SequencerState["INITIALIZING_CHECKPOINT"] = "INITIALIZING_CHECKPOINT";
+    /** Waiting for transactions to arrive in the pool. */ SequencerState["WAITING_FOR_TXS"] = "WAITING_FOR_TXS";
+    /** Creating a new L2 block. Includes processing public function calls. */ SequencerState["CREATING_BLOCK"] = "CREATING_BLOCK";
+    /** Waiting until the next block can be created. */ SequencerState["WAITING_UNTIL_NEXT_BLOCK"] = "WAITING_UNTIL_NEXT_BLOCK";
+    /** Assembling and broadcasting the checkpoint. */ SequencerState["ASSEMBLING_CHECKPOINT"] = "ASSEMBLING_CHECKPOINT";
+    /** Collecting attestations from its peers. */ SequencerState["COLLECTING_ATTESTATIONS"] = "COLLECTING_ATTESTATIONS";
+    /** Sending the tx to L1 with the L2 checkpoint data and awaiting it to be mined.. */ SequencerState["PUBLISHING_CHECKPOINT"] = "PUBLISHING_CHECKPOINT";
     return SequencerState;
 }({});
 export function sequencerStateToNumber(state) {

package/dest/test/index.d.ts

@@ -1,24 +1,23 @@
-import type { PublisherManager } from '@aztec/ethereum';
-import type { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
+import type { L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
+import type { PublisherManager } from '@aztec/ethereum/publisher-manager';
 import type { PublicProcessorFactory } from '@aztec/simulator/server';
-import type { ValidatorClient } from '@aztec/validator-client';
+import type { FullNodeCheckpointsBuilder, ValidatorClient } from '@aztec/validator-client';
 import { SequencerClient } from '../client/sequencer-client.js';
 import type { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
-import type { SequencerPublisher } from '../publisher/sequencer-publisher.js';
 import { Sequencer } from '../sequencer/sequencer.js';
 import type { SequencerTimetable } from '../sequencer/timetable.js';
 declare class TestSequencer_ extends Sequencer {
     publicProcessorFactory: PublicProcessorFactory;
     timetable: SequencerTimetable;
-    publisher: SequencerPublisher;
     publisherFactory: SequencerPublisherFactory;
     validatorClient: ValidatorClient;
+    checkpointsBuilder: FullNodeCheckpointsBuilder;
 }
 export type TestSequencer = TestSequencer_;
 declare class TestSequencerClient_ extends SequencerClient {
     sequencer: TestSequencer;
-    publisherManager: PublisherManager<L1TxUtilsWithBlobs>;
+    publisherManager: PublisherManager<L1TxUtils>;
 }
 export type TestSequencerClient = TestSequencerClient_;
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3RFLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRS9ELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSx5QkFBeUIsRUFBRSxNQUFNLDZDQUE2QyxDQUFDO0FBQzdGLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDOUUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFcEUsY0FBTSxjQUFlLFNBQVEsU0FBUztJQUNyQixzQkFBc0IsRUFBRSxzQkFBc0IsQ0FBQztJQUMvQyxTQUFTLEVBQUUsa0JBQWtCLENBQUM7SUFDOUIsU0FBUyxFQUFFLGtCQUFrQixDQUFDO0lBQzlCLGdCQUFnQixFQUFFLHlCQUF5QixDQUFDO0lBQzVDLGVBQWUsRUFBRSxlQUFlLENBQUM7Q0FDakQ7QUFFRCxNQUFNLE1BQU0sYUFBYSxHQUFHLGNBQWMsQ0FBQztBQUUzQyxjQUFNLG9CQUFxQixTQUFRLGVBQWU7SUFDakMsU0FBUyxFQUFFLGFBQWEsQ0FBQztJQUN6QixnQkFBZ0IsRUFBRSxnQkFBZ0IsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0NBQ3ZFO0FBRUQsTUFBTSxNQUFNLG1CQUFtQixHQUFHLG9CQUFvQixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSwwQkFBMEIsRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUUzRixPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUseUJBQXlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUM3RixPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDdEQsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUVwRSxjQUFNLGNBQWUsU0FBUSxTQUFTO0lBQ3JCLHNCQUFzQixFQUFFLHNCQUFzQixDQUFDO0lBQy9DLFNBQVMsRUFBRSxrQkFBa0IsQ0FBQztJQUM5QixnQkFBZ0IsRUFBRSx5QkFBeUIsQ0FBQztJQUM1QyxlQUFlLEVBQUUsZUFBZSxDQUFDO0lBQ2pDLGtCQUFrQixFQUFFLDBCQUEwQixDQUFDO0NBQy9EO0FBRUQsTUFBTSxNQUFNLGFBQWEsR0FBRyxjQUFjLENBQUM7QUFFM0MsY0FBTSxvQkFBcUIsU0FBUSxlQUFlO0lBQ2pDLFNBQVMsRUFBRSxhQUFhLENBQUM7SUFDekIsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLENBQUM7Q0FDOUQ7QUFFRCxNQUFNLE1BQU0sbUJBQW1CLEdBQUcsb0JBQW9CLENBQUMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAC7F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,cAAM,cAAe,SAAQ,SAAS;IACrB,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,SAAS,EAAE,kBAAkB,CAAC;IAC9B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,gBAAgB,EAAE,yBAAyB,CAAC;IAC5C,eAAe,EAAE,eAAe,CAAC;CACjD;AAED,MAAM,MAAM,aAAa,GAAG,cAAc,CAAC;AAE3C,cAAM,oBAAqB,SAAQ,eAAe;IACjC,SAAS,EAAE,aAAa,CAAC;IACzB,gBAAgB,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;CACvE;AAED,MAAM,MAAM,mBAAmB,GAAG,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,KAAK,EAAE,0BAA0B,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE3F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAC7F,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,cAAM,cAAe,SAAQ,SAAS;IACrB,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,SAAS,EAAE,kBAAkB,CAAC;IAC9B,gBAAgB,EAAE,yBAAyB,CAAC;IAC5C,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,EAAE,0BAA0B,CAAC;CAC/D;AAED,MAAM,MAAM,aAAa,GAAG,cAAc,CAAC;AAE3C,cAAM,oBAAqB,SAAQ,eAAe;IACjC,SAAS,EAAE,aAAa,CAAC;IACzB,gBAAgB,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;CAC9D;AAED,MAAM,MAAM,mBAAmB,GAAG,oBAAoB,CAAC"}

package/dest/test/mock_checkpoint_builder.d.ts

@@ -0,0 +1,95 @@
+import { type BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { L2Block } from '@aztec/stdlib/block';
+import { Checkpoint } from '@aztec/stdlib/checkpoint';
+import type { FullNodeBlockBuilderConfig, ICheckpointBlockBuilder, ICheckpointsBuilder, MerkleTreeWriteOperations, PublicProcessorLimits } from '@aztec/stdlib/interfaces/server';
+import type { CheckpointGlobalVariables, Tx } from '@aztec/stdlib/tx';
+import type { BuildBlockInCheckpointResult } from '@aztec/validator-client';
+/**
+ * A fake CheckpointBuilder for testing that implements the same interface as the real one.
+ * Can be seeded with blocks to return sequentially on each `buildBlock` call.
+ */
+export declare class MockCheckpointBuilder implements ICheckpointBlockBuilder {
+    private readonly constants;
+    private readonly checkpointNumber;
+    private blocks;
+    private builtBlocks;
+    private usedTxsPerBlock;
+    private blockIndex;
+    /** Optional function to dynamically provide the block (alternative to seedBlocks) */
+    private blockProvider;
+    /** Track calls for assertions */
+    buildBlockCalls: Array<{
+        blockNumber: BlockNumber;
+        timestamp: bigint;
+        opts: PublicProcessorLimits;
+    }>;
+    /** Track all consumed transaction hashes across buildBlock calls */
+    consumedTxHashes: Set<string>;
+    completeCheckpointCalled: boolean;
+    getCheckpointCalled: boolean;
+    /** Set to an error to make buildBlock throw on next call */
+    errorOnBuild: Error | undefined;
+    constructor(constants: CheckpointGlobalVariables, checkpointNumber: CheckpointNumber);
+    /** Seed the builder with blocks to return on successive buildBlock calls */
+    seedBlocks(blocks: L2Block[], usedTxsPerBlock?: Tx[][]): this;
+    /**
+     * Set a function that provides blocks dynamically.
+     * Useful for tests where the block is determined at call time (e.g., sequencer tests).
+     */
+    setBlockProvider(provider: () => L2Block): this;
+    getConstantData(): CheckpointGlobalVariables;
+    buildBlock(pendingTxs: Iterable<Tx> | AsyncIterable<Tx>, blockNumber: BlockNumber, timestamp: bigint, opts: PublicProcessorLimits): Promise<BuildBlockInCheckpointResult>;
+    completeCheckpoint(): Promise<Checkpoint>;
+    getCheckpoint(): Promise<Checkpoint>;
+    private buildCheckpoint;
+    /** Resets per-checkpoint state (built blocks, consumed txs) while preserving config (blockProvider, seeded blocks). */
+    resetCheckpointState(): void;
+    /** Reset for reuse in another test */
+    reset(): void;
+}
+/**
+ * A fake CheckpointsBuilder (factory) for testing that implements the same interface
+ * as FullNodeCheckpointsBuilder. Returns MockCheckpointBuilder instances.
+ * Does NOT use jest mocks - this is a proper test double.
+ */
+export declare class MockCheckpointsBuilder implements ICheckpointsBuilder {
+    private checkpointBuilder;
+    /** Track calls for assertions */
+    startCheckpointCalls: Array<{
+        checkpointNumber: CheckpointNumber;
+        constants: CheckpointGlobalVariables;
+        l1ToL2Messages: Fr[];
+        previousCheckpointOutHashes: Fr[];
+        feeAssetPriceModifier: bigint;
+    }>;
+    openCheckpointCalls: Array<{
+        checkpointNumber: CheckpointNumber;
+        constants: CheckpointGlobalVariables;
+        l1ToL2Messages: Fr[];
+        previousCheckpointOutHashes: Fr[];
+        existingBlocks: L2Block[];
+        feeAssetPriceModifier: bigint;
+    }>;
+    updateConfigCalls: Array<Partial<FullNodeBlockBuilderConfig>>;
+    /**
+     * Set the MockCheckpointBuilder to return from startCheckpoint.
+     * Must be called before startCheckpoint is invoked.
+     */
+    setCheckpointBuilder(builder: MockCheckpointBuilder): this;
+    /**
+     * Creates a new MockCheckpointBuilder with the given constants.
+     * Convenience method that creates and sets the builder in one call.
+     */
+    createCheckpointBuilder(constants: CheckpointGlobalVariables, checkpointNumber: CheckpointNumber): MockCheckpointBuilder;
+    /** Get the current checkpoint builder (for assertions) */
+    getCheckpointBuilder(): MockCheckpointBuilder | undefined;
+    getConfig(): FullNodeBlockBuilderConfig;
+    updateConfig(config: Partial<FullNodeBlockBuilderConfig>): void;
+    startCheckpoint(checkpointNumber: CheckpointNumber, constants: CheckpointGlobalVariables, feeAssetPriceModifier: bigint, l1ToL2Messages: Fr[], previousCheckpointOutHashes: Fr[], _fork: MerkleTreeWriteOperations): Promise<ICheckpointBlockBuilder>;
+    openCheckpoint(checkpointNumber: CheckpointNumber, constants: CheckpointGlobalVariables, feeAssetPriceModifier: bigint, l1ToL2Messages: Fr[], previousCheckpointOutHashes: Fr[], _fork: MerkleTreeWriteOperations, existingBlocks?: L2Block[]): Promise<ICheckpointBlockBuilder>;
+    getFork(_blockNumber: BlockNumber): Promise<MerkleTreeWriteOperations>;
+    /** Reset for reuse in another test */
+    reset(): void;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19jaGVja3BvaW50X2J1aWxkZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L21vY2tfY2hlY2twb2ludF9idWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBRSxnQkFBZ0IsRUFBeUIsTUFBTSxpQ0FBaUMsQ0FBQztBQUM1RyxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUN0RCxPQUFPLEtBQUssRUFDViwwQkFBMEIsRUFDMUIsdUJBQXVCLEVBQ3ZCLG1CQUFtQixFQUNuQix5QkFBeUIsRUFDekIscUJBQXFCLEVBQ3RCLE1BQU0saUNBQWlDLENBQUM7QUFHekMsT0FBTyxLQUFLLEVBQUUseUJBQXlCLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDdEUsT0FBTyxLQUFLLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUU1RTs7O0dBR0c7QUFDSCxxQkFBYSxxQkFBc0IsWUFBVyx1QkFBdUI7SUF3QmpFLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGdCQUFnQjtJQXhCbkMsT0FBTyxDQUFDLE1BQU0sQ0FBaUI7SUFDL0IsT0FBTyxDQUFDLFdBQVcsQ0FBaUI7SUFDcEMsT0FBTyxDQUFDLGVBQWUsQ0FBYztJQUNyQyxPQUFPLENBQUMsVUFBVSxDQUFLO0lBRXZCLHFGQUFxRjtJQUNyRixPQUFPLENBQUMsYUFBYSxDQUEwQztJQUUvRCxpQ0FBaUM7SUFDMUIsZUFBZSxFQUFFLEtBQUssQ0FBQztRQUM1QixXQUFXLEVBQUUsV0FBVyxDQUFDO1FBQ3pCLFNBQVMsRUFBRSxNQUFNLENBQUM7UUFDbEIs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