@aztec/aztec 0.0.1-fake-ceab37513c → 0.0.6-commit.a2d1860fe9

package/dest/testing/epoch_test_settler.js

@@ -0,0 +1,62 @@
+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';
+export class EpochTestSettler {
+    l2BlockSource;
+    log;
+    options;
+    rollupCheatCodes;
+    epochMonitor;
+    constructor(cheatcodes, rollupAddress, l2BlockSource, log, options){
+        this.l2BlockSource = l2BlockSource;
+        this.log = log;
+        this.options = options;
+        this.rollupCheatCodes = new RollupCheatCodes(cheatcodes, {
+            rollupAddress
+        });
+    }
+    async start() {
+        const { epochDuration } = await this.rollupCheatCodes.getConfig();
+        this.epochMonitor = new EpochMonitor(this.l2BlockSource, {
+            epochDuration: Number(epochDuration)
+        }, this.options);
+        this.epochMonitor.start(this);
+    }
+    async stop() {
+        await this.epochMonitor?.stop();
+    }
+    async handleEpochReadyToProve(epoch) {
+        const checkpointedBlocks = await this.l2BlockSource.getCheckpointedBlocksForEpoch(epoch);
+        const blocks = checkpointedBlocks.map((b)=>b.block);
+        this.log.info(`Settling epoch ${epoch} with blocks ${blocks[0]?.header.getBlockNumber()} to ${blocks.at(-1)?.header.getBlockNumber()}`, {
+            blocks: blocks.map((b)=>b.toBlockInfo())
+        });
+        const messagesInEpoch = [];
+        let previousSlotNumber = SlotNumber.ZERO;
+        let checkpointIndex = -1;
+        for (const block of blocks){
+            const slotNumber = block.header.globalVariables.slotNumber;
+            if (slotNumber !== previousSlotNumber) {
+                checkpointIndex++;
+                messagesInEpoch[checkpointIndex] = [];
+                previousSlotNumber = slotNumber;
+            }
+            messagesInEpoch[checkpointIndex].push(block.body.txEffects.map((txEffect)=>txEffect.l2ToL1Msgs));
+        }
+        const [firstMessage] = messagesInEpoch.flat(3);
+        if (firstMessage) {
+            const { root: outHash } = computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoch, firstMessage);
+            await this.rollupCheatCodes.insertOutbox(epoch, outHash.toBigInt());
+        } else {
+            this.log.info(`No L2 to L1 messages in epoch ${epoch}`);
+        }
+        const lastCheckpoint = checkpointedBlocks.at(-1)?.checkpointNumber;
+        if (lastCheckpoint !== undefined) {
+            await this.rollupCheatCodes.markAsProven(lastCheckpoint);
+        } else {
+            this.log.warn(`No checkpoint found for epoch ${epoch}`);
+        }
+        return true;
+    }
+}

package/dest/testing/index.d.ts

@@ -1,5 +1,5 @@
 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
+export { EpochTestSettler } from './epoch_test_settler.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNELE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUMifQ==

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;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC"}

package/dest/testing/index.js

@@ -1,4 +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';
+export { EpochTestSettler } from './epoch_test_settler.js';

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@aztec/aztec",
-  "version": "0.0.1-fake-ceab37513c",
+  "version": "0.0.6-commit.a2d1860fe9",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
     "./testing": "./dest/testing/index.js"
   },
