@aztec/aztec 0.0.0-test.1 → 0.0.1-commit.b655e406

package/dest/bin/index.js

@@ -1,19 +1,19 @@
 #!/usr/bin/env node
 //
 import { injectCommands as injectBuilderCommands } from '@aztec/builder';
-import { injectCommands as injectWalletCommands } from '@aztec/cli-wallet';
+import { injectCommands as injectAztecNodeCommands } from '@aztec/cli/aztec_node';
+import { enrichEnvironmentWithChainConfig, enrichEnvironmentWithNetworkConfig } from '@aztec/cli/config';
 import { injectCommands as injectContractCommands } from '@aztec/cli/contracts';
-import { injectCommands as injectDevnetCommands } from '@aztec/cli/devnet';
 import { injectCommands as injectInfrastructureCommands } from '@aztec/cli/infrastructure';
 import { injectCommands as injectL1Commands } from '@aztec/cli/l1';
 import { injectCommands as injectMiscCommands } from '@aztec/cli/misc';
-import { injectCommands as injectPXECommands } from '@aztec/cli/pxe';
+import { injectCommands as injectValidatorKeysCommands } from '@aztec/cli/validator_keys';
+import { getActiveNetworkName } from '@aztec/foundation/config';
 import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
-import { fileURLToPath } from '@aztec/foundation/url';
 import { Command } from 'commander';
-import { readFileSync } from 'fs';
-import { dirname, resolve } from 'path';
+import { NETWORK_FLAG } from '../cli/aztec_start_options.js';
 import { injectAztecCommands } from '../cli/index.js';
+import { getCliVersion } from '../cli/release_version.js';
 const userLog = createConsoleLogger();
 const debugLogger = createLogger('cli');
 /** CLI & full node main entrypoint */ async function main() {
@@ -22,19 +22,27 @@ const debugLogger = createLogger('cli');
     };
     process.once('SIGINT', shutdown);
     process.once('SIGTERM', shutdown);
