@aztec/sequencer-client 0.0.0-test.1 → 0.0.1-commit.b655e406

package/dest/sequencer/timetable.d.ts

@@ -1,38 +1,50 @@
 import type { SequencerMetrics } from './metrics.js';
 import { SequencerState } from './utils.js';
 export declare class SequencerTimetable {
-    private readonly ethereumSlotDuration;
-    private readonly aztecSlotDuration;
-    private readonly maxL1TxInclusionTimeIntoSlot;
-    private readonly enforce;
     private readonly metrics?;
     private readonly log;
-    /** How late into the slot can we be to start working */
-    readonly initialTime = 3;
-    /** How long it takes to get ready to start building */
-    readonly blockPrepareTime = 1;
-    /** How long it takes to for proposals and attestations to travel across the p2p layer (one-way) */
-    readonly attestationPropagationTime = 2;
-    /** How much time we spend validating and processing a block after building it, and assembling the proposal to send to attestors */
-    readonly blockValidationTime = 1;
+    /**
+     * 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;
     /**
      * 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;
-    constructor(ethereumSlotDuration: number, aztecSlotDuration: number, maxL1TxInclusionTimeIntoSlot: number, enforce?: boolean, metrics?: SequencerMetrics | undefined, log?: import("@aztec/aztec.js").Logger);
+    /** What's the minimum time we want to leave available for execution and reexecution (used to derive init deadline) */
+    readonly minExecutionTime: number;
+    /** How long it takes to get ready to start building */
+    readonly blockPrepareTime: 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;
+    /** 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;
+    constructor(opts: {
+        ethereumSlotDuration: number;
+        aztecSlotDuration: number;
+        maxL1TxInclusionTimeIntoSlot: number;
+        attestationPropagationTime?: 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;
+    getValidatorReexecTimeEnd(secondsIntoSlot?: number): number;
+    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;
 }
-export declare class SequencerTooSlowError extends Error {
-    readonly proposedState: SequencerState;
-    readonly maxAllowedTime: number;
-    readonly currentTime: number;
-    constructor(proposedState: SequencerState, maxAllowedTime: number, currentTime: number);
-}
 //# sourceMappingURL=timetable.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"timetable.d.ts","sourceRoot":"","sources":["../../src/sequencer/timetable.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,qBAAa,kBAAkB;IAqB3B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,4BAA4B;IAC7C,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAzBtB,wDAAwD;IACxD,SAAgB,WAAW,KAAK;IAEhC,uDAAuD;IACvD,SAAgB,gBAAgB,KAAK;IAErC,mGAAmG;IACnG,SAAgB,0BAA0B,KAAK;IAE/C,mIAAmI;IACnI,SAAgB,mBAAmB,KAAK;IAExC;;;;OAIG;IACH,SAAgB,gBAAgB,SAAC;gBAGd,oBAAoB,EAAE,MAAM,EAC5B,iBAAiB,EAAE,MAAM,EACzB,4BAA4B,EAAE,MAAM,EACpC,OAAO,GAAE,OAAc,EACvB,OAAO,CAAC,8BAAkB,EAC1B,GAAG,mCAAsC;IAK5D,OAAO,KAAK,yCAAyC,GAEpD;IAEM,2BAA2B,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM;IAenE,OAAO,KAAK,0BAA0B,GAErC;IAEM,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM;IAU1D,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,GAAG,SAAS;IAsB5D,cAAc,CAAC,QAAQ,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM;CAkBxE;AAED,qBAAa,qBAAsB,SAAQ,KAAK;aAE5B,aAAa,EAAE,cAAc;aAC7B,cAAc,EAAE,MAAM;aACtB,WAAW,EAAE,MAAM;gBAFnB,aAAa,EAAE,cAAc,EAC7B,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM;CAOtC"}
+{"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;gBAG/B,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,EAAE,gBAAgB,YAAA,EAC1B,GAAG,uCAAsC;IA+C5D,OAAO,KAAK,yCAAyC,GAEpD;IAEM,2BAA2B,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM;IAenE,OAAO,KAAK,0BAA0B,GAErC;IAEM,yBAAyB,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM;IAU3D,iBAAiB,CACtB,KAAK,EAAE,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,IAAI,GAAG,cAAc,CAAC,aAAa,CAAC,GAC1G,SAAS;IACL,iBAAiB,CACtB,KAAK,EAAE,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,IAAI,GAAG,cAAc,CAAC,aAAa,CAAC,GAC1G,MAAM;IACF,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,GAAG,SAAS;IAwB5D,cAAc,CAAC,QAAQ,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM;CAkBxE"}

package/dest/sequencer/timetable.js

@@ -1,33 +1,68 @@
-import { createLogger } from '@aztec/aztec.js';
+import { createLogger } from '@aztec/aztec.js/log';
+import { DEFAULT_ATTESTATION_PROPAGATION_TIME } from '../config.js';
+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 {
-    ethereumSlotDuration;
-    aztecSlotDuration;
-    maxL1TxInclusionTimeIntoSlot;
-    enforce;
     metrics;
     log;
-    /** How late into the slot can we be to start working */ initialTime;
-    /** 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;
+    /**
+   * 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.
+   */ initializeDeadline;
     /**
    * 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;
-    constructor(ethereumSlotDuration, aztecSlotDuration, maxL1TxInclusionTimeIntoSlot, enforce = true, metrics, log = createLogger('sequencer:timetable')){
-        this.ethereumSlotDuration = ethereumSlotDuration;
-        this.aztecSlotDuration = aztecSlotDuration;
-        this.maxL1TxInclusionTimeIntoSlot = maxL1TxInclusionTimeIntoSlot;
-        this.enforce = enforce;
+    /** 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;
+    /** 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')){
         this.metrics = metrics;
         this.log = log;
-        this.initialTime = 3;
-        this.blockPrepareTime = 1;
-        this.attestationPropagationTime = 2;
-        this.blockValidationTime = 1;
+        this.minExecutionTime = MIN_EXECUTION_TIME;
+        this.blockPrepareTime = BLOCK_PREPARE_TIME;
+        this.blockValidationTime = BLOCK_VALIDATION_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.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;
+        }
+        const allWorkToDo = this.blockPrepareTime + this.minExecutionTime * 2 + this.attestationPropagationTime * 2 + this.blockValidationTime + this.l1PublishingTime;
+        const initializeDeadline = this.aztecSlotDuration - allWorkToDo;
+        this.initializeDeadline = initializeDeadline;
+        this.log.verbose(`Sequencer timetable initialized (${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,
+            initializeDeadline: this.initializeDeadline,
+            enforce: this.enforce,
+            allWorkToDo
+        });
+        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}).`);
+        }
     }
     get afterBlockBuildingTimeNeededWithoutReexec() {
         return this.blockValidationTime + this.attestationPropagationTime * 2 + this.l1PublishingTime;
@@ -61,14 +96,15 @@ export class SequencerTimetable {
     getMaxAllowedTime(state) {
         switch(state){
             case SequencerState.STOPPED:
+            case SequencerState.STOPPING:
             case SequencerState.IDLE:
             case SequencerState.SYNCHRONIZING:
-            case SequencerState.PROPOSER_CHECK:
                 return; // We don't really care about times for this states
+            case SequencerState.PROPOSER_CHECK:
             case SequencerState.INITIALIZING_PROPOSAL:
-                return this.initialTime;
+                return this.initializeDeadline;
             case SequencerState.CREATING_BLOCK:
-                return this.initialTime + this.blockPrepareTime;
+                return this.initializeDeadline + this.blockPrepareTime;
             case SequencerState.COLLECTING_ATTESTATIONS:
                 return this.aztecSlotDuration - this.l1PublishingTime - 2 * this.attestationPropagationTime;
             case SequencerState.PUBLISHING_BLOCK:
@@ -99,12 +135,3 @@ export class SequencerTimetable {
         });
     }
 }
-export class SequencerTooSlowError extends Error {
-    proposedState;
-    maxAllowedTime;
-    currentTime;
-    constructor(proposedState, maxAllowedTime, currentTime){
-        super(`Too far into slot for ${proposedState} (time into slot ${currentTime}s greater than ${maxAllowedTime}s allowance)`), this.proposedState = proposedState, this.maxAllowedTime = maxAllowedTime, this.currentTime = currentTime;
-        this.name = 'SequencerTooSlowError';
-    }
-}

package/dest/sequencer/utils.d.ts

@@ -1,48 +1,24 @@
-import type { EthAddress } from '@aztec/foundation/eth-address';
-import { Signature } from '@aztec/foundation/eth-signature';
-import type { BlockAttestation } from '@aztec/stdlib/p2p';
 export declare enum SequencerState {
-    /**
-     * Sequencer is stopped and not processing any txs from the pool.
-     */
+    /** Sequencer is stopped and not processing any txs from the pool. */
     STOPPED = "STOPPED",
-    /**
-     * Sequencer is awaiting the next call to work().
-     */
+    /** Sequencer is being stopped. Will move to STOPPED shortly. */
+    STOPPING = "STOPPING",
+    /** Sequencer is awaiting the next call to work(). */
     IDLE = "IDLE",
-    /**
-     * Synchronizing with the L2 chain.
-     */
+    /** Synchronizing with the L2 chain. */
     SYNCHRONIZING = "SYNCHRONIZING",
-    /**
-     * Checking if we are the proposer for the current slot.
-     */
+    /** 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 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.
-     */
+    /** Creating a new L2 block. Includes processing public function calls and running rollup circuits. Will move to PUBLISHING_CONTRACT_DATA. */
     CREATING_BLOCK = "CREATING_BLOCK",
-    /**
-     * Collecting attestations from its peers. Will move to PUBLISHING_BLOCK.
-     */
+    /** Collecting attestations from its peers. Will move to PUBLISHING_BLOCK. */
     COLLECTING_ATTESTATIONS = "COLLECTING_ATTESTATIONS",
-    /**
-     * Sending the tx to L1 with the L2 block data and awaiting it to be mined. Will move to SYNCHRONIZING.
-     */
+    /** Sending the tx to L1 with the L2 block data and awaiting it to be mined. Will move to SYNCHRONIZING. */
     PUBLISHING_BLOCK = "PUBLISHING_BLOCK"
 }
