@aztec/aztec 3.0.0-nightly.20250905 → 4.0.0-nightly.20250907

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/src/cli/util.ts CHANGED
@@ -144,8 +144,8 @@ const getDefaultOrEnvValue = (opt: AztecStartOption) => {
144
144
  let val;
145
145
 
146
146
  // if the option is set in the environment, use that
147
- if (opt.envVar) {
148
- val = process.env[opt.envVar];
147
+ if (opt.env) {
148
+ val = process.env[opt.env];
149
149
  }
150
150
 
151
151
  // if we have fallback env vars, check those
@@ -164,7 +164,7 @@ const getDefaultOrEnvValue = (opt: AztecStartOption) => {
164
164
  return opt.parseVal(val);
165
165
  }
166
166
  return val;
167
- } else if (opt.defaultValue) {
167
+ } else if (opt.defaultValue !== undefined) {
168
168
  return opt.defaultValue;
169
169
  }
170
170
  return undefined;
@@ -175,7 +175,7 @@ export const addOptions = (cmd: Command, options: AztecStartOption[]) => {
175
175
  options.forEach(opt => {
176
176
  cmd.option(
177
177
  opt.flag,
178
- `${opt.description} (default: ${opt.defaultValue}) ($${opt.envVar})`,
178
+ `${opt.description} (default: ${opt.defaultValue}) ($${opt.env})`,
179
179
  opt.parseVal ? opt.parseVal : val => val,
180
180
  getDefaultOrEnvValue(opt),
181
181
  );
@@ -191,10 +191,11 @@ export const printAztecStartHelpText = () => {
191
191
  helpTextLines.push('');
192
192
 
193
193
  aztecStartOptions[category].forEach(opt => {
194
- const defaultValueText = opt.defaultValue
195
- ? `(default: ${opt.printDefault ? opt.printDefault(opt.defaultValue) : opt.defaultValue})`
196
- : '';
197
- const envVarText = opt.envVar ? `($${opt.envVar})` : '';
194
+ const defaultValueText =
195
+ opt.defaultValue || (Array.isArray(opt.defaultValue) && opt.defaultValue.length > 0)
196
+ ? `(default: ${opt.printDefault ? opt.printDefault(opt.defaultValue) : opt.defaultValue})`
197
+ : '';
198
+ const envVarText = opt.env ? `($${opt.env})` : '';
198
199
  const flagText = `${opt.flag}`;
199
200
 
200
201
  const paddedText = formatHelpLine(flagText, defaultValueText, envVarText, maxFlagLength, maxDefaultLength);
@@ -1,4 +0,0 @@
1
- import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
2
- import type { LogFn } from '@aztec/foundation/log';
3
- export declare function startFaucet(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, log: LogFn): Promise<void>;
4
- //# sourceMappingURL=start_faucet.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"start_faucet.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_faucet.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,wBAAsB,WAAW,CAC/B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,GAAG,EAAE,KAAK,iBAiBX"}
@@ -1,20 +0,0 @@
1
- import { Faucet, FaucetSchema, createFaucetHttpServer, faucetConfigMapping, getFaucetConfigFromEnv } from '@aztec/aztec-faucet';
2
- import { extractNamespacedOptions, extractRelevantOptions } from '../util.js';
3
- export async function startFaucet(options, signalHandlers, services, log) {
4
- const faucetOptions = extractNamespacedOptions(options, 'faucet');
5
- const config = {
6
- ...getFaucetConfigFromEnv(),
7
- ...extractRelevantOptions(options, faucetConfigMapping, 'faucet')
8
- };
9
- const faucet = await Faucet.create(config);
10
- if (faucetOptions.apiServer) {
11
- const httpServer = createFaucetHttpServer(faucet);
12
- httpServer.listen(faucetOptions.apiServerPort);
13
- signalHandlers.push(()=>new Promise((res)=>httpServer.close(()=>res())));
14
- log(`Faucet now running on port: ${faucetOptions.apiServerPort}`);
15
- }
16
- services.faucet = [
17
- faucet,
18
- FaucetSchema
19
- ];
20
- }
@@ -1,34 +0,0 @@
1
- import {
2
- Faucet,
3
- FaucetSchema,
4
- createFaucetHttpServer,
5
- faucetConfigMapping,
6
- getFaucetConfigFromEnv,
7
- } from '@aztec/aztec-faucet';
8
- import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
9
- import type { LogFn } from '@aztec/foundation/log';
10
-
11
- import { extractNamespacedOptions, extractRelevantOptions } from '../util.js';
12
-
13
- export async function startFaucet(
14
- options: any,
15
- signalHandlers: (() => Promise<void>)[],
16
- services: NamespacedApiHandlers,
17
- log: LogFn,
18
- ) {
19
- const faucetOptions = extractNamespacedOptions(options, 'faucet');
20
- const config = {
21
- ...getFaucetConfigFromEnv(),
22
- ...extractRelevantOptions(options, faucetConfigMapping, 'faucet'),
23
- };
24
-
25
- const faucet = await Faucet.create(config);
26
- if (faucetOptions.apiServer) {
27
- const httpServer = createFaucetHttpServer(faucet);
28
- httpServer.listen(faucetOptions.apiServerPort);
29
- signalHandlers.push(() => new Promise(res => httpServer.close(() => res())));
30
- log(`Faucet now running on port: ${faucetOptions.apiServerPort}`);
31
- }
32
-
33
- services.faucet = [faucet, FaucetSchema];
34
- }