@aztec/aztec 0.0.1-commit.993d240 → 0.0.1-commit.9a89641

package/dest/testing/anvil_test_watcher.d.ts

@@ -1,54 +0,0 @@
-import { EthCheatCodes } from '@aztec/ethereum/test';
-import type { ViemClient } from '@aztec/ethereum/types';
-import type { EthAddress } from '@aztec/foundation/eth-address';
-import type { TestDateProvider } from '@aztec/foundation/timer';
-export type AnvilTestWatcherOpts = {
-    isLocalNetwork?: boolean;
-    isMarkingAsProven?: boolean;
-};
-/**
- * Represents a watcher for a rollup contract.
- *
- * It started on a network like anvil where time traveling is allowed, and auto-mine is turned on
- * it will periodically check if the current slot have already been filled, e.g., there was an L2
- * block within the slot. And if so, it will time travel into the next slot.
- */
-export declare class AnvilTestWatcher {
-    private cheatcodes;
-    private dateProvider?;
-    private isLocalNetwork;
-    private isMarkingAsProven;
-    private rollup;
-    private rollupCheatCodes;
-    private l2SlotDuration;
-    private filledRunningPromise?;
-    private syncDateProviderPromise?;
-    private markingAsProvenRunningPromise?;
-    private logger;
-    private getPendingTxCount?;
-    private isSequencerBuilding?;
-    private unfilledSlotFirstSeen?;
-    private proposedTargetSlot?;
-    constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, l1Client: ViemClient, dateProvider?: TestDateProvider | undefined, opts?: AnvilTestWatcherOpts);
-    setIsMarkingAsProven(isMarkingAsProven: boolean): void;
-    setisLocalNetwork(isLocalNetwork: boolean): void;
-    /** Sets a callback to check for pending txs, used to skip unfilled slots faster when txs are waiting. */
-    setGetPendingTxCount(fn: () => Promise<number>): void;
-    /** Sets a callback to check if the sequencer is actively building, to avoid warping while it works. */
-    setIsSequencerBuilding(fn: () => boolean): void;
-    /**
-     * Records the target slot for which the proposer has built a block destined for L1. Used by
-     * the local-network watcher to fast-forward L1 (and the injected date provider) ahead of the
-     * pipelined publisher's `sendRequestsAt` sleep so it ends promptly instead of waiting a full
-     * wall-clock slot. Only ratchets up — late warps for stale slots are no-ops.
-     */
-    setProposedTargetSlot(slot: number): void;
-    start(): Promise<void>;
-    stop(): Promise<void>;
-    trigger(): Promise<void>;
-    markAsProven(): Promise<void>;
-    syncDateProviderToL1IfBehind(): Promise<void>;
-    warpTimeIfNeeded(): Promise<void>;
-    private warpToTimestamp;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW52aWxfdGVzdF93YXRjaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9hbnZpbF90ZXN0X3dhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBb0IsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV4RCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUdoRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS2hFLE1BQU0sTUFBTSxvQkFBb0IsR0FBRztJQUNqQyxjQUFjLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDekIsaUJBQWlCLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDN0IsQ0FBQztBQUVGOzs7Ozs7R0FNRztBQUNILHFCQUFhLGdCQUFnQjtJQThCekIsT0FBTyxDQUFDLFVBQVU7SUFHbEIsT0FBTyxDQUFDLFlBQVksQ0FBQztJQWhDdkIsT0FBTyxDQUFDLGNBQWMsQ0FBQztJQUN2QixPQUFPLENBQUMsaUJBQWlCLENBQUM7SUFFMUIsT0FBTyxDQUFDLE1BQU0sQ0FBc0Q7SUFDcEUsT0FBTyxDQUFDLGdCQUFnQixDQUFtQjtJQUMzQyxPQUFPLENBQUMsY0FBYyxDQUFVO0lBRWhDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFpQjtJQUM5QyxPQUFPLENBQUMsdUJBQXVCLENBQUMsQ0FBaUI7SUFDakQsT0FBTyxDQUFDLDZCQUE2QixDQUFDLENBQWlCO0lBRXZELE9BQU8sQ0FBQyxNQUFNLENBQWlEO0lBRy9ELE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUF3QjtJQUdsRCxPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0FBZ0I7SUFHNUMsT0FBTyxDQUFDLHFCQUFxQixDQUFDLENBQXFDO0lBTW5FLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFTO0lBRXBDLFlBQ1UsVUFBVSxFQUFFLGFBQWEsRUFDakMsYUFBYSxFQUFFLFVBQVUsRUFDekIsUUFBUSxFQUFFLFVBQVUsRUFDWixZQUFZLENBQUMsOEJBQWtCLEVBQ3ZDLElBQUksR0FBRSxvQkFBeUIsRUFnQmhDO0lBRUQsb0JBQW9CLENBQUMsaUJBQWlCLEVBQUUsT0FBTyxRQUc5QztJQUVELGlCQUFpQixDQUFDLGNBQWMsRUFBRSxPQUFPLFFBRXhDO0lBRUQseUdBQXlHO0lBQ3pHLG9CQUFvQixDQUFDLEVBQUUsRUFBRSxNQUFNLE9BQU8sQ0FBQyxNQUFNLENBQUMsUUFFN0M7SUFFRCx1R0FBdUc7SUFDdkcsc0JBQXNCLENBQUMsRUFBRSxFQUFFLE1BQU0sT0FBTyxRQUV2QztJQUVEOzs7OztPQUtHO0lBQ0gscUJBQXFCLENBQUMsSUFBSSxFQUFFLE1BQU0sUUFJakM7SUFFSyxLQUFLLGtCQXlCVjtJQUVLLElBQUksa0JBSVQ7SUFFSyxPQUFPLGtCQUlaO0lBRUssWUFBWSxrQkFLakI7SUFFSyw0QkFBNEIsa0JBc0JqQztJQUVLLGdCQUFnQixrQkEwRXJCO1lBTWEsZUFBZTtDQWdCOUIifQ==

