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

package/dest/testing/anvil_test_watcher.js

@@ -1,4 +1,5 @@
 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';
@@ -12,7 +13,7 @@ import { getAddress, getContract } from 'viem';
  */ export class AnvilTestWatcher {
     cheatcodes;
     dateProvider;
-    isSandbox;
+    isLocalNetwork;
     rollup;
     rollupCheatCodes;
     l2SlotDuration;
@@ -24,7 +25,7 @@ import { getAddress, getContract } from 'viem';
     constructor(cheatcodes, rollupAddress, l1Client, dateProvider){
         this.cheatcodes = cheatcodes;
         this.dateProvider = dateProvider;
-        this.isSandbox = false;
+        this.isLocalNetwork = false;
         this.logger = createLogger(`aztecjs:utils:watcher`);
         this.isMarkingAsProven = true;
         this.rollup = getContract({
@@ -38,10 +39,11 @@ import { getAddress, getContract } from 'viem';
         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;
     }
-    setIsSandbox(isSandbox) {
-        this.isSandbox = isSandbox;
+    setisLocalNetwork(isLocalNetwork) {
+        this.isLocalNetwork = isLocalNetwork;
     }
     async start() {
         if (this.filledRunningPromise) {
@@ -51,7 +53,7 @@ import { getAddress, getContract } from 'viem';
         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 sandbox and tests don't break because time is frozen and we never get to
+        // 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) {
@@ -83,7 +85,7 @@ import { getAddress, getContract } from 'viem';
         await this.rollupCheatCodes.markAsProven();
     }
     async syncDateProviderToL1IfBehind() {
-        // this doesn't apply to the sandbox, because we don't have a date provider in the sandbox
+        // this doesn't apply to the local network, because we don't have a date provider in the local network
         if (!this.dateProvider) {
             return;
         }
@@ -99,20 +101,20 @@ import { getAddress, getContract } from 'viem';
     }
     async warpTimeIfNeeded() {
         try {
-            const currentSlot = await this.rollup.read.getCurrentSlot();
-            const pendingBlockNumber = BigInt(await this.rollup.read.getPendingBlockNumber());
-            const blockLog = await this.rollup.read.getBlock([
-                pendingBlockNumber
+            const currentSlot = SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot());
+            const pendingCheckpointNumber = await this.rollup.read.getPendingCheckpointNumber();
+            const checkpointLog = await this.rollup.read.getCheckpoint([
+                pendingCheckpointNumber
             ]);
+            const nextSlot = SlotNumber(currentSlot + 1);
             const nextSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([
-                currentSlot + 1n
+                BigInt(nextSlot)
             ]));
-            if (currentSlot === blockLog.slotNumber) {
+            if (BigInt(currentSlot) === checkpointLog.slotNumber) {
                 // We should jump to the next slot
                 try {
                     await this.cheatcodes.warp(nextSlotTimestamp, {
-                        resetBlockInterval: true,
-                        updateDateProvider: this.dateProvider
+                        resetBlockInterval: true
                     });
                 } catch (e) {
                     this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
@@ -120,16 +122,15 @@ import { getAddress, getContract } from 'viem';
                 this.logger.info(`Slot ${currentSlot} was filled, jumped to next slot`);
                 return;
             }
-            // If we are not in sandbox, we don't need to warp time
-            if (!this.isSandbox) {
+            // 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,
-                        updateDateProvider: this.dateProvider
+                        resetBlockInterval: true
                     });
                 } catch (e) {
                     this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);

package/dest/testing/cheat_codes.d.ts

@@ -1,25 +1,22 @@
 import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
+import type { DateProvider } from '@aztec/foundation/timer';
 import type { SequencerClient } from '@aztec/sequencer-client';
-import type { AztecNode, PXE } from '@aztec/stdlib/interfaces/client';
-import { AztecCheatCodes } from './aztec_cheat_codes.js';
+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 {
-    /** Cheat codes for L1.*/
     eth: EthCheatCodes;
-    /** Cheat codes for Aztec L2. */
-    aztec: AztecCheatCodes;
-    /** Cheat codes for the Aztec Rollup contract on L1. */
     rollup: RollupCheatCodes;
     constructor(
     /** Cheat codes for L1.*/
     eth: EthCheatCodes, 
-    /** Cheat codes for Aztec L2. */
-    aztec: AztecCheatCodes, 
     /** Cheat codes for the Aztec Rollup contract on L1. */
     rollup: RollupCheatCodes);
-    static create(rpcUrls: string[], pxe: PXE): Promise<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
@@ -41,4 +38,4 @@ export declare class CheatCodes {
      */
     warpL2TimeAtLeastBy(sequencerClient: SequencerClient, node: AztecNode, duration: bigint | number): Promise<void>;
 }
-//# sourceMappingURL=cheat_codes.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILHFCQUFhLFVBQVU7SUFHWixHQUFHLEVBQUUsYUFBYTtJQUVsQixNQUFNLEVBQUUsZ0JBQWdCO0lBSmpDO0lBQ0UseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCLEVBQzdCO0lBRUosT0FBYSxNQUFNLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBT3ZHO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDRyxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsZUFBZSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsZUFBZSxFQUFFLE1BQU0sR0FBRyxNQUFNLGlCQXVCNUc7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxlQUFlLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLE1BQU0saUJBSXJHO0NBQ0YifQ==

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":"AACA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;GAEG;AACH,qBAAa,UAAU;IAEnB,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,gCAAgC;IACzB,KAAK,EAAE,eAAe;IAC7B,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;;IAL/B,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,gCAAgC;IACzB,KAAK,EAAE,eAAe;IAC7B,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;WAGpB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAUrE;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM;IAyB7G;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;CAKvG"}
+{"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;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

@@ -1,22 +1,21 @@
-import { retryUntil } from '@aztec/aztec.js';
 import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
-import { AztecCheatCodes } from './aztec_cheat_codes.js';
+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;
-    aztec;
     rollup;
-    constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for Aztec L2. */ aztec, /** Cheat codes for the Aztec Rollup contract on L1. */ rollup){
+    constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for the Aztec Rollup contract on L1. */ rollup){
         this.eth = eth;
-        this.aztec = aztec;
         this.rollup = rollup;
     }
-    static async create(rpcUrls, pxe) {
-        const ethCheatCodes = new EthCheatCodes(rpcUrls);
-        const aztecCheatCodes = new AztecCheatCodes(pxe);
-        const rollupCheatCodes = new RollupCheatCodes(ethCheatCodes, await pxe.getNodeInfo().then((n)=>n.l1ContractAddresses));
-        return new CheatCodes(ethCheatCodes, aztecCheatCodes, rollupCheatCodes);
+    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

package/dest/testing/index.d.ts

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

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,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC"}
+{"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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec",
-  "version": "3.0.0-canary.a9708bd",
+  "version": "3.0.0-devnet.20251212",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -15,12 +15,12 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && tsc -b",
+    "build": "yarn clean && ../scripts/tsc.sh",
     "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",
-    "build:dev": "tsc -b --watch",
+    "build:dev": "../scripts/tsc.sh --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"
   },
@@ -28,43 +28,44 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "3.0.0-canary.a9708bd",
-    "@aztec/archiver": "3.0.0-canary.a9708bd",
-    "@aztec/aztec-faucet": "3.0.0-canary.a9708bd",
-    "@aztec/aztec-node": "3.0.0-canary.a9708bd",
-    "@aztec/aztec.js": "3.0.0-canary.a9708bd",
-    "@aztec/bb-prover": "3.0.0-canary.a9708bd",
-    "@aztec/bb.js": "3.0.0-canary.a9708bd",
-    "@aztec/blob-sink": "3.0.0-canary.a9708bd",
-    "@aztec/bot": "3.0.0-canary.a9708bd",
-    "@aztec/builder": "3.0.0-canary.a9708bd",
-    "@aztec/cli": "3.0.0-canary.a9708bd",
-    "@aztec/cli-wallet": "3.0.0-canary.a9708bd",
-    "@aztec/constants": "3.0.0-canary.a9708bd",
-    "@aztec/entrypoints": "3.0.0-canary.a9708bd",
-    "@aztec/ethereum": "3.0.0-canary.a9708bd",
-    "@aztec/foundation": "3.0.0-canary.a9708bd",
-    "@aztec/kv-store": "3.0.0-canary.a9708bd",
-    "@aztec/l1-artifacts": "3.0.0-canary.a9708bd",
-    "@aztec/noir-contracts.js": "3.0.0-canary.a9708bd",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-canary.a9708bd",
-    "@aztec/p2p": "3.0.0-canary.a9708bd",
-    "@aztec/p2p-bootstrap": "3.0.0-canary.a9708bd",
-    "@aztec/protocol-contracts": "3.0.0-canary.a9708bd",
-    "@aztec/prover-client": "3.0.0-canary.a9708bd",
-    "@aztec/prover-node": "3.0.0-canary.a9708bd",
-    "@aztec/pxe": "3.0.0-canary.a9708bd",
-    "@aztec/stdlib": "3.0.0-canary.a9708bd",
-    "@aztec/telemetry-client": "3.0.0-canary.a9708bd",
-    "@aztec/txe": "3.0.0-canary.a9708bd",
-    "@aztec/world-state": "3.0.0-canary.a9708bd",
+    "@aztec/accounts": "3.0.0-devnet.20251212",
+    "@aztec/archiver": "3.0.0-devnet.20251212",
+    "@aztec/aztec-faucet": "3.0.0-devnet.20251212",
+    "@aztec/aztec-node": "3.0.0-devnet.20251212",
+    "@aztec/aztec.js": "3.0.0-devnet.20251212",
+    "@aztec/bb-prover": "3.0.0-devnet.20251212",
+    "@aztec/bb.js": "3.0.0-devnet.20251212",
+    "@aztec/blob-sink": "3.0.0-devnet.20251212",
+    "@aztec/bot": "3.0.0-devnet.20251212",
+    "@aztec/builder": "3.0.0-devnet.20251212",
+    "@aztec/cli": "3.0.0-devnet.20251212",
+    "@aztec/constants": "3.0.0-devnet.20251212",
+    "@aztec/entrypoints": "3.0.0-devnet.20251212",
+    "@aztec/ethereum": "3.0.0-devnet.20251212",
+    "@aztec/foundation": "3.0.0-devnet.20251212",
+    "@aztec/kv-store": "3.0.0-devnet.20251212",
+    "@aztec/l1-artifacts": "3.0.0-devnet.20251212",
+    "@aztec/node-lib": "3.0.0-devnet.20251212",
+    "@aztec/noir-contracts.js": "3.0.0-devnet.20251212",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-devnet.20251212",
+    "@aztec/p2p": "3.0.0-devnet.20251212",
+    "@aztec/p2p-bootstrap": "3.0.0-devnet.20251212",
+    "@aztec/protocol-contracts": "3.0.0-devnet.20251212",
+    "@aztec/prover-client": "3.0.0-devnet.20251212",
+    "@aztec/prover-node": "3.0.0-devnet.20251212",
+    "@aztec/pxe": "3.0.0-devnet.20251212",
+    "@aztec/stdlib": "3.0.0-devnet.20251212",
+    "@aztec/telemetry-client": "3.0.0-devnet.20251212",
+    "@aztec/test-wallet": "3.0.0-devnet.20251212",
+    "@aztec/txe": "3.0.0-devnet.20251212",
+    "@aztec/world-state": "3.0.0-devnet.20251212",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "koa": "^2.16.1",
-    "koa-router": "^12.0.0",
-    "viem": "2.23.7"
+    "koa-router": "^13.1.1",
+    "viem": "npm:@aztec/viem@2.38.2"
   },
   "files": [
     "dest",
@@ -76,6 +77,7 @@
     "@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.3.3"

package/src/bin/index.ts

@@ -1,20 +1,19 @@
 #!/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 { Command } from 'commander';
 
 import { NETWORK_FLAG } from '../cli/aztec_start_options.js';
-import { enrichEnvironmentWithChainConfig } from '../cli/chain_l2_config.js';
 import { injectAztecCommands } from '../cli/index.js';
 import { getCliVersion } from '../cli/release_version.js';
 
@@ -39,7 +38,9 @@ async function main() {
     networkValue = args[networkIndex].split('=')[1] || args[networkIndex + 1];
   }
 
-  await enrichEnvironmentWithChainConfig(getActiveNetworkName(networkValue));
+  const networkName = getActiveNetworkName(networkValue);
+  await enrichEnvironmentWithNetworkConfig(networkName);
+  enrichEnvironmentWithChainName(networkName);
 
   const cliVersion = getCliVersion();
   let program = new Command('aztec');
@@ -47,12 +48,11 @@ async function main() {
   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

@@ -5,11 +5,11 @@ import {
 } from '@aztec/foundation/json-rpc/server';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 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 { createSandbox } from '../sandbox/index.js';
+import { createLocalNetwork } from '../local-network/index.js';
 import { github, splash } from '../splash.js';
 import { getCliVersion } from './release_version.js';
 import { extractNamespacedOptions, installSignalHandlers } from './util.js';
@@ -22,20 +22,19 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
   const adminServices: NamespacedApiHandlers = {};
   let config: ChainConfig | undefined = undefined;
 
-  if (options.sandbox) {
+  if (options.localNetwork) {
     const cliVersion = getCliVersion();
-    const sandboxOptions = extractNamespacedOptions(options, 'sandbox');
-    sandboxOptions.testAccounts = true;
+    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: sandboxOptions.l1Mnemonic,
+        l1Mnemonic: localNetwork.l1Mnemonic,
         l1RpcUrls: options.l1RpcUrls,
-        deployAztecContractsSalt: sandboxOptions.deployAztecContractsSalt,
-        noPXE: sandboxOptions.noPXE,
-        testAccounts: sandboxOptions.testAccounts,
+        deployAztecContractsSalt: localNetwork.deployAztecContractsSalt,
+        testAccounts: localNetwork.testAccounts,
         realProofs: false,
       },
       userLog,
@@ -44,11 +43,6 @@ 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 (options.node) {
       const { startNode } = await import('./cmds/start_node.js');
@@ -62,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));
@@ -83,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);