@aztec/aztec 0.0.0-test.1 → 0.0.1-commit.5476d83

package/dest/testing/anvil_test_watcher.js

@@ -0,0 +1,144 @@
+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;
+    rollup;
+    rollupCheatCodes;
+    l2SlotDuration;
+    filledRunningPromise;
+    syncDateProviderPromise;
+    markingAsProvenRunningPromise;
+    logger;
+    isMarkingAsProven;
+    constructor(cheatcodes, rollupAddress, l1Client, dateProvider){
+        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,
+            client: l1Client
+        });
+        this.rollupCheatCodes = new RollupCheatCodes(this.cheatcodes, {
+            rollupAddress
+        });
+        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;
+    }
+    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.timestamp() * 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) {
+            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));
+        }
+    }
+    async warpTimeIfNeeded() {
+        try {
+            const currentSlot = SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot());
+            const pendingCheckpointNumber = BigInt(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) {
+                // We should jump to the next slot
+                try {
+                    await this.cheatcodes.warp(nextSlotTimestamp, {
+                        resetBlockInterval: true
+                    });
+                } catch (e) {
+                    this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
+                }
+                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;
+            }
+            const currentTimestamp = this.dateProvider?.now() ?? Date.now();
+            if (currentTimestamp > nextSlotTimestamp * 1000) {
+                try {
+                    await this.cheatcodes.warp(nextSlotTimestamp, {
+                        resetBlockInterval: true
+                    });
+                } catch (e) {
+                    this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
+                }
+                this.logger.info(`Slot ${currentSlot} was missed, jumped to next slot`);
+            }
+        } catch  {
+            this.logger.error('mineIfSlotFilled failed');
+        }
+    }
+}

package/dest/testing/cheat_codes.d.ts

