@aztec/aztec 0.0.1-commit.f5d02921e → 0.0.1-commit.f7ea82942

package/dest/testing/anvil_test_watcher.js

@@ -14,6 +14,7 @@ import { getAddress, getContract } from 'viem';
     cheatcodes;
     dateProvider;
     isLocalNetwork;
+    isMarkingAsProven;
     rollup;
     rollupCheatCodes;
     l2SlotDuration;
@@ -21,19 +22,16 @@ import { getAddress, getContract } from 'viem';
     syncDateProviderPromise;
     markingAsProvenRunningPromise;
     logger;
-    isMarkingAsProven;
     // 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;
-    constructor(cheatcodes, rollupAddress, l1Client, dateProvider){
+    constructor(cheatcodes, rollupAddress, l1Client, dateProvider, opts = {}){
         this.cheatcodes = cheatcodes;
         this.dateProvider = dateProvider;
-        this.isLocalNetwork = false;
         this.logger = createLogger(`aztecjs:utils:watcher`);
-        this.isMarkingAsProven = true;
         this.rollup = getContract({
             address: getAddress(rollupAddress.toString()),
             abi: RollupAbi,
@@ -42,6 +40,8 @@ import { getAddress, getContract } from 'viem';
         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) {
@@ -107,8 +107,19 @@ import { getAddress, getContract } from 'viem';
             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) {
-            this.logger.warn(`L1 is more than 1 L2 slot behind wall time. Warping to wall time`);
-            await this.cheatcodes.warp(Math.ceil(wallTime / 1000));
+            // 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() {
@@ -124,8 +135,9 @@ import { getAddress, getContract } from 'viem';
             ]));
             if (BigInt(currentSlot) === checkpointLog.slotNumber) {
                 // The current slot has been filled, we should jump to the next slot.
-                await this.warpToTimestamp(nextSlotTimestamp);
-                this.logger.info(`Slot ${currentSlot} was filled, jumped to 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
@@ -152,9 +164,10 @@ import { getAddress, getContract } from 'viem';
                         return;
                     }
                     if (realNow - this.unfilledSlotFirstSeen.realTime > 2000) {
-                        await this.warpToTimestamp(nextSlotTimestamp);
+                        if (await this.warpToTimestamp(nextSlotTimestamp)) {
+                            this.logger.info(`Slot ${currentSlot} was missed with pending txs, jumped to next slot`);
+                        }
                         this.unfilledSlotFirstSeen = undefined;
-                        this.logger.info(`Slot ${currentSlot} was missed with pending txs, jumped to next slot`);
                     }
                     return;
                 }
@@ -162,20 +175,33 @@ import { getAddress, getContract } from 'viem';
             // Fallback: warp when the dateProvider time has passed the next slot timestamp.
             const currentTimestamp = this.dateProvider?.now() ?? Date.now();
             if (currentTimestamp > nextSlotTimestamp * 1000) {
-                await this.warpToTimestamp(nextSlotTimestamp);
-                this.logger.info(`Slot ${currentSlot} was missed, jumped to next slot`);
+                if (await this.warpToTimestamp(nextSlotTimestamp)) {
+                    this.logger.info(`Slot ${currentSlot} was missed, jumped to next slot`);
+                }
             }
         } catch  {
             this.logger.error('mineIfSlotFilled failed');
         }
     }
-    async warpToTimestamp(timestamp) {
+    /**
+   * 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/dest/testing/cheat_codes.d.ts

@@ -1,7 +1,6 @@
 import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
 import type { DateProvider } from '@aztec/foundation/timer';
-import type { SequencerClient } from '@aztec/sequencer-client';
-import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import type { AztecNode, AztecNodeDebug } from '@aztec/stdlib/interfaces/client';
 /**
  * A class that provides utility functions for interacting with the chain.
  * @deprecated There used to be 3 kinds of cheat codes: eth, rollup and aztec. We have nuked the Aztec ones because
@@ -13,6 +12,7 @@ export declare class CheatCodes {
     eth: EthCheatCodes;
     /** Cheat codes for the Aztec Rollup contract on L1. */
     rollup: RollupCheatCodes;
+    private logger;
     constructor(
     /** Cheat codes for L1.*/
     eth: EthCheatCodes, 
@@ -21,23 +21,19 @@ export declare class CheatCodes {
     static create(rpcUrls: string[], node: AztecNode, dateProvider: DateProvider): Promise<CheatCodes>;
     /**
      * Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
-     * the target timestamp. L2 timestamp is not advanced exactly to the target timestamp because it is determined
-     * by the slot number, which advances in fixed intervals.
-     * This is useful for testing time-dependent contract behavior.
-     * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
-     * @param node - The Aztec node used to query if a new block has been mined.
+     * the target timestamp. If the target timestamp falls within the current L2 slot (which already has a block),
+     * the timestamp is automatically adjusted forward to the start of the next slot so that `mineBlock()` succeeds.
+     * @param node - The Aztec node used to force an empty block to be mined.
      * @param targetTimestamp - The target timestamp to warp to (in seconds)
      */
-    warpL2TimeAtLeastTo(sequencerClient: SequencerClient, node: AztecNode, targetTimestamp: bigint | number): Promise<void>;
+    warpL2TimeAtLeastTo(node: AztecNodeDebug, targetTimestamp: bigint | number): Promise<void>;
     /**
      * Warps the L1 timestamp forward by a specified duration and mines an L2 block that advances the L2 timestamp at
-     * least by the duration. L2 timestamp is not advanced exactly by the duration because it is determined by the slot
-     * number, which advances in fixed intervals.
-     * This is useful for testing time-dependent contract behavior.
-     * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
-     * @param node - The Aztec node used to query if a new block has been mined.
+     * least by the duration. If the duration is too short to cross an L2 slot boundary, the warp is automatically
+     * extended to the start of the next slot so that `mineBlock()` succeeds.
+     * @param node - The Aztec node used to force an empty block to be mined.
      * @param duration - The duration to advance time by (in seconds)
      */
-    warpL2TimeAtLeastBy(sequencerClient: SequencerClient, node: AztecNode, duration: bigint | number): Promise<void>;
+    warpL2TimeAtLeastBy(node: AztecNodeDebug, duration: bigint | number): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILHFCQUFhLFVBQVU7SUFFbkIseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCO0lBSmpDO0lBQ0UseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCLEVBQzdCO0lBRUosT0FBYSxNQUFNLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBT3ZHO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDRyxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsZUFBZSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsZUFBZSxFQUFFLE1BQU0sR0FBRyxNQUFNLGlCQXVCNUc7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxlQUFlLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLE1BQU0saUJBSXJHO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFakY7Ozs7O0dBS0c7QUFDSCxxQkFBYSxVQUFVO0lBSW5CLHlCQUF5QjtJQUNsQixHQUFHLEVBQUUsYUFBYTtJQUN6Qix1REFBdUQ7SUFDaEQsTUFBTSxFQUFFLGdCQUFnQjtJQU5qQyxPQUFPLENBQUMsTUFBTSxDQUF1QztJQUVyRDtJQUNFLHlCQUF5QjtJQUNsQixHQUFHLEVBQUUsYUFBYTtJQUN6Qix1REFBdUQ7SUFDaEQsTUFBTSxFQUFFLGdCQUFnQixFQUM3QjtJQUVKLE9BQWEsTUFBTSxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLFlBQVksRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQU92RztJQUVEOzs7Ozs7T0FNRztJQUNHLG1CQUFtQixDQUFDLElBQUksRUFBRSxjQUFjLEVBQUUsZUFBZSxFQUFFLE1BQU0sR0FBRyxNQUFNLGlCQTRCL0U7SUFFRDs7Ozs7O09BTUc7SUFDRyxtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsY0FBYyxFQUFFLFFBQVEsRUFBRSxNQUFNLEdBQUcsTUFBTSxpQkFReEU7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/testing/cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,UAAU;IAEnB,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;IAJjC;IACE,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB,EAC7B;IAEJ,OAAa,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,CAOvG;IAED;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,iBAuB5G;IAED;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,iBAIrG;CACF"}
+{"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/testing/cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjF;;;;;GAKG;AACH,qBAAa,UAAU;IAInB,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;IANjC,OAAO,CAAC,MAAM,CAAuC;IAErD;IACE,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB,EAC7B;IAEJ,OAAa,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,CAOvG;IAED;;;;;;OAMG;IACG,mBAAmB,CAAC,IAAI,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,iBA4B/E;IAED;;;;;;OAMG;IACG,mBAAmB,CAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,iBAQxE;CACF"}

package/dest/testing/cheat_codes.js

@@ -1,5 +1,6 @@
 import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
-import { retryUntil } from '@aztec/foundation/retry';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { createLogger } from '@aztec/foundation/log';
 /**
  * A class that provides utility functions for interacting with the chain.
  * @deprecated There used to be 3 kinds of cheat codes: eth, rollup and aztec. We have nuked the Aztec ones because
@@ -8,9 +9,11 @@ import { retryUntil } from '@aztec/foundation/retry';
  */ export class CheatCodes {
     eth;
     rollup;
+    logger;
     constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for the Aztec Rollup contract on L1. */ rollup){
         this.eth = eth;
         this.rollup = rollup;
+        this.logger = createLogger('aztecjs:cheat_codes');
     }
     static async create(rpcUrls, node, dateProvider) {
         const ethCheatCodes = new EthCheatCodes(rpcUrls, dateProvider);
@@ -19,44 +22,43 @@ import { retryUntil } from '@aztec/foundation/retry';
     }
     /**
    * Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
-   * the target timestamp. L2 timestamp is not advanced exactly to the target timestamp because it is determined
-   * by the slot number, which advances in fixed intervals.
-   * This is useful for testing time-dependent contract behavior.
-   * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
-   * @param node - The Aztec node used to query if a new block has been mined.
+   * the target timestamp. If the target timestamp falls within the current L2 slot (which already has a block),
+   * the timestamp is automatically adjusted forward to the start of the next slot so that `mineBlock()` succeeds.
+   * @param node - The Aztec node used to force an empty block to be mined.
    * @param targetTimestamp - The target timestamp to warp to (in seconds)
-   */ async warpL2TimeAtLeastTo(sequencerClient, node, targetTimestamp) {
-        const currentL2BlockNumber = await node.getBlockNumber();
-        // We warp the L1 timestamp
-        await this.eth.warp(targetTimestamp, {
+   */ async warpL2TimeAtLeastTo(node, targetTimestamp) {
+        const targetBigInt = BigInt(targetTimestamp);
+        const currentTimestamp = BigInt(await this.eth.lastBlockTimestamp());
+        if (targetBigInt <= currentTimestamp) {
+            throw new Error(`warpL2TimeAtLeastTo: target timestamp ${targetBigInt} is not in the future (current L1 timestamp is ${currentTimestamp}).`);
+        }
+        const currentSlot = await this.rollup.getSlot();
+        const targetSlot = await this.rollup.getSlotAt(targetBigInt);
+        let effectiveTimestamp = targetBigInt;
+        if (targetSlot <= currentSlot) {
+            // Target lands in the same (or earlier) slot — auto-adjust to the next slot's start.
+            const nextSlot = SlotNumber(currentSlot + 1);
+            const nextSlotTimestamp = await this.rollup.getTimestampForSlot(nextSlot);
+            this.logger.warn(`warpL2TimeAtLeastTo: target timestamp ${targetBigInt} falls in current slot ${currentSlot}. ` + `Auto-adjusting to start of slot ${nextSlot} at timestamp ${nextSlotTimestamp}.`);
+            effectiveTimestamp = nextSlotTimestamp;
+        }
+        await this.eth.warp(effectiveTimestamp, {
             resetBlockInterval: true
         });
-        // Wait until an L2 block is mined
-        const sequencer = sequencerClient.getSequencer();
-        const minTxsPerBlock = sequencer.getConfig().minTxsPerBlock;
-        sequencer.updateConfig({
-            minTxsPerBlock: 0
-        });
-        await retryUntil(async ()=>{
-            const newL2BlockNumber = await node.getBlockNumber();
-            return newL2BlockNumber > currentL2BlockNumber;
-        }, 'new block after warping L2 time', 36, 1);
-        // Restore original minTxsPerBlock
-        sequencer.updateConfig({
-            minTxsPerBlock
-        });
+        await node.mineBlock();
     }
     /**
    * Warps the L1 timestamp forward by a specified duration and mines an L2 block that advances the L2 timestamp at
-   * least by the duration. L2 timestamp is not advanced exactly by the duration because it is determined by the slot
-   * number, which advances in fixed intervals.
-   * This is useful for testing time-dependent contract behavior.
-   * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
-   * @param node - The Aztec node used to query if a new block has been mined.
+   * least by the duration. If the duration is too short to cross an L2 slot boundary, the warp is automatically
+   * extended to the start of the next slot so that `mineBlock()` succeeds.
+   * @param node - The Aztec node used to force an empty block to be mined.
    * @param duration - The duration to advance time by (in seconds)
-   */ async warpL2TimeAtLeastBy(sequencerClient, node, duration) {
+   */ async warpL2TimeAtLeastBy(node, duration) {
+        if (BigInt(duration) <= 0n) {
+            throw new Error(`warpL2TimeAtLeastBy: duration must be positive, got ${duration} seconds.`);
+        }
         const currentTimestamp = await this.eth.lastBlockTimestamp();
         const targetTimestamp = BigInt(currentTimestamp) + BigInt(duration);
-        await this.warpL2TimeAtLeastTo(sequencerClient, node, targetTimestamp);
+        await this.warpL2TimeAtLeastTo(node, targetTimestamp);
     }
 }

package/dest/testing/index.d.ts

@@ -1,6 +1,6 @@
-export { AnvilTestWatcher } from './anvil_test_watcher.js';
+export { AnvilTestWatcher, type AnvilTestWatcherOpts } from './anvil_test_watcher.js';
 export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
 export { CheatCodes } from './cheat_codes.js';
 export { EpochTestSettler } from './epoch_test_settler.js';
 export { getTokenAllowedSetupFunctions } from './token_allowed_setup.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNELE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDM0QsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sMEJBQTBCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxLQUFLLG9CQUFvQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDdEYsT0FBTyxFQUFFLGFBQWEsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQyJ9

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec",
-  "version": "0.0.1-commit.f5d02921e",
+  "version": "0.0.1-commit.f7ea82942",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -28,38 +28,38 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.f5d02921e",
-    "@aztec/archiver": "0.0.1-commit.f5d02921e",
-    "@aztec/aztec-node": "0.0.1-commit.f5d02921e",
-    "@aztec/aztec.js": "0.0.1-commit.f5d02921e",
-    "@aztec/bb-prover": "0.0.1-commit.f5d02921e",
-    "@aztec/bb.js": "0.0.1-commit.f5d02921e",
-    "@aztec/blob-client": "0.0.1-commit.f5d02921e",
-    "@aztec/bot": "0.0.1-commit.f5d02921e",
-    "@aztec/builder": "0.0.1-commit.f5d02921e",
-    "@aztec/cli": "0.0.1-commit.f5d02921e",
-    "@aztec/constants": "0.0.1-commit.f5d02921e",
-    "@aztec/entrypoints": "0.0.1-commit.f5d02921e",
-    "@aztec/ethereum": "0.0.1-commit.f5d02921e",
-    "@aztec/foundation": "0.0.1-commit.f5d02921e",
-    "@aztec/kv-store": "0.0.1-commit.f5d02921e",
-    "@aztec/l1-artifacts": "0.0.1-commit.f5d02921e",
-    "@aztec/node-lib": "0.0.1-commit.f5d02921e",
-    "@aztec/noir-contracts.js": "0.0.1-commit.f5d02921e",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.f5d02921e",
-    "@aztec/p2p": "0.0.1-commit.f5d02921e",
-    "@aztec/p2p-bootstrap": "0.0.1-commit.f5d02921e",
-    "@aztec/protocol-contracts": "0.0.1-commit.f5d02921e",
-    "@aztec/prover-client": "0.0.1-commit.f5d02921e",
-    "@aztec/prover-node": "0.0.1-commit.f5d02921e",
-    "@aztec/pxe": "0.0.1-commit.f5d02921e",
-    "@aztec/sequencer-client": "0.0.1-commit.f5d02921e",
-    "@aztec/stdlib": "0.0.1-commit.f5d02921e",
-    "@aztec/telemetry-client": "0.0.1-commit.f5d02921e",
-    "@aztec/txe": "0.0.1-commit.f5d02921e",
-    "@aztec/validator-ha-signer": "0.0.1-commit.f5d02921e",
-    "@aztec/wallets": "0.0.1-commit.f5d02921e",
-    "@aztec/world-state": "0.0.1-commit.f5d02921e",
+    "@aztec/accounts": "0.0.1-commit.f7ea82942",
+    "@aztec/archiver": "0.0.1-commit.f7ea82942",
+    "@aztec/aztec-node": "0.0.1-commit.f7ea82942",
+    "@aztec/aztec.js": "0.0.1-commit.f7ea82942",
+    "@aztec/bb-prover": "0.0.1-commit.f7ea82942",
+    "@aztec/bb.js": "0.0.1-commit.f7ea82942",
+    "@aztec/blob-client": "0.0.1-commit.f7ea82942",
+    "@aztec/bot": "0.0.1-commit.f7ea82942",
+    "@aztec/builder": "0.0.1-commit.f7ea82942",
+    "@aztec/cli": "0.0.1-commit.f7ea82942",
+    "@aztec/constants": "0.0.1-commit.f7ea82942",
+    "@aztec/entrypoints": "0.0.1-commit.f7ea82942",
+    "@aztec/ethereum": "0.0.1-commit.f7ea82942",
+    "@aztec/foundation": "0.0.1-commit.f7ea82942",
+    "@aztec/kv-store": "0.0.1-commit.f7ea82942",
+    "@aztec/l1-artifacts": "0.0.1-commit.f7ea82942",
+    "@aztec/node-lib": "0.0.1-commit.f7ea82942",
+    "@aztec/noir-contracts.js": "0.0.1-commit.f7ea82942",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.f7ea82942",
+    "@aztec/p2p": "0.0.1-commit.f7ea82942",
+    "@aztec/p2p-bootstrap": "0.0.1-commit.f7ea82942",
+    "@aztec/protocol-contracts": "0.0.1-commit.f7ea82942",
+    "@aztec/prover-client": "0.0.1-commit.f7ea82942",
+    "@aztec/prover-node": "0.0.1-commit.f7ea82942",
+    "@aztec/pxe": "0.0.1-commit.f7ea82942",
+    "@aztec/sequencer-client": "0.0.1-commit.f7ea82942",
+    "@aztec/stdlib": "0.0.1-commit.f7ea82942",
+    "@aztec/telemetry-client": "0.0.1-commit.f7ea82942",
+    "@aztec/txe": "0.0.1-commit.f7ea82942",
+    "@aztec/validator-ha-signer": "0.0.1-commit.f7ea82942",
+    "@aztec/wallets": "0.0.1-commit.f7ea82942",
+    "@aztec/world-state": "0.0.1-commit.f7ea82942",
     "@iarna/toml": "^2.2.5",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",

package/scripts/aztec.sh

@@ -23,10 +23,14 @@ case $cmd in
     # Attempt to compile, no-op if there are no changes
     node --no-warnings "$script_dir/../dest/bin/index.js" compile
 
-    export LOG_LEVEL="${LOG_LEVEL:-"error;trace:contract"}"
+    export LOG_LEVEL="${LOG_LEVEL:-"error;trace:^contract:"}"
     aztec start --txe --port 8081 &
     server_pid=$!
     trap 'kill $server_pid &>/dev/null || true' EXIT
+    if ! command -v nc &>/dev/null; then
+      echo "Error: 'nc' (netcat) is required but not installed." >&2
+      exit 1
+    fi
     while ! nc -z 127.0.0.1 8081 &>/dev/null; do sleep 0.2; done
     export NARGO_FOREIGN_CALL_TIMEOUT=300000
     nargo test --silence-warnings --oracle-resolver http://127.0.0.1:8081 --test-threads 16 "$@"

package/src/cli/aztec_start_action.ts

@@ -7,7 +7,7 @@ import {
 } from '@aztec/foundation/json-rpc/server';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import type { ChainConfig } from '@aztec/stdlib/config';
-import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
+import { AztecNodeAdminApiSchema, AztecNodeApiSchema, AztecNodeDebugApiSchema } from '@aztec/stdlib/interfaces/client';
 import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import { getVersioningMiddleware } from '@aztec/stdlib/versioning';
 import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
@@ -27,8 +27,7 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
   let config: ChainConfig | undefined = undefined;
 
   if (options.localNetwork) {
-    const localNetwork = extractNamespacedOptions(options, 'local-network');
-    localNetwork.testAccounts = true;
+    const localNetwork = extractNamespacedOptions(options, 'localNetwork');
     userLog(`${splash}\n${github}\n\n`);
     userLog(`Setting up Aztec local network ${packageVersion ?? 'unknown'}, please stand by...`);
 
@@ -51,6 +50,7 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
     signalHandlers.push(stop);
     services.node = [node, AztecNodeApiSchema];
     adminServices.node = [node, AztecNodeAdminApiSchema];
+    services.nodeDebug = [node, AztecNodeDebugApiSchema];
   } else {
     // Route --prover-node through startNode
     if (options.proverNode && !options.node) {
@@ -61,6 +61,9 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
       const { startNode } = await import('./cmds/start_node.js');
       const networkName = getActiveNetworkName(options.network);
       ({ config } = await startNode(options, signalHandlers, services, adminServices, userLog, networkName));
+      if (options.nodeDebug && services.node) {
+        services.nodeDebug = [services.node[0], AztecNodeDebugApiSchema];
+      }
     } else if (options.bot) {
       const { startBot } = await import('./cmds/start_bot.js');
       await startBot(options, signalHandlers, services, userLog);

package/src/cli/aztec_start_options.ts

@@ -36,7 +36,7 @@ export interface AztecStartOption {
   parseVal?: (val: string) => any;
 }
 
-export const getOptions = (namespace: string, configMappings: Record<string, ConfigMapping>) => {
+export const getOptions = (namespace: string, configMappings: Record<string, ConfigMapping<unknown>>) => {
   const options: AztecStartOption[] = [];
   for (const [key, { env, defaultValue: def, parseEnv, description, printDefault, fallback }] of Object.entries(
     configMappings,
@@ -58,7 +58,11 @@ export const getOptions = (namespace: string, configMappings: Record<string, Con
   return options;
 };
 
-const configToFlag = (flag: string, configMapping: ConfigMapping, overrideDefaultValue?: any): AztecStartOption => {
+const configToFlag = (
+  flag: string,
+  configMapping: ConfigMapping<unknown>,
+  overrideDefaultValue?: any,
+): AztecStartOption => {
   if (!configMapping.isBoolean) {
     flag += ' <value>';
   }
@@ -125,6 +129,12 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
       defaultValue: DefaultMnemonic,
       env: 'MNEMONIC',
     },
+    {
+      flag: '--local-network.testAccounts',
+      description: 'Deploy test accounts on local network start',
+      env: 'TEST_ACCOUNTS',
+      ...booleanConfigHelper(true),
+    },
   ],
   API: [
     {
@@ -165,6 +175,13 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
       env: 'AZTEC_RESET_ADMIN_API_KEY',
       parseVal: val => val === 'true' || val === '1',
     },
+    {
+      flag: '--node-debug',
+      description: 'Expose debug endpoints (e.g. mineBlock) on the main RPC port',
+      defaultValue: false,
+      env: 'AZTEC_NODE_DEBUG',
+      parseVal: val => val === undefined || val === 'true' || val === '1',
+    },
     {
       flag: '--api-prefix <value>',
       description: 'Prefix for API routes on any service that is started',

package/src/cli/cmds/compile.ts

@@ -3,7 +3,7 @@ import type { LogFn } from '@aztec/foundation/log';
 
 import { execFileSync } from 'child_process';
 import type { Command } from 'commander';
-import { readFile, writeFile } from 'fs/promises';
+import { readFile } from 'fs/promises';
 import { join } from 'path';
 
 import { readArtifactFiles } from './utils/artifacts.js';
@@ -25,19 +25,6 @@ async function collectContractArtifacts(): Promise<string[]> {
   return files.filter(f => Array.isArray(f.content.functions)).map(f => f.filePath);
 }
 
-/** Strips the `__aztec_nr_internals__` prefix from function names in contract artifacts. */
-async function stripInternalPrefixes(artifactPaths: string[]): Promise<void> {
-  for (const path of artifactPaths) {
-    const artifact = JSON.parse(await readFile(path, 'utf-8'));
-    for (const fn of artifact.functions) {
-      if (typeof fn.name === 'string') {
-        fn.name = fn.name.replace(/^__aztec_nr_internals__/, '');
-      }
-    }
-    await writeFile(path, JSON.stringify(artifact, null, 2) + '\n');
-  }
-}
-
 /** Returns the set of package names that are contract crates in the current workspace. */
 async function getContractPackageNames(): Promise<Set<string>> {
   const contractNames = new Set<string>();
@@ -161,9 +148,6 @@ async function compileAztecContract(nargoArgs: string[], log: LogFn): Promise<vo
     log('Postprocessing contracts...');
     const bbArgs = artifacts.flatMap(a => ['-i', a]);
     await run(bb, ['aztec_process', ...bbArgs]);
-
-    // TODO: This should be part of bb aztec_process!
-    await stripInternalPrefixes(artifacts);
   }
 
   log('Compilation complete!');

package/src/cli/cmds/standby.ts

@@ -28,11 +28,11 @@ export async function computeExpectedGenesisRoot(config: GenesisStateConfig, use
 
   userLog(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
 
-  const { genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
+  const { genesisArchiveRoot, genesis } = await getGenesisValues(initialFundedAccounts);
 
   userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
 
-  return { genesisArchiveRoot, prefilledPublicData };
+  return { genesisArchiveRoot, genesis };
 }
 
 async function checkRollupCompatibility(

package/src/cli/cmds/start_archiver.ts

@@ -20,7 +20,13 @@ export async function startArchiver(
   const envConfig = getArchiverConfigFromEnv();
   const cliOptions = extractRelevantOptions<ArchiverConfig & DataStoreConfig & BlobClientConfig>(
     options,
-    { ...archiverConfigMappings, ...dataConfigMappings, ...blobClientConfigMapping },
+    {
+      // dataConfigMappings must come first: its l1Contracts only maps rollupAddress,
+      // while archiverConfigMappings (spread later) maps all L1 contract addresses.
+      ...dataConfigMappings,
+      ...archiverConfigMappings,
+      ...blobClientConfigMapping,
+    },
     'archiver',
   );
 

package/src/cli/cmds/start_node.ts

@@ -9,7 +9,11 @@ import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
 import type { LogFn } from '@aztec/foundation/log';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
-import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker';
+import {
+  ProvingJobConsumerSchema,
+  createProvingJobBrokerClient,
+  proverBrokerBackoff,
+} from '@aztec/prover-client/broker';
 import { type CliPXEOptions, type PXEConfig, allPxeConfigMappings } from '@aztec/pxe/config';
 import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
 import { P2PApiSchema, ProverNodeApiSchema, type ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
@@ -65,12 +69,8 @@ export async function startNode(
     if (nodeConfig.proverBrokerUrl) {
       // at 1TPS we'd enqueue ~1k chonk verifier proofs and ~1k AVM proofs immediately
       // set a lower connection limit such that we don't overload the server
-      // Keep retrying up to 30s
-      const fetch = makeTracedFetch(
-        [1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3],
-        false,
-        makeUndiciFetch(new Agent({ connections: 100 })),
-      );
+      // Retry indefinitely until the epoch proving times out and the chain reorgs
+      const fetch = makeTracedFetch(proverBrokerBackoff, false, makeUndiciFetch(new Agent({ connections: 100 })));
       broker = createProvingJobBrokerClient(nodeConfig.proverBrokerUrl, getVersions(nodeConfig), fetch);
     } else if (options.proverBroker) {
       ({ broker } = await startProverBroker(options, signalHandlers, services, userLog));
@@ -83,7 +83,7 @@ export async function startNode(
   await preloadCrsDataForVerifying(nodeConfig, userLog);
 
   const genesisConfig = getGenesisStateConfigEnvVars();
-  const { genesisArchiveRoot, prefilledPublicData } = await computeExpectedGenesisRoot(genesisConfig, userLog);
+  const { genesisArchiveRoot, genesis } = await computeExpectedGenesisRoot(genesisConfig, userLog);
 
   const followsCanonicalRollup =
     typeof nodeConfig.rollupVersion !== 'number' || (nodeConfig.rollupVersion as unknown as string) === 'canonical';
@@ -116,12 +116,10 @@ export async function startNode(
     );
   }
 
-  // TODO(#12272): will clean this up.
   nodeConfig = {
     ...nodeConfig,
     l1Contracts: {
       ...addresses,
-      slashFactoryAddress: nodeConfig.l1Contracts.slashFactoryAddress,
     },
     ...config,
   };
@@ -158,7 +156,7 @@ export async function startNode(
   const telemetry = await initTelemetryClient(telemetryConfig);
 
   // Create and start Aztec Node
-  const node = await createAztecNode(nodeConfig, { telemetry, proverBroker: broker }, { prefilledPublicData });
+  const node = await createAztecNode(nodeConfig, { telemetry, proverBroker: broker }, { genesis });
 
   // Add node and p2p to services list
   services.node = [node, AztecNodeApiSchema];

package/src/cli/cmds/start_prover_agent.ts

@@ -9,6 +9,7 @@ import {
   createProofStore,
   createProvingJobBrokerClient,
   proverAgentConfigMappings,
+  proverBrokerBackoff,
 } from '@aztec/prover-client/broker';
 import { getProverNodeAgentConfigFromEnv } from '@aztec/prover-node';
 import { ProverAgentApiSchema } from '@aztec/stdlib/interfaces/server';
@@ -45,12 +46,8 @@ export async function startProverAgent(
 
   await preloadCrsDataForServerSideProving(config, userLog);
 
-  const fetch = makeTracedFetch(
-    // retry connections every 3s, up to 30s before giving up
-    [1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3],
-    false,
-    makeUndiciFetch(new Agent({ connections: 10 })),
-  );
+  // Retry indefinitely until the epoch proving times out and the chain reorgs
+  const fetch = makeTracedFetch(proverBrokerBackoff, false, makeUndiciFetch(new Agent({ connections: 10 })));
   const broker = createProvingJobBrokerClient(config.proverBrokerUrl, getVersions(), fetch);
 
   const telemetry = await initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));