package/dest/testing/anvil_test_watcher.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/testing/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAKhE,MAAM,MAAM,oBAAoB,GAAG;IACjC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,gBAAgB;IA8BzB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IAhCvB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,iBAAiB,CAAC;IAE1B,OAAO,CAAC,MAAM,CAAsD;IACpE,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,cAAc,CAAU;IAEhC,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAC9C,OAAO,CAAC,uBAAuB,CAAC,CAAiB;IACjD,OAAO,CAAC,6BAA6B,CAAC,CAAiB;IAEvD,OAAO,CAAC,MAAM,CAAiD;IAG/D,OAAO,CAAC,iBAAiB,CAAC,CAAwB;IAGlD,OAAO,CAAC,mBAAmB,CAAC,CAAgB;IAG5C,OAAO,CAAC,qBAAqB,CAAC,CAAqC;IAMnE,OAAO,CAAC,kBAAkB,CAAC,CAAS;IAEpC,YACU,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,QAAQ,EAAE,UAAU,EACZ,YAAY,CAAC,8BAAkB,EACvC,IAAI,GAAE,oBAAyB,EAgBhC;IAED,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,QAG9C;IAED,iBAAiB,CAAC,cAAc,EAAE,OAAO,QAExC;IAED,yGAAyG;IACzG,oBAAoB,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,QAE7C;IAED,uGAAuG;IACvG,sBAAsB,CAAC,EAAE,EAAE,MAAM,OAAO,QAEvC;IAED;;;;;OAKG;IACH,qBAAqB,CAAC,IAAI,EAAE,MAAM,QAIjC;IAEK,KAAK,kBAyBV;IAEK,IAAI,kBAIT;IAEK,OAAO,kBAIZ;IAEK,YAAY,kBAKjB;IAEK,4BAA4B,kBAsBjC;IAEK,gBAAgB,kBA0ErB;YAMa,eAAe;CAgB9B"}

package/dest/testing/anvil_test_watcher.js