@@ -0,0 +1,41 @@
+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';
+/**
+ * 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
+ * they became unused (we now have better testing tools). If you are introducing a new functionality to the cheat
+ * codes, please consider whether it makes sense to just introduce new utils in your tests instead.
+ */
+export declare class CheatCodes {
+    eth: EthCheatCodes;
+    rollup: RollupCheatCodes;
+    constructor(
+    /** Cheat codes for L1.*/
+    eth: EthCheatCodes, 
+    /** Cheat codes for the Aztec Rollup contract on L1. */
+    rollup: RollupCheatCodes);
+    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.
+     * @param targetTimestamp - The target timestamp to warp to (in seconds)
+     */
+    warpL2TimeAtLeastTo(sequencerClient: SequencerClient, node: AztecNode, 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.
+     * @param duration - The duration to advance time by (in seconds)
+     */
+    warpL2TimeAtLeastBy(sequencerClient: SequencerClient, node: AztecNode, duration: bigint | number): Promise<void>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUV2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILHFCQUFhLFVBQVU7SUFHWixHQUFHLEVBQUUsYUFBYTtJQUVsQixNQUFNLEVBQUUsZ0JBQWdCO0lBSmpDO0lBQ0UseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCLEVBQzdCO0lBRUosT0FBYSxNQUFNLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBT3ZHO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDRyxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsZUFBZSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsZUFBZSxFQUFFLE1BQU0sR0FBRyxNQUFNLGlCQXVCNUc7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxlQUFlLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLE1BQU0saUJBSXJHO0NBQ0YifQ==

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

@@ -0,0 +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;AAEvE,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;IAGZ,GAAG,EAAE,aAAa;IAElB,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"}

package/dest/testing/cheat_codes.js

@@ -0,0 +1,62 @@
+import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
+import { retryUntil } from '@aztec/foundation/retry';
+/**
+ * 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
+ * they became unused (we now have better testing tools). If you are introducing a new functionality to the cheat
+ * codes, please consider whether it makes sense to just introduce new utils in your tests instead.
+ */ export class CheatCodes {
+    eth;
+    rollup;
+    constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for the Aztec Rollup contract on L1. */ rollup){
+        this.eth = eth;
+        this.rollup = rollup;
+    }
+    static async create(rpcUrls, node, dateProvider) {
+        const ethCheatCodes = new EthCheatCodes(rpcUrls, dateProvider);
+        const rollupCheatCodes = new RollupCheatCodes(ethCheatCodes, await node.getNodeInfo().then((n)=>n.l1ContractAddresses));
+        return new CheatCodes(ethCheatCodes, rollupCheatCodes);
+    }
+    /**
+   * 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.
+   * @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, {
+            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
+        });
+    }
+    /**
+   * 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.
+   * @param duration - The duration to advance time by (in seconds)
+   */ async warpL2TimeAtLeastBy(sequencerClient, node, duration) {
+        const currentTimestamp = await this.eth.timestamp();
+        const targetTimestamp = BigInt(currentTimestamp) + BigInt(duration);
+        await this.warpL2TimeAtLeastTo(sequencerClient, node, targetTimestamp);
+    }
+}

package/dest/testing/index.d.ts

@@ -0,0 +1,4 @@
+export { AnvilTestWatcher } from './anvil_test_watcher.js';
+export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
+export { CheatCodes } from './cheat_codes.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNELE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUMifQ==

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

@@ -0,0 +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"}

package/dest/testing/index.js

@@ -0,0 +1,3 @@
+export { AnvilTestWatcher } from './anvil_test_watcher.js';
+export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
+export { CheatCodes } from './cheat_codes.js';

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@aztec/aztec",
-  "version": "0.0.0-test.1",
+  "version": "0.0.1-commit.5476d83",
   "type": "module",
   "exports": {
-    ".": "./dest/index.js"
+    ".": "./dest/index.js",
+    "./testing": "./dest/testing/index.js"
   },
   "bin": "./dest/bin/index.js",
   "typedocOptions": {
@@ -14,14 +15,12 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && tsc -b",
+    "build": "yarn clean && tsgo -b",
     "start": "node --no-warnings ./dest/bin",
     "start:debug": "node --inspect=0.0.0.0:9221 --no-warnings ./dest/bin",
-    "start:sandbox": "ETHEREUM_HOSTS=http://0.0.0.0:8545/ && yarn start start --sandbox",
+    "start:local-network": "ETHEREUM_HOSTS=http://0.0.0.0:8545/ && yarn start start --local-network",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
-    "build:dev": "tsc -b --watch",
+    "build:dev": "tsgo -b --watch",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
     "run:example:token": "LOG_LEVEL='verbose' node ./dest/examples/token.js"
   },
@@ -29,41 +28,44 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "0.0.0-test.1",
-    "@aztec/archiver": "0.0.0-test.1",
-    "@aztec/aztec-faucet": "0.0.0-test.1",
-    "@aztec/aztec-node": "0.0.0-test.1",
-    "@aztec/aztec.js": "0.0.0-test.1",
-    "@aztec/bb-prover": "0.0.0-test.1",
-    "@aztec/blob-sink": "0.0.0-test.1",
-    "@aztec/bot": "0.0.0-test.1",
-    "@aztec/builder": "0.0.0-test.1",
-    "@aztec/cli": "0.0.0-test.1",
-    "@aztec/cli-wallet": "0.0.0-test.1",
-    "@aztec/constants": "0.0.0-test.1",
-    "@aztec/entrypoints": "0.0.0-test.1",
-    "@aztec/ethereum": "0.0.0-test.1",
-    "@aztec/foundation": "0.0.0-test.1",
-    "@aztec/kv-store": "0.0.0-test.1",
-    "@aztec/noir-contracts.js": "0.0.0-test.1",
-    "@aztec/noir-protocol-circuits-types": "0.0.0-test.1",
-    "@aztec/p2p": "0.0.0-test.1",
-    "@aztec/p2p-bootstrap": "0.0.0-test.1",
-    "@aztec/protocol-contracts": "0.0.0-test.1",
-    "@aztec/prover-client": "0.0.0-test.1",
-    "@aztec/prover-node": "0.0.0-test.1",
-    "@aztec/pxe": "0.0.0-test.1",
-    "@aztec/stdlib": "0.0.0-test.1",
-    "@aztec/telemetry-client": "0.0.0-test.1",
-    "@aztec/txe": "0.0.0-test.1",
-    "@aztec/world-state": "0.0.0-test.1",
+    "@aztec/accounts": "0.0.1-commit.5476d83",
+    "@aztec/archiver": "0.0.1-commit.5476d83",
+    "@aztec/aztec-faucet": "0.0.1-commit.5476d83",
+    "@aztec/aztec-node": "0.0.1-commit.5476d83",
+    "@aztec/aztec.js": "0.0.1-commit.5476d83",
+    "@aztec/bb-prover": "0.0.1-commit.5476d83",
+    "@aztec/bb.js": "0.0.1-commit.5476d83",
+    "@aztec/blob-sink": "0.0.1-commit.5476d83",
+    "@aztec/bot": "0.0.1-commit.5476d83",
+    "@aztec/builder": "0.0.1-commit.5476d83",
+    "@aztec/cli": "0.0.1-commit.5476d83",
+    "@aztec/constants": "0.0.1-commit.5476d83",
+    "@aztec/entrypoints": "0.0.1-commit.5476d83",
+    "@aztec/ethereum": "0.0.1-commit.5476d83",
+    "@aztec/foundation": "0.0.1-commit.5476d83",
+    "@aztec/kv-store": "0.0.1-commit.5476d83",
+    "@aztec/l1-artifacts": "0.0.1-commit.5476d83",
+    "@aztec/node-lib": "0.0.1-commit.5476d83",
+    "@aztec/noir-contracts.js": "0.0.1-commit.5476d83",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.5476d83",
+    "@aztec/p2p": "0.0.1-commit.5476d83",
+    "@aztec/p2p-bootstrap": "0.0.1-commit.5476d83",
+    "@aztec/protocol-contracts": "0.0.1-commit.5476d83",
+    "@aztec/prover-client": "0.0.1-commit.5476d83",
+    "@aztec/prover-node": "0.0.1-commit.5476d83",
+    "@aztec/pxe": "0.0.1-commit.5476d83",
+    "@aztec/stdlib": "0.0.1-commit.5476d83",
+    "@aztec/telemetry-client": "0.0.1-commit.5476d83",
+    "@aztec/test-wallet": "0.0.1-commit.5476d83",
+    "@aztec/txe": "0.0.1-commit.5476d83",
+    "@aztec/world-state": "0.0.1-commit.5476d83",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
-    "koa": "^2.14.2",
-    "koa-router": "^12.0.0",
-    "viem": "2.22.8"
+    "koa": "^2.16.1",
+    "koa-router": "^13.1.1",
+    "viem": "npm:@aztec/viem@2.38.2"
   },
   "files": [
     "dest",
@@ -72,12 +74,13 @@
   ],
   "types": "./dest/index.d.ts",
   "devDependencies": {
-    "@jest/globals": "^29.5.0",
-    "@types/jest": "^29.5.0",
-    "@types/koa": "^2.13.6",
-    "jest": "^29.5.0",
+    "@jest/globals": "^30.0.0",
+    "@types/jest": "^30.0.0",
+    "@types/koa": "^2.15.0",
+    "@typescript/native-preview": "7.0.0-dev.20251126.1",
+    "jest": "^30.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "jest": {
     "moduleNameMapper": {
@@ -110,9 +113,13 @@
     "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
+    ],
+    "testEnvironment": "../../foundation/src/jest/env.mjs",
+    "setupFilesAfterEnv": [
+      "../../foundation/src/jest/setupAfterEnv.mjs"
     ]
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   }
 }