-  "bin": "./dest/bin/index.js",
+  "bin": "./scripts/aztec.sh",
   "typedocOptions": {
     "entryPoints": [
       "./src/index.ts"
@@ -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,47 +28,50 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "0.0.1-fake-ceab37513c",
-    "@aztec/archiver": "0.0.1-fake-ceab37513c",
-    "@aztec/aztec-faucet": "0.0.1-fake-ceab37513c",
-    "@aztec/aztec-node": "0.0.1-fake-ceab37513c",
-    "@aztec/aztec.js": "0.0.1-fake-ceab37513c",
-    "@aztec/bb-prover": "0.0.1-fake-ceab37513c",
-    "@aztec/bb.js": "0.0.1-fake-ceab37513c",
-    "@aztec/blob-sink": "0.0.1-fake-ceab37513c",
-    "@aztec/bot": "0.0.1-fake-ceab37513c",
-    "@aztec/builder": "0.0.1-fake-ceab37513c",
-    "@aztec/cli": "0.0.1-fake-ceab37513c",
-    "@aztec/cli-wallet": "0.0.1-fake-ceab37513c",
-    "@aztec/constants": "0.0.1-fake-ceab37513c",
-    "@aztec/entrypoints": "0.0.1-fake-ceab37513c",
-    "@aztec/ethereum": "0.0.1-fake-ceab37513c",
-    "@aztec/foundation": "0.0.1-fake-ceab37513c",
-    "@aztec/kv-store": "0.0.1-fake-ceab37513c",
-    "@aztec/l1-artifacts": "0.0.1-fake-ceab37513c",
-    "@aztec/node-lib": "0.0.1-fake-ceab37513c",
-    "@aztec/noir-contracts.js": "0.0.1-fake-ceab37513c",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-fake-ceab37513c",
-    "@aztec/p2p": "0.0.1-fake-ceab37513c",
-    "@aztec/p2p-bootstrap": "0.0.1-fake-ceab37513c",
-    "@aztec/protocol-contracts": "0.0.1-fake-ceab37513c",
-    "@aztec/prover-client": "0.0.1-fake-ceab37513c",
-    "@aztec/prover-node": "0.0.1-fake-ceab37513c",
-    "@aztec/pxe": "0.0.1-fake-ceab37513c",
-    "@aztec/stdlib": "0.0.1-fake-ceab37513c",
-    "@aztec/telemetry-client": "0.0.1-fake-ceab37513c",
-    "@aztec/txe": "0.0.1-fake-ceab37513c",
-    "@aztec/world-state": "0.0.1-fake-ceab37513c",
+    "@aztec/accounts": "0.0.6-commit.a2d1860fe9",
+    "@aztec/archiver": "0.0.6-commit.a2d1860fe9",
+    "@aztec/aztec-faucet": "0.0.6-commit.a2d1860fe9",
+    "@aztec/aztec-node": "0.0.6-commit.a2d1860fe9",
+    "@aztec/aztec.js": "0.0.6-commit.a2d1860fe9",
+    "@aztec/bb-prover": "0.0.6-commit.a2d1860fe9",
+    "@aztec/bb.js": "0.0.6-commit.a2d1860fe9",
+    "@aztec/blob-client": "0.0.6-commit.a2d1860fe9",
+    "@aztec/bot": "0.0.6-commit.a2d1860fe9",
+    "@aztec/builder": "0.0.6-commit.a2d1860fe9",
+    "@aztec/cli": "0.0.6-commit.a2d1860fe9",
+    "@aztec/constants": "0.0.6-commit.a2d1860fe9",
+    "@aztec/entrypoints": "0.0.6-commit.a2d1860fe9",
+    "@aztec/ethereum": "0.0.6-commit.a2d1860fe9",
+    "@aztec/foundation": "0.0.6-commit.a2d1860fe9",
+    "@aztec/kv-store": "0.0.6-commit.a2d1860fe9",
+    "@aztec/l1-artifacts": "0.0.6-commit.a2d1860fe9",
+    "@aztec/node-lib": "0.0.6-commit.a2d1860fe9",
+    "@aztec/noir-contracts.js": "0.0.6-commit.a2d1860fe9",
+    "@aztec/noir-protocol-circuits-types": "0.0.6-commit.a2d1860fe9",
+    "@aztec/p2p": "0.0.6-commit.a2d1860fe9",
+    "@aztec/p2p-bootstrap": "0.0.6-commit.a2d1860fe9",
+    "@aztec/protocol-contracts": "0.0.6-commit.a2d1860fe9",
+    "@aztec/prover-client": "0.0.6-commit.a2d1860fe9",
+    "@aztec/prover-node": "0.0.6-commit.a2d1860fe9",
+    "@aztec/pxe": "0.0.6-commit.a2d1860fe9",
+    "@aztec/sequencer-client": "0.0.6-commit.a2d1860fe9",
+    "@aztec/stdlib": "0.0.6-commit.a2d1860fe9",
+    "@aztec/telemetry-client": "0.0.6-commit.a2d1860fe9",
+    "@aztec/txe": "0.0.6-commit.a2d1860fe9",
+    "@aztec/validator-ha-signer": "0.0.6-commit.a2d1860fe9",
+    "@aztec/wallets": "0.0.6-commit.a2d1860fe9",
+    "@aztec/world-state": "0.0.6-commit.a2d1860fe9",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
-    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
+    "viem": "npm:@aztec/viem@2.38.2"
   },
   "files": [
     "dest",
+    "scripts",
     "src",
     "!*.test.*"
   ],
@@ -77,6 +80,7 @@
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/koa": "^2.15.0",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "jest": "^30.0.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3"

package/scripts/aztec.sh

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Re-execute using correct version if we have an .aztecrc file.
+if [ "${AZTEC_VERSIONED:-0}" -eq 0 ] && [ -f .aztecrc ] && command -v aztec-up &>/dev/null; then
+  env_setup=$(aztec-up env)
+  eval "$env_setup"
+  AZTEC_VERSIONED=1 exec aztec "$@"
+fi
+
+cmd=${1:-}
+[ -n "$cmd" ] && shift
+
+script_dir="$(dirname "$(realpath "$0")")"
+
+function aztec {
+  export AZTEC_SHELL_WRAPPER=1
+  exec node --no-warnings $script_dir/../dest/bin/index.js "$@"
+}
+
+case $cmd in
+  test)
+    export LOG_LEVEL="${LOG_LEVEL:-"error;trace:contract_log"}"
+    aztec start --txe --port 8081 &
+    server_pid=$!
+    trap 'kill $server_pid &>/dev/null || true' EXIT
+    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 "$@"
+    ;;
+  start)
+    if [ "${1:-}" == "--local-network" ]; then
+      # TODO: Can these just be set in TS?
+      export ARCHIVER_POLLING_INTERVAL_MS=500
+      export P2P_BLOCK_CHECK_INTERVAL_MS=500
+      export SEQ_TX_POLLING_INTERVAL_MS=500
+      export WS_BLOCK_CHECK_INTERVAL_MS=500
+      export ARCHIVER_VIEM_POLLING_INTERVAL_MS=500
+      export TEST_ACCOUNTS=${TEST_ACCOUNTS:-true}
+      export LOG_LEVEL=${LOG_LEVEL:-info;silent:sequencer;verbose:debug_log}
+      export DEPLOY_AZTEC_CONTRACTS_SALT=${DEPLOY_AZTEC_CONTRACTS_SALT:-$RANDOM}
+
+      ANVIL_PORT=${ANVIL_PORT:-8545}
+
+      export L1_CHAIN_ID=${L1_CHAIN_ID:-31337}
+      export ETHEREUM_HOSTS=${ETHEREUM_HOSTS:-"http://127.0.0.1:${ANVIL_PORT}"}
+
+      anvil --version
+      anvil --silent &
+      anvil_pid=$!
+      trap 'kill $anvil_pid &>/dev/null' EXIT
+    fi
+
+    aztec start "$@"
+    ;;
+  new|init|flamegraph)
+    $script_dir/${cmd}.sh "$@"
+    ;;
+  *)
+    aztec $cmd "$@"
+    ;;
+esac