@@ -1,235 +0,0 @@
-import { RollupCheatCodes } from '@aztec/ethereum/test';
-import { SlotNumber } from '@aztec/foundation/branded-types';
-import { createLogger } from '@aztec/foundation/log';
-import { RunningPromise } from '@aztec/foundation/running-promise';
-import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
-import { getAddress, getContract } from 'viem';
-/**
- * Represents a watcher for a rollup contract.
- *
- * It started on a network like anvil where time traveling is allowed, and auto-mine is turned on
- * it will periodically check if the current slot have already been filled, e.g., there was an L2
- * block within the slot. And if so, it will time travel into the next slot.
- */ export class AnvilTestWatcher {
-    cheatcodes;
-    dateProvider;
-    isLocalNetwork;
-    isMarkingAsProven;
-    rollup;
-    rollupCheatCodes;
-    l2SlotDuration;
-    filledRunningPromise;
-    syncDateProviderPromise;
-    markingAsProvenRunningPromise;
-    logger;
-    // Optional callback to check if there are pending txs in the mempool.
-    getPendingTxCount;
-    // Optional callback to check if the sequencer is actively building a block.
-    isSequencerBuilding;
-    // Tracks when we first observed the current unfilled slot with pending txs (real wall time).
-    unfilledSlotFirstSeen;
-    // Latest target slot for which the proposer has built a block destined for L1 but which has
-    // not yet been committed. Set by the proposer-pipelining hook from `block-proposed` events so
-    // the watcher can advance L1 (and the injected date provider) to the target slot ahead of the
-    // publisher's `sendRequestsAt` sleep, instead of waiting a full wall-clock slot.
-    proposedTargetSlot;
-    constructor(cheatcodes, rollupAddress, l1Client, dateProvider, opts = {}){
-        this.cheatcodes = cheatcodes;
-        this.dateProvider = dateProvider;
-        this.logger = createLogger(`aztecjs:utils:watcher`);
-        this.rollup = getContract({
-            address: getAddress(rollupAddress.toString()),
-            abi: RollupAbi,
-            client: l1Client
-        });
-        this.rollupCheatCodes = new RollupCheatCodes(this.cheatcodes, {
-            rollupAddress
-        });
-        this.isLocalNetwork = opts.isLocalNetwork ?? false;
-        this.isMarkingAsProven = opts.isMarkingAsProven ?? true;
-        this.logger.debug(`Watcher created for rollup at ${rollupAddress}`);
-    }
-    setIsMarkingAsProven(isMarkingAsProven) {
-        this.logger.warn(`Watcher is now ${isMarkingAsProven ? 'marking' : 'not marking'} blocks as proven`);
-        this.isMarkingAsProven = isMarkingAsProven;
-    }
-    setisLocalNetwork(isLocalNetwork) {
-        this.isLocalNetwork = isLocalNetwork;
-    }
-    /** Sets a callback to check for pending txs, used to skip unfilled slots faster when txs are waiting. */ setGetPendingTxCount(fn) {
-        this.getPendingTxCount = fn;
-    }
-    /** Sets a callback to check if the sequencer is actively building, to avoid warping while it works. */ setIsSequencerBuilding(fn) {
-        this.isSequencerBuilding = fn;
-    }
-    /**
-   * Records the target slot for which the proposer has built a block destined for L1. Used by
-   * the local-network watcher to fast-forward L1 (and the injected date provider) ahead of the
-   * pipelined publisher's `sendRequestsAt` sleep so it ends promptly instead of waiting a full
-   * wall-clock slot. Only ratchets up — late warps for stale slots are no-ops.
-   */ setProposedTargetSlot(slot) {
-        if (this.proposedTargetSlot === undefined || slot > this.proposedTargetSlot) {
-            this.proposedTargetSlot = slot;
-        }
-    }
-    async start() {
-        if (this.filledRunningPromise) {
-            throw new Error('Watcher already watching for filled slot');
-        }
-        const config = await this.rollupCheatCodes.getConfig();
-        this.l2SlotDuration = config.slotDuration;
-        // If auto mining is not supported (e.g., we are on a real network), then we
-        // will simple do nothing. But if on an anvil or the like, this make sure that
-        // the local network and tests don't break because time is frozen and we never get to
-        // the next slot.
-        const isAutoMining = await this.cheatcodes.isAutoMining();
-        if (isAutoMining) {
-            this.filledRunningPromise = new RunningPromise(()=>this.warpTimeIfNeeded(), this.logger, 200);
-            this.filledRunningPromise.start();
-            this.syncDateProviderPromise = new RunningPromise(()=>this.syncDateProviderToL1IfBehind(), this.logger, 200);
-            this.syncDateProviderPromise.start();
-            this.markingAsProvenRunningPromise = new RunningPromise(()=>this.markAsProven(), this.logger, 200);
-            this.markingAsProvenRunningPromise.start();
-            this.logger.info(`Watcher started for rollup at ${this.rollup.address}`);
-        } else {
-            this.logger.info(`Watcher not started because not auto mining`);
-        }
-    }
-    async stop() {
-        await this.filledRunningPromise?.stop();
-        await this.syncDateProviderPromise?.stop();
-        await this.markingAsProvenRunningPromise?.stop();
-    }
-    async trigger() {
-        await this.filledRunningPromise?.trigger();
-        await this.syncDateProviderPromise?.trigger();
-        await this.markingAsProvenRunningPromise?.trigger();
-    }
-    async markAsProven() {
-        if (!this.isMarkingAsProven) {
-            return;
-        }
-        await this.rollupCheatCodes.markAsProven();
-    }
-    async syncDateProviderToL1IfBehind() {
-        // this doesn't apply to the local network, because we don't have a date provider in the local network
-        if (!this.dateProvider) {
-            return;
-        }
-        const l1Time = await this.cheatcodes.lastBlockTimestamp() * 1000;
-        const wallTime = this.dateProvider.now();
-        if (l1Time > wallTime) {
-            this.logger.warn(`L1 is ahead of wall time. Syncing wall time to L1 time`);
-            this.dateProvider.setTime(l1Time);
-        } else if (l1Time + Number(this.l2SlotDuration) * 1000 < wallTime) {
-            // Warp L1 to the slot boundary at-or-before wall time. Rounding to a slot boundary (rather than
-            // `ceil(wallTime / 1000)`) keeps this loop's target aligned with `warpTimeIfNeeded`'s
-            // `nextSlotTimestamp` target, avoiding a race where the two loops pick timestamps a fraction of
-            // a second apart and one of them is then rejected by anvil as non-monotonic.
-            const wallSec = Math.floor(wallTime / 1000);
-            const targetSlot = await this.rollup.read.getSlotAt([
-                BigInt(wallSec)
-            ]);
-            const targetTimestamp = Number(await this.rollup.read.getTimestampForSlot([
-                targetSlot
-            ]));
-            this.logger.warn(`L1 is more than 1 L2 slot behind wall time. Warping to slot ${targetSlot} boundary`);
-            await this.warpToTimestamp(targetTimestamp);
-        }
-    }
-    async warpTimeIfNeeded() {
-        try {
-            const currentSlot = SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot());
-            const pendingCheckpointNumber = await this.rollup.read.getPendingCheckpointNumber();
-            const checkpointLog = await this.rollup.read.getCheckpoint([
-                pendingCheckpointNumber
-            ]);
-            const nextSlot = SlotNumber(currentSlot + 1);
-            const nextSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([
-                BigInt(nextSlot)
-            ]));
-            if (BigInt(currentSlot) === checkpointLog.slotNumber) {
-                // The current slot has been filled, we should jump to the next slot.
-                if (await this.warpToTimestamp(nextSlotTimestamp)) {
-                    this.logger.info(`Slot ${currentSlot} was filled, jumped to next slot`);
-                }
-                return;
-            }
-            // If we are not in local network, we don't need to warp time
-            if (!this.isLocalNetwork) {
-                return;
-            }
-            // Pipelined-publish shortcut: if the proposer has built a block destined for a slot
-            // beyond the current L1 slot, fast-forward L1 to that slot's timestamp so the publisher's
-            // `sendRequestsAt(targetSlot)` sleep ends and the multicall mines inside the target slot.
-            // Without this, the publisher waits up to a full real-time slot for wall clock to catch up.
-            if (this.proposedTargetSlot !== undefined && this.proposedTargetSlot > currentSlot) {
-                const targetSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([
-                    BigInt(this.proposedTargetSlot)
-                ]));
-                if (await this.warpToTimestamp(targetSlotTimestamp)) {
-                    this.logger.info(`Warped L1 to target slot ${this.proposedTargetSlot} for pipelined publish`);
-                }
-                return;
-            }
-            // If there are pending txs and the sequencer missed them, warp quickly (after a 2s real-time debounce) so the
-            // sequencer can retry in the next slot. Without this, we'd have to wait a full real-time slot duration (~36s) for
-            // the dateProvider to catch up to the next slot timestamp. We skip the warp if the sequencer is actively building
-            // to avoid invalidating its in-progress work.
-            if (this.getPendingTxCount) {
-                const pendingTxs = await this.getPendingTxCount();
-                if (pendingTxs > 0) {
-                    if (this.isSequencerBuilding?.()) {
-                        this.unfilledSlotFirstSeen = undefined;
-                        return;
-                    }
-                    const realNow = Date.now();
-                    if (!this.unfilledSlotFirstSeen || this.unfilledSlotFirstSeen.slot !== currentSlot) {
-                        this.unfilledSlotFirstSeen = {
-                            slot: currentSlot,
-                            realTime: realNow
-                        };
-                        return;
-                    }
-                    if (realNow - this.unfilledSlotFirstSeen.realTime > 2000) {
-                        if (await this.warpToTimestamp(nextSlotTimestamp)) {
-                            this.logger.info(`Slot ${currentSlot} was missed with pending txs, jumped to next slot`);
-                        }
-                        this.unfilledSlotFirstSeen = undefined;
-                    }
-                    return;
-                }
-            }
-            // Fallback: warp when the dateProvider time has passed the next slot timestamp.
-            const currentTimestamp = this.dateProvider?.now() ?? Date.now();
-            if (currentTimestamp > nextSlotTimestamp * 1000) {
-                if (await this.warpToTimestamp(nextSlotTimestamp)) {
-                    this.logger.info(`Slot ${currentSlot} was missed, jumped to next slot`);
-                }
-            }
-        } catch  {
-            this.logger.error('mineIfSlotFilled failed');
-        }
-    }
-    /**
-   * Warps L1 to `timestamp`, unless L1 is already at or past it. Returns true when a warp actually
-   * happened, false when skipped or on error. Callers use the return value to gate success logs.
-   */ async warpToTimestamp(timestamp) {
-        try {
-            // Anvil rejects evm_setNextBlockTimestamp values <= the current block's timestamp. The two
-            // watcher loops can race and pick targets a fraction of a second apart; skip here rather than
-            // letting the second one error out noisily.
-            const lastTimestamp = await this.cheatcodes.lastBlockTimestamp();
-            if (timestamp <= lastTimestamp) {
-                return false;
-            }
-            await this.cheatcodes.warp(timestamp, {
-                resetBlockInterval: true
-            });
-            return true;
-        } catch (e) {
-            this.logger.error(`Failed to warp to timestamp ${timestamp}: ${e}`);
-            return false;
-        }
-    }
-}