package/src/bin/index.ts

@@ -1,21 +1,21 @@
 #!/usr/bin/env node
 //
 import { injectCommands as injectBuilderCommands } from '@aztec/builder';
-import { injectCommands as injectWalletCommands } from '@aztec/cli-wallet';
+import { injectCommands as injectAztecNodeCommands } from '@aztec/cli/aztec_node';
+import { enrichEnvironmentWithChainName, enrichEnvironmentWithNetworkConfig } from '@aztec/cli/config';
 import { injectCommands as injectContractCommands } from '@aztec/cli/contracts';
-import { injectCommands as injectDevnetCommands } from '@aztec/cli/devnet';
 import { injectCommands as injectInfrastructureCommands } from '@aztec/cli/infrastructure';
 import { injectCommands as injectL1Commands } from '@aztec/cli/l1';
 import { injectCommands as injectMiscCommands } from '@aztec/cli/misc';
-import { injectCommands as injectPXECommands } from '@aztec/cli/pxe';
+import { injectCommands as injectValidatorKeysCommands } from '@aztec/cli/validator_keys';
+import { getActiveNetworkName } from '@aztec/foundation/config';
 import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
-import { fileURLToPath } from '@aztec/foundation/url';
 
 import { Command } from 'commander';
-import { readFileSync } from 'fs';
-import { dirname, resolve } from 'path';
 