package/scripts/extract_function.js

@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+import fs from 'fs/promises';
+import path from 'path';
+
+// Simple script to extract a contract function as a separate Noir artifact.
+// We need to use this since the transpiling that we do on public functions make the contract artifacts
+// unreadable by noir tooling, since they are no longer following the noir artifact format.
+async function main() {
+  let [contractArtifactPath, functionName] = process.argv.slice(2);
+  if (!contractArtifactPath || !functionName) {
+    console.log('Usage: node extractFunctionAsNoirArtifact.js <contractArtifactPath> <functionName>');
+    return;
+  }
+
+  const contractArtifact = JSON.parse(await fs.readFile(contractArtifactPath, 'utf8'));
+  const func = contractArtifact.functions.find(f => f.name === functionName);
+  if (!func) {
+    console.error(`Function ${functionName} not found in ${contractArtifactPath}`);
+    return;
+  }
+
+  const artifact = {
+    noir_version: contractArtifact.noir_version,
+    hash: 0,
+    abi: func.abi,
+    bytecode: func.bytecode,
+    debug_symbols: func.debug_symbols,
+    file_map: contractArtifact.file_map,
+    expression_width: {
+      Bounded: {
+        width: 4,
+      },
+    },
+  };
+
+  const outputDir = path.dirname(contractArtifactPath);
+  const outputName = path.basename(contractArtifactPath, '.json') + `-${functionName}.json`;
+
+  const outPath = path.join(outputDir, outputName);
+
+  await fs.writeFile(outPath, JSON.stringify(artifact, null, 2));
+}
+
+main().catch(err => {
+  console.error(err);
+  process.exit(1);
+});