+export type SequencerStateWithSlot = SequencerState.INITIALIZING_PROPOSAL | SequencerState.CREATING_BLOCK | SequencerState.COLLECTING_ATTESTATIONS | SequencerState.PUBLISHING_BLOCK | SequencerState.PROPOSER_CHECK;
 export type SequencerStateCallback = () => SequencerState;
 export declare function sequencerStateToNumber(state: SequencerState): number;
-/** Order Attestations
- *
- * Returns attestation signatures in the order of a series of provided ethereum addresses
- * The rollup smart contract expects attestations to appear in the order of the committee
- *
- * @todo: perform this logic within the memory attestation store instead?
- */
-export declare function orderAttestations(attestations: BlockAttestation[], orderAddresses: EthAddress[]): Promise<Signature[]>;
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/sequencer/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,oBAAY,cAAc;IACxB;;OAEG;IACH,OAAO,YAAY;IACnB;;OAEG;IACH,IAAI,SAAS;IACb;;OAEG;IACH,aAAa,kBAAkB;IAC/B;;OAEG;IACH,cAAc,mBAAmB;IACjC;;OAEG;IACH,qBAAqB,0BAA0B;IAC/C;;OAEG;IACH,cAAc,mBAAmB;IACjC;;OAEG;IACH,uBAAuB,4BAA4B;IACnD;;OAEG;IACH,gBAAgB,qBAAqB;CACtC;AAED,MAAM,MAAM,sBAAsB,GAAG,MAAM,cAAc,CAAC;AAE1D,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAEpE;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,YAAY,EAAE,gBAAgB,EAAE,EAChC,cAAc,EAAE,UAAU,EAAE,GAC3B,OAAO,CAAC,SAAS,EAAE,CAAC,CAkBtB"}
+{"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"}

