@aztec/ethereum 3.0.0-canary.a9708bd → 3.0.0-devnet.20251212

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAEhF,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,MAAM,CAAC;AAE3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,GAAG,CAAC;CACX;AAED,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AAE9F,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,GAAG,EAAE,eAAe,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,6BAA6B;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,+BAA+B;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,uCAAuC;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,oBAAY,YAAY;IACtB,IAAI,IAAA;IACJ,IAAI,IAAA;IACJ,QAAQ,IAAA;IACR,SAAS,IAAA;IACT,SAAS,IAAA;IACT,KAAK,IAAA;CACN;AAED,eAAO,MAAM,oBAAoB,gBAAkE,CAAC;AAEpG,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,GAAG,EAAE,CAAC;IAChB,cAAc,EAAE,GAAG,EAAE,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,iBAAiB,EAAE,UAAU,CAAC;IAC9B,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,EAAE,YAAY,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,IAAI,CAAC;IACjB,cAAc,EAAE,IAAI,CAAC;IACrB,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B,UAAU,EAAE,YAAY,GAAG,SAAS,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,CAC5B,WAAW,EAAE,uBAAuB,EACpC,cAAc,EAAE,UAAU,KACvB,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAEvC,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,YAAY,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAGzC;CACF;AAED,qBAAa,uBAAwB,SAAQ,KAAK;IAChD,YAAY,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAGzC;CACF"}

package/dest/l1_tx_utils/types.js

@@ -0,0 +1,26 @@
+export var TxUtilsState = /*#__PURE__*/ function(TxUtilsState) {
+    TxUtilsState[TxUtilsState["IDLE"] = 0] = "IDLE";
+    TxUtilsState[TxUtilsState["SENT"] = 1] = "SENT";
+    TxUtilsState[TxUtilsState["SPEED_UP"] = 2] = "SPEED_UP";
+    TxUtilsState[TxUtilsState["CANCELLED"] = 3] = "CANCELLED";
+    TxUtilsState[TxUtilsState["NOT_MINED"] = 4] = "NOT_MINED";
+    TxUtilsState[TxUtilsState["MINED"] = 5] = "MINED";
+    return TxUtilsState;
+}({});
+export const TerminalTxUtilsState = [
+    0,
+    5,
+    4
+];
+export class UnknownMinedTxError extends Error {
+    constructor(nonce, account){
+        super(`Nonce ${nonce} from account ${account} is MINED but not by one of our expected transactions`);
+        this.name = 'UnknownMinedTxError';
+    }
+}
+export class DroppedTransactionError extends Error {
+    constructor(nonce, account){
+        super(`Transaction with nonce ${nonce} from account ${account} was dropped from the mempool`);
+        this.name = 'DroppedTransactionError';
+    }
+}

package/dest/l1_tx_utils/utils.d.ts

@@ -0,0 +1,4 @@
+import type { ContractFunctionExecutionError } from 'viem';
+export declare function tryGetCustomErrorNameContractFunction(err: ContractFunctionExecutionError): string;
+export declare function getCalldataGasUsage(data: Uint8Array): number;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sMV90eF91dGlscy91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSw4QkFBOEIsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUUzRCx3QkFBZ0IscUNBQXFDLENBQUMsR0FBRyxFQUFFLDhCQUE4QixVQUV4RjtBQU9ELHdCQUFnQixtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsVUFBVSxVQUVuRCJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,MAAM,CAAC;AAE3D,wBAAgB,qCAAqC,CAAC,GAAG,EAAE,8BAA8B,UAExF;AAOD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,UAEnD"}

package/dest/l1_tx_utils/utils.js

@@ -0,0 +1,14 @@
+import { compactArray } from '@aztec/foundation/collection';
+export function tryGetCustomErrorNameContractFunction(err) {
+    return compactArray([
+        err.shortMessage,
+        ...(err.metaMessages ?? []).slice(0, 2).map((s)=>s.trim())
+    ]).join(' ');
+}
+/*
+ * Returns cost of calldata usage in Ethereum.
+ * @param data - Calldata.
+ * @returns 4 for each zero byte, 16 for each nonzero.
+ */ export function getCalldataGasUsage(data) {
+    return data.filter((byte)=>byte === 0).length * 4 + data.filter((byte)=>byte !== 0).length * 16;
+}

package/dest/l1_types.d.ts

@@ -3,4 +3,4 @@ export type L1BlockId = {
     l1BlockNumber: bigint;
     l1BlockHash: Buffer32;
 };
-//# sourceMappingURL=l1_types.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9sMV90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUV6RCxNQUFNLE1BQU0sU0FBUyxHQUFHO0lBQ3RCLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFDdEIsV0FBVyxFQUFFLFFBQVEsQ0FBQztDQUN2QixDQUFDIn0=

package/dest/publisher_manager.d.ts

@@ -1,10 +1,15 @@
-import { L1TxUtils } from './l1_tx_utils.js';
+import { L1TxUtils } from './l1_tx_utils/index.js';
 export type PublisherFilter<UtilsType extends L1TxUtils> = (utils: UtilsType) => boolean;
 export declare class PublisherManager<UtilsType extends L1TxUtils = L1TxUtils> {
     private publishers;
     private log;
-    constructor(publishers: UtilsType[]);
+    private config;
+    constructor(publishers: UtilsType[], config: {
+        publisherAllowInvalidStates?: boolean;
+    });
+    /** Loads the state of all publishers and resumes monitoring any pending txs */
+    loadState(): Promise<void>;
     getAvailablePublisher(filter?: PublisherFilter<UtilsType>): Promise<UtilsType>;
     interrupt(): void;
 }