package/scripts/flamegraph.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+set -eu
+
+# If first arg is -h or --help, print usage.
+if [ $# -lt 2 ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
+    cat << 'EOF'
+Aztec Flamegraph - Generate a gate count flamegraph for an aztec contract function.
+
+Usage: aztec flamegraph <contract_artifact> <function>
+
+Options:
+  -h, --help     Print help
+
+Will output an svg at <artifact_path>/<contract>-<function>-flamegraph.svg.
+You can open it in your browser to view it.
+
+EOF
+    exit 0
+fi
+
+cleanup() {
+  set +e
+  if [ -f "$function_artifact" ]; then
+    rm -f "$function_artifact"
+  fi
+}
+
+trap cleanup EXIT
+
+# Get the directory of the script
+script_dir=$(realpath $(dirname $0))
+
+PROFILER=${PROFILER_PATH:-noir-profiler}
+BB=${BB:-bb}
+
+# first console arg is contract name in camel case or path to contract artifact
+contract=$1
+
+# second console arg is the contract function
+function=$2
+
+if [ ! -f "$contract" ]; then
+  echo "Error: Contract artifact not found at: $contract"
+  exit 1
+fi
+artifact_path=$contract
+function_artifact="${artifact_path%%.json}-${function}.json"
+output_dir=$(dirname "$artifact_path")
+
+# Extract artifact for the specific function.
+node $script_dir/extract_function.js "$artifact_path" $function
+
+# Generate the flamegraph
+$PROFILER gates --artifact-path "$function_artifact" --backend-path "$BB" --backend-gates-command "gates" --output "$output_dir" --scheme chonk --include_gates_per_opcode
+
+# Save as $artifact_name-$function-flamegraph.svg
+output_file="${function_artifact%%.json}-flamegraph.svg"
+mv "$output_dir/__aztec_nr_internals__${function}_gates.svg" "$output_file"
+echo "Flamegraph generated at: $output_file"

package/scripts/init.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+NARGO=${NARGO:-nargo}
+script_path=$(realpath $(dirname "$0"))
+
+for arg in "$@"; do
+  if [ "$arg" == "--help" ] || [ "$arg" == "-h" ]; then
+    cat << 'EOF'
+Aztec Init - Create a new Aztec Noir project in the current directory
+
+Usage: aztec init [OPTIONS]
+
+Options:
+  --name <NAME>  Name of the package [default: current directory name]
+  --lib          Use a library template
+  -h, --help     Print help
+
+This command creates a new Aztec Noir project in the current directory using nargo
+and automatically adds the Aztec.nr dependency to your Nargo.toml file.
+
+EOF
+    exit 0
+  fi
+  if [ "$arg" == "--lib" ]; then
+    is_contract=0
+  fi
+done
+
+echo "Initializing Noir project..."
+$NARGO init "$@"
+
+if [ "${is_contract:-1}" -eq 1 ]; then
+  $script_path/setup_project.sh
+fi

package/scripts/new.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+NARGO=${NARGO:-nargo}
+script_path=$(realpath $(dirname "$0"))
+
+type_arg="--contract"
+
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    --help|-h)
+      cat << 'EOF'
+Aztec New - Create a new Aztec Noir project in a new directory
+
+Usage: aztec new [OPTIONS] <PATH>
+
+Arguments:
+  <PATH>  The path to save the new project
+
+Options:
+  --name <NAME>  Name of the package [default: package directory name]
+  --lib          Create a library template instead of a contract
+  -h, --help     Print help
+
+This command creates a new Aztec Noir project using nargo and automatically
+adds the Aztec.nr dependency to your Nargo.toml file.
+EOF
+      exit 0
+      ;;
+    --lib)
+      type_arg="--lib"
+      shift
+      ;;
+    --name)
+      name_arg="--name $2"
+      shift 2
+      ;;
+    *)
+      project_path=$1
+      shift
+      break
+      ;;
+  esac
+done
+
+if [ -z "$project_path" ]; then
+  echo "Error: PATH argument is required"
+  echo "Usage: aztec new [OPTIONS] <PATH>"
+  echo "Run 'aztec new --help' for more information"
+  exit 1
+fi
+
+echo "Creating new Noir project at $project_path..."
+$NARGO new $type_arg ${name_arg:-} $project_path
+
+if [ "$type_arg" == "--contract" ]; then
+  cd $project_path
+  $script_path/setup_project.sh
+fi