-    const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
-    const cliVersion = JSON.parse(readFileSync(packageJsonPath).toString()).version;
+    // Intercept the setting of a network and enrich the environment with defaults for that network
+    let networkValue;
+    const args = process.argv.slice(2);
+    const networkIndex = args.findIndex((arg)=>arg.startsWith(`--${NETWORK_FLAG}=`) || arg === `--${NETWORK_FLAG}`);
+    if (networkIndex !== -1) {
+        networkValue = args[networkIndex].split('=')[1] || args[networkIndex + 1];
+    }
+    const networkName = getActiveNetworkName(networkValue);
+    await enrichEnvironmentWithNetworkConfig(networkName);
+    enrichEnvironmentWithChainConfig(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.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;AAmB3D,wBAAsB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,iBAyFjF"}
+{"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,iBA6FjF"}

package/dest/cli/aztec_start_action.js

@@ -1,33 +1,30 @@
 import { createNamespacedSafeJsonRpcServer, startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
-import { fileURLToPath } from '@aztec/foundation/url';
-import { AztecNodeApiSchema, PXESchema } from '@aztec/stdlib/interfaces/client';
+import { AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
 import { getVersioningMiddleware } from '@aztec/stdlib/versioning';
 import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
-import { readFileSync } from 'fs';
-import { dirname, resolve } from 'path';
 import { createSandbox } from '../sandbox/index.js';
 import { github, splash } from '../splash.js';
-import { enrichEnvironmentWithChainConfig } from './chain_l2_config.js';
+import { getCliVersion } from './release_version.js';
 import { extractNamespacedOptions, installSignalHandlers } from './util.js';
 import { getVersions } from './versioning.js';
-const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
-const cliVersion = JSON.parse(readFileSync(packageJsonPath).toString()).version;
 export async function aztecStart(options, userLog, debugLogger) {
     // list of 'stop' functions to call when process ends
     const signalHandlers = [];
     const services = {};
+    const adminServices = {};
     let config = undefined;
     if (options.sandbox) {
+        const cliVersion = getCliVersion();
         const sandboxOptions = extractNamespacedOptions(options, 'sandbox');
-        const nodeOptions = extractNamespacedOptions(options, 'node');
+        sandboxOptions.testAccounts = true;
         userLog(`${splash}\n${github}\n\n`);
         userLog(`Setting up Aztec Sandbox ${cliVersion}, please stand by...`);
-        const { node, pxe, stop } = await createSandbox({
-            l1Mnemonic: options.l1Mnemonic,
+        const { node, stop } = await createSandbox({
+            l1Mnemonic: sandboxOptions.l1Mnemonic,
             l1RpcUrls: options.l1RpcUrls,
-            l1Salt: nodeOptions.deployAztecContractsSalt,
-            noPXE: sandboxOptions.noPXE,
-            testAccounts: sandboxOptions.testAccounts
+            deployAztecContractsSalt: sandboxOptions.deployAztecContractsSalt,
+            testAccounts: sandboxOptions.testAccounts,
+            realProofs: false
         }, userLog);
         // Start Node and PXE JSON-RPC server
         signalHandlers.push(stop);
@@ -35,22 +32,10 @@ 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 a network is specified, enrich the environment with the chain config
-        if (options.network) {
-            await enrichEnvironmentWithChainConfig(options.network);
-        }
         if (options.node) {
             const { startNode } = await import('./cmds/start_node.js');
-            ({ config } = await startNode(options, signalHandlers, services, userLog));
+            ({ config } = await startNode(options, signalHandlers, services, adminServices, userLog));
         } else if (options.bot) {
             const { startBot } = await import('./cmds/start_bot.js');
             await startBot(options, signalHandlers, services, userLog);
@@ -60,9 +45,6 @@ export async function aztecStart(options, userLog, debugLogger) {
         } 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));
@@ -81,9 +63,6 @@ export async function aztecStart(options, userLog, debugLogger) {
         } else if (options.sequencer) {
             userLog(`Cannot run a standalone sequencer without a node`);
             process.exit(1);
-        } else if (options.faucet) {
-            const { startFaucet } = await import('./cmds/start_faucet.js');
-            await startFaucet(options, signalHandlers, services, userLog);
         } else {
             userLog(`No module specified to start`);
             process.exit(1);
@@ -91,6 +70,7 @@ export async function aztecStart(options, userLog, debugLogger) {
     }
     installSignalHandlers(debugLogger.info, signalHandlers);
     const versions = getVersions(config);
+    // Start the main JSON-RPC server
     if (Object.entries(services).length > 0) {
         const rpcServer = createNamespacedSafeJsonRpcServer(services, {
             http200OnError: false,
@@ -98,11 +78,30 @@ export async function aztecStart(options, userLog, debugLogger) {
             middlewares: [
                 getOtelJsonRpcPropagationMiddleware(),
                 getVersioningMiddleware(versions)
-            ]
+            ],
+            maxBatchSize: options.rpcMaxBatchSize,
+            maxBodySizeBytes: options.rpcMaxBodySize
         });
         const { port } = await startHttpRpcServer(rpcServer, {
             port: options.port
         });
         debugLogger.info(`Aztec Server listening on port ${port}`, versions);
     }
+    // If there are any admin services, start a separate JSON-RPC server for them
+    if (Object.entries(adminServices).length > 0) {
+        const rpcServer = createNamespacedSafeJsonRpcServer(adminServices, {
+            http200OnError: false,
+            log: debugLogger,
+            middlewares: [
+                getOtelJsonRpcPropagationMiddleware(),
+                getVersioningMiddleware(versions)
+            ],
+            maxBatchSize: options.rpcMaxBatchSize,
+            maxBodySizeBytes: options.rpcMaxBodySize
+        });
+        const { port } = await startHttpRpcServer(rpcServer, {
+            port: options.adminPort
+        });
+        debugLogger.info(`Aztec Server admin API listening on port ${port}`, versions);
+    }
 }

package/dest/cli/aztec_start_options.d.ts

@@ -2,13 +2,15 @@ import { type ConfigMapping, type EnvVar } from '@aztec/foundation/config';
 export interface AztecStartOption {
     flag: string;
     description: string;
-    defaultValue: any | undefined;
+    defaultValue: any;
     printDefault?: (val: any) => string;
-    envVar: EnvVar | undefined;
+    env: EnvVar | undefined;
+    fallback?: EnvVar[];
     parseVal?: (val: string) => any;
 }
 export declare const getOptions: (namespace: string, configMappings: Record<string, ConfigMapping>) => AztecStartOption[];
 export declare const universalOptions: string[];
+export declare const NETWORK_FLAG = "network";
 export declare const aztecStartOptions: {
     [key: string]: AztecStartOption[];
 };

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":"AAKA,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,GAAG,SAAS,CAAC;IAC9B,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC;IACpC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;CACjC;AAED,eAAO,MAAM,UAAU,cAAe,MAAM,kBAAkB,OAAO,MAAM,EAAE,aAAa,CAAC,uBAiB1F,CAAC;AAGF,eAAO,MAAM,gBAAgB,UAA2E,CAAC;AAGzG,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAwTlE,CAAC"}
+{"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;CA+NlE,CAAC"}