-//# sourceMappingURL=publisher_manager.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGlzaGVyX21hbmFnZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wdWJsaXNoZXJfbWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsU0FBUyxFQUFnQixNQUFNLHdCQUF3QixDQUFDO0FBd0JqRSxNQUFNLE1BQU0sZUFBZSxDQUFDLFNBQVMsU0FBUyxTQUFTLElBQUksQ0FBQyxLQUFLLEVBQUUsU0FBUyxLQUFLLE9BQU8sQ0FBQztBQUV6RixxQkFBYSxnQkFBZ0IsQ0FBQyxTQUFTLFNBQVMsU0FBUyxHQUFHLFNBQVM7SUFLakUsT0FBTyxDQUFDLFVBQVU7SUFKcEIsT0FBTyxDQUFDLEdBQUcsQ0FBcUM7SUFDaEQsT0FBTyxDQUFDLE1BQU0sQ0FBNEM7SUFFMUQsWUFDVSxVQUFVLEVBQUUsU0FBUyxFQUFFLEVBQy9CLE1BQU0sRUFBRTtRQUFFLDJCQUEyQixDQUFDLEVBQUUsT0FBTyxDQUFBO0tBQUUsRUFLbEQ7SUFFRCwrRUFBK0U7SUFDbEUsU0FBUyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFdEM7SUFRWSxxQkFBcUIsQ0FBQyxNQUFNLEdBQUUsZUFBZSxDQUFDLFNBQVMsQ0FBYyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0ErQ3RHO0lBRU0sU0FBUyxTQUVmO0NBQ0YifQ==