package/dest/sequencer/utils.js

@@ -1,53 +1,15 @@
-import { Signature } from '@aztec/foundation/eth-signature';
 export var SequencerState = /*#__PURE__*/ function(SequencerState) {
-    /**
-   * Sequencer is stopped and not processing any txs from the pool.
-   */ SequencerState["STOPPED"] = "STOPPED";
-    /**
-   * 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";
+    /** Sequencer is stopped and not processing any txs from the pool. */ SequencerState["STOPPED"] = "STOPPED";
+    /** Sequencer is being stopped. Will move to STOPPED shortly. */ SequencerState["STOPPING"] = "STOPPING";
+    /** 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";
     return SequencerState;
 }({});
 export function sequencerStateToNumber(state) {
     return Object.values(SequencerState).indexOf(state);
 }
-/** Order Attestations
- *
- * Returns attestation signatures in the order of a series of provided ethereum addresses
- * The rollup smart contract expects attestations to appear in the order of the committee
- *
- * @todo: perform this logic within the memory attestation store instead?
- */ export async function orderAttestations(attestations, orderAddresses) {
-    // Create a map of sender addresses to BlockAttestations
-    const attestationMap = new Map();
-    for (const attestation of attestations){
-        const sender = await attestation.getSender();
-        if (sender) {
-            attestationMap.set(sender.toString(), attestation);
-        }
-    }
-    // Create the ordered array based on the orderAddresses, else return an empty signature
-    const orderedAttestations = orderAddresses.map((address)=>{
-        const addressString = address.toString();
-        return attestationMap.get(addressString)?.signature || Signature.empty();
-    });
-    return orderedAttestations;
-}

package/dest/test/index.d.ts

@@ -1,5 +1,9 @@
+import type { PublisherManager } from '@aztec/ethereum';
+import type { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
 import type { PublicProcessorFactory } from '@aztec/simulator/server';
+import type { 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';
@@ -7,10 +11,13 @@ declare class TestSequencer_ extends Sequencer {
     publicProcessorFactory: PublicProcessorFactory;
     timetable: SequencerTimetable;
     publisher: SequencerPublisher;
+    publisherFactory: SequencerPublisherFactory;
+    validatorClient: ValidatorClient;
 }
 export type TestSequencer = TestSequencer_;
 declare class TestSequencerClient_ extends SequencerClient {
     sequencer: TestSequencer;
+    publisherManager: PublisherManager<L1TxUtilsWithBlobs>;
 }
 export type TestSequencerClient = TestSequencerClient_;
 export {};

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,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,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;IACpB,sBAAsB,EAAG,sBAAsB,CAAC;IAChD,SAAS,EAAG,kBAAkB,CAAC;IAC/B,SAAS,EAAG,kBAAkB,CAAC;CAChD;AAED,MAAM,MAAM,aAAa,GAAG,cAAc,CAAC;AAE3C,cAAM,oBAAqB,SAAQ,eAAe;IAChC,SAAS,EAAG,aAAa,CAAC;CAC3C;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,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"}

package/dest/test/index.js

@@ -1,10 +1,6 @@
 import { SequencerClient } from '../client/sequencer-client.js';
 import { Sequencer } from '../sequencer/sequencer.js';
 class TestSequencer_ extends Sequencer {
-    publicProcessorFactory;
-    timetable;
-    publisher;
 }
 class TestSequencerClient_ extends SequencerClient {
-    sequencer;
 }

package/dest/tx_validator/nullifier_cache.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import type { NullifierSource } from '@aztec/p2p';
 import type { MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server';
 /**

package/dest/tx_validator/nullifier_cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nullifier_cache.d.ts","sourceRoot":"","sources":["../../src/tx_validator/nullifier_cache.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAGhF;;;GAGG;AACH,qBAAa,cAAe,YAAW,eAAe;IAGxC,OAAO,CAAC,EAAE;IAFtB,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;gBAEJ,EAAE,EAAE,wBAAwB;IAInC,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAS/D,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE;CAK1C"}
+{"version":3,"file":"nullifier_cache.d.ts","sourceRoot":"","sources":["../../src/tx_validator/nullifier_cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAGhF;;;GAGG;AACH,qBAAa,cAAe,YAAW,eAAe;IAGxC,OAAO,CAAC,EAAE;IAFtB,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;gBAEJ,EAAE,EAAE,wBAAwB;IAInC,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAS/D,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE;CAK1C"}

package/dest/tx_validator/tx_validator_factory.d.ts

@@ -1,18 +1,17 @@
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import type { GasFees } from '@aztec/stdlib/gas';
-import type { AllowedElement, ClientProtocolCircuitVerifier, MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server';
-import { GlobalVariables, type ProcessedTx, type Tx, type TxValidator } from '@aztec/stdlib/tx';
-import { NullifierCache } from './nullifier_cache.js';
-export declare function createValidatorForAcceptingTxs(db: MerkleTreeReadOperations, contractDataSource: ContractDataSource, verifier: ClientProtocolCircuitVerifier | undefined, { blockNumber, l1ChainId, setupAllowList, gasFees, skipFeeEnforcement, }: {
-    blockNumber: number;
+import type { AllowedElement, ClientProtocolCircuitVerifier, MerkleTreeReadOperations, PublicProcessorValidator } from '@aztec/stdlib/interfaces/server';
+import { GlobalVariables, type Tx, type TxValidator } from '@aztec/stdlib/tx';
+import type { UInt64 } from '@aztec/stdlib/types';
+export declare function createValidatorForAcceptingTxs(db: MerkleTreeReadOperations, contractDataSource: ContractDataSource, verifier: ClientProtocolCircuitVerifier | undefined, { l1ChainId, rollupVersion, setupAllowList, gasFees, skipFeeEnforcement, timestamp, blockNumber, txsPermitted, }: {
     l1ChainId: number;
+    rollupVersion: number;
     setupAllowList: AllowedElement[];
     gasFees: GasFees;
     skipFeeEnforcement?: boolean;
+    timestamp: UInt64;
+    blockNumber: number;
+    txsPermitted: boolean;
 }): TxValidator<Tx>;
-export declare function createValidatorsForBlockBuilding(db: MerkleTreeReadOperations, contractDataSource: ContractDataSource, globalVariables: GlobalVariables, setupAllowList: AllowedElement[]): {
-    preprocessValidator: TxValidator<Tx>;
-    postprocessValidator: TxValidator<ProcessedTx>;
-    nullifierCache: NullifierCache;
-};
+export declare function createValidatorForBlockBuilding(db: MerkleTreeReadOperations, contractDataSource: ContractDataSource, globalVariables: GlobalVariables, setupAllowList: AllowedElement[]): PublicProcessorValidator;
 //# sourceMappingURL=tx_validator_factory.d.ts.map

package/dest/tx_validator/tx_validator_factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx_validator_factory.d.ts","sourceRoot":"","sources":["../../src/tx_validator/tx_validator_factory.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,wBAAwB,EACzB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,KAAK,WAAW,EAAE,KAAK,EAAE,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAIhG,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,6BAA6B,GAAG,SAAS,EACnD,EACE,WAAW,EACX,SAAS,EACT,cAAc,EACd,OAAO,EACP,kBAAkB,GACnB,EAAE;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,cAAc,EAAE,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,GACA,WAAW,CAAC,EAAE,CAAC,CAkBjB;AAED,wBAAgB,gCAAgC,CAC9C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,cAAc,EAAE,GAC/B;IACD,mBAAmB,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IACrC,oBAAoB,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;IAC/C,cAAc,EAAE,cAAc,CAAC;CAChC,CAiBA"}
+{"version":3,"file":"tx_validator_factory.d.ts","sourceRoot":"","sources":["../../src/tx_validator/tx_validator_factory.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,6BAA6B,GAAG,SAAS,EACnD,EACE,SAAS,EACT,aAAa,EACb,cAAc,EACd,OAAO,EACP,kBAAkB,EAClB,SAAS,EACT,WAAW,EACX,YAAY,GACb,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,cAAc,EAAE,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;CACvB,GACA,WAAW,CAAC,EAAE,CAAC,CA4BjB;AAED,wBAAgB,+BAA+B,CAC7C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,cAAc,EAAE,GAC/B,wBAAwB,CAgB1B"}

package/dest/tx_validator/tx_validator_factory.js

@@ -1,17 +1,25 @@
 import { Fr } from '@aztec/foundation/fields';
-import { AggregateTxValidator, BlockHeaderTxValidator, DataTxValidator, DoubleSpendTxValidator, MetadataTxValidator, TxProofValidator } from '@aztec/p2p';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { readPublicState } from '@aztec/simulator/server';
-import { ArchiveCache } from './archive_cache.js';
-import { GasTxValidator } from './gas_validator.js';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
+import { AggregateTxValidator, ArchiveCache, BlockHeaderTxValidator, DataTxValidator, DoubleSpendTxValidator, GasTxValidator, MetadataTxValidator, PhasesTxValidator, TimestampTxValidator, TxPermittedValidator, TxProofValidator } from '@aztec/p2p';
+import { ProtocolContractAddress, protocolContractsHash } from '@aztec/protocol-contracts';
+import { DatabasePublicStateSource } from '@aztec/stdlib/trees';
 import { NullifierCache } from './nullifier_cache.js';
-import { PhasesTxValidator } from './phases_validator.js';
-export function createValidatorForAcceptingTxs(db, contractDataSource, verifier, { blockNumber, l1ChainId, setupAllowList, gasFees, skipFeeEnforcement }) {
+export function createValidatorForAcceptingTxs(db, contractDataSource, verifier, { l1ChainId, rollupVersion, setupAllowList, gasFees, skipFeeEnforcement, timestamp, blockNumber, txsPermitted }) {
     const validators = [
+        new TxPermittedValidator(txsPermitted),
         new DataTxValidator(),
-        new MetadataTxValidator(new Fr(l1ChainId), new Fr(blockNumber)),
+        new MetadataTxValidator({
+            l1ChainId: new Fr(l1ChainId),
+            rollupVersion: new Fr(rollupVersion),
+            protocolContractsHash,
+            vkTreeRoot: getVKTreeRoot()
+        }),
+        new TimestampTxValidator({
+            timestamp,
+            blockNumber
+        }),
         new DoubleSpendTxValidator(new NullifierCache(db)),
-        new PhasesTxValidator(contractDataSource, setupAllowList),
+        new PhasesTxValidator(contractDataSource, setupAllowList, timestamp),
         new BlockHeaderTxValidator(new ArchiveCache(db))
     ];
     if (!skipFeeEnforcement) {
@@ -22,29 +30,24 @@ export function createValidatorForAcceptingTxs(db, contractDataSource, verifier,
     }
     return new AggregateTxValidator(...validators);
 }
-export function createValidatorsForBlockBuilding(db, contractDataSource, globalVariables, setupAllowList) {
+export function createValidatorForBlockBuilding(db, contractDataSource, globalVariables, setupAllowList) {
     const nullifierCache = new NullifierCache(db);
     const archiveCache = new ArchiveCache(db);
     const publicStateSource = new DatabasePublicStateSource(db);
     return {
         preprocessValidator: preprocessValidator(nullifierCache, archiveCache, publicStateSource, contractDataSource, globalVariables, setupAllowList),
-        postprocessValidator: postprocessValidator(nullifierCache),
         nullifierCache
     };
 }
-class DatabasePublicStateSource {
-    db;
-    constructor(db){
-        this.db = db;
-    }
-    storageRead(contractAddress, slot) {
-        return readPublicState(this.db, contractAddress, slot);
-    }
-}
 function preprocessValidator(nullifierCache, archiveCache, publicStateSource, contractDataSource, globalVariables, setupAllowList) {
     // We don't include the TxProofValidator nor the DataTxValidator here because they are already checked by the time we get to block building.
-    return new AggregateTxValidator(new MetadataTxValidator(globalVariables.chainId, globalVariables.blockNumber), new DoubleSpendTxValidator(nullifierCache), new PhasesTxValidator(contractDataSource, setupAllowList), new GasTxValidator(publicStateSource, ProtocolContractAddress.FeeJuice, globalVariables.gasFees), new BlockHeaderTxValidator(archiveCache));
-}
-function postprocessValidator(nullifierCache) {
-    return new DoubleSpendTxValidator(nullifierCache);
+    return new AggregateTxValidator(new MetadataTxValidator({
+        l1ChainId: globalVariables.chainId,
+        rollupVersion: globalVariables.version,
+        protocolContractsHash,
+        vkTreeRoot: getVKTreeRoot()
+    }), new TimestampTxValidator({
+        timestamp: globalVariables.timestamp,
+        blockNumber: globalVariables.blockNumber
+    }), new DoubleSpendTxValidator(nullifierCache), new PhasesTxValidator(contractDataSource, setupAllowList, globalVariables.timestamp), new GasTxValidator(publicStateSource, ProtocolContractAddress.FeeJuice, globalVariables.gasFees), new BlockHeaderTxValidator(archiveCache));
 }