@aztec/aztec 4.0.0-nightly.20250907 → 4.0.0-nightly.20260108

package/README.md

@@ -8,7 +8,7 @@ Aztec is a package that allows for a simple development environment on Aztec sta
 
 The easiest way to run is by using `docker compose up`. This will create two containers:
 
-1. The sandbox listening on port `8080`
+1. The local network listening on port `8080`
 2. An anvil instance listening on port `8545`
 
 ### Node Server

package/dest/bin/index.d.ts

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 export {};
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iaW4vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/dest/bin/index.js

@@ -1,20 +1,20 @@
 #!/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 } from '@aztec/cli/config/chain';
+import { enrichEnvironmentWithNetworkConfig } from '@aztec/cli/config/network';
 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';
+const NETWORK_FLAG = 'network';
 const userLog = createConsoleLogger();
 const debugLogger = createLogger('cli');
 /** CLI & full node main entrypoint */ async function main() {
@@ -30,19 +30,20 @@ const debugLogger = createLogger('cli');
     if (networkIndex !== -1) {
         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');
     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);
 }
 main().catch((err)=>{

package/dest/cli/aztec_start_action.d.ts

@@ -1,3 +1,3 @@
 import type { LogFn, Logger } from '@aztec/foundation/log';
 export declare function aztecStart(options: any, userLog: LogFn, debugLogger: Logger): Promise<void>;
-//# sourceMappingURL=aztec_start_action.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfYWN0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2F6dGVjX3N0YXJ0X2FjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFZM0Qsd0JBQXNCLFVBQVUsQ0FBQyxPQUFPLEVBQUUsR0FBRyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBeUZqRiJ9

package/dest/cli/aztec_start_action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aztec_start_action.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_action.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAY3D,wBAAsB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,iBAsGjF"}
+{"version":3,"file":"aztec_start_action.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_action.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAY3D,wBAAsB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,iBAyFjF"}

package/dest/cli/aztec_start_action.js

@@ -1,8 +1,8 @@
 import { createNamespacedSafeJsonRpcServer, startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
-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';
@@ -13,18 +13,16 @@ export async function aztecStart(options, userLog, debugLogger) {
     const services = {};
     const adminServices = {};
     let config = 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...`);
-        const { node, pxe, stop } = await createSandbox({
-            l1Mnemonic: sandboxOptions.l1Mnemonic,
+        userLog(`Setting up Aztec local network ${cliVersion}, please stand by...`);
+        const { node, stop } = await createLocalNetwork({
+            l1Mnemonic: localNetwork.l1Mnemonic,
             l1RpcUrls: options.l1RpcUrls,
-            deployAztecContractsSalt: sandboxOptions.deployAztecContractsSalt,
-            noPXE: sandboxOptions.noPXE,
-            testAccounts: sandboxOptions.testAccounts,
+            testAccounts: localNetwork.testAccounts,
             realProofs: false
         }, userLog);
         // Start Node and PXE JSON-RPC server
@@ -33,14 +31,6 @@ export async function aztecStart(options, userLog, debugLogger) {
             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');
@@ -51,12 +41,6 @@ export async function aztecStart(options, userLog, debugLogger) {
         } else if (options.proverNode) {
             const { startProverNode } = await import('./cmds/start_prover_node.js');
             ({ config } = await startProverNode(options, signalHandlers, services, userLog));
-        } 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));

package/dest/cli/aztec_start_options.d.ts

@@ -14,4 +14,4 @@ export declare const NETWORK_FLAG = "network";
 export declare const aztecStartOptions: {
     [key: string]: AztecStartOption[];
 };
-//# sourceMappingURL=aztec_start_options.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfb3B0aW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9henRlY19zdGFydF9vcHRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sRUFDTCxLQUFLLGFBQWEsRUFDbEIsS0FBSyxNQUFNLEVBSVosTUFBTSwwQkFBMEIsQ0FBQztBQWVsQyxNQUFNLFdBQVcsZ0JBQWdCO0lBQy9CLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixXQUFXLEVBQUUsTUFBTSxDQUFDO0lBQ3BCLFlBQVksRUFBRSxHQUFHLENBQUM7SUFDbEIsWUFBWSxDQUFDLEVBQUUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxLQUFLLE1BQU0sQ0FBQztJQUNwQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUN4QixRQUFRLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNwQixRQUFRLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEtBQUssR0FBRyxDQUFDO0NBQ2pDO0FBRUQsZUFBTyxNQUFNLFVBQVUsMEZBb0J0QixDQUFDO0FBdUJGLGVBQU8sTUFBTSxnQkFBZ0IsVUFZNUIsQ0FBQztBQUVGLGVBQU8sTUFBTSxZQUFZLFlBQVksQ0FBQztBQUd0QyxlQUFPLE1BQU0saUJBQWlCLEVBQUU7SUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLEVBQUUsQ0FBQTtDQWlObEUsQ0FBQyJ9

package/dest/cli/aztec_start_options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aztec_start_options.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_options.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,MAAM,EAIZ,MAAM,0BAA0B,CAAC;AAclC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC;IACpC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;CACjC;AAED,eAAO,MAAM,UAAU,GAAI,WAAW,MAAM,EAAE,gBAAgB,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,uBAoB1F,CAAC;AAuBF,eAAO,MAAM,gBAAgB,UAW5B,CAAC;AAEF,eAAO,MAAM,YAAY,YAAY,CAAC;AAGtC,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAqOlE,CAAC"}
+{"version":3,"file":"aztec_start_options.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_options.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,MAAM,EAIZ,MAAM,0BAA0B,CAAC;AAelC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC;IACpC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;CACjC;AAED,eAAO,MAAM,UAAU,0FAoBtB,CAAC;AAuBF,eAAO,MAAM,gBAAgB,UAY5B,CAAC;AAEF,eAAO,MAAM,YAAY,YAAY,CAAC;AAGtC,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAiNlE,CAAC"}

package/dest/cli/aztec_start_options.js

@@ -1,19 +1,21 @@
 import { archiverConfigMappings } from '@aztec/archiver/config';
-import { sequencerClientConfigMappings } from '@aztec/aztec-node/config';
-import { blobSinkConfigMappings } from '@aztec/blob-sink/server';
+import { blobClientConfigMapping } from '@aztec/blob-client/client/config';
 import { botConfigMappings } from '@aztec/bot/config';
-import { l1ContractAddressesMapping, l1ContractsConfigMappings, l1ReaderConfigMappings } from '@aztec/ethereum';
+import { l1ContractsConfigMappings } from '@aztec/ethereum/config';
+import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
+import { l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
 import { getKeys } from '@aztec/foundation/collection';
 import { booleanConfigHelper, isBooleanConfigValue, omitConfigMappings } from '@aztec/foundation/config';
 import { dataConfigMappings } from '@aztec/kv-store/config';
 import { sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import { bootnodeConfigMappings, p2pConfigMappings } from '@aztec/p2p/config';
-import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/prover-client/broker';
+import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/prover-client/broker/config';
 import { proverNodeConfigMappings } from '@aztec/prover-node/config';
 import { allPxeConfigMappings } from '@aztec/pxe/config';
+import { sequencerClientConfigMappings } from '@aztec/sequencer-client/config';
 import { chainConfigMappings } from '@aztec/stdlib/config';
-import { telemetryClientConfigMappings } from '@aztec/telemetry-client';
-import { worldStateConfigMappings } from '@aztec/world-state';
+import { telemetryClientConfigMappings } from '@aztec/telemetry-client/config';
+import { worldStateConfigMappings } from '@aztec/world-state/config';
 import { DefaultMnemonic } from '../mnemonic.js';
 export const getOptions = (namespace, configMappings)=>{
     const options = [];
@@ -56,6 +58,7 @@ export const universalOptions = [
     'l1ConsensusHostApiKeys',
     'l1ConsensusHostApiKeyHeaders',
     'p2pEnabled',
+    'fishermanMode',
     ...getKeys(chainConfigMappings),
     ...getKeys(l1ContractsConfigMappings),
     ...getKeys(l1ContractAddressesMapping),
@@ -76,33 +79,21 @@ export const aztecStartOptions = {
         configToFlag('--auto-update', sharedNodeConfigMappings.autoUpdate),
         configToFlag('--auto-update-url', sharedNodeConfigMappings.autoUpdateUrl),
         configToFlag('--sync-mode', sharedNodeConfigMappings.syncMode),
-        configToFlag('--snapshots-url', sharedNodeConfigMappings.snapshotsUrl)
+        configToFlag('--snapshots-urls', sharedNodeConfigMappings.snapshotsUrls),
+        configToFlag('--fisherman-mode', sharedNodeConfigMappings.fishermanMode)
     ],
-    SANDBOX: [
+    LOCAL_NETWORK: [
         {
-            flag: '--sandbox',
-            description: 'Starts Aztec Sandbox',
+            flag: '--local-network',
+            description: 'Starts Aztec Local Network',
             defaultValue: undefined,
             env: undefined
         },
         {
-            flag: '--sandbox.noPXE',
-            description: 'Do not expose PXE service on sandbox start',
-            env: 'NO_PXE',
-            ...booleanConfigHelper()
-        },
-        {
-            flag: '--sandbox.l1Mnemonic <value>',
+            flag: '--local-network.l1Mnemonic <value>',
             description: 'Mnemonic for L1 accounts. Will be used ',
             defaultValue: DefaultMnemonic,
             env: 'MNEMONIC'
-        },
-        {
-            flag: '--sandbox.deployAztecContractsSalt <value>',
-            description: 'Numeric salt for deploying L1 Aztec contracts before starting the sandbox. Needs mnemonic or private key to be set.',
-            env: 'DEPLOY_AZTEC_CONTRACTS_SALT',
-            defaultValue: undefined,
-            parseVal: (val)=>val ? parseInt(val) : undefined
         }
     ],
     API: [
@@ -115,7 +106,7 @@ export const aztecStartOptions = {
         },
         {
             flag: '--admin-port <value>',
-            description: 'Port to run admin APIs of Aztec Services on on',
+            description: 'Port to run admin APIs of Aztec Services on',
             defaultValue: 8880,
             env: 'AZTEC_ADMIN_PORT',
             parseVal: (val)=>parseInt(val, 10)
@@ -134,17 +125,17 @@ export const aztecStartOptions = {
             ...l1ReaderConfigMappings.l1RpcUrls,
             defaultValue: undefined
         }),
-        configToFlag('--l1-consensus-host-urls', blobSinkConfigMappings.l1ConsensusHostUrls),
-        configToFlag('--l1-consensus-host-api-keys', blobSinkConfigMappings.l1ConsensusHostApiKeys),
-        configToFlag('--l1-consensus-host-api-key-headers', blobSinkConfigMappings.l1ConsensusHostApiKeyHeaders)
+        configToFlag('--l1-consensus-host-urls', blobClientConfigMapping.l1ConsensusHostUrls),
+        configToFlag('--l1-consensus-host-api-keys', blobClientConfigMapping.l1ConsensusHostApiKeys),
+        configToFlag('--l1-consensus-host-api-key-headers', blobClientConfigMapping.l1ConsensusHostApiKeyHeaders)
     ],
     'L1 CONTRACTS': [
         configToFlag('--registry-address', l1ContractAddressesMapping.registryAddress),
-        configToFlag('--rollup-version', chainConfigMappings.rollupVersion, 'canonical')
+        configToFlag('--rollup-version', chainConfigMappings.rollupVersion)
     ],
     STORAGE: [
         configToFlag('--data-directory', dataConfigMappings.dataDirectory),
-        configToFlag('--data-store-map-size-kb', dataConfigMappings.dataStoreMapSizeKB)
+        configToFlag('--data-store-map-size-kb', dataConfigMappings.dataStoreMapSizeKb)
     ],
     'WORLD STATE': [
         configToFlag('--world-state-data-directory', worldStateConfigMappings.worldStateDataDirectory),
@@ -178,20 +169,12 @@ export const aztecStartOptions = {
         },
         ...getOptions('sequencer', omitConfigMappings(sequencerClientConfigMappings, [
             'fakeProcessingDelayPerTxMs',
+            'fakeThrowAfterProcessingTxCount',
             'skipCollectingAttestations',
             'skipInvalidateBlockAsProposer',
             'blobSinkMapSizeKb'
         ]))
     ],
-    'BLOB SINK': [
-        {
-            flag: '--blob-sink',
-            description: 'Starts Aztec Blob Sink with options',
-            defaultValue: undefined,
-            env: undefined
-        },
-        ...getOptions('blobSink', blobSinkConfigMappings)
-    ],
     'PROVER NODE': [
         {
             flag: '--prover-node',

package/dest/cli/cli.d.ts

@@ -6,4 +6,4 @@ import { Command } from 'commander';
  * @param debugLogger - logger for logging debug messages.
  */
 export declare function injectAztecCommands(program: Command, userLog: LogFn, debugLogger: Logger): Command;
-//# sourceMappingURL=cli.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2NsaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFM0QsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUtwQzs7OztHQUlHO0FBQ0gsd0JBQWdCLG1CQUFtQixDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0F3RmxHIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CA2ClG"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAwFlG"}

package/dest/cli/cli.js

@@ -24,10 +24,55 @@ import { addOptions, printAztecStartHelpText } from './util.js';
 
   Additional commands:
 
+    init [folder] [options]: creates a new Noir project
+      Options:
+        --name <name>       Name of the package
+        --contract          Use a contract template (default)
+        --lib               Use a library template
+        --bin               Use a binary template
+      Examples:
+        $ aztec init                    # creates a contract project in current directory
+        $ aztec init --lib              # creates a library project
+
+    new <path> [options]: creates a new Noir project in a new directory
+      Options:
+        --name <name>       Name of the package
+        --contract          Use a contract template (default)
+        --lib               Use a library template
+        --bin               Use a binary template
+      Examples:
+        $ aztec new my-project          # creates a contract project in ./my-project
+        $ aztec new my-lib --lib        # creates a library project in ./my-lib
+
+    compile [options]: compiles Aztec Noir contracts
+      Compiles contracts with nargo compile and then 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.
+      Supports standard nargo compile options.
+
+    fmt [options]: formats Noir code using nargo fmt
+      Example:
+        $ aztec fmt                     # formats all Noir files in the project
+
+    check [options]: type-checks Noir code without compiling using nargo check
+      Example:
+        $ aztec check                   # checks all Noir files in the project
+
     test [options]: starts a dockerized TXE node via
       $ aztec start --txe
     then runs
-      $ aztec-nargo test --silence-warnings --oracle-resolver=<TXE_ADDRESS> [options]
+      $ aztec test --silence-warnings --oracle-resolver=<TXE_ADDRESS> [options]
+
+    lsp: starts the Nargo Language Server Protocol server
+      Runs nargo lsp in a Docker container for IDE integration with Noir.
+      This command is typically used by IDE extensions and not called directly by users.
+      Example:
+        $ aztec lsp                     # starts the LSP server
+
+    preload-crs: Downloads and caches the Common Reference String (CRS) data required for zero-knowledge proofs.
+      Example:
+        $ aztec preload-crs             # preloads CRS data
     `);
     program.command('preload-crs').description('Preload the points data needed for proving and verifying').action(async (options)=>{
         const { preloadCrs } = await import('./preload_crs.js');

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

@@ -6,4 +6,4 @@ export type { ArchiverConfig, DataStoreConfig };
 export declare function startArchiver(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers): Promise<{
     config: ArchiverConfig & DataStoreConfig;
 }>;
-//# sourceMappingURL=start_archiver.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfYXJjaGl2ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvY21kcy9zdGFydF9hcmNoaXZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBRUwsS0FBSyxjQUFjLEVBSXBCLE1BQU0saUJBQWlCLENBQUM7QUFJekIsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0sd0JBQXdCLENBQUM7QUFPbEYsWUFBWSxFQUFFLGNBQWMsRUFBRSxlQUFlLEVBQUUsQ0FBQztBQUVoRCxvQ0FBb0M7QUFDcEMsd0JBQXNCLGFBQWEsQ0FDakMsT0FBTyxFQUFFLEdBQUcsRUFDWixjQUFjLEVBQUUsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQ3ZDLFFBQVEsRUFBRSxxQkFBcUIsR0FDOUIsT0FBTyxDQUFDO0lBQUUsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLENBQUE7Q0FBRSxDQUFDLENBbUN2RCJ9

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

@@ -1 +1 @@
-{"version":3,"file":"start_archiver.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_archiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EAIpB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAQlF,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC;AAEhD,oCAAoC;AACpC,wBAAsB,aAAa,CACjC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,GAC9B,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,GAAG,eAAe,CAAA;CAAE,CAAC,CAmCvD"}
+{"version":3,"file":"start_archiver.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_archiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EAIpB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAOlF,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC;AAEhD,oCAAoC;AACpC,wBAAsB,aAAa,CACjC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,GAC9B,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,GAAG,eAAe,CAAA;CAAE,CAAC,CAmCvD"}

package/dest/cli/cmds/start_archiver.js

@@ -1,24 +1,24 @@
 import { Archiver, KVArchiverDataStore, archiverConfigMappings, getArchiverConfigFromEnv } from '@aztec/archiver';
-import { createLogger } from '@aztec/aztec.js';
-import { blobSinkConfigMapping, createBlobSinkClient } from '@aztec/blob-sink/client';
+import { createLogger } from '@aztec/aztec.js/log';
+import { blobClientConfigMapping, createBlobClient } from '@aztec/blob-client/client';
+import { getL1Config } from '@aztec/cli/config';
 import { dataConfigMappings } from '@aztec/kv-store/config';
 import { createStore } from '@aztec/kv-store/lmdb-v2';
 import { ArchiverApiSchema } from '@aztec/stdlib/interfaces/server';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
-import { getL1Config } from '../get_l1_config.js';
 import { extractRelevantOptions } from '../util.js';
 /** Starts a standalone archiver. */ export async function startArchiver(options, signalHandlers, services) {
     const envConfig = getArchiverConfigFromEnv();
     const cliOptions = extractRelevantOptions(options, {
         ...archiverConfigMappings,
         ...dataConfigMappings,
-        ...blobSinkConfigMapping
+        ...blobClientConfigMapping
     }, 'archiver');
     let archiverConfig = {
         ...envConfig,
         ...cliOptions
     };
-    archiverConfig.dataStoreMapSizeKB = archiverConfig.archiverStoreMapSizeKb ?? archiverConfig.dataStoreMapSizeKB;
+    archiverConfig.dataStoreMapSizeKb = archiverConfig.archiverStoreMapSizeKb ?? archiverConfig.dataStoreMapSizeKb;
     if (!archiverConfig.l1Contracts.registryAddress || archiverConfig.l1Contracts.registryAddress.isZero()) {
         throw new Error('L1 registry address is required to start an Archiver');
     }
@@ -31,13 +31,13 @@ import { extractRelevantOptions } from '../util.js';
     const storeLog = createLogger('archiver:lmdb');
     const store = await createStore('archiver', KVArchiverDataStore.SCHEMA_VERSION, archiverConfig, storeLog);
     const archiverStore = new KVArchiverDataStore(store, archiverConfig.maxLogs);
-    const telemetry = initTelemetryClient(getTelemetryClientConfig());
-    const blobSinkClient = createBlobSinkClient(archiverConfig, {
-        logger: createLogger('archiver:blob-sink:client')
+    const telemetry = await initTelemetryClient(getTelemetryClientConfig());
+    const blobClient = createBlobClient(archiverConfig, {
+        logger: createLogger('archiver:blob-client:client')
     });
     const archiver = await Archiver.createAndSync(archiverConfig, archiverStore, {
         telemetry,
-        blobSinkClient
+        blobClient
     }, true);
     services.archiver = [
         archiver,

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

@@ -1,11 +1,8 @@
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import type { LogFn } from '@aztec/foundation/log';
-import type { AztecNode, PXE } from '@aztec/stdlib/interfaces/client';
+import { type AztecNode, type AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import type { TelemetryClient } from '@aztec/telemetry-client';
+import { TestWallet } from '@aztec/test-wallet/server';
 export declare function startBot(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, userLog: LogFn): Promise<void>;
-export declare function addBot(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, deps: {
-    pxe?: PXE;
-    node?: AztecNode;
-    telemetry: TelemetryClient;
-}): Promise<void>;
-//# sourceMappingURL=start_bot.d.ts.map
+export declare function addBot(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, wallet: TestWallet, aztecNode: AztecNode, telemetry: TelemetryClient, aztecNodeAdmin?: AztecNodeAdmin): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfYm90LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2NtZHMvc3RhcnRfYm90LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDL0UsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHbkQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFFLEtBQUssY0FBYyxFQUF5QixNQUFNLGlDQUFpQyxDQUFDO0FBQzdHLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBTS9ELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUt2RCx3QkFBc0IsUUFBUSxDQUM1QixPQUFPLEVBQUUsR0FBRyxFQUNaLGNBQWMsRUFBRSxDQUFDLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsRUFDdkMsUUFBUSxFQUFFLHFCQUFxQixFQUMvQixPQUFPLEVBQUUsS0FBSyxpQkF1QmY7QUFFRCx3QkFBc0IsTUFBTSxDQUMxQixPQUFPLEVBQUUsR0FBRyxFQUNaLGNBQWMsRUFBRSxDQUFDLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsRUFDdkMsUUFBUSxFQUFFLHFCQUFxQixFQUMvQixNQUFNLEVBQUUsVUFBVSxFQUNsQixTQUFTLEVBQUUsU0FBUyxFQUNwQixTQUFTLEVBQUUsZUFBZSxFQUMxQixjQUFjLENBQUMsRUFBRSxjQUFjLGlCQWtCaEMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"start_bot.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_bot.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAK/D,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,iBAkBf;AAED,wBAAgB,MAAM,CACpB,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,IAAI,EAAE;IAAE,GAAG,CAAC,EAAE,GAAG,CAAC;IAAC,IAAI,CAAC,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,eAAe,CAAA;CAAE,iBAWlE"}
+{"version":3,"file":"start_bot.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_bot.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,cAAc,EAAyB,MAAM,iCAAiC,CAAC;AAC7G,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAM/D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAKvD,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,iBAuBf;AAED,wBAAsB,MAAM,CAC1B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,eAAe,EAC1B,cAAc,CAAC,EAAE,cAAc,iBAkBhC"}

package/dest/cli/cmds/start_bot.js

@@ -1,27 +1,38 @@
-import { BotRunner, botConfigMappings, getBotRunnerApiHandler } from '@aztec/bot';
-import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
+import { BotRunner, BotStore, botConfigMappings, getBotRunnerApiHandler } from '@aztec/bot';
+import { createStore, openTmpStore } from '@aztec/kv-store/lmdb-v2';
+import { allPxeConfigMappings } from '@aztec/pxe/config';
+import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
+import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient, makeTracedFetch } from '@aztec/telemetry-client';
+import { TestWallet } from '@aztec/test-wallet/server';
 import { extractRelevantOptions } from '../util.js';
+import { getVersions } from '../versioning.js';
 export async function startBot(options, signalHandlers, services, userLog) {
     const { proverNode, archiver, sequencer, p2pBootstrap, txe, prover } = options;
     if (proverNode || archiver || sequencer || p2pBootstrap || txe || prover) {
         userLog(`Starting a bot with --prover-node, --prover, --archiver, --sequencer, --p2p-bootstrap, or --txe is not supported.`);
         process.exit(1);
     }
-    // Start a PXE client that is used by the bot if required
-    let pxe;
-    if (options.pxe) {
-        const { addPXE } = await import('./start_pxe.js');
-        ({ pxe } = await addPXE(options, signalHandlers, services, userLog));
+    const fetch = makeTracedFetch([
+        1,
+        2,
+        3
+    ], true);
+    const config = extractRelevantOptions(options, botConfigMappings, 'bot');
+    if (!config.nodeUrl) {
+        throw new Error('The bot requires access to a Node');
     }
-    const telemetry = initTelemetryClient(getTelemetryClientConfig());
-    await addBot(options, signalHandlers, services, {
-        pxe,
-        telemetry
-    });
+    const aztecNode = createAztecNodeClient(config.nodeUrl, getVersions(), fetch);
+    const pxeConfig = extractRelevantOptions(options, allPxeConfigMappings, 'pxe');
+    const wallet = await TestWallet.create(aztecNode, pxeConfig);
+    const telemetry = await initTelemetryClient(getTelemetryClientConfig());
+    await addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, undefined);
 }
-export function addBot(options, signalHandlers, services, deps) {
+export async function addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, aztecNodeAdmin) {
     const config = extractRelevantOptions(options, botConfigMappings, 'bot');
-    const botRunner = new BotRunner(config, deps);
+    const db = await (config.dataDirectory ? createStore('bot', BotStore.SCHEMA_VERSION, config) : openTmpStore('bot', true, config.dataStoreMapSizeKb));
+    const store = new BotStore(db);
+    await store.cleanupOldClaims();
+    const botRunner = new BotRunner(config, wallet, aztecNode, telemetry, aztecNodeAdmin, store);
     if (!config.noStart) {
         void botRunner.start(); // Do not block since bot setup takes time
     }

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

@@ -4,4 +4,4 @@ import type { LogFn } from '@aztec/foundation/log';
 export declare function startNode(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, adminServices: NamespacedApiHandlers, userLog: LogFn): Promise<{
     config: AztecNodeConfig;
 }>;
-//# sourceMappingURL=start_node.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfbm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUE2QyxNQUFNLG1CQUFtQixDQUFDO0FBTXBHLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDL0UsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFvQm5ELHdCQUFzQixTQUFTLENBQzdCLE9BQU8sRUFBRSxHQUFHLEVBQ1osY0FBYyxFQUFFLENBQUMsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxFQUN2QyxRQUFRLEVBQUUscUJBQXFCLEVBQy9CLGFBQWEsRUFBRSxxQkFBcUIsRUFDcEMsT0FBTyxFQUFFLEtBQUssR0FDYixPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsZUFBZSxDQUFBO0NBQUUsQ0FBQyxDQXlIdEMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"start_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAA6C,MAAM,mBAAmB,CAAC;AAKpG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAmBnD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB,EACpC,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CA4HtC"}
+{"version":3,"file":"start_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAA6C,MAAM,mBAAmB,CAAC;AAMpG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAoBnD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB,EACpC,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CAyHtC"}

package/dest/cli/cmds/start_node.js

@@ -1,15 +1,17 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { aztecNodeConfigMappings, getConfigEnvVars } from '@aztec/aztec-node';
-import { Fr } from '@aztec/aztec.js';
+import { Fr } from '@aztec/aztec.js/fields';
 import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
-import { getPublicClient } from '@aztec/ethereum';
+import { getL1Config } from '@aztec/cli/config';
+import { getPublicClient } from '@aztec/ethereum/client';
 import { SecretValue } from '@aztec/foundation/config';
+import { allPxeConfigMappings } from '@aztec/pxe/config';
 import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
 import { P2PApiSchema } from '@aztec/stdlib/interfaces/server';
 import { initTelemetryClient, telemetryClientConfigMappings } from '@aztec/telemetry-client';
+import { TestWallet } from '@aztec/test-wallet/server';
 import { getGenesisValues } from '@aztec/world-state/testing';
-import { createAztecNode } from '../../sandbox/index.js';
-import { getL1Config } from '../get_l1_config.js';
+import { createAztecNode } from '../../local-network/index.js';
 import { extractNamespacedOptions, extractRelevantOptions, preloadCrsDataForVerifying, setupUpdateMonitor } from '../util.js';
 export async function startNode(options, signalHandlers, services, adminServices, userLog) {
     // All options set from environment variables
@@ -26,7 +28,7 @@ export async function startNode(options, signalHandlers, services, adminServices
         process.exit(1);
     }
     await preloadCrsDataForVerifying(nodeConfig, userLog);
-    const testAccounts = nodeConfig.testAccounts ? (await getInitialTestAccounts()).map((a)=>a.address) : [];
+    const testAccounts = nodeConfig.testAccounts ? (await getInitialTestAccountsData()).map((a)=>a.address) : [];
     const sponsoredFPCAccounts = nodeConfig.sponsoredFPC ? [
         await getSponsoredFPCAddress()
     ] : [];
@@ -52,7 +54,7 @@ export async function startNode(options, signalHandlers, services, adminServices
         },
         ...config
     };
-    if (!options.sequencer) {
+    if (!options.sequencer && !nodeConfig.fishermanMode) {
         nodeConfig.disableValidator = true;
     } else {
         const sequencerConfig = {
@@ -76,7 +78,7 @@ export async function startNode(options, signalHandlers, services, adminServices
         }
     }
     const telemetryConfig = extractRelevantOptions(options, telemetryClientConfigMappings, 'tel');
-    const telemetry = initTelemetryClient(telemetryConfig);
+    const telemetry = await initTelemetryClient(telemetryConfig);
     // Create and start Aztec Node
     const node = await createAztecNode(nodeConfig, {
         telemetry
@@ -98,22 +100,12 @@ export async function startNode(options, signalHandlers, services, adminServices
     ];
     // Add node stop function to signal handlers
     signalHandlers.push(node.stop.bind(node));
-    // Add a PXE client that connects to this node if requested
-    let pxe;
-    if (options.pxe) {
-        const { addPXE } = await import('./start_pxe.js');
-        ({ pxe } = await addPXE(options, signalHandlers, services, userLog, {
-            node
-        }));
-    }
     // Add a txs bot if requested
     if (options.bot) {
         const { addBot } = await import('./start_bot.js');
-        await addBot(options, signalHandlers, services, {
-            pxe,
-            node,
-            telemetry
-        });
+        const pxeConfig = extractRelevantOptions(options, allPxeConfigMappings, 'pxe');
+        const wallet = await TestWallet.create(node, pxeConfig);
+        await addBot(options, signalHandlers, services, wallet, node, telemetry, undefined);
     }
     if (nodeConfig.autoUpdate !== 'disabled' && nodeConfig.autoUpdateUrl) {
         await setupUpdateMonitor(nodeConfig.autoUpdate, new URL(nodeConfig.autoUpdateUrl), followsCanonicalRollup, getPublicClient(nodeConfig), nodeConfig.l1Contracts.registryAddress, signalHandlers, async (config)=>node.setConfig((await AztecNodeAdminApiSchema.setConfig.parameters().parseAsync([

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

@@ -3,4 +3,4 @@ import { type LogFn } from '@aztec/foundation/log';
 export declare function startP2PBootstrap(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, userLog: LogFn): Promise<{
     config: import("@aztec/stdlib/config").ChainConfig;
 }>;
-//# sourceMappingURL=start_p2p_bootstrap.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfcDJwX2Jvb3RzdHJhcC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X3AycF9ib290c3RyYXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsS0FBSyxLQUFLLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFhakUsd0JBQXNCLGlCQUFpQixDQUNyQyxPQUFPLEVBQUUsR0FBRyxFQUNaLGNBQWMsRUFBRSxDQUFDLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsRUFDdkMsUUFBUSxFQUFFLHFCQUFxQixFQUMvQixPQUFPLEVBQUUsS0FBSzs7R0FpQmYifQ==

package/dest/cli/cmds/start_p2p_bootstrap.js

@@ -15,7 +15,7 @@ export async function startP2PBootstrap(options, signalHandlers, services, userL
     };
     userLog(`Starting P2P bootstrap node with config: ${jsonStringify(safeConfig)}`);
     const telemetryConfig = extractRelevantOptions(options, telemetryClientConfigMappings, 'tel');
-    const telemetryClient = initTelemetryClient(telemetryConfig);
+    const telemetryClient = await initTelemetryClient(telemetryConfig);
     const store = await createStore('p2p-bootstrap', 1, config, createLogger('p2p:bootstrap:store'));
     const node = new BootstrapNode(store, telemetryClient);
     await node.start(config);

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

@@ -1,4 +1,4 @@
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import type { LogFn } from '@aztec/foundation/log';
 export declare function startProverAgent(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, userLog: LogFn): Promise<void>;
-//# sourceMappingURL=start_prover_agent.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfcHJvdmVyX2FnZW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2NtZHMvc3RhcnRfcHJvdmVyX2FnZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFL0UsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFnQm5ELHdCQUFzQixnQkFBZ0IsQ0FDcEMsT0FBTyxFQUFFLEdBQUcsRUFDWixjQUFjLEVBQUUsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQ3ZDLFFBQVEsRUFBRSxxQkFBcUIsRUFDL0IsT0FBTyxFQUFFLEtBQUssaUJBd0RmIn0=