+import { NETWORK_FLAG } from '../cli/aztec_start_options.js';
 import { injectAztecCommands } from '../cli/index.js';
+import { getCliVersion } from '../cli/release_version.js';
 
 const userLog = createConsoleLogger();
 const debugLogger = createLogger('cli');
@@ -28,19 +28,31 @@ async function main() {
   process.once('SIGINT', shutdown);
   process.once('SIGTERM', shutdown);
 
-  const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
-  const cliVersion: string = JSON.parse(readFileSync(packageJsonPath).toString()).version;
+  // Intercept the setting of a network and enrich the environment with defaults for that network
+  let networkValue: string | undefined;
+
+  const args = process.argv.slice(2);
+  const networkIndex = args.findIndex(arg => arg.startsWith(`--${NETWORK_FLAG}=`) || arg === `--${NETWORK_FLAG}`);
+
+  if (networkIndex !== -1) {
+    networkValue = args[networkIndex].split('=')[1] || args[networkIndex + 1];
+  }
+
+  const networkName = getActiveNetworkName(networkValue);
+  await enrichEnvironmentWithNetworkConfig(networkName);
+  enrichEnvironmentWithChainName(networkName);
+
+  const cliVersion = getCliVersion();
   let program = new Command('aztec');
   program.description('Aztec command line interface').version(cliVersion);
   program = injectAztecCommands(program, userLog, debugLogger);
   program = injectBuilderCommands(program);
   program = injectContractCommands(program, userLog, debugLogger);
-  program = injectInfrastructureCommands(program, userLog, debugLogger);
+  program = injectInfrastructureCommands(program, userLog);
   program = injectL1Commands(program, userLog, debugLogger);
-  program = injectPXECommands(program, userLog, debugLogger);
+  program = injectAztecNodeCommands(program, userLog, debugLogger);
   program = injectMiscCommands(program, userLog);
-  program = injectDevnetCommands(program, userLog, debugLogger);
-  program = injectWalletCommands(program, userLog, debugLogger);
+  program = injectValidatorKeysCommands(program, userLog);
 
   await program.parseAsync(process.argv);
 }

package/src/cli/aztec_start_action.ts

@@ -4,43 +4,38 @@ import {
   startHttpRpcServer,
 } from '@aztec/foundation/json-rpc/server';
 import type { LogFn, Logger } from '@aztec/foundation/log';
-import { fileURLToPath } from '@aztec/foundation/url';
 import type { ChainConfig } from '@aztec/stdlib/config';
