@aztec/aztec 0.0.1-commit.b1c78909e → 0.0.1-commit.b2a5d0dd1

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) {
-        const currentTimestamp = await this.eth.timestamp();
+   */ 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/epoch_test_settler.d.ts

@@ -16,4 +16,4 @@ export declare class EpochTestSettler {
     stop(): Promise<void>;
     handleEpochReadyToProve(epoch: EpochNumber): Promise<boolean>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2hfdGVzdF9zZXR0bGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9lcG9jaF90ZXN0X3NldHRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUFvQixNQUFNLHNCQUFzQixDQUFDO0FBQzVFLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBYyxNQUFNLGlDQUFpQyxDQUFDO0FBQy9FLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUdyRSxxQkFBYSxnQkFBZ0I7SUFPekIsT0FBTyxDQUFDLGFBQWE7SUFDckIsT0FBTyxDQUFDLEdBQUc7SUFDWCxPQUFPLENBQUMsT0FBTztJQVJqQixPQUFPLENBQUMsZ0JBQWdCLENBQW1CO0lBQzNDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBZTtJQUVwQyxZQUNFLFVBQVUsRUFBRSxhQUFhLEVBQ3pCLGFBQWEsRUFBRSxVQUFVLEVBQ2pCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLEdBQUcsRUFBRSxNQUFNLEVBQ1gsT0FBTyxFQUFFO1FBQUUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO1FBQUMsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFHeEU7SUFFSyxLQUFLLGtCQUlWO0lBRUssSUFBSSxrQkFFVDtJQUVLLHVCQUF1QixDQUFDLEtBQUssRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQXFDbEU7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2hfdGVzdF9zZXR0bGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9lcG9jaF90ZXN0X3NldHRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUFvQixNQUFNLHNCQUFzQixDQUFDO0FBQzVFLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBYyxNQUFNLGlDQUFpQyxDQUFDO0FBQy9FLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUdyRSxxQkFBYSxnQkFBZ0I7SUFPekIsT0FBTyxDQUFDLGFBQWE7SUFDckIsT0FBTyxDQUFDLEdBQUc7SUFDWCxPQUFPLENBQUMsT0FBTztJQVJqQixPQUFPLENBQUMsZ0JBQWdCLENBQW1CO0lBQzNDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBZTtJQUVwQyxZQUNFLFVBQVUsRUFBRSxhQUFhLEVBQ3pCLGFBQWEsRUFBRSxVQUFVLEVBQ2pCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLEdBQUcsRUFBRSxNQUFNLEVBQ1gsT0FBTyxFQUFFO1FBQUUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO1FBQUMsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFHeEU7SUFFSyxLQUFLLGtCQUlWO0lBRUssSUFBSSxrQkFFVDtJQUVLLHVCQUF1QixDQUFDLEtBQUssRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQW9DbEU7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"epoch_test_settler.d.ts","sourceRoot":"","sources":["../../src/testing/epoch_test_settler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,KAAK,WAAW,EAAc,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGrE,qBAAa,gBAAgB;IAOzB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;IARjB,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,YAAY,CAAC,CAAe;IAEpC,YACE,UAAU,EAAE,aAAa,EACzB,aAAa,EAAE,UAAU,EACjB,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EAGxE;IAEK,KAAK,kBAIV;IAEK,IAAI,kBAET;IAEK,uBAAuB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAqClE;CACF"}
+{"version":3,"file":"epoch_test_settler.d.ts","sourceRoot":"","sources":["../../src/testing/epoch_test_settler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,KAAK,WAAW,EAAc,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGrE,qBAAa,gBAAgB;IAOzB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;IARjB,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,YAAY,CAAC,CAAe;IAEpC,YACE,UAAU,EAAE,aAAa,EACzB,aAAa,EAAE,UAAU,EACjB,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EAGxE;IAEK,KAAK,kBAIV;IAEK,IAAI,kBAET;IAEK,uBAAuB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAoClE;CACF"}

package/dest/testing/epoch_test_settler.js

@@ -1,7 +1,7 @@
 import { RollupCheatCodes } from '@aztec/ethereum/test';
 import { SlotNumber } from '@aztec/foundation/branded-types';
 import { EpochMonitor } from '@aztec/prover-node';
-import { computeL2ToL1MembershipWitnessFromMessagesInEpoch } from '@aztec/stdlib/messaging';
+import { computeEpochOutHash } from '@aztec/stdlib/messaging';
 export class EpochTestSettler {
     l2BlockSource;
     log;
@@ -44,9 +44,8 @@ export class EpochTestSettler {
             }
             messagesInEpoch[checkpointIndex].push(block.body.txEffects.map((txEffect)=>txEffect.l2ToL1Msgs));
         }
-        const [firstMessage] = messagesInEpoch.flat(3);
-        if (firstMessage) {
-            const { root: outHash } = computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoch, firstMessage);
+        const outHash = computeEpochOutHash(messagesInEpoch);
+        if (!outHash.isZero()) {
             await this.rollupCheatCodes.insertOutbox(epoch, outHash.toBigInt());
         } else {
             this.log.info(`No L2 to L1 messages in epoch ${epoch}`);

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.b1c78909e",
+  "version": "0.0.1-commit.b2a5d0dd1",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -28,39 +28,38 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.b1c78909e",
-    "@aztec/archiver": "0.0.1-commit.b1c78909e",
-    "@aztec/aztec-faucet": "0.0.1-commit.b1c78909e",
-    "@aztec/aztec-node": "0.0.1-commit.b1c78909e",
-    "@aztec/aztec.js": "0.0.1-commit.b1c78909e",
-    "@aztec/bb-prover": "0.0.1-commit.b1c78909e",
-    "@aztec/bb.js": "0.0.1-commit.b1c78909e",
-    "@aztec/blob-client": "0.0.1-commit.b1c78909e",
-    "@aztec/bot": "0.0.1-commit.b1c78909e",
-    "@aztec/builder": "0.0.1-commit.b1c78909e",
-    "@aztec/cli": "0.0.1-commit.b1c78909e",
-    "@aztec/constants": "0.0.1-commit.b1c78909e",
-    "@aztec/entrypoints": "0.0.1-commit.b1c78909e",
-    "@aztec/ethereum": "0.0.1-commit.b1c78909e",
-    "@aztec/foundation": "0.0.1-commit.b1c78909e",
-    "@aztec/kv-store": "0.0.1-commit.b1c78909e",
-    "@aztec/l1-artifacts": "0.0.1-commit.b1c78909e",
-    "@aztec/node-lib": "0.0.1-commit.b1c78909e",
-    "@aztec/noir-contracts.js": "0.0.1-commit.b1c78909e",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b1c78909e",
-    "@aztec/p2p": "0.0.1-commit.b1c78909e",
-    "@aztec/p2p-bootstrap": "0.0.1-commit.b1c78909e",
-    "@aztec/protocol-contracts": "0.0.1-commit.b1c78909e",
-    "@aztec/prover-client": "0.0.1-commit.b1c78909e",
-    "@aztec/prover-node": "0.0.1-commit.b1c78909e",
-    "@aztec/pxe": "0.0.1-commit.b1c78909e",
-    "@aztec/sequencer-client": "0.0.1-commit.b1c78909e",
-    "@aztec/stdlib": "0.0.1-commit.b1c78909e",
-    "@aztec/telemetry-client": "0.0.1-commit.b1c78909e",
-    "@aztec/txe": "0.0.1-commit.b1c78909e",
-    "@aztec/validator-ha-signer": "0.0.1-commit.b1c78909e",
-    "@aztec/wallets": "0.0.1-commit.b1c78909e",
-    "@aztec/world-state": "0.0.1-commit.b1c78909e",
+    "@aztec/accounts": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/archiver": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/aztec-node": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/aztec.js": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/bb-prover": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/bb.js": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/blob-client": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/bot": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/builder": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/cli": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/constants": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/entrypoints": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/ethereum": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/foundation": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/kv-store": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/l1-artifacts": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/node-lib": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/noir-contracts.js": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/p2p": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/p2p-bootstrap": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/protocol-contracts": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/prover-client": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/prover-node": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/pxe": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/sequencer-client": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/stdlib": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/telemetry-client": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/txe": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/validator-ha-signer": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/wallets": "0.0.1-commit.b2a5d0dd1",
+    "@aztec/world-state": "0.0.1-commit.b2a5d0dd1",
     "@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_log"}"
+    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 { 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';
@@ -23,14 +23,13 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
   const signalHandlers: Array<() => Promise<void>> = [];
   const services: NamespacedApiHandlers = {};
   const adminServices: NamespacedApiHandlers = {};
+  const packageVersion = getPackageVersion();
   let config: ChainConfig | undefined = undefined;
 
   if (options.localNetwork) {
-    const cliVersion = getPackageVersion() ?? 'unknown';
-    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 ${cliVersion}, please stand by...`);
+    userLog(`Setting up Aztec local network ${packageVersion ?? 'unknown'}, please stand by...`);
 
     const { node, stop } = await createLocalNetwork(
       {
@@ -50,6 +49,8 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
     // Start Node and PXE JSON-RPC server
     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) {
@@ -60,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);
@@ -89,13 +93,14 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
 
   installSignalHandlers(debugLogger.info, signalHandlers);
   const versions = getVersions(config);
+  const versioningOpts = { packageVersion };
 
   // Start the main JSON-RPC server
   if (Object.entries(services).length > 0) {
     const rpcServer = createNamespacedSafeJsonRpcServer(services, {
       http200OnError: false,
       log: debugLogger,
-      middlewares: [getOtelJsonRpcPropagationMiddleware(), getVersioningMiddleware(versions)],
+      middlewares: [getOtelJsonRpcPropagationMiddleware(), getVersioningMiddleware(versions, versioningOpts)],
       maxBatchSize: options.rpcMaxBatchSize,
       maxBodySizeBytes: options.rpcMaxBodySize,
     });
@@ -105,7 +110,7 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
 
   // If there are any admin services, start a separate JSON-RPC server for them
   if (Object.entries(adminServices).length > 0) {
-    const adminMiddlewares = [getOtelJsonRpcPropagationMiddleware(), getVersioningMiddleware(versions)];
+    const adminMiddlewares = [getOtelJsonRpcPropagationMiddleware(), getVersioningMiddleware(versions, versioningOpts)];
 
     // Resolve the admin API key (auto-generated and persisted, or opt-out)
     const apiKeyResolution = await resolveAdminApiKey(

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

@@ -1,13 +1,15 @@
+import { findBbBinary } from '@aztec/bb.js';
 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';
 import { needsRecompile } from './utils/needs_recompile.js';
 import { run } from './utils/spawn.js';
+import { warnIfAztecVersionMismatch } from './utils/warn_if_aztec_version_mismatch.js';
 
 /** Returns paths to contract artifacts in the target directory. */
 async function collectContractArtifacts(): Promise<string[]> {
@@ -23,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>();
@@ -138,13 +127,15 @@ async function checkNoTestsInContracts(nargo: string, log: LogFn): Promise<void>
 
 /** Compiles Aztec Noir contracts and postprocesses artifacts. */
 async function compileAztecContract(nargoArgs: string[], log: LogFn): Promise<void> {
+  await warnIfAztecVersionMismatch(log);
+
   if (!(await needsRecompile())) {
     log('No source changes detected, skipping compilation.');
     return;
   }
 
   const nargo = process.env.NARGO ?? 'nargo';
-  const bb = process.env.BB ?? 'bb';
+  const bb = process.env.BB ?? findBbBinary() ?? 'bb';
 
   await run(nargo, ['compile', ...nargoArgs]);
 
@@ -157,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/profile_flamegraph.ts

@@ -1,3 +1,4 @@
+import { findBbBinary } from '@aztec/bb.js';
 import type { LogFn } from '@aztec/foundation/log';
 
 import { readFile, rename, rm, writeFile } from 'fs/promises';
@@ -33,7 +34,7 @@ export async function profileFlamegraph(artifactPath: string, functionName: stri
     await writeFile(functionArtifact, makeFunctionArtifact(artifact, func));
 
     const profiler = process.env.PROFILER_PATH ?? 'noir-profiler';
-    const bb = process.env.BB ?? 'bb';
+    const bb = process.env.BB ?? findBbBinary() ?? 'bb';
 
     await run(profiler, [
       'gates',

package/src/cli/cmds/profile_gates.ts

@@ -1,3 +1,4 @@
+import { findBbBinary } from '@aztec/bb.js';
 import { asyncPool } from '@aztec/foundation/async-pool';
 import type { LogFn } from '@aztec/foundation/log';
 
@@ -32,7 +33,7 @@ async function getGateCount(bb: string, artifactPath: string): Promise<number> {
 
 /** Profiles all compiled artifacts in a target directory and prints gate counts. */
 export async function profileGates(targetDir: string, log: LogFn): Promise<void> {
-  const bb = process.env.BB ?? 'bb';
+  const bb = process.env.BB ?? findBbBinary() ?? 'bb';
   const { artifacts, tmpDir } = await discoverArtifacts(targetDir);
 
   if (artifacts.length === 0) {

package/src/cli/cmds/standby.ts

@@ -28,17 +28,40 @@ 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(
+  rollup: RollupContract,
+  expected: { genesisArchiveRoot: Fr; vkTreeRoot: Fr; protocolContractsHash: Fr },
+): Promise<string[]> {
+  const mismatches: string[] = [];
+  const [l1Genesis, l1Vk, l1Protocol] = await Promise.all([
+    rollup.getGenesisArchiveTreeRoot(),
+    rollup.getVkTreeRoot(),
+    rollup.getProtocolContractsHash(),
+  ]);
+  if (!l1Genesis.equals(expected.genesisArchiveRoot)) {
+    mismatches.push(`genesis archive root (expected ${expected.genesisArchiveRoot}, got ${l1Genesis})`);
+  }
+  if (!l1Vk.equals(expected.vkTreeRoot)) {
+    mismatches.push(`VK tree root (expected ${expected.vkTreeRoot}, got ${l1Vk})`);
+  }
+  if (!l1Protocol.equals(expected.protocolContractsHash)) {
+    mismatches.push(`protocol contracts hash (expected ${expected.protocolContractsHash}, got ${l1Protocol})`);
+  }
+  return mismatches;
 }
 
 /**
- * Waits until the canonical rollup's genesis archive root matches the expected local genesis root.
- * If the rollup is not yet compatible (e.g. during L1 contract upgrades), enters standby mode:
- * starts a lightweight HTTP server for K8s liveness probes and polls every 60s until a compatible rollup appears.
+ * Waits until the canonical rollup's genesis archive root, VK tree root, and protocol contracts hash
+ * all match the expected local values. If the rollup is not yet compatible (e.g. during L1 contract upgrades),
+ * enters standby mode: starts a lightweight HTTP server for K8s liveness probes and polls every 60s
+ * until a compatible rollup appears.
  */
 export async function waitForCompatibleRollup(
   config: {
@@ -47,7 +70,7 @@ export async function waitForCompatibleRollup(
     l1Contracts: { registryAddress: EthAddress };
     rollupVersion?: number;
   },
-  expectedGenesisRoot: Fr,
+  expected: { genesisArchiveRoot: Fr; vkTreeRoot: Fr; protocolContractsHash: Fr },
   port: number | undefined,
   userLog: LogFn,
 ): Promise<void> {
@@ -58,21 +81,19 @@ export async function waitForCompatibleRollup(
   const rollupAddress = await registry.getRollupAddress(rollupVersion);
   const rollup = new RollupContract(publicClient, rollupAddress.toString());
 
-  let l1GenesisRoot: Fr;
+  let mismatches: string[];
   try {
-    l1GenesisRoot = await rollup.getGenesisArchiveTreeRoot();
+    mismatches = await checkRollupCompatibility(rollup, expected);
   } catch (err: any) {
-    throw new Error(
-      `Could not retrieve genesis archive root from canonical rollup at ${rollupAddress}: ${err.message}`,
-    );
+    throw new Error(`Could not retrieve rollup config from canonical rollup at ${rollupAddress}: ${err.message}`);
   }
 
-  if (l1GenesisRoot.equals(expectedGenesisRoot)) {
+  if (mismatches.length === 0) {
     return;
   }
 
   userLog(
-    `Genesis root mismatch: expected ${expectedGenesisRoot}, got ${l1GenesisRoot} from rollup at ${rollupAddress}. ` +
+    `Rollup at ${rollupAddress} is incompatible: ${mismatches.join('; ')}. ` +
       `Entering standby mode. Will poll every ${ROLLUP_POLL_INTERVAL_S}s for a compatible rollup...`,
   );
 
@@ -85,20 +106,20 @@ export async function waitForCompatibleRollup(
         const currentRollupAddress = await registry.getRollupAddress(rollupVersion);
         const currentRollup = new RollupContract(publicClient, currentRollupAddress.toString());
 
-        let currentGenesisRoot: Fr;
+        let currentMismatches: string[];
         try {
-          currentGenesisRoot = await currentRollup.getGenesisArchiveTreeRoot();
+          currentMismatches = await checkRollupCompatibility(currentRollup, expected);
         } catch {
-          userLog(`Failed to fetch genesis root from rollup at ${currentRollupAddress}. Retrying...`);
+          userLog(`Failed to fetch rollup config from rollup at ${currentRollupAddress}. Retrying...`);
           return undefined;
         }
 
-        if (currentGenesisRoot.equals(expectedGenesisRoot)) {
+        if (currentMismatches.length === 0) {
           userLog(`Compatible rollup found at ${currentRollupAddress}. Exiting standby mode.`);
           return true;
         }
 
-        userLog(`Still waiting. Rollup at ${currentRollupAddress} has genesis root ${currentGenesisRoot}.`);
+        userLog(`Still waiting. Rollup at ${currentRollupAddress}: ${currentMismatches.join('; ')}.`);
         return undefined;
       },
       'compatible rollup',

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',
   );