package/scripts/setup_project.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Get the actual aztec version for the git tag.
+AZTEC_VERSION=$(jq -r '.version' $(dirname $0)/../package.json)
+NARGO_TOML_PATH="Nargo.toml"
+MAIN_NR_PATH="src/main.nr"
+
+if [ ! -f "$NARGO_TOML_PATH" ]; then
+  >&2 echo "Warning: Could not find Nargo.toml at $NARGO_TOML_PATH to add aztec dependency"
+  exit 1
+fi
+
+if [ ! -f "$MAIN_NR_PATH" ]; then
+  >&2 echo "Warning: Could not find main.nr at $MAIN_NR_PATH"
+  exit 1
+fi
+
+# Add aztec dependency to Nargo.toml
+echo "" >> "$NARGO_TOML_PATH"
+echo "aztec = { git=\"https://github.com/AztecProtocol/aztec-nr\", tag=\"v${AZTEC_VERSION}\", directory=\"aztec\" }" >> "$NARGO_TOML_PATH"
+echo "Added aztec dependency (v${AZTEC_VERSION}) to Nargo.toml"
+
+# Replace the contents of main.nr with the Aztec contract template
+cat > "$MAIN_NR_PATH" << 'EOF'
+use aztec::macros::aztec;
+
+#[aztec]
+contract Main {}
+EOF
+echo "Created main.nr with Aztec contract template"

package/src/bin/index.ts

@@ -1,22 +1,26 @@
 #!/usr/bin/env node
 //
 import { injectCommands as injectBuilderCommands } from '@aztec/builder';
-import { injectCommands as injectWalletCommands } from '@aztec/cli-wallet';
-import { enrichEnvironmentWithChainConfig, enrichEnvironmentWithNetworkConfig } from '@aztec/cli/config';
+import { injectCommands as injectAztecNodeCommands } from '@aztec/cli/aztec_node';
+import { enrichEnvironmentWithChainName } from '@aztec/cli/config/chain';
+import { enrichEnvironmentWithNetworkConfig } from '@aztec/cli/config/network';
 import { injectCommands as injectContractCommands } from '@aztec/cli/contracts';
 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 { injectCompileCommand } from '../cli/cmds/compile.js';
+import { injectMigrateCommand } from '../cli/cmds/migrate_ha_db.js';
 import { injectAztecCommands } from '../cli/index.js';
 import { getCliVersion } from '../cli/release_version.js';
 
+const NETWORK_FLAG = 'network';
+
 const userLog = createConsoleLogger();
 const debugLogger = createLogger('cli');
 
@@ -40,19 +44,21 @@ async function main() {
 
   const networkName = getActiveNetworkName(networkValue);
   await enrichEnvironmentWithNetworkConfig(networkName);
-  enrichEnvironmentWithChainConfig(networkName);
+  enrichEnvironmentWithChainName(networkName);
 
   const cliVersion = getCliVersion();
   let program = new Command('aztec');
-  program.description('Aztec command line interface').version(cliVersion);
+  program.description('Aztec command line interface').version(cliVersion).enablePositionalOptions();
   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 = injectWalletCommands(program, userLog, debugLogger);
+  program = injectValidatorKeysCommands(program, userLog);
+  program = injectCompileCommand(program, userLog);
+  program = injectMigrateCommand(program, userLog);
 
   await program.parseAsync(process.argv);
 }