@aztec/aztec 0.0.1-commit.e6bd8901 → 0.0.1-commit.ec5f612

package/src/local-network/local-network.ts

@@ -18,13 +18,16 @@ import type { LogFn } from '@aztec/foundation/log';
 import { DateProvider, TestDateProvider } from '@aztec/foundation/timer';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
+import { SequencerState } from '@aztec/sequencer-client';
+import type { ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import {
   type TelemetryClient,
   getConfigEnvVars as getTelemetryClientConfig,
   initTelemetryClient,
 } from '@aztec/telemetry-client';
-import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
+import { EmbeddedWallet } from '@aztec/wallets/embedded';
+import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
 import { getGenesisValues } from '@aztec/world-state/testing';
 
 import { type Hex, createPublicClient, fallback, http as httpViemTransport } from 'viem';
@@ -104,12 +107,14 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
   };
   const hdAccount = mnemonicToAccount(config.l1Mnemonic || DefaultMnemonic);
   if (
-    aztecNodeConfig.publisherPrivateKeys == undefined ||
-    !aztecNodeConfig.publisherPrivateKeys.length ||
-    aztecNodeConfig.publisherPrivateKeys[0].getValue() === NULL_KEY
+    aztecNodeConfig.sequencerPublisherPrivateKeys == undefined ||
+    !aztecNodeConfig.sequencerPublisherPrivateKeys.length ||
+    aztecNodeConfig.sequencerPublisherPrivateKeys[0].getValue() === NULL_KEY
   ) {
     const privKey = hdAccount.getHdKey().privateKey;
-    aztecNodeConfig.publisherPrivateKeys = [new SecretValue(`0x${Buffer.from(privKey!).toString('hex')}` as const)];
+    aztecNodeConfig.sequencerPublisherPrivateKeys = [
+      new SecretValue(`0x${Buffer.from(privKey!).toString('hex')}` as const),
+    ];
   }
   if (!aztecNodeConfig.validatorPrivateKeys?.getValue().length) {
     const privKey = hdAccount.getHdKey().privateKey;
@@ -177,6 +182,21 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
   const blobClient = createBlobClient();
   const node = await createAztecNode(aztecNodeConfig, { telemetry, blobClient, dateProvider }, { prefilledPublicData });
 
+  // Now that the node is up, let the watcher check for pending txs so it can skip unfilled slots faster when
+  // transactions are waiting in the mempool. Also let it check if the sequencer is actively building, to avoid
+  // warping time out from under an in-progress block.
+  watcher?.setGetPendingTxCount(() => node.getPendingTxCount());
+  const sequencer = node.getSequencer()?.getSequencer();
+  if (sequencer) {
+    const idleStates: Set<string> = new Set([
+      SequencerState.STOPPED,
+      SequencerState.STOPPING,
+      SequencerState.IDLE,
+      SequencerState.SYNCHRONIZING,
+    ]);
+    watcher?.setIsSequencerBuilding(() => !idleStates.has(sequencer.getState()));
+  }
+
   let epochTestSettler: EpochTestSettler | undefined;
   if (!aztecNodeConfig.p2pEnabled) {
     epochTestSettler = new EpochTestSettler(
@@ -190,16 +210,14 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
   }
 
   if (initialAccounts.length) {
-    const PXEConfig = { proverEnabled: aztecNodeConfig.realProofs };
-    const wallet = await TestWallet.create(node, PXEConfig);
+    const wallet = await EmbeddedWallet.create(node, {
+      pxeConfig: { proverEnabled: aztecNodeConfig.realProofs },
+      ephemeral: true,
+    });
 
     userLog('Setting up funded test accounts...');
     const accountManagers = await deployFundedSchnorrAccounts(wallet, initialAccounts);
-    const accountsWithSecrets = accountManagers.map((manager, i) => ({
-      account: manager,
-      secretKey: initialAccounts[i].secret,
-    }));
-    const accLogs = await createAccountLogs(accountsWithSecrets, wallet);
+    const accLogs = await createAccountLogs(accountManagers, wallet);
     userLog(accLogs.join(''));
 
     await setupBananaFPC(initialAccounts, wallet, userLog);
@@ -225,7 +243,12 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
  */
 export async function createAztecNode(
   config: Partial<AztecNodeConfig> = {},
-  deps: { telemetry?: TelemetryClient; blobClient?: BlobClientInterface; dateProvider?: DateProvider } = {},
+  deps: {
+    telemetry?: TelemetryClient;
+    blobClient?: BlobClientInterface;
+    dateProvider?: DateProvider;
+    proverBroker?: ProvingJobBroker;
+  } = {},
   options: { prefilledPublicData?: PublicDataTreeLeaf[] } = {},
 ) {
   // TODO(#12272): will clean this up. This is criminal.
@@ -235,6 +258,10 @@ export async function createAztecNode(
     ...config,
     l1Contracts: { ...l1Contracts, ...config.l1Contracts },
   };
-  const node = await AztecNodeService.createAndSync(aztecNodeConfig, deps, options);
+  const node = await AztecNodeService.createAndSync(
+    aztecNodeConfig,
+    { ...deps, proverNodeDeps: { broker: deps.proverBroker } },
+    options,
+  );
   return node;
 }

package/src/testing/anvil_test_watcher.ts

@@ -31,6 +31,15 @@ export class AnvilTestWatcher {
 
   private isMarkingAsProven = true;
 
+  // Optional callback to check if there are pending txs in the mempool.
+  private getPendingTxCount?: () => Promise<number>;
+
+  // Optional callback to check if the sequencer is actively building a block.
+  private isSequencerBuilding?: () => boolean;
+
+  // Tracks when we first observed the current unfilled slot with pending txs (real wall time).
+  private unfilledSlotFirstSeen?: { slot: number; realTime: number };
+
   constructor(
     private cheatcodes: EthCheatCodes,
     rollupAddress: EthAddress,
@@ -59,6 +68,16 @@ export class AnvilTestWatcher {
     this.isLocalNetwork = isLocalNetwork;
   }
 
+  /** Sets a callback to check for pending txs, used to skip unfilled slots faster when txs are waiting. */
+  setGetPendingTxCount(fn: () => Promise<number>) {
+    this.getPendingTxCount = fn;
+  }
+
+  /** Sets a callback to check if the sequencer is actively building, to avoid warping while it works. */
+  setIsSequencerBuilding(fn: () => boolean) {
+    this.isSequencerBuilding = fn;
+  }
+
   async start() {
     if (this.filledRunningPromise) {
       throw new Error('Watcher already watching for filled slot');
@@ -131,15 +150,8 @@ export class AnvilTestWatcher {
       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}`);
-        }
-
+        // The current slot has been filled, we should jump to the next slot.
+        await this.warpToTimestamp(nextSlotTimestamp);
         this.logger.info(`Slot ${currentSlot} was filled, jumped to next slot`);
         return;
       }
@@ -149,18 +161,50 @@ export class AnvilTestWatcher {
         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}`);
+      // If there are pending txs and the sequencer missed them, warp quickly (after a 2s real-time debounce) so the
+      // sequencer can retry in the next slot. Without this, we'd have to wait a full real-time slot duration (~36s) for
+      // the dateProvider to catch up to the next slot timestamp. We skip the warp if the sequencer is actively building
+      // to avoid invalidating its in-progress work.
+      if (this.getPendingTxCount) {
+        const pendingTxs = await this.getPendingTxCount();
+        if (pendingTxs > 0) {
+          if (this.isSequencerBuilding?.()) {
+            this.unfilledSlotFirstSeen = undefined;
+            return;
+          }
+
+          const realNow = Date.now();
+          if (!this.unfilledSlotFirstSeen || this.unfilledSlotFirstSeen.slot !== currentSlot) {
+            this.unfilledSlotFirstSeen = { slot: currentSlot, realTime: realNow };
+            return;
+          }
+
+          if (realNow - this.unfilledSlotFirstSeen.realTime > 2000) {
+            await this.warpToTimestamp(nextSlotTimestamp);
+            this.unfilledSlotFirstSeen = undefined;
+            this.logger.info(`Slot ${currentSlot} was missed with pending txs, jumped to next slot`);
+          }
+
+          return;
         }
+      }
 
+      // Fallback: warp when the dateProvider time has passed the next slot timestamp.
+      const currentTimestamp = this.dateProvider?.now() ?? Date.now();
+      if (currentTimestamp > nextSlotTimestamp * 1000) {
+        await this.warpToTimestamp(nextSlotTimestamp);
         this.logger.info(`Slot ${currentSlot} was missed, jumped to next slot`);
       }
     } catch {
       this.logger.error('mineIfSlotFilled failed');
     }
   }
+
+  private async warpToTimestamp(timestamp: number) {
+    try {
+      await this.cheatcodes.warp(timestamp, { resetBlockInterval: true });
+    } catch (e) {
+      this.logger.error(`Failed to warp to timestamp ${timestamp}: ${e}`);
+    }
+  }
 }

package/dest/cli/cmds/start_prover_node.d.ts

@@ -1,7 +0,0 @@
-import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
-import type { LogFn } from '@aztec/foundation/log';
-import { type ProverNodeConfig } from '@aztec/prover-node';
-export declare function startProverNode(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, userLog: LogFn): Promise<{
-    config: ProverNodeConfig;
-}>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfcHJvdmVyX25vZGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvY21kcy9zdGFydF9wcm92ZXJfbm9kZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBRS9FLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRW5ELE9BQU8sRUFDTCxLQUFLLGdCQUFnQixFQUl0QixNQUFNLG9CQUFvQixDQUFDO0FBUzVCLHdCQUFzQixlQUFlLENBQ25DLE9BQU8sRUFBRSxHQUFHLEVBQ1osY0FBYyxFQUFFLENBQUMsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxFQUN2QyxRQUFRLEVBQUUscUJBQXFCLEVBQy9CLE9BQU8sRUFBRSxLQUFLLEdBQ2IsT0FBTyxDQUFDO0lBQUUsTUFBTSxFQUFFLGdCQUFnQixDQUFBO0NBQUUsQ0FBQyxDQStGdkMifQ==

package/dest/cli/cmds/start_prover_node.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"start_prover_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_node.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EACL,KAAK,gBAAgB,EAItB,MAAM,oBAAoB,CAAC;AAS5B,wBAAsB,eAAe,CACnC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,gBAAgB,CAAA;CAAE,CAAC,CA+FvC"}

package/dest/cli/cmds/start_prover_node.js

@@ -1,108 +0,0 @@
-import { getInitialTestAccountsData } from '@aztec/accounts/testing';
-import { Fr } from '@aztec/aztec.js/fields';
-import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
-import { getL1Config } from '@aztec/cli/config';
-import { getPublicClient } from '@aztec/ethereum/client';
-import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
-import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker';
-import { createProverNode, getProverNodeConfigFromEnv, proverNodeConfigMappings } from '@aztec/prover-node';
-import { P2PApiSchema, ProverNodeApiSchema } from '@aztec/stdlib/interfaces/server';
-import { initTelemetryClient, makeTracedFetch, telemetryClientConfigMappings } from '@aztec/telemetry-client';
-import { getGenesisValues } from '@aztec/world-state/testing';
-import { extractRelevantOptions, preloadCrsDataForVerifying, setupUpdateMonitor } from '../util.js';
-import { getVersions } from '../versioning.js';
-import { startProverBroker } from './start_prover_broker.js';
-export async function startProverNode(options, signalHandlers, services, userLog) {
-    if (options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
-        userLog(`Starting a prover-node with --node, --sequencer, --pxe, --p2p-bootstrap, or --txe is not supported.`);
-        process.exit(1);
-    }
-    let proverConfig = {
-        ...getProverNodeConfigFromEnv(),
-        ...extractRelevantOptions(options, proverNodeConfigMappings, 'proverNode')
-    };
-    if (!proverConfig.l1Contracts.registryAddress || proverConfig.l1Contracts.registryAddress.isZero()) {
-        throw new Error('L1 registry address is required to start a Prover Node');
-    }
-    const followsCanonicalRollup = typeof proverConfig.rollupVersion !== 'number';
-    const { addresses, config } = await getL1Config(proverConfig.l1Contracts.registryAddress, proverConfig.l1RpcUrls, proverConfig.l1ChainId, proverConfig.rollupVersion);
-    process.env.ROLLUP_CONTRACT_ADDRESS ??= addresses.rollupAddress.toString();
-    proverConfig.l1Contracts = addresses;
-    proverConfig = {
-        ...proverConfig,
-        ...config
-    };
-    const testAccounts = proverConfig.testAccounts ? (await getInitialTestAccountsData()).map((a)=>a.address) : [];
-    const sponsoredFPCAccounts = proverConfig.sponsoredFPC ? [
-        await getSponsoredFPCAddress()
-    ] : [];
-    const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts);
-    userLog(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
-    const { genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
-    userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
-    if (!Fr.fromHexString(config.genesisArchiveTreeRoot).equals(genesisArchiveRoot)) {
-        throw new Error(`The computed genesis archive tree root ${genesisArchiveRoot} does not match the expected genesis archive tree root ${config.genesisArchiveTreeRoot} for the rollup deployed at ${addresses.rollupAddress}`);
-    }
-    const telemetry = await initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
-    let broker;
-    if (proverConfig.proverBrokerUrl) {
-        // at 1TPS we'd enqueue ~1k chonk verifier proofs and ~1k AVM proofs immediately
-        // set a lower connection limit such that we don't overload the server
-        // Keep retrying up to 30s
-        const fetch = makeTracedFetch([
-            1,
-            2,
-            3,
-            3,
-            3,
-            3,
-            3,
-            3,
-            3,
-            3,
-            3
-        ], false, makeUndiciFetch(new Agent({
-            connections: 100
-        })));
-        broker = createProvingJobBrokerClient(proverConfig.proverBrokerUrl, getVersions(proverConfig), fetch);
-    } else if (options.proverBroker) {
-        ({ broker } = await startProverBroker(options, signalHandlers, services, userLog));
-    } else {
-        userLog(`--prover-broker-url or --prover-broker is required to start a Prover Node`);
-        process.exit(1);
-    }
-    if (proverConfig.proverAgentCount === 0) {
-        userLog(`Running prover node without local prover agent. Connect one or more prover agents to this node or pass --proverAgent.proverAgentCount`);
-    }
-    await preloadCrsDataForVerifying(proverConfig, userLog);
-    const proverNode = await createProverNode(proverConfig, {
-        telemetry,
-        broker
-    }, {
-        prefilledPublicData
-    });
-    services.proverNode = [
-        proverNode,
-        ProverNodeApiSchema
-    ];
-    if (proverNode.getP2P()) {
-        services.p2p = [
-            proverNode.getP2P(),
-            P2PApiSchema
-        ];
-    }
-    if (!proverConfig.proverBrokerUrl) {
-        services.provingJobSource = [
-            proverNode.getProver().getProvingJobSource(),
-            ProvingJobConsumerSchema
-        ];
-    }
-    signalHandlers.push(proverNode.stop.bind(proverNode));
-    await proverNode.start();
-    if (proverConfig.autoUpdate !== 'disabled' && proverConfig.autoUpdateUrl) {
-        await setupUpdateMonitor(proverConfig.autoUpdate, new URL(proverConfig.autoUpdateUrl), followsCanonicalRollup, getPublicClient(proverConfig), proverConfig.l1Contracts.registryAddress, signalHandlers);
-    }
-    return {
-        config: proverConfig
-    };
-}

package/scripts/compile.sh

@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-NARGO=${NARGO:-nargo}
-BB=${BB:-bb}
-
-# If help is requested, show Aztec-specific info then run nargo compile help and then exit in order to not trigger
-# transpilation
-for arg in "$@"; do
-  if [ "$arg" == "--help" ] || [ "$arg" == "-h" ]; then
-    cat << 'EOF'
-Aztec Compile - Compile Aztec Noir contracts
-
-This command compiles Aztec Noir contracts using nargo and then automatically
-postprocesses them to generate Aztec specific artifacts including:
-- Transpiled contract artifacts
-- Verification keys
-
-The compiled contracts will be placed in the target/ directory by default.
-
----
-Underlying nargo compile options:
-
-EOF
-    nargo compile --help
-    exit 0
-  fi
-done
-
-# Run nargo compile.
-$NARGO compile "$@"
-
-echo "Postprocessing contract..."
-$BB aztec_process
-
-# Strip internal prefixes from all compiled contract JSONs in target directory
-# TODO: This should be part of bb aztec_process!
-for json in target/*.json; do
-  temp_file="${json}.tmp"
-  jq '.functions |= map(.name |= sub("^__aztec_nr_internals__"; ""))' "$json" > "$temp_file"
-  mv "$temp_file" "$json"
-done
-
-echo "Compilation complete!"

package/scripts/extract_function.js

@@ -1,47 +0,0 @@
-#!/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

@@ -1,59 +0,0 @@
-#!/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/setup_project.sh

@@ -1,31 +0,0 @@
-#!/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/cli/cmds/start_prover_node.ts

@@ -1,124 +0,0 @@
-import { getInitialTestAccountsData } from '@aztec/accounts/testing';
-import { Fr } from '@aztec/aztec.js/fields';
-import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
-import { getL1Config } from '@aztec/cli/config';
-import { getPublicClient } from '@aztec/ethereum/client';
-import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
-import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
-import type { LogFn } from '@aztec/foundation/log';
-import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker';
-import {
-  type ProverNodeConfig,
-  createProverNode,
-  getProverNodeConfigFromEnv,
-  proverNodeConfigMappings,
-} from '@aztec/prover-node';
-import { P2PApiSchema, ProverNodeApiSchema, type ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
-import { initTelemetryClient, makeTracedFetch, telemetryClientConfigMappings } from '@aztec/telemetry-client';
-import { getGenesisValues } from '@aztec/world-state/testing';
-
-import { extractRelevantOptions, preloadCrsDataForVerifying, setupUpdateMonitor } from '../util.js';
-import { getVersions } from '../versioning.js';
-import { startProverBroker } from './start_prover_broker.js';
-
-export async function startProverNode(
-  options: any,
-  signalHandlers: (() => Promise<void>)[],
-  services: NamespacedApiHandlers,
-  userLog: LogFn,
-): Promise<{ config: ProverNodeConfig }> {
-  if (options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
-    userLog(`Starting a prover-node with --node, --sequencer, --pxe, --p2p-bootstrap, or --txe is not supported.`);
-    process.exit(1);
-  }
-
-  let proverConfig = {
-    ...getProverNodeConfigFromEnv(), // get default config from env
-    ...extractRelevantOptions<ProverNodeConfig>(options, proverNodeConfigMappings, 'proverNode'), // override with command line options
-  };
-
-  if (!proverConfig.l1Contracts.registryAddress || proverConfig.l1Contracts.registryAddress.isZero()) {
-    throw new Error('L1 registry address is required to start a Prover Node');
-  }
-
-  const followsCanonicalRollup = typeof proverConfig.rollupVersion !== 'number';
-  const { addresses, config } = await getL1Config(
-    proverConfig.l1Contracts.registryAddress,
-    proverConfig.l1RpcUrls,
-    proverConfig.l1ChainId,
-    proverConfig.rollupVersion,
-  );
-  process.env.ROLLUP_CONTRACT_ADDRESS ??= addresses.rollupAddress.toString();
-  proverConfig.l1Contracts = addresses;
-  proverConfig = { ...proverConfig, ...config };
-
-  const testAccounts = proverConfig.testAccounts ? (await getInitialTestAccountsData()).map(a => a.address) : [];
-  const sponsoredFPCAccounts = proverConfig.sponsoredFPC ? [await getSponsoredFPCAddress()] : [];
-  const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts);
-
-  userLog(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
-  const { genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
-
-  userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
-
-  if (!Fr.fromHexString(config.genesisArchiveTreeRoot).equals(genesisArchiveRoot)) {
-    throw new Error(
-      `The computed genesis archive tree root ${genesisArchiveRoot} does not match the expected genesis archive tree root ${config.genesisArchiveTreeRoot} for the rollup deployed at ${addresses.rollupAddress}`,
-    );
-  }
-
-  const telemetry = await initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
-
-  let broker: ProvingJobBroker;
-  if (proverConfig.proverBrokerUrl) {
-    // at 1TPS we'd enqueue ~1k chonk verifier proofs and ~1k AVM proofs immediately
-    // set a lower connection limit such that we don't overload the server
-    // Keep retrying up to 30s
-    const fetch = makeTracedFetch(
-      [1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3],
-      false,
-      makeUndiciFetch(new Agent({ connections: 100 })),
-    );
-    broker = createProvingJobBrokerClient(proverConfig.proverBrokerUrl, getVersions(proverConfig), fetch);
-  } else if (options.proverBroker) {
-    ({ broker } = await startProverBroker(options, signalHandlers, services, userLog));
-  } else {
-    userLog(`--prover-broker-url or --prover-broker is required to start a Prover Node`);
-    process.exit(1);
-  }
-
-  if (proverConfig.proverAgentCount === 0) {
-    userLog(
-      `Running prover node without local prover agent. Connect one or more prover agents to this node or pass --proverAgent.proverAgentCount`,
-    );
-  }
-
-  await preloadCrsDataForVerifying(proverConfig, userLog);
-
-  const proverNode = await createProverNode(proverConfig, { telemetry, broker }, { prefilledPublicData });
-  services.proverNode = [proverNode, ProverNodeApiSchema];
-
-  if (proverNode.getP2P()) {
-    services.p2p = [proverNode.getP2P(), P2PApiSchema];
-  }
-
-  if (!proverConfig.proverBrokerUrl) {
-    services.provingJobSource = [proverNode.getProver().getProvingJobSource(), ProvingJobConsumerSchema];
-  }
-
-  signalHandlers.push(proverNode.stop.bind(proverNode));
-
-  await proverNode.start();
-
-  if (proverConfig.autoUpdate !== 'disabled' && proverConfig.autoUpdateUrl) {
-    await setupUpdateMonitor(
-      proverConfig.autoUpdate,
-      new URL(proverConfig.autoUpdateUrl),
-      followsCanonicalRollup,
-      getPublicClient(proverConfig),
-      proverConfig.l1Contracts.registryAddress,
-      signalHandlers,
-    );
-  }
-  return { config: proverConfig };
-}