@aztec/sequencer-client 3.0.3-rc.3 → 4.0.0-devnet.1-patch.0

package/dest/client/sequencer-client.d.ts

@@ -1,4 +1,4 @@
-import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
+import type { BlobClientInterface } from '@aztec/blob-client/client';
 import { EpochCache } from '@aztec/epoch-cache';
 import { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
 import { PublisherManager } from '@aztec/ethereum/publisher-manager';
@@ -7,11 +7,11 @@ import type { DateProvider } from '@aztec/foundation/timer';
 import type { KeystoreManager } from '@aztec/node-keystore';
 import type { P2P } from '@aztec/p2p';
 import type { SlasherClientInterface } from '@aztec/slasher';
-import type { L2BlockSource } from '@aztec/stdlib/block';
-import type { IFullNodeBlockBuilder, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import type { L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
+import type { ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
 import { L1Metrics, type TelemetryClient } from '@aztec/telemetry-client';
-import { type ValidatorClient } from '@aztec/validator-client';
+import { FullNodeCheckpointsBuilder, type ValidatorClient } from '@aztec/validator-client';
 import type { SequencerClientConfig } from '../config.js';
 import { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
 import { Sequencer, type SequencerConfig } from '../sequencer/index.js';
@@ -21,10 +21,10 @@ import { Sequencer, type SequencerConfig } from '../sequencer/index.js';
 export declare class SequencerClient {
     protected publisherManager: PublisherManager<L1TxUtilsWithBlobs>;
     protected sequencer: Sequencer;
-    protected blockBuilder: IFullNodeBlockBuilder;
+    protected checkpointsBuilder: FullNodeCheckpointsBuilder;
     protected validatorClient?: ValidatorClient | undefined;
     private l1Metrics?;
-    constructor(publisherManager: PublisherManager<L1TxUtilsWithBlobs>, sequencer: Sequencer, blockBuilder: IFullNodeBlockBuilder, validatorClient?: ValidatorClient | undefined, l1Metrics?: L1Metrics | undefined);
+    constructor(publisherManager: PublisherManager<L1TxUtilsWithBlobs>, sequencer: Sequencer, checkpointsBuilder: FullNodeCheckpointsBuilder, validatorClient?: ValidatorClient | undefined, l1Metrics?: L1Metrics | undefined);
     /**
      * Initializes a new instance.
      * @param config - Configuration for the sequencer, publisher, and L1 tx sender.
@@ -38,16 +38,16 @@ export declare class SequencerClient {
      * @returns A new running instance.
      */
     static new(config: SequencerClientConfig, deps: {
-        validatorClient: ValidatorClient | undefined;
+        validatorClient: ValidatorClient;
         p2pClient: P2P;
         worldStateSynchronizer: WorldStateSynchronizer;
         slasherClient: SlasherClientInterface | undefined;
-        blockBuilder: IFullNodeBlockBuilder;
-        l2BlockSource: L2BlockSource;
+        checkpointsBuilder: FullNodeCheckpointsBuilder;
+        l2BlockSource: L2BlockSource & L2BlockSink;
         l1ToL2MessageSource: L1ToL2MessageSource;
         telemetry: TelemetryClient;
         publisherFactory?: SequencerPublisherFactory;
-        blobSinkClient?: BlobSinkClientInterface;
+        blobClient: BlobClientInterface;
         dateProvider: DateProvider;
         epochCache?: EpochCache;
         l1TxUtils: L1TxUtilsWithBlobs[];
@@ -68,4 +68,4 @@ export declare class SequencerClient {
     get validatorAddresses(): EthAddress[] | undefined;
     get maxL2BlockGas(): number | undefined;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLWNsaWVudC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9zZXF1ZW5jZXItY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDdkUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSWhELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHdDQUF3QyxDQUFDO0FBQzVFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3JFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUUzRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDdEMsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFDVixxQkFBcUIsRUFDckIseUJBQXlCLEVBQ3pCLHNCQUFzQixFQUN2QixNQUFNLGlDQUFpQyxDQUFDO0FBRXpDLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbkUsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzFFLE9BQU8sRUFBdUIsS0FBSyxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVwRixPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUUxRCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUN4RixPQUFPLEVBQUUsU0FBUyxFQUFFLEtBQUssZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFeEU7O0dBRUc7QUFDSCxxQkFBYSxlQUFlO0lBRXhCLFNBQVMsQ0FBQyxnQkFBZ0IsRUFBRSxnQkFBZ0IsQ0FBQyxrQkFBa0IsQ0FBQztJQUNoRSxTQUFTLENBQUMsU0FBUyxFQUFFLFNBQVM7SUFDOUIsU0FBUyxDQUFDLFlBQVksRUFBRSxxQkFBcUI7SUFDN0MsU0FBUyxDQUFDLGVBQWUsQ0FBQztJQUMxQixPQUFPLENBQUMsU0FBUyxDQUFDO0lBTHBCLFlBQ1ksZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsa0JBQWtCLENBQUMsRUFDdEQsU0FBUyxFQUFFLFNBQVMsRUFDcEIsWUFBWSxFQUFFLHFCQUFxQixFQUNuQyxlQUFlLENBQUMsNkJBQWlCLEVBQ25DLFNBQVMsQ0FBQyx1QkFBVyxFQUMzQjtJQUVKOzs7Ozs7Ozs7OztPQVdHO0lBQ0gsT0FBb0IsR0FBRyxDQUNyQixNQUFNLEVBQUUscUJBQXFCLEVBQzdCLElBQUksRUFBRTtRQUNKLGVBQWUsRUFBRSxlQUFlLEdBQUcsU0FBUyxDQUFDO1FBQzdDLFNBQVMsRUFBRSxHQUFHLENBQUM7UUFDZixzQkFBc0IsRUFBRSxzQkFBc0IsQ0FBQztRQUMvQyxhQUFhLEVBQUUsc0JBQXNCLEdBQUcsU0FBUyxDQUFDO1FBQ2xELFlBQVksRUFBRSxxQkFBcUIsQ0FBQztRQUNwQyxhQUFhLEVBQUUsYUFBYSxDQUFDO1FBQzdCLG1CQUFtQixFQUFFLG1CQUFtQixDQUFDO1FBQ3pDLFNBQVMsRUFBRSxlQUFlLENBQUM7UUFDM0IsZ0JBQWdCLENBQUMsRUFBRSx5QkFBeUIsQ0FBQztRQUM3QyxjQUFjLENBQUMsRUFBRSx1QkFBdUIsQ0FBQztRQUN6QyxZQUFZLEVBQUUsWUFBWSxDQUFDO1FBQzNCLFVBQVUsQ0FBQyxFQUFFLFVBQVUsQ0FBQztRQUN4QixTQUFTLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQztRQUNoQyxZQUFZLEVBQUUsZUFBZSxDQUFDO0tBQy9CLDRCQWtIRjtJQUVEOzs7T0FHRztJQUNJLFlBQVksQ0FBQyxNQUFNLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyx5QkFBeUIsQ0FBQyxRQUkvRTtJQUVELDRCQUE0QjtJQUNmLEtBQUssa0JBS2pCO0lBRUQ7O09BRUc7SUFDVSxJQUFJLGtCQUtoQjtJQUVNLFlBQVksSUFBSSxTQUFTLENBRS9CO0lBRUQsSUFBSSxrQkFBa0IsSUFBSSxVQUFVLEVBQUUsR0FBRyxTQUFTLENBRWpEO0lBRUQsSUFBSSxhQUFhLElBQUksTUFBTSxHQUFHLFNBQVMsQ0FFdEM7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLWNsaWVudC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9zZXF1ZW5jZXItY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDckUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSWhELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHdDQUF3QyxDQUFDO0FBQzVFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3JFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUUzRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDdEMsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDdEUsT0FBTyxLQUFLLEVBQUUseUJBQXlCLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUV6RyxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ25FLE9BQU8sRUFBRSxTQUFTLEVBQUUsS0FBSyxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMxRSxPQUFPLEVBQUUsMEJBQTBCLEVBQXVCLEtBQUssZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFaEgsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFMUQsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDeEYsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXhFOztHQUVHO0FBQ0gscUJBQWEsZUFBZTtJQUV4QixTQUFTLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsa0JBQWtCLENBQUM7SUFDaEUsU0FBUyxDQUFDLFNBQVMsRUFBRSxTQUFTO0lBQzlCLFNBQVMsQ0FBQyxrQkFBa0IsRUFBRSwwQkFBMEI7SUFDeEQsU0FBUyxDQUFDLGVBQWUsQ0FBQztJQUMxQixPQUFPLENBQUMsU0FBUyxDQUFDO0lBTHBCLFlBQ1ksZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsa0JBQWtCLENBQUMsRUFDdEQsU0FBUyxFQUFFLFNBQVMsRUFDcEIsa0JBQWtCLEVBQUUsMEJBQTBCLEVBQzlDLGVBQWUsQ0FBQyw2QkFBaUIsRUFDbkMsU0FBUyxDQUFDLHVCQUFXLEVBQzNCO0lBRUo7Ozs7Ozs7Ozs7O09BV0c7SUFDSCxPQUFvQixHQUFHLENBQ3JCLE1BQU0sRUFBRSxxQkFBcUIsRUFDN0IsSUFBSSxFQUFFO1FBQ0osZUFBZSxFQUFFLGVBQWUsQ0FBQztRQUNqQyxTQUFTLEVBQUUsR0FBRyxDQUFDO1FBQ2Ysc0JBQXNCLEVBQUUsc0JBQXNCLENBQUM7UUFDL0MsYUFBYSxFQUFFLHNCQUFzQixHQUFHLFNBQVMsQ0FBQztRQUNsRCxrQkFBa0IsRUFBRSwwQkFBMEIsQ0FBQztRQUMvQyxhQUFhLEVBQUUsYUFBYSxHQUFHLFdBQVcsQ0FBQztRQUMzQyxtQkFBbUIsRUFBRSxtQkFBbUIsQ0FBQztRQUN6QyxTQUFTLEVBQUUsZUFBZSxDQUFDO1FBQzNCLGdCQUFnQixDQUFDLEVBQUUseUJBQXlCLENBQUM7UUFDN0MsVUFBVSxFQUFFLG1CQUFtQixDQUFDO1FBQ2hDLFlBQVksRUFBRSxZQUFZLENBQUM7UUFDM0IsVUFBVSxDQUFDLEVBQUUsVUFBVSxDQUFDO1FBQ3hCLFNBQVMsRUFBRSxrQkFBa0IsRUFBRSxDQUFDO1FBQ2hDLFlBQVksRUFBRSxlQUFlLENBQUM7S0FDL0IsNEJBOEdGO0lBRUQ7OztPQUdHO0lBQ0ksWUFBWSxDQUFDLE1BQU0sRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLHlCQUF5QixDQUFDLFFBSS9FO0lBRUQsNEJBQTRCO0lBQ2YsS0FBSyxrQkFLakI7SUFFRDs7T0FFRztJQUNVLElBQUksa0JBS2hCO0lBRU0sWUFBWSxJQUFJLFNBQVMsQ0FFL0I7SUFFRCxJQUFJLGtCQUFrQixJQUFJLFVBQVUsRUFBRSxHQUFHLFNBQVMsQ0FFakQ7SUFFRCxJQUFJLGFBQWEsSUFBSSxNQUFNLEdBQUcsU0FBUyxDQUV0QztDQUNGIn0=

package/dest/client/sequencer-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sequencer-client.d.ts","sourceRoot":"","sources":["../../src/client/sequencer-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EAAuB,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAEpF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AACxF,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExE;;GAEG;AACH,qBAAa,eAAe;IAExB,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,kBAAkB,CAAC;IAChE,SAAS,CAAC,SAAS,EAAE,SAAS;IAC9B,SAAS,CAAC,YAAY,EAAE,qBAAqB;IAC7C,SAAS,CAAC,eAAe,CAAC;IAC1B,OAAO,CAAC,SAAS,CAAC;IALpB,YACY,gBAAgB,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,EACtD,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,qBAAqB,EACnC,eAAe,CAAC,6BAAiB,EACnC,SAAS,CAAC,uBAAW,EAC3B;IAEJ;;;;;;;;;;;OAWG;IACH,OAAoB,GAAG,CACrB,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE;QACJ,eAAe,EAAE,eAAe,GAAG,SAAS,CAAC;QAC7C,SAAS,EAAE,GAAG,CAAC;QACf,sBAAsB,EAAE,sBAAsB,CAAC;QAC/C,aAAa,EAAE,sBAAsB,GAAG,SAAS,CAAC;QAClD,YAAY,EAAE,qBAAqB,CAAC;QACpC,aAAa,EAAE,aAAa,CAAC;QAC7B,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,SAAS,EAAE,eAAe,CAAC;QAC3B,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;QAC7C,cAAc,CAAC,EAAE,uBAAuB,CAAC;QACzC,YAAY,EAAE,YAAY,CAAC;QAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,SAAS,EAAE,kBAAkB,EAAE,CAAC;QAChC,YAAY,EAAE,eAAe,CAAC;KAC/B,4BAkHF;IAED;;;OAGG;IACI,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,yBAAyB,CAAC,QAI/E;IAED,4BAA4B;IACf,KAAK,kBAKjB;IAED;;OAEG;IACU,IAAI,kBAKhB;IAEM,YAAY,IAAI,SAAS,CAE/B;IAED,IAAI,kBAAkB,IAAI,UAAU,EAAE,GAAG,SAAS,CAEjD;IAED,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;CACF"}
+{"version":3,"file":"sequencer-client.d.ts","sourceRoot":"","sources":["../../src/client/sequencer-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,KAAK,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEzG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EAAE,0BAA0B,EAAuB,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAEhH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AACxF,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExE;;GAEG;AACH,qBAAa,eAAe;IAExB,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,kBAAkB,CAAC;IAChE,SAAS,CAAC,SAAS,EAAE,SAAS;IAC9B,SAAS,CAAC,kBAAkB,EAAE,0BAA0B;IACxD,SAAS,CAAC,eAAe,CAAC;IAC1B,OAAO,CAAC,SAAS,CAAC;IALpB,YACY,gBAAgB,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,EACtD,SAAS,EAAE,SAAS,EACpB,kBAAkB,EAAE,0BAA0B,EAC9C,eAAe,CAAC,6BAAiB,EACnC,SAAS,CAAC,uBAAW,EAC3B;IAEJ;;;;;;;;;;;OAWG;IACH,OAAoB,GAAG,CACrB,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE;QACJ,eAAe,EAAE,eAAe,CAAC;QACjC,SAAS,EAAE,GAAG,CAAC;QACf,sBAAsB,EAAE,sBAAsB,CAAC;QAC/C,aAAa,EAAE,sBAAsB,GAAG,SAAS,CAAC;QAClD,kBAAkB,EAAE,0BAA0B,CAAC;QAC/C,aAAa,EAAE,aAAa,GAAG,WAAW,CAAC;QAC3C,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,SAAS,EAAE,eAAe,CAAC;QAC3B,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;QAC7C,UAAU,EAAE,mBAAmB,CAAC;QAChC,YAAY,EAAE,YAAY,CAAC;QAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,SAAS,EAAE,kBAAkB,EAAE,CAAC;QAChC,YAAY,EAAE,eAAe,CAAC;KAC/B,4BA8GF;IAED;;;OAGG;IACI,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,yBAAyB,CAAC,QAI/E;IAED,4BAA4B;IACf,KAAK,kBAKjB;IAED;;OAEG;IACU,IAAI,kBAKhB;IAEM,YAAY,IAAI,SAAS,CAE/B;IAED,IAAI,kBAAkB,IAAI,UAAU,EAAE,GAAG,SAAS,CAEjD;IAED,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;CACF"}

package/dest/client/sequencer-client.js

@@ -16,13 +16,13 @@ import { Sequencer } from '../sequencer/index.js';
  */ export class SequencerClient {
     publisherManager;
     sequencer;
-    blockBuilder;
+    checkpointsBuilder;
     validatorClient;
     l1Metrics;
-    constructor(publisherManager, sequencer, blockBuilder, validatorClient, l1Metrics){
+    constructor(publisherManager, sequencer, checkpointsBuilder, validatorClient, l1Metrics){
         this.publisherManager = publisherManager;
         this.sequencer = sequencer;
-        this.blockBuilder = blockBuilder;
+        this.checkpointsBuilder = checkpointsBuilder;
         this.validatorClient = validatorClient;
         this.l1Metrics = l1Metrics;
     }
@@ -38,17 +38,19 @@ import { Sequencer } from '../sequencer/index.js';
    * @param prover - An instance of a block prover
    * @returns A new running instance.
    */ static async new(config, deps) {
-        const { validatorClient, p2pClient, worldStateSynchronizer, slasherClient, blockBuilder, l2BlockSource, l1ToL2MessageSource, telemetry: telemetryClient } = deps;
+        const { validatorClient, p2pClient, worldStateSynchronizer, slasherClient, checkpointsBuilder, l2BlockSource, l1ToL2MessageSource, telemetry: telemetryClient } = deps;
         const { l1RpcUrls: rpcUrls, l1ChainId: chainId } = config;
         const log = createLogger('sequencer');
         const publicClient = getPublicClient(config);
         const l1TxUtils = deps.l1TxUtils;
         const l1Metrics = new L1Metrics(telemetryClient.getMeter('L1PublisherMetrics'), publicClient, l1TxUtils.map((x)=>x.getSenderAddress()));
-        const publisherManager = new PublisherManager(l1TxUtils, config);
+        const publisherManager = new PublisherManager(l1TxUtils, config, log.getBindings());
         const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
-        const [l1GenesisTime, slotDuration] = await Promise.all([
+        const [l1GenesisTime, slotDuration, rollupVersion, rollupManaLimit] = await Promise.all([
             rollupContract.getL1GenesisTime(),
-            rollupContract.getSlotDuration()
+            rollupContract.getSlotDuration(),
+            rollupContract.getVersion(),
+            rollupContract.getManaLimit().then(Number)
         ]);
         const governanceProposerContract = new GovernanceProposerContract(publicClient, config.l1Contracts.governanceProposerAddress.toString());
         const epochCache = deps.epochCache ?? await EpochCache.create(config.l1Contracts.rollupAddress, {
@@ -62,7 +64,7 @@ import { Sequencer } from '../sequencer/index.js';
         const slashFactoryContract = new SlashFactoryContract(publicClient, config.l1Contracts.slashFactoryAddress?.toString() ?? EthAddress.ZERO.toString());
         const publisherFactory = deps.publisherFactory ?? new SequencerPublisherFactory(config, {
             telemetry: telemetryClient,
-            blobSinkClient: deps.blobSinkClient,
+            blobClient: deps.blobClient,
             epochCache,
             governanceProposerContract,
             slashFactoryContract,
@@ -72,41 +74,43 @@ import { Sequencer } from '../sequencer/index.js';
             nodeKeyStore: NodeKeystoreAdapter.fromKeyStoreManager(deps.nodeKeyStore),
             logger: log
         });
-        const globalsBuilder = new GlobalVariableBuilder(config);
         const ethereumSlotDuration = config.ethereumSlotDuration;
-        const rollupManaLimit = Number(await rollupContract.getManaLimit());
+        const l1Constants = {
+            l1GenesisTime,
+            slotDuration: Number(slotDuration),
+            ethereumSlotDuration
+        };
+        const globalsBuilder = new GlobalVariableBuilder({
+            ...config,
+            ...l1Constants,
+            rollupVersion
+        });
         let sequencerManaLimit = config.maxL2BlockGas ?? rollupManaLimit;
         if (sequencerManaLimit > rollupManaLimit) {
-            log.warn(`Provided maxL2BlockGas of ${sequencerManaLimit} is greater than the maximum allowed by the L1 (${rollupManaLimit}), setting limit to ${rollupManaLimit}`);
+            log.warn(`Provided maxL2BlockGas ${sequencerManaLimit} is greater than the max allowed by L1. Setting limit to ${rollupManaLimit}.`);
             sequencerManaLimit = rollupManaLimit;
         }
         // When running in anvil, assume we can post a tx up until one second before the end of an L1 slot.
-        // Otherwise, assume we must have broadcasted the tx before the slot started (we use a default
-        // maxL1TxInclusionTimeIntoSlot of zero) to get the tx into that L1 slot.
+        // Otherwise, we need the full L1 slot duration for publishing to ensure inclusion.
         // In theory, the L1 slot has an initial 4s phase where the block is propagated, so we could
-        // make it with a propagation time into slot equal to 4s. However, we prefer being conservative.
+        // reduce the publishing time allowance. However, we prefer being conservative.
         // See https://www.blocknative.com/blog/anatomy-of-a-slot#7 for more info.
-        const maxInclusionBasedOnChain = isAnvilTestChain(config.l1ChainId) ? ethereumSlotDuration - 1 : 0;
-        const maxL1TxInclusionTimeIntoSlot = config.maxL1TxInclusionTimeIntoSlot ?? maxInclusionBasedOnChain;
-        const l1Constants = {
-            l1GenesisTime,
-            slotDuration: Number(slotDuration),
-            ethereumSlotDuration
-        };
-        const sequencer = new Sequencer(publisherFactory, validatorClient, globalsBuilder, p2pClient, worldStateSynchronizer, slasherClient, l2BlockSource, l1ToL2MessageSource, blockBuilder, l1Constants, deps.dateProvider, epochCache, rollupContract, {
+        const l1PublishingTimeBasedOnChain = isAnvilTestChain(config.l1ChainId) ? 1 : ethereumSlotDuration;
+        const l1PublishingTime = config.l1PublishingTime ?? l1PublishingTimeBasedOnChain;
+        const sequencer = new Sequencer(publisherFactory, validatorClient, globalsBuilder, p2pClient, worldStateSynchronizer, slasherClient, l2BlockSource, l1ToL2MessageSource, checkpointsBuilder, l1Constants, deps.dateProvider, epochCache, rollupContract, {
             ...config,
-            maxL1TxInclusionTimeIntoSlot,
+            l1PublishingTime,
             maxL2BlockGas: sequencerManaLimit
         }, telemetryClient, log);
         await sequencer.init();
-        return new SequencerClient(publisherManager, sequencer, blockBuilder, validatorClient, l1Metrics);
+        return new SequencerClient(publisherManager, sequencer, checkpointsBuilder, validatorClient, l1Metrics);
     }
     /**
    * Updates sequencer and validator client config.
    * @param config - New parameters.
    */ updateConfig(config) {
         this.sequencer.updateConfig(config);
-        this.blockBuilder.updateConfig(config);
+        this.checkpointsBuilder.updateConfig(config);
         this.validatorClient?.updateConfig(config);
     }
     /** Starts the sequencer. */ async start() {

package/dest/config.d.ts

@@ -4,11 +4,16 @@ import { type ConfigMappingsType } from '@aztec/foundation/config';
 import { type KeyStoreConfig } from '@aztec/node-keystore/config';
 import { type P2PConfig } from '@aztec/p2p/config';
 import { type ChainConfig, type SequencerConfig } from '@aztec/stdlib/config';
+import type { ResolvedSequencerConfig } from '@aztec/stdlib/interfaces/server';
 import { type ValidatorClientConfig } from '@aztec/validator-client/config';
 import { type PublisherConfig, type TxSenderConfig } from './publisher/config.js';
 export * from './publisher/config.js';
 export type { SequencerConfig };
-export declare const DEFAULT_ATTESTATION_PROPAGATION_TIME = 2;
+/**
+ * Default values for SequencerConfig.
+ * Centralized location for all sequencer configuration defaults.
+ */
+export declare const DefaultSequencerConfig: ResolvedSequencerConfig;
 /**
  * Configuration settings for the SequencerClient.
  */
@@ -19,4 +24,4 @@ export declare const sequencerClientConfigMappings: ConfigMappingsType<Sequencer
  * Creates an instance of SequencerClientConfig out of environment variables using sensible defaults for integration testing if not set.
  */
 export declare function getConfigEnvVars(): SequencerClientConfig;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUE2QixNQUFNLHdCQUF3QixDQUFDO0FBQzNGLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBMEIsTUFBTSwyQkFBMkIsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFLeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsQyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQTBCLE1BQU0sNkJBQTZCLENBQUM7QUFDMUYsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFxQixNQUFNLG1CQUFtQixDQUFDO0FBRXRFLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBRSxLQUFLLGVBQWUsRUFBdUIsTUFBTSxzQkFBc0IsQ0FBQztBQUNuRyxPQUFPLEVBQUUsS0FBSyxxQkFBcUIsRUFBaUMsTUFBTSxnQ0FBZ0MsQ0FBQztBQUUzRyxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBQ3BCLEtBQUssY0FBYyxFQUdwQixNQUFNLHVCQUF1QixDQUFDO0FBRS9CLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsWUFBWSxFQUFFLGVBQWUsRUFBRSxDQUFDO0FBRWhDLGVBQU8sTUFBTSxvQ0FBb0MsSUFBSSxDQUFDO0FBRXREOztHQUVHO0FBQ0gsTUFBTSxNQUFNLHFCQUFxQixHQUFHLGVBQWUsR0FDakQsY0FBYyxHQUNkLHFCQUFxQixHQUNyQixjQUFjLEdBQ2QsZUFBZSxHQUNmLGNBQWMsR0FDZCxXQUFXLEdBQ1gsSUFBSSxDQUFDLFNBQVMsRUFBRSx3QkFBd0IsQ0FBQyxHQUN6QyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsc0JBQXNCLEdBQUcsbUJBQW1CLEdBQUcsb0JBQW9CLENBQUMsQ0FBQztBQUUvRixlQUFPLE1BQU0sdUJBQXVCLEVBQUUsa0JBQWtCLENBQUMsZUFBZSxDQXlIdkUsQ0FBQztBQUVGLGVBQU8sTUFBTSw2QkFBNkIsRUFBRSxrQkFBa0IsQ0FBQyxxQkFBcUIsQ0FTbkYsQ0FBQztBQUVGOztHQUVHO0FBQ0gsd0JBQWdCLGdCQUFnQixJQUFJLHFCQUFxQixDQUV4RCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUE2QixNQUFNLHdCQUF3QixDQUFDO0FBQzNGLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBMEIsTUFBTSwyQkFBMkIsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFLeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsQyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQTBCLE1BQU0sNkJBQTZCLENBQUM7QUFDMUYsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFxQixNQUFNLG1CQUFtQixDQUFDO0FBRXRFLE9BQU8sRUFDTCxLQUFLLFdBQVcsRUFDaEIsS0FBSyxlQUFlLEVBR3JCLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUUvRSxPQUFPLEVBQUUsS0FBSyxxQkFBcUIsRUFBaUMsTUFBTSxnQ0FBZ0MsQ0FBQztBQUUzRyxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBQ3BCLEtBQUssY0FBYyxFQUdwQixNQUFNLHVCQUF1QixDQUFDO0FBRS9CLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsWUFBWSxFQUFFLGVBQWUsRUFBRSxDQUFDO0FBRWhDOzs7R0FHRztBQUNILGVBQU8sTUFBTSxzQkFBc0IsRUFBRSx1QkFvQnBDLENBQUM7QUFFRjs7R0FFRztBQUNILE1BQU0sTUFBTSxxQkFBcUIsR0FBRyxlQUFlLEdBQ2pELGNBQWMsR0FDZCxxQkFBcUIsR0FDckIsY0FBYyxHQUNkLGVBQWUsR0FDZixjQUFjLEdBQ2QsV0FBVyxHQUNYLElBQUksQ0FBQyxTQUFTLEVBQUUsd0JBQXdCLENBQUMsR0FDekMsSUFBSSxDQUFDLGlCQUFpQixFQUFFLHNCQUFzQixHQUFHLG1CQUFtQixHQUFHLG9CQUFvQixDQUFDLENBQUM7QUFFL0YsZUFBTyxNQUFNLHVCQUF1QixFQUFFLGtCQUFrQixDQUFDLGVBQWUsQ0F3SXZFLENBQUM7QUFFRixlQUFPLE1BQU0sNkJBQTZCLEVBQUUsa0JBQWtCLENBQUMscUJBQXFCLENBU25GLENBQUM7QUFFRjs7R0FFRztBQUNILHdCQUFnQixnQkFBZ0IsSUFBSSxxQkFBcUIsQ0FFeEQifQ==

package/dest/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAA6B,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AAEtE,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAuB,MAAM,sBAAsB,CAAC;AACnG,OAAO,EAAE,KAAK,qBAAqB,EAAiC,MAAM,gCAAgC,CAAC;AAE3G,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAGpB,MAAM,uBAAuB,CAAC;AAE/B,cAAc,uBAAuB,CAAC;AACtC,YAAY,EAAE,eAAe,EAAE,CAAC;AAEhC,eAAO,MAAM,oCAAoC,IAAI,CAAC;AAEtD;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,eAAe,GACjD,cAAc,GACd,qBAAqB,GACrB,cAAc,GACd,eAAe,GACf,cAAc,GACd,WAAW,GACX,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,GACzC,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,GAAG,mBAAmB,GAAG,oBAAoB,CAAC,CAAC;AAE/F,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,CAyHvE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CASnF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAA6B,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AAEtE,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,eAAe,EAGrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE/E,OAAO,EAAE,KAAK,qBAAqB,EAAiC,MAAM,gCAAgC,CAAC;AAE3G,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAGpB,MAAM,uBAAuB,CAAC;AAE/B,cAAc,uBAAuB,CAAC;AACtC,YAAY,EAAE,eAAe,EAAE,CAAC;AAEhC;;;GAGG;AACH,eAAO,MAAM,sBAAsB,EAAE,uBAoBpC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,eAAe,GACjD,cAAc,GACd,qBAAqB,GACrB,cAAc,GACd,eAAe,GACf,cAAc,GACd,WAAW,GACX,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,GACzC,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,GAAG,mBAAmB,GAAG,oBAAoB,CAAC,CAAC;AAE/F,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,CAwIvE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CASnF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD"}

package/dest/config.js

@@ -5,41 +5,68 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { keyStoreConfigMappings } from '@aztec/node-keystore/config';
 import { p2pConfigMappings } from '@aztec/p2p/config';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { chainConfigMappings } from '@aztec/stdlib/config';
+import { chainConfigMappings, sharedSequencerConfigMappings } from '@aztec/stdlib/config';
+import { DEFAULT_P2P_PROPAGATION_TIME } from '@aztec/stdlib/timetable';
 import { validatorClientConfigMappings } from '@aztec/validator-client/config';
 import { getPublisherConfigMappings, getTxSenderConfigMappings } from './publisher/config.js';
 export * from './publisher/config.js';
-export const DEFAULT_ATTESTATION_PROPAGATION_TIME = 2;
+/**
+ * Default values for SequencerConfig.
+ * Centralized location for all sequencer configuration defaults.
+ */ export const DefaultSequencerConfig = {
+    sequencerPollingIntervalMS: 500,
+    maxTxsPerBlock: 32,
+    minTxsPerBlock: 1,
+    buildCheckpointIfEmpty: false,
+    publishTxsWithProposals: false,
+    maxL2BlockGas: 10e9,
+    maxDABlockGas: 10e9,
+    maxBlockSizeInBytes: 1024 * 1024,
+    enforceTimeTable: true,
+    attestationPropagationTime: DEFAULT_P2P_PROPAGATION_TIME,
+    secondsBeforeInvalidatingBlockAsCommitteeMember: 144,
+    secondsBeforeInvalidatingBlockAsNonCommitteeMember: 432,
+    skipCollectingAttestations: false,
+    skipInvalidateBlockAsProposer: false,
+    broadcastInvalidBlockProposal: false,
+    injectFakeAttestation: false,
+    fishermanMode: false,
+    shuffleAttestationOrdering: false,
+    skipPushProposedBlocksToArchiver: false
+};
 export const sequencerConfigMappings = {
-    transactionPollingIntervalMS: {
-        env: 'SEQ_TX_POLLING_INTERVAL_MS',
-        description: 'The number of ms to wait between polling for pending txs.',
-        ...numberConfigHelper(500)
+    sequencerPollingIntervalMS: {
+        env: 'SEQ_POLLING_INTERVAL_MS',
+        description: 'The number of ms to wait between polling for checking to build on the next slot.',
+        ...numberConfigHelper(DefaultSequencerConfig.sequencerPollingIntervalMS)
     },
     maxTxsPerBlock: {
         env: 'SEQ_MAX_TX_PER_BLOCK',
         description: 'The maximum number of txs to include in a block.',
-        ...numberConfigHelper(32)
+        ...numberConfigHelper(DefaultSequencerConfig.maxTxsPerBlock)
     },
     minTxsPerBlock: {
         env: 'SEQ_MIN_TX_PER_BLOCK',
         description: 'The minimum number of txs to include in a block.',
-        ...numberConfigHelper(1)
+        ...numberConfigHelper(DefaultSequencerConfig.minTxsPerBlock)
+    },
+    minValidTxsPerBlock: {
+        description: 'The minimum number of valid txs (after execution) to include in a block. If not set, falls back to minTxsPerBlock.'
     },
     publishTxsWithProposals: {
         env: 'SEQ_PUBLISH_TXS_WITH_PROPOSALS',
         description: 'Whether to publish txs with proposals.',
-        ...booleanConfigHelper(false)
+        ...booleanConfigHelper(DefaultSequencerConfig.publishTxsWithProposals)
     },
     maxL2BlockGas: {
         env: 'SEQ_MAX_L2_BLOCK_GAS',
         description: 'The maximum L2 block gas.',
-        ...numberConfigHelper(10e9)
+        ...numberConfigHelper(DefaultSequencerConfig.maxL2BlockGas)
     },
     maxDABlockGas: {
         env: 'SEQ_MAX_DA_BLOCK_GAS',
         description: 'The maximum DA block gas.',
-        ...numberConfigHelper(10e9)
+        ...numberConfigHelper(DefaultSequencerConfig.maxDABlockGas)
     },
     coinbase: {
         env: 'COINBASE',
@@ -62,67 +89,78 @@ export const sequencerConfigMappings = {
     maxBlockSizeInBytes: {
         env: 'SEQ_MAX_BLOCK_SIZE_IN_BYTES',
         description: 'Max block size',
-        ...numberConfigHelper(1024 * 1024)
+        ...numberConfigHelper(DefaultSequencerConfig.maxBlockSizeInBytes)
     },
     enforceTimeTable: {
         env: 'SEQ_ENFORCE_TIME_TABLE',
         description: 'Whether to enforce the time table when building blocks',
-        ...booleanConfigHelper(),
-        defaultValue: true
+        ...booleanConfigHelper(DefaultSequencerConfig.enforceTimeTable)
     },
     governanceProposerPayload: {
         env: 'GOVERNANCE_PROPOSER_PAYLOAD_ADDRESS',
         description: 'The address of the payload for the governanceProposer',
-        parseEnv: (val)=>EthAddress.fromString(val),
-        defaultValue: EthAddress.ZERO
+        parseEnv: (val)=>EthAddress.fromString(val)
     },
-    maxL1TxInclusionTimeIntoSlot: {
-        env: 'SEQ_MAX_L1_TX_INCLUSION_TIME_INTO_SLOT',
-        description: 'How many seconds into an L1 slot we can still send a tx and get it mined.',
+    l1PublishingTime: {
+        env: 'SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT',
+        description: 'How much time (in seconds) we allow in the slot for publishing the L1 tx (defaults to 1 L1 slot).',
         parseEnv: (val)=>val ? parseInt(val, 10) : undefined
     },
     attestationPropagationTime: {
         env: 'SEQ_ATTESTATION_PROPAGATION_TIME',
         description: 'How many seconds it takes for proposals and attestations to travel across the p2p layer (one-way)',
-        ...numberConfigHelper(DEFAULT_ATTESTATION_PROPAGATION_TIME)
+        ...numberConfigHelper(DefaultSequencerConfig.attestationPropagationTime)
     },
     fakeProcessingDelayPerTxMs: {
         description: 'Used for testing to introduce a fake delay after processing each tx'
     },
+    fakeThrowAfterProcessingTxCount: {
+        description: 'Used for testing to throw an error after processing N txs'
+    },
     secondsBeforeInvalidatingBlockAsCommitteeMember: {
         env: 'SEQ_SECONDS_BEFORE_INVALIDATING_BLOCK_AS_COMMITTEE_MEMBER',
         description: 'How many seconds to wait before trying to invalidate a block from the pending chain as a committee member (zero to never invalidate).' + ' The next proposer is expected to invalidate, so the committee acts as a fallback.',
-        ...numberConfigHelper(144)
+        ...numberConfigHelper(DefaultSequencerConfig.secondsBeforeInvalidatingBlockAsCommitteeMember)
     },
     secondsBeforeInvalidatingBlockAsNonCommitteeMember: {
         env: 'SEQ_SECONDS_BEFORE_INVALIDATING_BLOCK_AS_NON_COMMITTEE_MEMBER',
         description: 'How many seconds to wait before trying to invalidate a block from the pending chain as a non-committee member (zero to never invalidate).' + ' The next proposer is expected to invalidate, then the committee, so other sequencers act as a fallback.',
-        ...numberConfigHelper(432)
+        ...numberConfigHelper(DefaultSequencerConfig.secondsBeforeInvalidatingBlockAsNonCommitteeMember)
     },
     skipCollectingAttestations: {
         description: 'Whether to skip collecting attestations from validators and only use self-attestations (for testing only)',
-        ...booleanConfigHelper(false)
+        ...booleanConfigHelper(DefaultSequencerConfig.skipCollectingAttestations)
     },
     skipInvalidateBlockAsProposer: {
         description: 'Do not invalidate the previous block if invalid when we are the proposer (for testing only)',
-        ...booleanConfigHelper(false)
+        ...booleanConfigHelper(DefaultSequencerConfig.skipInvalidateBlockAsProposer)
     },
     broadcastInvalidBlockProposal: {
         description: 'Broadcast invalid block proposals with corrupted state (for testing only)',
-        ...booleanConfigHelper(false)
+        ...booleanConfigHelper(DefaultSequencerConfig.broadcastInvalidBlockProposal)
     },
     injectFakeAttestation: {
         description: 'Inject a fake attestation (for testing only)',
-        ...booleanConfigHelper(false)
+        ...booleanConfigHelper(DefaultSequencerConfig.injectFakeAttestation)
     },
     fishermanMode: {
         env: 'FISHERMAN_MODE',
         description: 'Whether to run in fisherman mode: builds blocks on every slot for validation without publishing to L1',
-        ...booleanConfigHelper(false)
+        ...booleanConfigHelper(DefaultSequencerConfig.fishermanMode)
     },
     shuffleAttestationOrdering: {
         description: 'Shuffle attestation ordering to create invalid ordering (for testing only)',
-        ...booleanConfigHelper(false)
+        ...booleanConfigHelper(DefaultSequencerConfig.shuffleAttestationOrdering)
+    },
+    ...sharedSequencerConfigMappings,
+    buildCheckpointIfEmpty: {
+        env: 'SEQ_BUILD_CHECKPOINT_IF_EMPTY',
+        description: 'Have sequencer build and publish an empty checkpoint if there are no txs',
+        ...booleanConfigHelper(DefaultSequencerConfig.buildCheckpointIfEmpty)
+    },
+    skipPushProposedBlocksToArchiver: {
+        description: 'Skip pushing proposed blocks to archiver (default: true)',
+        ...booleanConfigHelper(DefaultSequencerConfig.skipPushProposedBlocksToArchiver)
     },
     ...pickConfigMappings(p2pConfigMappings, [
         'txPublicSetupAllowList'

package/dest/global_variable_builder/global_builder.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"global_builder.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/global_builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,qBAAqB,IAAI,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAChG,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAInD;;GAEG;AACH,qBAAa,qBAAsB,YAAW,8BAA8B;IAC1E,OAAO,CAAC,GAAG,CAAqD;IAChE,OAAO,CAAC,eAAe,CAAwD;IAC/E,OAAO,CAAC,oBAAoB,CAAiC;IAE7D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAmB;IAChD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAE9C,OAAO,CAAC,OAAO,CAAC,CAAK;IACrB,OAAO,CAAC,OAAO,CAAC,CAAK;IAErB,YAAY,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,EAcnF;YAMa,sBAAsB;IAevB,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC,CAUlD;IAEY,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,SAAS,CAAC,CAAC,CAQ/F;IAED;;;;;;;OAOG;IACU,oBAAoB,CAC/B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,UAAU,CAAC,EAAE,UAAU,GACtB,OAAO,CAAC,eAAe,CAAC,CA4B1B;CACF"}
+{"version":3,"file":"global_builder.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/global_builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,KAAK,iBAAiB,EAAuB,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EACV,yBAAyB,EACzB,qBAAqB,IAAI,8BAA8B,EACxD,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAInD;;GAEG;AACH,qBAAa,qBAAsB,YAAW,8BAA8B;IAC1E,OAAO,CAAC,GAAG,CAAqD;IAChE,OAAO,CAAC,cAAc,CAAwD;IAC9E,OAAO,CAAC,oBAAoB,CAAiC;IAE7D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAmB;IAChD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,OAAO,CAAK;IAEpB,YACE,MAAM,EAAE,cAAc,GACpB,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,GAC/C,IAAI,CAAC,iBAAiB,EAAE,cAAc,GAAG,eAAe,CAAC,GAAG;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE,EAoBxF;YAMa,qBAAqB;IAetB,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAUjD;IAED;;;;;;;OAOG;IACU,oBAAoB,CAC/B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,SAAS,CAAC,EAAE,UAAU,GACrB,OAAO,CAAC,eAAe,CAAC,CAS1B;IAED,yEAAyE;IAC5D,8BAA8B,CACzC,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,yBAAyB,GAAG;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAa5D;CACF"}

package/dest/global_variable_builder/global_builder.js

@@ -3,6 +3,7 @@ import { RollupContract } from '@aztec/ethereum/contracts';
 import { SlotNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
+import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import { GasFees } from '@aztec/stdlib/gas';
 import { GlobalVariables } from '@aztec/stdlib/tx';
 import { createPublicClient, fallback, http } from 'viem';
@@ -10,79 +11,87 @@ import { createPublicClient, fallback, http } from 'viem';
  * Simple global variables builder.
  */ export class GlobalVariableBuilder {
     log = createLogger('sequencer:global_variable_builder');
-    currentBaseFees = Promise.resolve(new GasFees(0, 0));
+    currentMinFees = Promise.resolve(new GasFees(0, 0));
     currentL1BlockNumber = undefined;
     rollupContract;
     publicClient;
     ethereumSlotDuration;
+    aztecSlotDuration;
+    l1GenesisTime;
     chainId;
     version;
     constructor(config){
         const { l1RpcUrls, l1ChainId: chainId, l1Contracts } = config;
         const chain = createEthereumChain(l1RpcUrls, chainId);
+        this.version = new Fr(config.rollupVersion);
+        this.chainId = new Fr(chainId);
         this.ethereumSlotDuration = config.ethereumSlotDuration;
+        this.aztecSlotDuration = config.slotDuration;
+        this.l1GenesisTime = config.l1GenesisTime;
         this.publicClient = createPublicClient({
             chain: chain.chainInfo,
-            transport: fallback(chain.rpcUrls.map((url)=>http(url))),
+            transport: fallback(chain.rpcUrls.map((url)=>http(url, {
+                    batch: false
+                }))),
             pollingInterval: config.viemPollingIntervalMS
         });
         this.rollupContract = new RollupContract(this.publicClient, l1Contracts.rollupAddress);
     }
     /**
-   * Computes the "current" base fees, e.g., the price that you currently should pay to get include in the next block
-   * @returns Base fees for the next block
-   */ async computeCurrentBaseFees() {
+   * Computes the "current" min fees, e.g., the price that you currently should pay to get include in the next block
+   * @returns Min fees for the next block
+   */ async computeCurrentMinFees() {
         // Since this might be called in the middle of a slot where a block might have been published,
         // we need to fetch the last block written, and estimate the earliest timestamp for the next block.
         // The timestamp of that last block will act as a lower bound for the next block.
-        const lastBlock = await this.rollupContract.getCheckpoint(await this.rollupContract.getCheckpointNumber());
-        const earliestTimestamp = await this.rollupContract.getTimestampForSlot(SlotNumber.fromBigInt(lastBlock.slotNumber + 1n));
+        const lastCheckpoint = await this.rollupContract.getPendingCheckpoint();
+        const earliestTimestamp = await this.rollupContract.getTimestampForSlot(SlotNumber.fromBigInt(BigInt(lastCheckpoint.slotNumber) + 1n));
         const nextEthTimestamp = BigInt((await this.publicClient.getBlock()).timestamp + BigInt(this.ethereumSlotDuration));
         const timestamp = earliestTimestamp > nextEthTimestamp ? earliestTimestamp : nextEthTimestamp;
-        return new GasFees(0, await this.rollupContract.getManaBaseFeeAt(timestamp, true));
+        return new GasFees(0, await this.rollupContract.getManaMinFeeAt(timestamp, true));
     }
-    async getCurrentBaseFees() {
+    async getCurrentMinFees() {
         // Get the current block number
         const blockNumber = await this.publicClient.getBlockNumber();
-        // If the L1 block number has changed then chain a new promise to get the current base fees
+        // If the L1 block number has changed then chain a new promise to get the current min fees
         if (this.currentL1BlockNumber === undefined || blockNumber > this.currentL1BlockNumber) {
             this.currentL1BlockNumber = blockNumber;
-            this.currentBaseFees = this.currentBaseFees.then(()=>this.computeCurrentBaseFees());
+            this.currentMinFees = this.currentMinFees.then(()=>this.computeCurrentMinFees());
         }
-        return this.currentBaseFees;
-    }
-    async getGlobalConstantVariables() {
-        if (!this.chainId) {
-            this.chainId = new Fr(this.publicClient.chain.id);
-        }
-        if (!this.version) {
-            this.version = new Fr(await this.rollupContract.getVersion());
-        }
-        return {
-            chainId: this.chainId,
-            version: this.version
-        };
+        return this.currentMinFees;
     }
     /**
-   * Simple builder of global variables that use the minimum time possible.
+   * Simple builder of global variables.
    * @param blockNumber - The block number to build global variables for.
    * @param coinbase - The address to receive block reward.
    * @param feeRecipient - The address to receive fees.
    * @param slotNumber - The slot number to use for the global variables, if undefined it will be calculated.
    * @returns The global variables for the given block number.
-   */ async buildGlobalVariables(blockNumber, coinbase, feeRecipient, slotNumber) {
-        const { chainId, version } = await this.getGlobalConstantVariables();
-        let slot;
-        if (slotNumber === undefined) {
-            const ts = BigInt((await this.publicClient.getBlock()).timestamp + BigInt(this.ethereumSlotDuration));
-            slot = await this.rollupContract.getSlotAt(ts);
-        } else {
-            slot = slotNumber;
-        }
-        const timestamp = await this.rollupContract.getTimestampForSlot(slot);
-        // We can skip much of the logic in getCurrentBaseFees since it we already check that we are not within a slot elsewhere.
-        const gasFees = new GasFees(0, await this.rollupContract.getManaBaseFeeAt(timestamp, true));
-        const globalVariables = new GlobalVariables(chainId, version, blockNumber, slot, timestamp, coinbase, feeRecipient, gasFees);
-        return globalVariables;
+   */ async buildGlobalVariables(blockNumber, coinbase, feeRecipient, maybeSlot) {
+        const slot = maybeSlot ?? await this.rollupContract.getSlotAt(BigInt((await this.publicClient.getBlock()).timestamp + BigInt(this.ethereumSlotDuration)));
+        const checkpointGlobalVariables = await this.buildCheckpointGlobalVariables(coinbase, feeRecipient, slot);
+        return GlobalVariables.from({
+            blockNumber,
+            ...checkpointGlobalVariables
+        });
+    }
+    /** Builds global variables that are constant throughout a checkpoint. */ async buildCheckpointGlobalVariables(coinbase, feeRecipient, slotNumber) {
+        const { chainId, version } = this;
+        const timestamp = getTimestampForSlot(slotNumber, {
+            slotDuration: this.aztecSlotDuration,
+            l1GenesisTime: this.l1GenesisTime
+        });
+        // We can skip much of the logic in getCurrentMinFees since it we already check that we are not within a slot elsewhere.
+        // TODO(palla/mbps): Can we use a cached value here?
+        const gasFees = new GasFees(0, await this.rollupContract.getManaMinFeeAt(timestamp, true));
+        return {
+            chainId,
+            version,
+            slotNumber,
+            timestamp,
+            coinbase,
+            feeRecipient,
+            gasFees
+        };
     }
 }