package/src/testing/anvil_test_watcher.ts

@@ -1,273 +0,0 @@
-import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
-import type { ViemClient } from '@aztec/ethereum/types';
-import { SlotNumber } from '@aztec/foundation/branded-types';
-import type { EthAddress } from '@aztec/foundation/eth-address';
-import { type Logger, createLogger } from '@aztec/foundation/log';
-import { RunningPromise } from '@aztec/foundation/running-promise';
-import type { TestDateProvider } from '@aztec/foundation/timer';
-import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
-
-import { type GetContractReturnType, getAddress, getContract } from 'viem';
-
-export type AnvilTestWatcherOpts = {
-  isLocalNetwork?: boolean;
-  isMarkingAsProven?: boolean;
-};
-
-/**
- * Represents a watcher for a rollup contract.
- *
- * It started on a network like anvil where time traveling is allowed, and auto-mine is turned on
- * it will periodically check if the current slot have already been filled, e.g., there was an L2
- * block within the slot. And if so, it will time travel into the next slot.
- */
-export class AnvilTestWatcher {
-  private isLocalNetwork;
-  private isMarkingAsProven;
-
-  private rollup: GetContractReturnType<typeof RollupAbi, ViemClient>;
-  private rollupCheatCodes: RollupCheatCodes;
-  private l2SlotDuration!: number;
-
-  private filledRunningPromise?: RunningPromise;
-  private syncDateProviderPromise?: RunningPromise;
-  private markingAsProvenRunningPromise?: RunningPromise;
-
-  private logger: Logger = createLogger(`aztecjs:utils:watcher`);
-
-  // Optional callback to check if there are pending txs in the mempool.
-  private getPendingTxCount?: () => Promise<number>;
-
-  // Optional callback to check if the sequencer is actively building a block.
-  private isSequencerBuilding?: () => boolean;
-
-  // Tracks when we first observed the current unfilled slot with pending txs (real wall time).
-  private unfilledSlotFirstSeen?: { slot: number; realTime: number };
-
-  // Latest target slot for which the proposer has built a block destined for L1 but which has
-  // not yet been committed. Set by the proposer-pipelining hook from `block-proposed` events so
-  // the watcher can advance L1 (and the injected date provider) to the target slot ahead of the
-  // publisher's `sendRequestsAt` sleep, instead of waiting a full wall-clock slot.
-  private proposedTargetSlot?: number;
-
-  constructor(
-    private cheatcodes: EthCheatCodes,
-    rollupAddress: EthAddress,
-    l1Client: ViemClient,
-    private dateProvider?: TestDateProvider,
-    opts: AnvilTestWatcherOpts = {},
-  ) {
-    this.rollup = getContract({
-      address: getAddress(rollupAddress.toString()),
-      abi: RollupAbi,
-      client: l1Client,
-    });
-
-    this.rollupCheatCodes = new RollupCheatCodes(this.cheatcodes, {
-      rollupAddress,
-    });
-
-    this.isLocalNetwork = opts.isLocalNetwork ?? false;
-    this.isMarkingAsProven = opts.isMarkingAsProven ?? true;
-
-    this.logger.debug(`Watcher created for rollup at ${rollupAddress}`);
-  }
-
-  setIsMarkingAsProven(isMarkingAsProven: boolean) {
-    this.logger.warn(`Watcher is now ${isMarkingAsProven ? 'marking' : 'not marking'} blocks as proven`);
-    this.isMarkingAsProven = isMarkingAsProven;
-  }
-
-  setisLocalNetwork(isLocalNetwork: boolean) {
-    this.isLocalNetwork = isLocalNetwork;
-  }
-
-  /** Sets a callback to check for pending txs, used to skip unfilled slots faster when txs are waiting. */
-  setGetPendingTxCount(fn: () => Promise<number>) {
-    this.getPendingTxCount = fn;
-  }
-
-  /** Sets a callback to check if the sequencer is actively building, to avoid warping while it works. */
-  setIsSequencerBuilding(fn: () => boolean) {
-    this.isSequencerBuilding = fn;
-  }
-
-  /**
-   * Records the target slot for which the proposer has built a block destined for L1. Used by
-   * the local-network watcher to fast-forward L1 (and the injected date provider) ahead of the
-   * pipelined publisher's `sendRequestsAt` sleep so it ends promptly instead of waiting a full
-   * wall-clock slot. Only ratchets up — late warps for stale slots are no-ops.
-   */
-  setProposedTargetSlot(slot: number) {
-    if (this.proposedTargetSlot === undefined || slot > this.proposedTargetSlot) {
-      this.proposedTargetSlot = slot;
-    }
-  }
-
-  async start() {
-    if (this.filledRunningPromise) {
-      throw new Error('Watcher already watching for filled slot');
-    }
-
-    const config = await this.rollupCheatCodes.getConfig();
-    this.l2SlotDuration = config.slotDuration;
-
-    // If auto mining is not supported (e.g., we are on a real network), then we
-    // will simple do nothing. But if on an anvil or the like, this make sure that
-    // the local network and tests don't break because time is frozen and we never get to
-    // the next slot.
-    const isAutoMining = await this.cheatcodes.isAutoMining();
-
-    if (isAutoMining) {
-      this.filledRunningPromise = new RunningPromise(() => this.warpTimeIfNeeded(), this.logger, 200);
-      this.filledRunningPromise.start();
-      this.syncDateProviderPromise = new RunningPromise(() => this.syncDateProviderToL1IfBehind(), this.logger, 200);
-      this.syncDateProviderPromise.start();
-      this.markingAsProvenRunningPromise = new RunningPromise(() => this.markAsProven(), this.logger, 200);
-      this.markingAsProvenRunningPromise.start();
-      this.logger.info(`Watcher started for rollup at ${this.rollup.address}`);
-    } else {
-      this.logger.info(`Watcher not started because not auto mining`);
-    }
-  }
-
-  async stop() {
-    await this.filledRunningPromise?.stop();
-    await this.syncDateProviderPromise?.stop();
-    await this.markingAsProvenRunningPromise?.stop();
-  }
-
-  async trigger() {
-    await this.filledRunningPromise?.trigger();
-    await this.syncDateProviderPromise?.trigger();
-    await this.markingAsProvenRunningPromise?.trigger();
-  }
-
-  async markAsProven() {
-    if (!this.isMarkingAsProven) {
-      return;
-    }
-    await this.rollupCheatCodes.markAsProven();
-  }
-
-  async syncDateProviderToL1IfBehind() {
-    // this doesn't apply to the local network, because we don't have a date provider in the local network
-    if (!this.dateProvider) {
-      return;
-    }
-
-    const l1Time = (await this.cheatcodes.lastBlockTimestamp()) * 1000;
-    const wallTime = this.dateProvider.now();
-    if (l1Time > wallTime) {
-      this.logger.warn(`L1 is ahead of wall time. Syncing wall time to L1 time`);
-      this.dateProvider.setTime(l1Time);
-    } else if (l1Time + Number(this.l2SlotDuration) * 1000 < wallTime) {
-      // Warp L1 to the slot boundary at-or-before wall time. Rounding to a slot boundary (rather than
-      // `ceil(wallTime / 1000)`) keeps this loop's target aligned with `warpTimeIfNeeded`'s
-      // `nextSlotTimestamp` target, avoiding a race where the two loops pick timestamps a fraction of
-      // a second apart and one of them is then rejected by anvil as non-monotonic.
-      const wallSec = Math.floor(wallTime / 1000);
-      const targetSlot = await this.rollup.read.getSlotAt([BigInt(wallSec)]);
-      const targetTimestamp = Number(await this.rollup.read.getTimestampForSlot([targetSlot]));
-      this.logger.warn(`L1 is more than 1 L2 slot behind wall time. Warping to slot ${targetSlot} boundary`);
-      await this.warpToTimestamp(targetTimestamp);
-    }
-  }
-
-  async warpTimeIfNeeded() {
-    try {
-      const currentSlot = SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot());
-      const pendingCheckpointNumber = await this.rollup.read.getPendingCheckpointNumber();
-      const checkpointLog = await this.rollup.read.getCheckpoint([pendingCheckpointNumber]);
-      const nextSlot = SlotNumber(currentSlot + 1);
-      const nextSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([BigInt(nextSlot)]));
-
-      if (BigInt(currentSlot) === checkpointLog.slotNumber) {
-        // The current slot has been filled, we should jump to the next slot.
-        if (await this.warpToTimestamp(nextSlotTimestamp)) {
-          this.logger.info(`Slot ${currentSlot} was filled, jumped to next slot`);
-        }
-        return;
-      }
-
-      // If we are not in local network, we don't need to warp time
-      if (!this.isLocalNetwork) {
-        return;
-      }
-
-      // Pipelined-publish shortcut: if the proposer has built a block destined for a slot
-      // beyond the current L1 slot, fast-forward L1 to that slot's timestamp so the publisher's
-      // `sendRequestsAt(targetSlot)` sleep ends and the multicall mines inside the target slot.
-      // Without this, the publisher waits up to a full real-time slot for wall clock to catch up.
-      if (this.proposedTargetSlot !== undefined && this.proposedTargetSlot > currentSlot) {
-        const targetSlotTimestamp = Number(
-          await this.rollup.read.getTimestampForSlot([BigInt(this.proposedTargetSlot)]),
-        );
-        if (await this.warpToTimestamp(targetSlotTimestamp)) {
-          this.logger.info(`Warped L1 to target slot ${this.proposedTargetSlot} for pipelined publish`);
-        }
-        return;
-      }
-
-      // If there are pending txs and the sequencer missed them, warp quickly (after a 2s real-time debounce) so the
-      // sequencer can retry in the next slot. Without this, we'd have to wait a full real-time slot duration (~36s) for
-      // the dateProvider to catch up to the next slot timestamp. We skip the warp if the sequencer is actively building
-      // to avoid invalidating its in-progress work.
-      if (this.getPendingTxCount) {
-        const pendingTxs = await this.getPendingTxCount();
-        if (pendingTxs > 0) {
-          if (this.isSequencerBuilding?.()) {
-            this.unfilledSlotFirstSeen = undefined;
-            return;
-          }
-
-          const realNow = Date.now();
-          if (!this.unfilledSlotFirstSeen || this.unfilledSlotFirstSeen.slot !== currentSlot) {
-            this.unfilledSlotFirstSeen = { slot: currentSlot, realTime: realNow };
-            return;
-          }
-
-          if (realNow - this.unfilledSlotFirstSeen.realTime > 2000) {
-            if (await this.warpToTimestamp(nextSlotTimestamp)) {
-              this.logger.info(`Slot ${currentSlot} was missed with pending txs, jumped to next slot`);
-            }
-            this.unfilledSlotFirstSeen = undefined;
-          }
-
-          return;
-        }
-      }
-
-      // Fallback: warp when the dateProvider time has passed the next slot timestamp.
-      const currentTimestamp = this.dateProvider?.now() ?? Date.now();
-      if (currentTimestamp > nextSlotTimestamp * 1000) {
-        if (await this.warpToTimestamp(nextSlotTimestamp)) {
-          this.logger.info(`Slot ${currentSlot} was missed, jumped to next slot`);
-        }
-      }
-    } catch {
-      this.logger.error('mineIfSlotFilled failed');
-    }
-  }
-
-  /**
-   * Warps L1 to `timestamp`, unless L1 is already at or past it. Returns true when a warp actually
-   * happened, false when skipped or on error. Callers use the return value to gate success logs.
-   */
-  private async warpToTimestamp(timestamp: number): Promise<boolean> {
-    try {
-      // Anvil rejects evm_setNextBlockTimestamp values <= the current block's timestamp. The two
-      // watcher loops can race and pick targets a fraction of a second apart; skip here rather than
-      // letting the second one error out noisily.
-      const lastTimestamp = await this.cheatcodes.lastBlockTimestamp();
-      if (timestamp <= lastTimestamp) {
-        return false;
-      }
-      await this.cheatcodes.warp(timestamp, { resetBlockInterval: true });
-      return true;
-    } catch (e) {
-      this.logger.error(`Failed to warp to timestamp ${timestamp}: ${e}`);
-      return false;
-    }
-  }
-}