package/dest/publisher_manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publisher_manager.d.ts","sourceRoot":"","sources":["../src/publisher_manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAgB,MAAM,kBAAkB,CAAC;AAK3D,MAAM,MAAM,eAAe,CAAC,SAAS,SAAS,SAAS,IAAI,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC;AAEzF,qBAAa,gBAAgB,CAAC,SAAS,SAAS,SAAS,GAAG,SAAS;IAGvD,OAAO,CAAC,UAAU;IAF9B,OAAO,CAAC,GAAG,CAAoC;gBAE3B,UAAU,EAAE,SAAS,EAAE;IAW9B,qBAAqB,CAAC,MAAM,GAAE,eAAe,CAAC,SAAS,CAAc,GAAG,OAAO,CAAC,SAAS,CAAC;IAqChG,SAAS;CAGjB"}
+{"version":3,"file":"publisher_manager.d.ts","sourceRoot":"","sources":["../src/publisher_manager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAgB,MAAM,wBAAwB,CAAC;AAwBjE,MAAM,MAAM,eAAe,CAAC,SAAS,SAAS,SAAS,IAAI,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC;AAEzF,qBAAa,gBAAgB,CAAC,SAAS,SAAS,SAAS,GAAG,SAAS;IAKjE,OAAO,CAAC,UAAU;IAJpB,OAAO,CAAC,GAAG,CAAqC;IAChD,OAAO,CAAC,MAAM,CAA4C;IAE1D,YACU,UAAU,EAAE,SAAS,EAAE,EAC/B,MAAM,EAAE;QAAE,2BAA2B,CAAC,EAAE,OAAO,CAAA;KAAE,EAKlD;IAED,+EAA+E;IAClE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAEtC;IAQY,qBAAqB,CAAC,MAAM,GAAE,eAAe,CAAC,SAAS,CAAc,GAAG,OAAO,CAAC,SAAS,CAAC,CA+CtG;IAEM,SAAS,SAEf;CACF"}

package/dest/publisher_manager.js

@@ -1,33 +1,61 @@
+import { pick } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
-import { TxUtilsState } from './l1_tx_utils.js';
+import { TxUtilsState } from './l1_tx_utils/index.js';
+// Defines the order in which we prioritise publishers based on their state (first is better)
 const sortOrder = [
+    // Always prefer sending from idle publishers
     TxUtilsState.IDLE,
-    TxUtilsState.MINED
+    // Then from publishers that have sent a tx and it got mined
+    TxUtilsState.MINED,
+    // Then from publishers that have sent a tx but it's in-flight
+    TxUtilsState.SPEED_UP,
+    TxUtilsState.SENT,
+    // We leave cancelled and not-mined states for last, since these represent failures to mines and could be problematic
+    TxUtilsState.CANCELLED,
+    TxUtilsState.NOT_MINED
 ];
-const invalidStates = [
+// Which states represent a busy publisher that we should avoid if possible
+const busyStates = [
     TxUtilsState.SENT,
     TxUtilsState.SPEED_UP,
     TxUtilsState.CANCELLED,
     TxUtilsState.NOT_MINED
-]; // Cancelled and not mined are states that can be handled by a later iteration
+];
 export class PublisherManager {
     publishers;
     log;
-    constructor(publishers){
+    config;
+    constructor(publishers, config){
         this.publishers = publishers;
-        this.log = createLogger('PublisherManager');
+        this.log = createLogger('publisher:manager');
         this.log.info(`PublisherManager initialized with ${publishers.length} publishers.`);
         this.publishers = publishers;
+        this.config = pick(config, 'publisherAllowInvalidStates');
+    }
+    /** Loads the state of all publishers and resumes monitoring any pending txs */ async loadState() {
+        await Promise.all(this.publishers.map((pub)=>pub.loadStateAndResumeMonitoring()));
     }
     // Finds and prioritises available publishers based on
     // 1. Validity as per the provided filter function
     // 2. Validity based on the state the publisher is in
-    // 3. Priority based on state as defined bu sortOrder
+    // 3. Priority based on state as defined by sortOrder
     // 4. Then priority based on highest balance
     // 5. Then priority based on least recently used
     async getAvailablePublisher(filter = ()=>true) {
+        this.log.debug(`Getting available publisher`, {
+            publishers: this.publishers.map((p)=>({
+                    address: p.getSenderAddress(),
+                    state: p.state,
+                    lastMined: p.lastMinedAtBlockNumber
+                }))
+        });
         // Extract the valid publishers
-        const validPublishers = this.publishers.filter((pub)=>!invalidStates.includes(pub.state) && filter(pub));
+        let validPublishers = this.publishers.filter((pub)=>!busyStates.includes(pub.state) && filter(pub));
+        // If none found but we allow invalid (busy) states, try again including them
+        if (validPublishers.length === 0 && this.config.publisherAllowInvalidStates) {
+            this.log.warn(`No valid publishers found. Trying again including invalid states.`);
+            validPublishers = this.publishers.filter((pub)=>filter(pub));
+        }
         // Error if none found
         if (validPublishers.length === 0) {
             throw new Error(`Failed to find an available publisher.`);

package/dest/queries.d.ts

@@ -11,4 +11,4 @@ export declare function getL1ContractsConfig(publicClient: ViemPublicClient, add
     rollupVersion: number;
     genesisArchiveTreeRoot: `0x${string}`;
 }>;
-//# sourceMappingURL=queries.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcmllcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3F1ZXJpZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTNELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBSXJELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRW5ELHFEQUFxRDtBQUNyRCx3QkFBc0Isb0JBQW9CLENBQ3hDLFlBQVksRUFBRSxnQkFBZ0IsRUFDOUIsU0FBUyxFQUFFO0lBQUUsaUJBQWlCLEVBQUUsVUFBVSxDQUFDO0lBQUMsYUFBYSxDQUFDLEVBQUUsVUFBVSxDQUFBO0NBQUUsR0FDdkUsT0FBTyxDQUNSLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxzQkFBc0IsQ0FBQyxHQUFHO0lBQ2hELFlBQVksRUFBRSxNQUFNLENBQUM7SUFDckIsYUFBYSxFQUFFLE1BQU0sQ0FBQztJQUN0QixhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLHNCQUFzQixFQUFFLEtBQUssTUFBTSxFQUFFLENBQUM7Q0FDdkMsQ0FDRixDQWdHQSJ9

package/dest/queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../src/queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAK3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,qDAAqD;AACrD,wBAAsB,oBAAoB,CACxC,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE;IAAE,iBAAiB,EAAE,UAAU,CAAC;IAAC,aAAa,CAAC,EAAE,UAAU,CAAA;CAAE,GACvE,OAAO,CACR,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,GAAG;IAChD,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,KAAK,MAAM,EAAE,CAAC;CACvC,CACF,CAqFA"}
+{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../src/queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,qDAAqD;AACrD,wBAAsB,oBAAoB,CACxC,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE;IAAE,iBAAiB,EAAE,UAAU,CAAC;IAAC,aAAa,CAAC,EAAE,UAAU,CAAA;CAAE,GACvE,OAAO,CACR,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,GAAG;IAChD,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,KAAK,MAAM,EAAE,CAAC;CACvC,CACF,CAgGA"}

package/dest/queries.js

@@ -1,6 +1,4 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { SlasherAbi } from '@aztec/l1-artifacts/SlasherAbi';
-import { getContract } from 'viem';
 import { ReadOnlyGovernanceContract } from './contracts/governance.js';
 import { GovernanceProposerContract } from './contracts/governance_proposer.js';
 import { RollupContract } from './contracts/rollup.js';
@@ -11,21 +9,19 @@ import { RollupContract } from './contracts/rollup.js';
     const rollupAddress = addresses.rollupAddress ?? await governanceProposer.getRollupAddress();
     const rollup = new RollupContract(publicClient, rollupAddress.toString());
     const slasherProposer = await rollup.getSlashingProposer();
-    const slasherAddress = await rollup.getSlasher();
-    const slasher = getContract({
-        address: slasherAddress,
-        abi: SlasherAbi,
-        client: publicClient
-    });
-    const [l1StartBlock, l1GenesisTime, aztecEpochDuration, aztecSlotDuration, aztecProofSubmissionEpochs, aztecTargetCommitteeSize, activationThreshold, ejectionThreshold, governanceProposerQuorum, governanceProposerRoundSize, slashingQuorum, slashingRoundSize, slashingLifetimeInRounds, slashingExecutionDelayInRounds, slashingOffsetInRounds, slashingAmounts, slashingVetoer, manaTarget, provingCostPerMana, rollupVersion, genesisArchiveTreeRoot, exitDelay] = await Promise.all([
+    const slasher = await rollup.getSlasherContract();
+    const [l1StartBlock, l1GenesisTime, aztecEpochDuration, aztecSlotDuration, aztecProofSubmissionEpochs, aztecTargetCommitteeSize, lagInEpochsForValidatorSet, lagInEpochsForRandao, activationThreshold, ejectionThreshold, localEjectionThreshold, governanceProposerQuorum, governanceProposerRoundSize, slashingQuorum, slashingRoundSize, slashingLifetimeInRounds, slashingExecutionDelayInRounds, slashingOffsetInRounds, slashingAmounts, slashingVetoer, slashingDisableDuration, manaTarget, provingCostPerMana, rollupVersion, genesisArchiveTreeRoot, exitDelay] = await Promise.all([
         rollup.getL1StartBlock(),
         rollup.getL1GenesisTime(),
         rollup.getEpochDuration(),
         rollup.getSlotDuration(),
         rollup.getProofSubmissionEpochs(),
         rollup.getTargetCommitteeSize(),
+        rollup.getLagInEpochsForValidatorSet(),
+        rollup.getLagInEpochsForRandao(),
         rollup.getActivationThreshold(),
         rollup.getEjectionThreshold(),
+        rollup.getLocalEjectionThreshold(),
         governanceProposer.getQuorumSize(),
         governanceProposer.getRoundSize(),
         slasherProposer?.getQuorumSize() ?? 0n,
@@ -38,7 +34,8 @@ import { RollupContract } from './contracts/rollup.js';
             0n,
             0n
         ],
-        slasher.read.VETOER(),
+        slasher?.getVetoer() ?? EthAddress.ZERO,
+        slasher?.getSlashingDisableDuration() ?? 0,
         rollup.getManaTarget(),
         rollup.getProvingCostPerMana(),
         rollup.getVersion(),
@@ -52,16 +49,20 @@ import { RollupContract } from './contracts/rollup.js';
         aztecSlotDuration: Number(aztecSlotDuration),
         aztecProofSubmissionEpochs: Number(aztecProofSubmissionEpochs),
         aztecTargetCommitteeSize: Number(aztecTargetCommitteeSize),
+        lagInEpochsForValidatorSet: Number(lagInEpochsForValidatorSet),
+        lagInEpochsForRandao: Number(lagInEpochsForRandao),
         governanceProposerQuorum: Number(governanceProposerQuorum),
         governanceProposerRoundSize: Number(governanceProposerRoundSize),
         activationThreshold,
         ejectionThreshold,
+        localEjectionThreshold,
         slashingQuorum: Number(slashingQuorum),
         slashingRoundSizeInEpochs: Number(slashingRoundSize / aztecEpochDuration),
         slashingLifetimeInRounds: Number(slashingLifetimeInRounds),
         slashingExecutionDelayInRounds: Number(slashingExecutionDelayInRounds),
-        slashingVetoer: EthAddress.fromString(slashingVetoer),
-        manaTarget: manaTarget,
+        slashingVetoer,
+        slashingDisableDuration,
+        manaTarget,
         provingCostPerMana: provingCostPerMana,
         rollupVersion: Number(rollupVersion),
         genesisArchiveTreeRoot,

package/dest/test/chain_monitor.d.ts

@@ -1,4 +1,5 @@
-import { type RollupContract } from '@aztec/ethereum/contracts';
+import type { RollupContract } from '@aztec/ethereum/contracts';
+import { CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { DateProvider } from '@aztec/foundation/timer';
 import { EventEmitter } from 'events';
@@ -7,13 +8,16 @@ export type ChainMonitorEventMap = {
         l1BlockNumber: number;
         timestamp: bigint;
     }];
-    'l2-block': [{
-        l2BlockNumber: number;
-        l1BlockNumber: number;
-        timestamp: bigint;
-    }];
-    'l2-block-proven': [{
-        l2ProvenBlockNumber: number;
+    checkpoint: [
+        {
+            checkpointNumber: CheckpointNumber;
+            l1BlockNumber: number;
+            l2SlotNumber: SlotNumber;
+            timestamp: bigint;
+        }
+    ];
+    'checkpoint-proven': [{
+        provenCheckpointNumber: CheckpointNumber;
         l1BlockNumber: number;
         timestamp: bigint;
     }];
@@ -22,10 +26,14 @@ export type ChainMonitorEventMap = {
         l1BlockNumber: number;
     }];
     'l2-epoch': [{
-        l2EpochNumber: number;
+        l2EpochNumber: EpochNumber;
         timestamp: bigint;
         committee: EthAddress[] | undefined;
     }];
+    'l2-slot': [{
+        l2SlotNumber: SlotNumber;
+        timestamp: bigint;
+    }];
 };
 /** Utility class that polls the chain on quick intervals and logs new L1 blocks, L2 blocks, and L2 proofs. */
 export declare class ChainMonitor extends EventEmitter<ChainMonitorEventMap> {
@@ -39,23 +47,29 @@ export declare class ChainMonitor extends EventEmitter<ChainMonitorEventMap> {
     private running;
     /** Current L1 block number */
     l1BlockNumber: number;
-    /** Current L2 block number */
-    l2BlockNumber: number;
-    /** Current L2 proven block number */
-    l2ProvenBlockNumber: number;
-    /** L1 timestamp for the current L2 block */
-    l2BlockTimestamp: bigint;
-    /** L1 timestamp for the proven L2 block */
-    l2ProvenBlockTimestamp: bigint;
+    /** Current checkpoint number */
+    checkpointNumber: CheckpointNumber;
+    /** Current proven checkpoint number */
+    provenCheckpointNumber: CheckpointNumber;
+    /** L1 timestamp for the current checkpoint */
+    checkpointTimestamp: bigint;
+    /** L1 timestamp for the proven checkpoint */
+    provenCheckpointTimestamp: bigint;
     /** Total number of L2 messages pushed into the Inbox */
     totalL2Messages: number;
     /** Current L2 epoch number */
-    l2EpochNumber: bigint;
+    l2EpochNumber: EpochNumber;
+    /** Current L2 slot number */
+    l2SlotNumber: SlotNumber;
     constructor(rollup: RollupContract, dateProvider?: DateProvider, logger?: import("@aztec/foundation/log").Logger, intervalMs?: number);
     start(): this;
     stop(): Promise<void>;
     private getInbox;
     protected safeRun(): void;
     run(force?: boolean): Promise<this>;
+    waitUntilL2Slot(slot: SlotNumber): Promise<void>;
+    waitUntilL1Block(block: number | bigint): Promise<void>;
+    waitUntilL1Timestamp(timestamp: number | bigint): Promise<void>;
+    waitUntilCheckpoint(checkpointNumber: CheckpointNumber): Promise<void>;
 }
-//# sourceMappingURL=chain_monitor.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW5fbW9uaXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvY2hhaW5fbW9uaXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUVoRSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzVGLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUczRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFdkQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUl0QyxNQUFNLE1BQU0sb0JBQW9CLEdBQUc7SUFDakMsVUFBVSxFQUFFLENBQUM7UUFBRSxhQUFhLEVBQUUsTUFBTSxDQUFDO1FBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQTtLQUFFLENBQUMsQ0FBQztJQUMzRCxVQUFVLEVBQUU7UUFDVjtZQUFFLGdCQUFnQixFQUFFLGdCQUFnQixDQUFDO1lBQUMsYUFBYSxFQUFFLE1BQU0sQ0FBQztZQUFDLFlBQVksRUFBRSxVQUFVLENBQUM7WUFBQyxTQUFTLEVBQUUsTUFBTSxDQUFBO1NBQUU7S0FDM0csQ0FBQztJQUNGLG1CQUFtQixFQUFFLENBQUM7UUFBRSxzQkFBc0IsRUFBRSxnQkFBZ0IsQ0FBQztRQUFDLGFBQWEsRUFBRSxNQUFNLENBQUM7UUFBQyxTQUFTLEVBQUUsTUFBTSxDQUFBO0tBQUUsQ0FBQyxDQUFDO0lBQzlHLGFBQWEsRUFBRSxDQUFDO1FBQUUsZUFBZSxFQUFFLE1BQU0sQ0FBQztRQUFDLGFBQWEsRUFBRSxNQUFNLENBQUE7S0FBRSxDQUFDLENBQUM7SUFDcEUsVUFBVSxFQUFFLENBQUM7UUFBRSxhQUFhLEVBQUUsV0FBVyxDQUFDO1FBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQztRQUFDLFNBQVMsRUFBRSxVQUFVLEVBQUUsR0FBRyxTQUFTLENBQUE7S0FBRSxDQUFDLENBQUM7SUFDckcsU0FBUyxFQUFFLENBQUM7UUFBRSxZQUFZLEVBQUUsVUFBVSxDQUFDO1FBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQTtLQUFFLENBQUMsQ0FBQztDQUM5RCxDQUFDO0FBRUYsOEdBQThHO0FBQzlHLHFCQUFhLFlBQWEsU0FBUSxZQUFZLENBQUMsb0JBQW9CLENBQUM7SUF5QmhFLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUN2QixPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBQ3ZCLE9BQU8sQ0FBQyxRQUFRLENBQUMsVUFBVTtJQTNCN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQWE7SUFDdEMsT0FBTyxDQUFDLEtBQUssQ0FBNEI7SUFDekMsT0FBTyxDQUFDLE1BQU0sQ0FBNkI7SUFFM0MsT0FBTyxDQUFDLE9BQU8sQ0FBaUM7SUFFaEQsOEJBQThCO0lBQ3ZCLGFBQWEsRUFBRyxNQUFNLENBQUM7SUFDOUIsZ0NBQWdDO0lBQ3pCLGdCQUFnQixFQUFHLGdCQUFnQixDQUFDO0lBQzNDLHVDQUF1QztJQUNoQyxzQkFBc0IsRUFBRyxnQkFBZ0IsQ0FBQztJQUNqRCw4Q0FBOEM7SUFDdkMsbUJBQW1CLEVBQUcsTUFBTSxDQUFDO0lBQ3BDLDZDQUE2QztJQUN0Qyx5QkFBeUIsRUFBRyxNQUFNLENBQUM7SUFDMUMsd0RBQXdEO0lBQ2pELGVBQWUsRUFBRSxNQUFNLENBQUs7SUFDbkMsOEJBQThCO0lBQ3ZCLGFBQWEsRUFBRyxXQUFXLENBQUM7SUFDbkMsNkJBQTZCO0lBQ3RCLFlBQVksRUFBRyxVQUFVLENBQUM7SUFFakMsWUFDbUIsTUFBTSxFQUFFLGNBQWMsRUFDdEIsWUFBWSxHQUFFLFlBQWlDLEVBQy9DLE1BQU0seUNBQThDLEVBQ3BELFVBQVUsU0FBTSxFQUlsQztJQUVELEtBQUssU0FNSjtJQUVLLElBQUksa0JBV1Q7WUFFYSxRQUFRO0lBUXRCLFNBQVMsQ0FBQyxPQUFPLFNBWWhCO0lBRUssR0FBRyxDQUFDLEtBQUssVUFBUSxpQkFnRnRCO0lBRU0sZUFBZSxDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQWF0RDtJQUVNLGdCQUFnQixDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FjN0Q7SUFFTSxvQkFBb0IsQ0FBQyxTQUFTLEVBQUUsTUFBTSxHQUFHLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBY3JFO0lBRU0sbUJBQW1CLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQWE1RTtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"chain_monitor.d.ts","sourceRoot":"","sources":["../../src/test/chain_monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,EAAE,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC3D,UAAU,EAAE,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClF,iBAAiB,EAAE,CAAC;QAAE,mBAAmB,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/F,aAAa,EAAE,CAAC;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpE,UAAU,EAAE,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,UAAU,EAAE,GAAG,SAAS,CAAA;KAAE,CAAC,CAAC;CACjG,CAAC;AAEF,8GAA8G;AAC9G,qBAAa,YAAa,SAAQ,YAAY,CAAC,oBAAoB,CAAC;IAuBhE,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAzB7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;IACtC,OAAO,CAAC,KAAK,CAA4B;IACzC,OAAO,CAAC,MAAM,CAA6B;IAE3C,OAAO,CAAC,OAAO,CAAiC;IAEhD,8BAA8B;IACvB,aAAa,EAAG,MAAM,CAAC;IAC9B,8BAA8B;IACvB,aAAa,EAAG,MAAM,CAAC;IAC9B,qCAAqC;IAC9B,mBAAmB,EAAG,MAAM,CAAC;IACpC,4CAA4C;IACrC,gBAAgB,EAAG,MAAM,CAAC;IACjC,2CAA2C;IACpC,sBAAsB,EAAG,MAAM,CAAC;IACvC,wDAAwD;IACjD,eAAe,EAAE,MAAM,CAAK;IACnC,8BAA8B;IACvB,aAAa,EAAG,MAAM,CAAC;gBAGX,MAAM,EAAE,cAAc,EACtB,YAAY,GAAE,YAAiC,EAC/C,MAAM,yCAA8C,EACpD,UAAU,SAAM;IAMnC,KAAK;IAQC,IAAI;YAaI,QAAQ;IAQtB,SAAS,CAAC,OAAO;IAcX,GAAG,CAAC,KAAK,UAAQ;CAoExB"}
+{"version":3,"file":"chain_monitor.d.ts","sourceRoot":"","sources":["../../src/test/chain_monitor.ts"],"names":[],"mappings":"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"}

package/dest/test/chain_monitor.js

@@ -15,12 +15,13 @@ import { EventEmitter } from 'events';
     // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
     running;
     /** Current L1 block number */ l1BlockNumber;
-    /** Current L2 block number */ l2BlockNumber;
-    /** Current L2 proven block number */ l2ProvenBlockNumber;
-    /** L1 timestamp for the current L2 block */ l2BlockTimestamp;
-    /** L1 timestamp for the proven L2 block */ l2ProvenBlockTimestamp;
+    /** Current checkpoint number */ checkpointNumber;
+    /** Current proven checkpoint number */ provenCheckpointNumber;
+    /** L1 timestamp for the current checkpoint */ checkpointTimestamp;
+    /** L1 timestamp for the proven checkpoint */ provenCheckpointTimestamp;
     /** Total number of L2 messages pushed into the Inbox */ totalL2Messages;
     /** Current L2 epoch number */ l2EpochNumber;
+    /** Current L2 slot number */ l2SlotNumber;
     constructor(rollup, dateProvider = new DateProvider(), logger = createLogger('aztecjs:utils:chain_monitor'), intervalMs = 200){
         super(), this.rollup = rollup, this.dateProvider = dateProvider, this.logger = logger, this.intervalMs = intervalMs, this.running = new Set(), this.totalL2Messages = 0;
         this.l1Client = rollup.client;
@@ -71,37 +72,42 @@ import { EventEmitter } from 'events';
             return this;
         }
         this.l1BlockNumber = newL1BlockNumber;
-        const block = await this.l1Client.getBlock({
-            blockNumber: BigInt(newL1BlockNumber),
-            includeTransactions: false
-        });
-        const timestamp = block.timestamp;
+        const [l2SlotNumber, l2Epoch, l1block] = await Promise.all([
+            this.rollup.getSlotNumber(),
+            this.rollup.getCurrentEpoch(),
+            this.l1Client.getBlock({
+                blockNumber: BigInt(newL1BlockNumber),
+                includeTransactions: false
+            })
+        ]);
+        const timestamp = l1block.timestamp;
         const timestampString = new Date(Number(timestamp) * 1000).toTimeString().split(' ')[0];
         this.emit('l1-block', {
             l1BlockNumber: newL1BlockNumber,
             timestamp
         });
         let msg = `L1 block ${newL1BlockNumber} mined at ${timestampString}`;
-        const newL2BlockNumber = Number(await this.rollup.getBlockNumber());
-        if (this.l2BlockNumber !== newL2BlockNumber) {
-            const epochNumber = await this.rollup.getEpochNumber(BigInt(newL2BlockNumber));
-            msg += ` with new L2 block ${newL2BlockNumber} for epoch ${epochNumber}`;
-            this.l2BlockNumber = newL2BlockNumber;
-            this.l2BlockTimestamp = timestamp;
-            this.emit('l2-block', {
-                l2BlockNumber: newL2BlockNumber,
+        const newCheckpointNumber = await this.rollup.getCheckpointNumber();
+        if (this.checkpointNumber !== newCheckpointNumber) {
+            const epochNumber = await this.rollup.getEpochNumberForCheckpoint(newCheckpointNumber);
+            msg += ` with new checkpoint ${newCheckpointNumber} for epoch ${epochNumber}`;
+            this.checkpointNumber = newCheckpointNumber;
+            this.checkpointTimestamp = timestamp;
+            this.emit('checkpoint', {
+                checkpointNumber: newCheckpointNumber,
                 l1BlockNumber: newL1BlockNumber,
+                l2SlotNumber,
                 timestamp
             });
         }
-        const newL2ProvenBlockNumber = Number(await this.rollup.getProvenBlockNumber());
-        if (this.l2ProvenBlockNumber !== newL2ProvenBlockNumber) {
-            const epochNumber = await this.rollup.getEpochNumber(BigInt(newL2ProvenBlockNumber));
-            msg += ` with proof up to L2 block ${newL2ProvenBlockNumber} for epoch ${epochNumber}`;
-            this.l2ProvenBlockNumber = newL2ProvenBlockNumber;
-            this.l2ProvenBlockTimestamp = timestamp;
-            this.emit('l2-block-proven', {
-                l2ProvenBlockNumber: newL2ProvenBlockNumber,
+        const newProvenCheckpointNumber = await this.rollup.getProvenCheckpointNumber();
+        if (this.provenCheckpointNumber !== newProvenCheckpointNumber) {
+            const epochNumber = await this.rollup.getEpochNumberForCheckpoint(newProvenCheckpointNumber);
+            msg += ` with proof up to checkpoint ${newProvenCheckpointNumber} for epoch ${epochNumber}`;
+            this.provenCheckpointNumber = newProvenCheckpointNumber;
+            this.provenCheckpointTimestamp = timestamp;
+            this.emit('checkpoint-proven', {
+                provenCheckpointNumber: newProvenCheckpointNumber,
                 l1BlockNumber: newL1BlockNumber,
                 timestamp
             });
@@ -116,20 +122,23 @@ import { EventEmitter } from 'events';
                 l1BlockNumber: newL1BlockNumber
             });
         }
-        const [l2SlotNumber, l2Epoch] = await Promise.all([
-            this.rollup.getSlotNumber(),
-            this.rollup.getCurrentEpoch()
-        ]);
         let committee;
         if (l2Epoch !== this.l2EpochNumber) {
             this.l2EpochNumber = l2Epoch;
             committee = (await this.rollup.getCurrentEpochCommittee())?.map((addr)=>EthAddress.fromString(addr));
             this.emit('l2-epoch', {
-                l2EpochNumber: Number(l2Epoch),
+                l2EpochNumber: l2Epoch,
                 timestamp,
                 committee
             });
-            msg += ` starting new epoch ${this.l2EpochNumber} with committee ${committee?.join(', ') ?? 'undefined'}`;
+            msg += ` starting new epoch ${this.l2EpochNumber} `;
+        }
+        if (l2SlotNumber !== this.l2SlotNumber) {
+            this.l2SlotNumber = l2SlotNumber;
+            this.emit('l2-slot', {
+                l2SlotNumber,
+                timestamp
+            });
         }
         this.logger.info(msg, {
             currentTimestamp: this.dateProvider.nowInSeconds(),
@@ -137,11 +146,69 @@ import { EventEmitter } from 'events';
             l1BlockNumber: this.l1BlockNumber,
             l2SlotNumber,
             l2Epoch,
-            l2BlockNumber: this.l2BlockNumber,
-            l2ProvenBlockNumber: this.l2ProvenBlockNumber,
+            checkpointNumber: this.checkpointNumber,
+            provenCheckpointNumber: this.provenCheckpointNumber,
             totalL2Messages: this.totalL2Messages,
             committee
         });
         return this;
     }
+    waitUntilL2Slot(slot) {
+        if (this.l2SlotNumber >= slot) {
+            return Promise.resolve();
+        }
+        return new Promise((resolve)=>{
+            const listener = (data)=>{
+                if (data.l2SlotNumber >= slot) {
+                    this.off('l2-slot', listener);
+                    resolve();
+                }
+            };
+            this.on('l2-slot', listener);
+        });
+    }
+    waitUntilL1Block(block) {
+        const targetBlock = typeof block === 'bigint' ? block.valueOf() : block;
+        if (this.l1BlockNumber >= targetBlock) {
+            return Promise.resolve();
+        }
+        return new Promise((resolve)=>{
+            const listener = (data)=>{
+                if (data.l1BlockNumber >= targetBlock) {
+                    this.off('l1-block', listener);
+                    resolve();
+                }
+            };
+            this.on('l1-block', listener);
+        });
+    }
+    waitUntilL1Timestamp(timestamp) {
+        const targetTimestamp = typeof timestamp === 'bigint' ? timestamp.valueOf() : timestamp;
+        if (this.l1BlockNumber >= targetTimestamp) {
+            return Promise.resolve();
+        }
+        return new Promise((resolve)=>{
+            const listener = (data)=>{
+                if (data.timestamp >= targetTimestamp) {
+                    this.off('l1-block', listener);
+                    resolve();
+                }
+            };
+            this.on('l1-block', listener);
+        });
+    }
+    waitUntilCheckpoint(checkpointNumber) {
+        if (this.checkpointNumber >= checkpointNumber) {
+            return Promise.resolve();
+        }
+        return new Promise((resolve)=>{
+            const listener = (data)=>{
+                if (data.checkpointNumber >= checkpointNumber) {
+                    this.off('checkpoint', listener);
+                    resolve();
+                }
+            };
+            this.on('checkpoint', listener);
+        });
+    }
 }

package/dest/test/delayed_tx_utils.d.ts

@@ -1,7 +1,7 @@
 import { type Logger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
-import { type L1TxUtilsConfig } from '../l1_tx_utils.js';
-import { L1TxUtilsWithBlobs } from '../l1_tx_utils_with_blobs.js';
+import { type L1TxUtilsConfig } from '../l1_tx_utils/index.js';
+import { L1TxUtilsWithBlobs } from '../l1_tx_utils/l1_tx_utils_with_blobs.js';
 import type { ExtendedViemWalletClient } from '../types.js';
 import { type Delayer } from './tx_delayer.js';
 export declare class DelayedTxUtils extends L1TxUtilsWithBlobs {
@@ -10,4 +10,4 @@ export declare class DelayedTxUtils extends L1TxUtilsWithBlobs {
     enableDelayer(ethereumSlotDuration: number): void;
 }
 export declare function createDelayedL1TxUtilsFromViemWallet(client: ExtendedViemWalletClient, logger?: Logger, dateProvider?: DateProvider, config?: Partial<L1TxUtilsConfig>, debugMaxGasLimit?: boolean): DelayedTxUtils;
-//# sourceMappingURL=delayed_tx_utils.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVsYXllZF90eF91dGlscy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvZGVsYXllZF90eF91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXZELE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRixPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSwwQ0FBMEMsQ0FBQztBQUM5RSxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM1RCxPQUFPLEVBQUUsS0FBSyxPQUFPLEVBQWUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1RCxxQkFBYSxjQUFlLFNBQVEsa0JBQWtCO0lBQzdDLE9BQU8sRUFBRSxPQUFPLEdBQUcsU0FBUyxDQUFDO0lBRXBDLE9BQWMsYUFBYSxDQUN6QixTQUFTLEVBQUUsa0JBQWtCLEVBQzdCLG9CQUFvQixFQUFFLE1BQU0sRUFDNUIsTUFBTSxFQUFFLHdCQUF3QixrQkFTakM7SUFFTSxhQUFhLENBQUMsb0JBQW9CLEVBQUUsTUFBTSxRQU1oRDtDQUNGO0FBRUQsd0JBQWdCLG9DQUFvQyxDQUNsRCxNQUFNLEVBQUUsd0JBQXdCLEVBQ2hDLE1BQU0sR0FBRSxNQUFrQyxFQUMxQyxZQUFZLEdBQUUsWUFBaUMsRUFDL0MsTUFBTSxDQUFDLEVBQUUsT0FBTyxDQUFDLGVBQWUsQ0FBQyxFQUNqQyxnQkFBZ0IsR0FBRSxPQUFlLGtCQVdsQyJ9

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

@@ -1 +1 @@
-{"version":3,"file":"delayed_tx_utils.d.ts","sourceRoot":"","sources":["../../src/test/delayed_tx_utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,KAAK,OAAO,EAAe,MAAM,iBAAiB,CAAC;AAE5D,qBAAa,cAAe,SAAQ,kBAAkB;IAC7C,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;WAEtB,aAAa,CACzB,SAAS,EAAE,kBAAkB,EAC7B,oBAAoB,EAAE,MAAM,EAC5B,MAAM,EAAE,wBAAwB;IAW3B,aAAa,CAAC,oBAAoB,EAAE,MAAM;CAOlD;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,wBAAwB,EAChC,MAAM,GAAE,MAAkC,EAC1C,YAAY,GAAE,YAAiC,EAC/C,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,EACjC,gBAAgB,GAAE,OAAe,kBAWlC"}
+{"version":3,"file":"delayed_tx_utils.d.ts","sourceRoot":"","sources":["../../src/test/delayed_tx_utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,KAAK,OAAO,EAAe,MAAM,iBAAiB,CAAC;AAE5D,qBAAa,cAAe,SAAQ,kBAAkB;IAC7C,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAEpC,OAAc,aAAa,CACzB,SAAS,EAAE,kBAAkB,EAC7B,oBAAoB,EAAE,MAAM,EAC5B,MAAM,EAAE,wBAAwB,kBASjC;IAEM,aAAa,CAAC,oBAAoB,EAAE,MAAM,QAMhD;CACF;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,wBAAwB,EAChC,MAAM,GAAE,MAAkC,EAC1C,YAAY,GAAE,YAAiC,EAC/C,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,EACjC,gBAAgB,GAAE,OAAe,kBAWlC"}

package/dest/test/delayed_tx_utils.js

@@ -1,8 +1,8 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
-import { createViemSigner } from '../l1_tx_utils.js';
-import { L1TxUtilsWithBlobs } from '../l1_tx_utils_with_blobs.js';
+import { createViemSigner } from '../l1_tx_utils/index.js';
+import { L1TxUtilsWithBlobs } from '../l1_tx_utils/l1_tx_utils_with_blobs.js';
 import { withDelayer } from './tx_delayer.js';
 export class DelayedTxUtils extends L1TxUtilsWithBlobs {
     delayer;