-import { AztecNodeApiSchema, PXESchema } from '@aztec/stdlib/interfaces/client';
+import { AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
 import { getVersioningMiddleware } from '@aztec/stdlib/versioning';
 import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
 
-import { readFileSync } from 'fs';
-import { dirname, resolve } from 'path';
-
-import { createSandbox } from '../sandbox/index.js';
+import { createLocalNetwork } from '../local-network/index.js';
 import { github, splash } from '../splash.js';
-import { enrichEnvironmentWithChainConfig } from './chain_l2_config.js';
+import { getCliVersion } from './release_version.js';
 import { extractNamespacedOptions, installSignalHandlers } from './util.js';
 import { getVersions } from './versioning.js';
 
-const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
-const cliVersion: string = JSON.parse(readFileSync(packageJsonPath).toString()).version;
-
 export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logger) {
   // list of 'stop' functions to call when process ends
   const signalHandlers: Array<() => Promise<void>> = [];
   const services: NamespacedApiHandlers = {};
+  const adminServices: NamespacedApiHandlers = {};
   let config: ChainConfig | undefined = undefined;
 
-  if (options.sandbox) {
-    const sandboxOptions = extractNamespacedOptions(options, 'sandbox');
-    const nodeOptions = extractNamespacedOptions(options, 'node');
+  if (options.localNetwork) {
+    const cliVersion = getCliVersion();
+    const localNetwork = extractNamespacedOptions(options, 'local-network');
+    localNetwork.testAccounts = true;
     userLog(`${splash}\n${github}\n\n`);
-    userLog(`Setting up Aztec Sandbox ${cliVersion}, please stand by...`);
+    userLog(`Setting up Aztec local network ${cliVersion}, please stand by...`);
 
-    const { node, pxe, stop } = await createSandbox(
+    const { node, stop } = await createLocalNetwork(
       {
-        l1Mnemonic: options.l1Mnemonic,
+        l1Mnemonic: localNetwork.l1Mnemonic,
         l1RpcUrls: options.l1RpcUrls,
-        l1Salt: nodeOptions.deployAztecContractsSalt,
-        noPXE: sandboxOptions.noPXE,
-        testAccounts: sandboxOptions.testAccounts,
+        deployAztecContractsSalt: localNetwork.deployAztecContractsSalt,
+        testAccounts: localNetwork.testAccounts,
+        realProofs: false,
       },
       userLog,
     );
@@ -48,19 +43,10 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
     // Start Node and PXE JSON-RPC server
     signalHandlers.push(stop);
     services.node = [node, AztecNodeApiSchema];
-    if (!sandboxOptions.noPXE) {
-      services.pxe = [pxe, PXESchema];
-    } else {
-      userLog(`Not exposing PXE API through JSON-RPC server`);
-    }
   } else {
-    // If a network is specified, enrich the environment with the chain config
-    if (options.network) {
-      await enrichEnvironmentWithChainConfig(options.network);
-    }
     if (options.node) {
       const { startNode } = await import('./cmds/start_node.js');
-      ({ config } = await startNode(options, signalHandlers, services, userLog));
+      ({ config } = await startNode(options, signalHandlers, services, adminServices, userLog));
     } else if (options.bot) {
       const { startBot } = await import('./cmds/start_bot.js');
       await startBot(options, signalHandlers, services, userLog);
@@ -70,9 +56,6 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
     } else if (options.blobSink) {
       const { startBlobSink } = await import('./cmds/start_blob_sink.js');
       await startBlobSink(options, signalHandlers, userLog);
-    } else if (options.pxe) {
-      const { startPXE } = await import('./cmds/start_pxe.js');
-      ({ config } = await startPXE(options, signalHandlers, services, userLog));
     } else if (options.archiver) {
       const { startArchiver } = await import('./cmds/start_archiver.js');
       ({ config } = await startArchiver(options, signalHandlers, services));
@@ -91,9 +74,6 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
     } else if (options.sequencer) {
       userLog(`Cannot run a standalone sequencer without a node`);
       process.exit(1);
-    } else if (options.faucet) {
-      const { startFaucet } = await import('./cmds/start_faucet.js');
-      await startFaucet(options, signalHandlers, services, userLog);
     } else {
       userLog(`No module specified to start`);
       process.exit(1);
@@ -102,13 +82,30 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
 
   installSignalHandlers(debugLogger.info, signalHandlers);
   const versions = getVersions(config);
+
+  // Start the main JSON-RPC server
   if (Object.entries(services).length > 0) {
     const rpcServer = createNamespacedSafeJsonRpcServer(services, {
       http200OnError: false,
       log: debugLogger,
       middlewares: [getOtelJsonRpcPropagationMiddleware(), getVersioningMiddleware(versions)],
+      maxBatchSize: options.rpcMaxBatchSize,
+      maxBodySizeBytes: options.rpcMaxBodySize,
     });
     const { port } = await startHttpRpcServer(rpcServer, { port: options.port });
     debugLogger.info(`Aztec Server listening on port ${port}`, versions);
   }
+
+  // If there are any admin services, start a separate JSON-RPC server for them
+  if (Object.entries(adminServices).length > 0) {
+    const rpcServer = createNamespacedSafeJsonRpcServer(adminServices, {
+      http200OnError: false,
+      log: debugLogger,
+      middlewares: [getOtelJsonRpcPropagationMiddleware(), getVersioningMiddleware(versions)],
+      maxBatchSize: options.rpcMaxBatchSize,
+      maxBodySizeBytes: options.rpcMaxBodySize,
+    });
+    const { port } = await startHttpRpcServer(rpcServer, { port: options.adminPort });
+    debugLogger.info(`Aztec Server admin API listening on port ${port}`, versions);
+  }
 }