@aztec/aztec 0.0.1-commit.7b97ef96e → 0.0.1-commit.7cbc774

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.
Files changed (143) hide show
  1. package/dest/bin/index.js +4 -2
  2. package/dest/cli/admin_api_key_store.d.ts +3 -3
  3. package/dest/cli/admin_api_key_store.d.ts.map +1 -1
  4. package/dest/cli/admin_api_key_store.js +3 -3
  5. package/dest/cli/aztec_start_action.d.ts +1 -1
  6. package/dest/cli/aztec_start_action.d.ts.map +1 -1
  7. package/dest/cli/aztec_start_action.js +33 -16
  8. package/dest/cli/aztec_start_options.d.ts +2 -2
  9. package/dest/cli/aztec_start_options.d.ts.map +1 -1
  10. package/dest/cli/aztec_start_options.js +20 -20
  11. package/dest/cli/cli.js +3 -3
  12. package/dest/cli/cmds/compile.d.ts +1 -1
  13. package/dest/cli/cmds/compile.d.ts.map +1 -1
  14. package/dest/cli/cmds/compile.js +114 -43
  15. package/dest/cli/cmds/profile.d.ts +4 -0
  16. package/dest/cli/cmds/profile.d.ts.map +1 -0
  17. package/dest/cli/cmds/profile.js +8 -0
  18. package/dest/cli/cmds/profile_flamegraph.d.ts +4 -0
  19. package/dest/cli/cmds/profile_flamegraph.d.ts.map +1 -0
  20. package/dest/cli/cmds/profile_flamegraph.js +52 -0
  21. package/dest/cli/cmds/profile_gates.d.ts +4 -0
  22. package/dest/cli/cmds/profile_gates.d.ts.map +1 -0
  23. package/dest/cli/cmds/profile_gates.js +76 -0
  24. package/dest/cli/cmds/profile_utils.d.ts +18 -0
  25. package/dest/cli/cmds/profile_utils.d.ts.map +1 -0
  26. package/dest/cli/cmds/profile_utils.js +50 -0
  27. package/dest/cli/cmds/standby.d.ts +30 -0
  28. package/dest/cli/cmds/standby.d.ts.map +1 -0
  29. package/dest/cli/cmds/standby.js +97 -0
  30. package/dest/cli/cmds/start_bot.d.ts +1 -1
  31. package/dest/cli/cmds/start_bot.d.ts.map +1 -1
  32. package/dest/cli/cmds/start_bot.js +3 -3
  33. package/dest/cli/cmds/start_node.d.ts +3 -2
  34. package/dest/cli/cmds/start_node.d.ts.map +1 -1
  35. package/dest/cli/cmds/start_node.js +28 -40
  36. package/dest/cli/cmds/start_prover_agent.d.ts +1 -1
  37. package/dest/cli/cmds/start_prover_agent.d.ts.map +1 -1
  38. package/dest/cli/cmds/start_prover_agent.js +5 -17
  39. package/dest/cli/cmds/start_prover_broker.d.ts +1 -1
  40. package/dest/cli/cmds/start_prover_broker.d.ts.map +1 -1
  41. package/dest/cli/cmds/start_prover_broker.js +22 -13
  42. package/dest/cli/cmds/start_txe.d.ts +2 -2
  43. package/dest/cli/cmds/start_txe.d.ts.map +1 -1
  44. package/dest/cli/cmds/start_txe.js +6 -5
  45. package/dest/cli/cmds/utils/artifacts.d.ts +21 -0
  46. package/dest/cli/cmds/utils/artifacts.d.ts.map +1 -0
  47. package/dest/cli/cmds/utils/artifacts.js +24 -0
  48. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts +21 -0
  49. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts.map +1 -0
  50. package/dest/cli/cmds/utils/collect_crate_dirs.js +114 -0
  51. package/dest/cli/cmds/utils/needs_recompile.d.ts +10 -0
  52. package/dest/cli/cmds/utils/needs_recompile.d.ts.map +1 -0
  53. package/dest/cli/cmds/utils/needs_recompile.js +90 -0
  54. package/dest/cli/cmds/utils/spawn.d.ts +3 -0
  55. package/dest/cli/cmds/utils/spawn.d.ts.map +1 -0
  56. package/dest/cli/cmds/utils/spawn.js +16 -0
  57. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts +4 -0
  58. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts.map +1 -0
  59. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.js +61 -0
  60. package/dest/cli/util.d.ts +3 -5
  61. package/dest/cli/util.d.ts.map +1 -1
  62. package/dest/cli/util.js +46 -85
  63. package/dest/examples/token.js +4 -4
  64. package/dest/local-network/auth_registry.d.ts +4 -0
  65. package/dest/local-network/auth_registry.d.ts.map +1 -0
  66. package/dest/local-network/auth_registry.js +15 -0
  67. package/dest/local-network/banana_fpc.d.ts +1 -1
  68. package/dest/local-network/banana_fpc.d.ts.map +1 -1
  69. package/dest/local-network/banana_fpc.js +9 -7
  70. package/dest/local-network/local-network.d.ts +5 -28
  71. package/dest/local-network/local-network.d.ts.map +1 -1
  72. package/dest/local-network/local-network.js +44 -17
  73. package/dest/testing/anvil_test_watcher.d.ts +15 -3
  74. package/dest/testing/anvil_test_watcher.d.ts.map +1 -1
  75. package/dest/testing/anvil_test_watcher.js +68 -14
  76. package/dest/testing/cheat_codes.d.ts +18 -17
  77. package/dest/testing/cheat_codes.d.ts.map +1 -1
  78. package/dest/testing/cheat_codes.js +72 -36
  79. package/dest/testing/epoch_test_settler.d.ts +1 -1
  80. package/dest/testing/epoch_test_settler.d.ts.map +1 -1
  81. package/dest/testing/epoch_test_settler.js +9 -8
  82. package/dest/testing/index.d.ts +3 -2
  83. package/dest/testing/index.d.ts.map +1 -1
  84. package/dest/testing/index.js +1 -0
  85. package/dest/testing/token_allowed_setup.d.ts +7 -0
  86. package/dest/testing/token_allowed_setup.d.ts.map +1 -0
  87. package/dest/testing/token_allowed_setup.js +20 -0
  88. package/package.json +35 -34
  89. package/scripts/add_crate.sh +53 -0
  90. package/scripts/aztec.sh +15 -4
  91. package/scripts/init.sh +23 -19
  92. package/scripts/new.sh +48 -24
  93. package/scripts/setup_workspace.sh +69 -0
  94. package/scripts/templates/blank/contract/Nargo.toml +6 -0
  95. package/scripts/templates/blank/contract/src/main.nr +10 -0
  96. package/scripts/templates/blank/test/Nargo.toml +7 -0
  97. package/scripts/templates/blank/test/src/lib.nr +11 -0
  98. package/scripts/templates/counter/contract/Nargo.toml +7 -0
  99. package/scripts/templates/counter/contract/src/main.nr +48 -0
  100. package/scripts/templates/counter/test/Nargo.toml +7 -0
  101. package/scripts/templates/counter/test/src/lib.nr +32 -0
  102. package/src/bin/index.ts +4 -2
  103. package/src/cli/admin_api_key_store.ts +4 -4
  104. package/src/cli/aztec_start_action.ts +22 -16
  105. package/src/cli/aztec_start_options.ts +27 -28
  106. package/src/cli/cli.ts +3 -3
  107. package/src/cli/cmds/compile.ts +129 -44
  108. package/src/cli/cmds/profile.ts +26 -0
  109. package/src/cli/cmds/profile_flamegraph.ts +64 -0
  110. package/src/cli/cmds/profile_gates.ts +84 -0
  111. package/src/cli/cmds/profile_utils.ts +58 -0
  112. package/src/cli/cmds/standby.ts +132 -0
  113. package/src/cli/cmds/start_bot.ts +3 -5
  114. package/src/cli/cmds/start_node.ts +43 -39
  115. package/src/cli/cmds/start_prover_agent.ts +5 -8
  116. package/src/cli/cmds/start_prover_broker.ts +23 -24
  117. package/src/cli/cmds/start_txe.ts +7 -5
  118. package/src/cli/cmds/utils/artifacts.ts +44 -0
  119. package/src/cli/cmds/utils/collect_crate_dirs.ts +118 -0
  120. package/src/cli/cmds/utils/needs_recompile.ts +98 -0
  121. package/src/cli/cmds/utils/spawn.ts +16 -0
  122. package/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts +76 -0
  123. package/src/cli/util.ts +49 -82
  124. package/src/examples/token.ts +6 -4
  125. package/src/local-network/auth_registry.ts +14 -0
  126. package/src/local-network/banana_fpc.ts +5 -8
  127. package/src/local-network/local-network.ts +43 -14
  128. package/src/testing/anvil_test_watcher.ts +76 -13
  129. package/src/testing/cheat_codes.ts +92 -39
  130. package/src/testing/epoch_test_settler.ts +6 -8
  131. package/src/testing/index.ts +2 -1
  132. package/src/testing/token_allowed_setup.ts +19 -0
  133. package/dest/cli/cmds/start_archiver.d.ts +0 -9
  134. package/dest/cli/cmds/start_archiver.d.ts.map +0 -1
  135. package/dest/cli/cmds/start_archiver.js +0 -48
  136. package/dest/cli/release_version.d.ts +0 -2
  137. package/dest/cli/release_version.d.ts.map +0 -1
  138. package/dest/cli/release_version.js +0 -14
  139. package/scripts/extract_function.js +0 -47
  140. package/scripts/flamegraph.sh +0 -59
  141. package/scripts/setup_project.sh +0 -31
  142. package/src/cli/cmds/start_archiver.ts +0 -50
  143. package/src/cli/release_version.ts +0 -21
package/dest/bin/index.js CHANGED
@@ -11,11 +11,12 @@ import { injectCommands as injectMiscCommands } from '@aztec/cli/misc';
11
11
  import { injectCommands as injectValidatorKeysCommands } from '@aztec/cli/validator_keys';
12
12
  import { getActiveNetworkName } from '@aztec/foundation/config';
13
13
  import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
14
+ import { getPackageVersion } from '@aztec/stdlib/update-checker';
14
15
  import { Command } from 'commander';
15
16
  import { injectCompileCommand } from '../cli/cmds/compile.js';
16
17
  import { injectMigrateCommand } from '../cli/cmds/migrate_ha_db.js';
18
+ import { injectProfileCommand } from '../cli/cmds/profile.js';
17
19
  import { injectAztecCommands } from '../cli/index.js';
18
- import { getCliVersion } from '../cli/release_version.js';
19
20
  const NETWORK_FLAG = 'network';
20
21
  const userLog = createConsoleLogger();
21
22
  const debugLogger = createLogger('cli');
@@ -35,7 +36,7 @@ const debugLogger = createLogger('cli');
35
36
  const networkName = getActiveNetworkName(networkValue);
36
37
  await enrichEnvironmentWithNetworkConfig(networkName);
37
38
  enrichEnvironmentWithChainName(networkName);
38
- const cliVersion = getCliVersion();
39
+ const cliVersion = getPackageVersion();
39
40
  let program = new Command('aztec');
40
41
  program.description('Aztec command line interface').version(cliVersion).enablePositionalOptions();
41
42
  program = injectAztecCommands(program, userLog, debugLogger);
@@ -47,6 +48,7 @@ const debugLogger = createLogger('cli');
47
48
  program = injectMiscCommands(program, userLog);
48
49
  program = injectValidatorKeysCommands(program, userLog);
49
50
  program = injectCompileCommand(program, userLog);
51
+ program = injectProfileCommand(program, userLog);
50
52
  program = injectMigrateCommand(program, userLog);
51
53
  await program.parseAsync(process.argv);
52
54
  }
@@ -17,7 +17,7 @@ export interface ResolveAdminApiKeyOptions {
17
17
  /** SHA-256 hex hash of a pre-generated API key. When set, the node uses this hash directly. */
18
18
  adminApiKeyHash?: string;
19
19
  /** If true, disable admin API key auth entirely. */
20
- noAdminApiKey?: boolean;
20
+ disableAdminApiKey?: boolean;
21
21
  /** If true, force-generate a new key even if one is already persisted. */
22
22
  resetAdminApiKey?: boolean;
23
23
  /** Root data directory for persistent storage. */
@@ -27,7 +27,7 @@ export interface ResolveAdminApiKeyOptions {
27
27
  * Resolves the admin API key for the admin RPC endpoint.
28
28
  *
29
29
  * Strategy:
30
- * 1. If opt-out flag is set (`noAdminApiKey`), return undefined (no auth).
30
+ * 1. If opt-out flag is set (`disableAdminApiKey`), return undefined (no auth).
31
31
  * 2. If a pre-generated hash is provided (`adminApiKeyHash`), use it directly.
32
32
  * 3. If a data directory exists, look for a persisted hash file
33
33
  * at `<dataDirectory>/admin/api_key_hash`:
@@ -42,4 +42,4 @@ export interface ResolveAdminApiKeyOptions {
42
42
  * @returns The resolved API key hash, or undefined if auth is disabled.
43
43
  */
44
44
  export declare function resolveAdminApiKey(options: ResolveAdminApiKeyOptions, log: Logger): Promise<AdminApiKeyResolution | undefined>;
45
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRtaW5fYXBpX2tleV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9hZG1pbl9hcGlfa2V5X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBU3BEOzs7O0dBSUc7QUFDSCxNQUFNLFdBQVcscUJBQXFCO0lBQ3BDLHVDQUF1QztJQUN2QyxVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQ25COzs7T0FHRztJQUNILE1BQU0sQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNqQjtBQUVELE1BQU0sV0FBVyx5QkFBeUI7SUFDeEMsK0ZBQStGO0lBQy9GLGVBQWUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN6QixvREFBb0Q7SUFDcEQsYUFBYSxDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQ3hCLDBFQUEwRTtJQUMxRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUMzQixrREFBa0Q7SUFDbEQsYUFBYSxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3hCO0FBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBaUJHO0FBQ0gsd0JBQXNCLGtCQUFrQixDQUN0QyxPQUFPLEVBQUUseUJBQXlCLEVBQ2xDLEdBQUcsRUFBRSxNQUFNLEdBQ1YsT0FBTyxDQUFDLHFCQUFxQixHQUFHLFNBQVMsQ0FBQyxDQTJENUMifQ==
45
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRtaW5fYXBpX2tleV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9hZG1pbl9hcGlfa2V5X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBU3BEOzs7O0dBSUc7QUFDSCxNQUFNLFdBQVcscUJBQXFCO0lBQ3BDLHVDQUF1QztJQUN2QyxVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQ25COzs7T0FHRztJQUNILE1BQU0sQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNqQjtBQUVELE1BQU0sV0FBVyx5QkFBeUI7SUFDeEMsK0ZBQStGO0lBQy9GLGVBQWUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN6QixvREFBb0Q7SUFDcEQsa0JBQWtCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDN0IsMEVBQTBFO0lBQzFFLGdCQUFnQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQzNCLGtEQUFrRDtJQUNsRCxhQUFhLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDeEI7QUFFRDs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FpQkc7QUFDSCx3QkFBc0Isa0JBQWtCLENBQ3RDLE9BQU8sRUFBRSx5QkFBeUIsRUFDbEMsR0FBRyxFQUFFLE1BQU0sR0FDVixPQUFPLENBQUMscUJBQXFCLEdBQUcsU0FBUyxDQUFDLENBMkQ1QyJ9
@@ -1 +1 @@
1
- {"version":3,"file":"admin_api_key_store.d.ts","sourceRoot":"","sources":["../../src/cli/admin_api_key_store.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AASpD;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC,uCAAuC;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,yBAAyB;IACxC,+FAA+F;IAC/F,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oDAAoD;IACpD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,0EAA0E;IAC1E,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,kDAAkD;IAClD,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,yBAAyB,EAClC,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CA2D5C"}
1
+ {"version":3,"file":"admin_api_key_store.d.ts","sourceRoot":"","sources":["../../src/cli/admin_api_key_store.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AASpD;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC,uCAAuC;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,yBAAyB;IACxC,+FAA+F;IAC/F,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oDAAoD;IACpD,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,0EAA0E;IAC1E,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,kDAAkD;IAClD,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,yBAAyB,EAClC,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CA2D5C"}
@@ -8,7 +8,7 @@ const HASH_FILE_NAME = 'api_key_hash';
8
8
  * Resolves the admin API key for the admin RPC endpoint.
9
9
  *
10
10
  * Strategy:
11
- * 1. If opt-out flag is set (`noAdminApiKey`), return undefined (no auth).
11
+ * 1. If opt-out flag is set (`disableAdminApiKey`), return undefined (no auth).
12
12
  * 2. If a pre-generated hash is provided (`adminApiKeyHash`), use it directly.
13
13
  * 3. If a data directory exists, look for a persisted hash file
14
14
  * at `<dataDirectory>/admin/api_key_hash`:
@@ -23,8 +23,8 @@ const HASH_FILE_NAME = 'api_key_hash';
23
23
  * @returns The resolved API key hash, or undefined if auth is disabled.
24
24
  */ export async function resolveAdminApiKey(options, log) {
25
25
  // Operator explicitly opted out of admin auth
26
- if (options.noAdminApiKey) {
27
- log.warn('Admin API key authentication is DISABLED (--no-admin-api-key / AZTEC_NO_ADMIN_API_KEY)');
26
+ if (options.disableAdminApiKey) {
27
+ log.warn('Admin API key authentication is DISABLED (--disable-admin-api-key / AZTEC_DISABLE_ADMIN_API_KEY)');
28
28
  return undefined;
29
29
  }
30
30
  // Operator provided a pre-generated hash (e.g. via AZTEC_ADMIN_API_KEY_HASH env var)
@@ -1,3 +1,3 @@
1
1
  import type { LogFn, Logger } from '@aztec/foundation/log';
2
2
  export declare function aztecStart(options: any, userLog: LogFn, debugLogger: Logger): Promise<void>;
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfYWN0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2F6dGVjX3N0YXJ0X2FjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFNQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFhM0Qsd0JBQXNCLFVBQVUsQ0FBQyxPQUFPLEVBQUUsR0FBRyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBd0lqRiJ9
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfYWN0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2F6dGVjX3N0YXJ0X2FjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFhM0Qsd0JBQXNCLFVBQVUsQ0FBQyxPQUFPLEVBQUUsR0FBRyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBNklqRiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"aztec_start_action.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_action.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAa3D,wBAAsB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,iBAwIjF"}
1
+ {"version":3,"file":"aztec_start_action.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_action.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAa3D,wBAAsB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,iBA6IjF"}
@@ -1,11 +1,12 @@
1
+ import { getActiveNetworkName } from '@aztec/foundation/config';
1
2
  import { createNamespacedSafeJsonRpcServer, getApiKeyAuthMiddleware, startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
2
- import { AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
3
+ import { AztecNodeAdminApiSchema, AztecNodeApiSchema, AztecNodeDebugApiSchema } from '@aztec/stdlib/interfaces/client';
4
+ import { getPackageVersion } from '@aztec/stdlib/update-checker';
3
5
  import { getVersioningMiddleware } from '@aztec/stdlib/versioning';
4
- import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
6
+ import { getOtelJsonRpcDiagnosticsMiddleware, getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
5
7
  import { createLocalNetwork } from '../local-network/index.js';
6
8
  import { github, splash } from '../splash.js';
7
9
  import { resolveAdminApiKey } from './admin_api_key_store.js';
8
- import { getCliVersion } from './release_version.js';
9
10
  import { extractNamespacedOptions, installSignalHandlers } from './util.js';
10
11
  import { getVersions } from './versioning.js';
11
12
  export async function aztecStart(options, userLog, debugLogger) {
@@ -13,13 +14,12 @@ export async function aztecStart(options, userLog, debugLogger) {
13
14
  const signalHandlers = [];
14
15
  const services = {};
15
16
  const adminServices = {};
17
+ const packageVersion = getPackageVersion();
16
18
  let config = undefined;
17
19
  if (options.localNetwork) {
18
- const cliVersion = getCliVersion();
19
- const localNetwork = extractNamespacedOptions(options, 'local-network');
20
- localNetwork.testAccounts = true;
20
+ const localNetwork = extractNamespacedOptions(options, 'localNetwork');
21
21
  userLog(`${splash}\n${github}\n\n`);
22
- userLog(`Setting up Aztec local network ${cliVersion}, please stand by...`);
22
+ userLog(`Setting up Aztec local network ${packageVersion}, please stand by...`);
23
23
  const { node, stop } = await createLocalNetwork({
24
24
  l1Mnemonic: localNetwork.l1Mnemonic,
25
25
  l1RpcUrls: options.l1RpcUrls,
@@ -37,6 +37,14 @@ export async function aztecStart(options, userLog, debugLogger) {
37
37
  node,
38
38
  AztecNodeApiSchema
39
39
  ];
40
+ adminServices.node = [
41
+ node,
42
+ AztecNodeAdminApiSchema
43
+ ];
44
+ services.nodeDebug = [
45
+ node,
46
+ AztecNodeDebugApiSchema
47
+ ];
40
48
  } else {
41
49
  // Route --prover-node through startNode
42
50
  if (options.proverNode && !options.node) {
@@ -44,13 +52,17 @@ export async function aztecStart(options, userLog, debugLogger) {
44
52
  }
45
53
  if (options.node) {
46
54
  const { startNode } = await import('./cmds/start_node.js');
47
- ({ config } = await startNode(options, signalHandlers, services, adminServices, userLog));
55
+ const networkName = getActiveNetworkName(options.network);
56
+ ({ config } = await startNode(options, signalHandlers, services, adminServices, userLog, networkName));
57
+ if (options.nodeDebug && services.node) {
58
+ services.nodeDebug = [
59
+ services.node[0],
60
+ AztecNodeDebugApiSchema
61
+ ];
62
+ }
48
63
  } else if (options.bot) {
49
64
  const { startBot } = await import('./cmds/start_bot.js');
50
65
  await startBot(options, signalHandlers, services, userLog);
51
- } else if (options.archiver) {
52
- const { startArchiver } = await import('./cmds/start_archiver.js');
53
- ({ config } = await startArchiver(options, signalHandlers, services));
54
66
  } else if (options.p2pBootstrap) {
55
67
  const { startP2PBootstrap } = await import('./cmds/start_p2p_bootstrap.js');
56
68
  ({ config } = await startP2PBootstrap(options, signalHandlers, services, userLog));
@@ -62,7 +74,7 @@ export async function aztecStart(options, userLog, debugLogger) {
62
74
  await startProverBroker(options, signalHandlers, services, userLog);
63
75
  } else if (options.txe) {
64
76
  const { startTXE } = await import('./cmds/start_txe.js');
65
- await startTXE(options, debugLogger);
77
+ await startTXE(options, signalHandlers, debugLogger);
66
78
  } else if (options.sequencer) {
67
79
  userLog(`Cannot run a standalone sequencer without a node`);
68
80
  process.exit(1);
@@ -73,14 +85,18 @@ export async function aztecStart(options, userLog, debugLogger) {
73
85
  }
74
86
  installSignalHandlers(debugLogger.info, signalHandlers);
75
87
  const versions = getVersions(config);
88
+ const versioningOpts = {
89
+ packageVersion
90
+ };
76
91
  // Start the main JSON-RPC server
77
92
  if (Object.entries(services).length > 0) {
78
93
  const rpcServer = createNamespacedSafeJsonRpcServer(services, {
94
+ diagnostic: getOtelJsonRpcDiagnosticsMiddleware(),
79
95
  http200OnError: false,
80
96
  log: debugLogger,
81
97
  middlewares: [
82
98
  getOtelJsonRpcPropagationMiddleware(),
83
- getVersioningMiddleware(versions)
99
+ getVersioningMiddleware(versions, versioningOpts)
84
100
  ],
85
101
  maxBatchSize: options.rpcMaxBatchSize,
86
102
  maxBodySizeBytes: options.rpcMaxBodySize
@@ -94,12 +110,12 @@ export async function aztecStart(options, userLog, debugLogger) {
94
110
  if (Object.entries(adminServices).length > 0) {
95
111
  const adminMiddlewares = [
96
112
  getOtelJsonRpcPropagationMiddleware(),
97
- getVersioningMiddleware(versions)
113
+ getVersioningMiddleware(versions, versioningOpts)
98
114
  ];
99
115
  // Resolve the admin API key (auto-generated and persisted, or opt-out)
100
116
  const apiKeyResolution = await resolveAdminApiKey({
101
117
  adminApiKeyHash: options.adminApiKeyHash,
102
- noAdminApiKey: options.noAdminApiKey,
118
+ disableAdminApiKey: options.disableAdminApiKey,
103
119
  resetAdminApiKey: options.resetAdminApiKey,
104
120
  dataDirectory: options.dataDirectory
105
121
  }, debugLogger);
@@ -109,6 +125,7 @@ export async function aztecStart(options, userLog, debugLogger) {
109
125
  debugLogger.warn('No admin API key set — admin endpoint is unauthenticated');
110
126
  }
111
127
  const rpcServer = createNamespacedSafeJsonRpcServer(adminServices, {
128
+ diagnostic: getOtelJsonRpcDiagnosticsMiddleware(),
112
129
  http200OnError: false,
113
130
  log: debugLogger,
114
131
  middlewares: adminMiddlewares,
@@ -136,7 +153,7 @@ export async function aztecStart(options, userLog, debugLogger) {
136
153
  userLog(' The key hash has been persisted — on next restart, the same key will be used.');
137
154
  }
138
155
  userLog('');
139
- userLog(' To disable admin auth: --no-admin-api-key or AZTEC_NO_ADMIN_API_KEY=true');
156
+ userLog(' To disable admin auth: --disable-admin-api-key or AZTEC_DISABLE_ADMIN_API_KEY=true');
140
157
  userLog(separator);
141
158
  userLog('');
142
159
  }
@@ -8,10 +8,10 @@ export interface AztecStartOption {
8
8
  fallback?: EnvVar[];
9
9
  parseVal?: (val: string) => any;
10
10
  }
11
- export declare const getOptions: (namespace: string, configMappings: Record<string, ConfigMapping>) => AztecStartOption[];
11
+ export declare const getOptions: (namespace: string, configMappings: Record<string, ConfigMapping<unknown>>) => AztecStartOption[];
12
12
  export declare const universalOptions: string[];
13
13
  export declare const NETWORK_FLAG = "network";
14
14
  export declare const aztecStartOptions: {
15
15
  [key: string]: AztecStartOption[];
16
16
  };
17
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfb3B0aW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9henRlY19zdGFydF9vcHRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sRUFDTCxLQUFLLGFBQWEsRUFDbEIsS0FBSyxNQUFNLEVBSVosTUFBTSwwQkFBMEIsQ0FBQztBQWVsQyxNQUFNLFdBQVcsZ0JBQWdCO0lBQy9CLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixXQUFXLEVBQUUsTUFBTSxDQUFDO0lBQ3BCLFlBQVksRUFBRSxHQUFHLENBQUM7SUFDbEIsWUFBWSxDQUFDLEVBQUUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxLQUFLLE1BQU0sQ0FBQztJQUNwQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUN4QixRQUFRLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNwQixRQUFRLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEtBQUssR0FBRyxDQUFDO0NBQ2pDO0FBRUQsZUFBTyxNQUFNLFVBQVUsMEZBb0J0QixDQUFDO0FBdUJGLGVBQU8sTUFBTSxnQkFBZ0IsVUFZNUIsQ0FBQztBQUVGLGVBQU8sTUFBTSxZQUFZLFlBQVksQ0FBQztBQUd0QyxlQUFPLE1BQU0saUJBQWlCLEVBQUU7SUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLEVBQUUsQ0FBQTtDQXNPbEUsQ0FBQyJ9
17
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfb3B0aW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9henRlY19zdGFydF9vcHRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sRUFDTCxLQUFLLGFBQWEsRUFDbEIsS0FBSyxNQUFNLEVBSVosTUFBTSwwQkFBMEIsQ0FBQztBQWVsQyxNQUFNLFdBQVcsZ0JBQWdCO0lBQy9CLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixXQUFXLEVBQUUsTUFBTSxDQUFDO0lBQ3BCLFlBQVksRUFBRSxHQUFHLENBQUM7SUFDbEIsWUFBWSxDQUFDLEVBQUUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxLQUFLLE1BQU0sQ0FBQztJQUNwQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUN4QixRQUFRLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNwQixRQUFRLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEtBQUssR0FBRyxDQUFDO0NBQ2pDO0FBRUQsZUFBTyxNQUFNLFVBQVUsbUdBb0J0QixDQUFDO0FBMkJGLGVBQU8sTUFBTSxnQkFBZ0IsVUFZNUIsQ0FBQztBQUVGLGVBQU8sTUFBTSxZQUFZLFlBQVksQ0FBQztBQUd0QyxlQUFPLE1BQU0saUJBQWlCLEVBQUU7SUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLEVBQUUsQ0FBQTtDQWlPbEUsQ0FBQyJ9
@@ -1 +1 @@
1
- {"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;CAsOlE,CAAC"}
1
+ {"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,mGAoBtB,CAAC;AA2BF,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;CAiOlE,CAAC"}
@@ -6,7 +6,6 @@ import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresse
6
6
  import { l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
7
7
  import { getKeys } from '@aztec/foundation/collection';
8
8
  import { booleanConfigHelper, isBooleanConfigValue, omitConfigMappings } from '@aztec/foundation/config';
9
- import { dataConfigMappings } from '@aztec/kv-store/config';
10
9
  import { sharedNodeConfigMappings } from '@aztec/node-lib/config';
11
10
  import { bootnodeConfigMappings, p2pConfigMappings } from '@aztec/p2p/config';
12
11
  import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/prover-client/broker/config';
@@ -14,6 +13,7 @@ import { proverNodeConfigMappings } from '@aztec/prover-node/config';
14
13
  import { allPxeConfigMappings } from '@aztec/pxe/config';
15
14
  import { sequencerClientConfigMappings } from '@aztec/sequencer-client/config';
16
15
  import { chainConfigMappings, nodeRpcConfigMappings } from '@aztec/stdlib/config';
16
+ import { dataConfigMappings } from '@aztec/stdlib/kv-store';
17
17
  import { telemetryClientConfigMappings } from '@aztec/telemetry-client/config';
18
18
  import { worldStateConfigMappings } from '@aztec/world-state/config';
19
19
  import { DefaultMnemonic } from '../mnemonic.js';
@@ -76,8 +76,7 @@ export const aztecStartOptions = {
76
76
  defaultValue: undefined,
77
77
  env: 'NETWORK'
78
78
  },
79
- configToFlag('--auto-update', sharedNodeConfigMappings.autoUpdate),
80
- configToFlag('--auto-update-url', sharedNodeConfigMappings.autoUpdateUrl),
79
+ configToFlag('--enable-version-check', sharedNodeConfigMappings.enableVersionCheck),
81
80
  configToFlag('--sync-mode', sharedNodeConfigMappings.syncMode),
82
81
  configToFlag('--snapshots-urls', sharedNodeConfigMappings.snapshotsUrls),
83
82
  configToFlag('--fisherman-mode', sharedNodeConfigMappings.fishermanMode)
@@ -94,6 +93,12 @@ export const aztecStartOptions = {
94
93
  description: 'Mnemonic for L1 accounts. Will be used ',
95
94
  defaultValue: DefaultMnemonic,
96
95
  env: 'MNEMONIC'
96
+ },
97
+ {
98
+ flag: '--local-network.testAccounts',
99
+ description: 'Deploy test accounts on local network start',
100
+ env: 'TEST_ACCOUNTS',
101
+ ...booleanConfigHelper(true)
97
102
  }
98
103
  ],
99
104
  API: [
@@ -118,11 +123,12 @@ export const aztecStartOptions = {
118
123
  env: 'AZTEC_ADMIN_API_KEY_HASH'
119
124
  },
120
125
  {
121
- flag: '--no-admin-api-key',
126
+ flag: '--disable-admin-api-key',
122
127
  description: 'Disable API key authentication on the admin RPC endpoint. By default, a key is auto-generated, displayed once, and its hash is persisted.',
123
128
  defaultValue: false,
124
- env: 'AZTEC_NO_ADMIN_API_KEY',
125
- parseVal: (val)=>val === 'true' || val === '1'
129
+ env: 'AZTEC_DISABLE_ADMIN_API_KEY',
130
+ // undefined means the flag was passed without a value (boolean toggle), treat as true.
131
+ parseVal: (val)=>val === undefined || val === 'true' || val === '1'
126
132
  },
127
133
  {
128
134
  flag: '--reset-admin-api-key',
@@ -131,6 +137,13 @@ export const aztecStartOptions = {
131
137
  env: 'AZTEC_RESET_ADMIN_API_KEY',
132
138
  parseVal: (val)=>val === 'true' || val === '1'
133
139
  },
140
+ {
141
+ flag: '--node-debug',
142
+ description: 'Expose debug endpoints (e.g. mineBlock) on the main RPC port',
143
+ defaultValue: false,
144
+ env: 'AZTEC_NODE_DEBUG',
145
+ parseVal: (val)=>val === undefined || val === 'true' || val === '1'
146
+ },
134
147
  {
135
148
  flag: '--api-prefix <value>',
136
149
  description: 'Prefix for API routes on any service that is started',
@@ -174,12 +187,6 @@ export const aztecStartOptions = {
174
187
  }
175
188
  ],
176
189
  ARCHIVER: [
177
- {
178
- flag: '--archiver',
179
- description: 'Starts Aztec Archiver with options',
180
- defaultValue: undefined,
181
- env: undefined
182
- },
183
190
  ...getOptions('archiver', omitConfigMappings(archiverConfigMappings, Object.keys(l1ContractsConfigMappings)))
184
191
  ],
185
192
  SEQUENCER: [
@@ -217,8 +224,7 @@ export const aztecStartOptions = {
217
224
  defaultValue: undefined,
218
225
  env: undefined
219
226
  },
220
- ...getOptions('proverBroker', // filter out archiver options from prover node options as they're passed separately in --archiver
221
- proverBrokerConfigMappings)
227
+ ...getOptions('proverBroker', proverBrokerConfigMappings)
222
228
  ],
223
229
  'PROVER AGENT': [
224
230
  {
@@ -266,12 +272,6 @@ export const aztecStartOptions = {
266
272
  ...getOptions('bot', botConfigMappings)
267
273
  ],
268
274
  PXE: [
269
- {
270
- flag: '--pxe',
271
- description: 'Starts Aztec PXE with options',
272
- defaultValue: undefined,
273
- env: undefined
274
- },
275
275
  ...getOptions('pxe', allPxeConfigMappings)
276
276
  ],
277
277
  TXE: [
package/dest/cli/cli.js CHANGED
@@ -24,9 +24,9 @@ import { addOptions, printAztecStartHelpText } from './util.js';
24
24
  program.addHelpText('after', `
25
25
  Additional commands:
26
26
 
27
- init [folder] [options] creates a new Aztec Noir project.
28
- new <path> [options] creates a new Aztec Noir project in a new directory.
29
- test [options] starts a TXE and runs "nargo test" using it as the oracle resolver.
27
+ init creates a new Aztec Noir workspace in the current directory.
28
+ new <name> creates a new Aztec Noir workspace in its own directory (or creates a new contract-test crates pair and adds it to the current workspace if run in workspace).
29
+ test [options] starts a TXE and runs "nargo test" using it as the oracle resolver.
30
30
  `);
31
31
  }
32
32
  program.command('preload-crs').description('Preload the points data needed for proving and verifying').action(async (options)=>{
@@ -1,4 +1,4 @@
1
1
  import type { LogFn } from '@aztec/foundation/log';
2
2
  import type { Command } from 'commander';
3
3
  export declare function injectCompileCommand(program: Command, log: LogFn): Command;
4
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGlsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL2NvbXBpbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHbkQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBaUZ6Qyx3QkFBZ0Isb0JBQW9CLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxHQUFHLE9BQU8sQ0FzQjFFIn0=
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGlsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL2NvbXBpbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFJbkQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBb0t6Qyx3QkFBZ0Isb0JBQW9CLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxHQUFHLE9BQU8sQ0FzQjFFIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/compile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiFzC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAsB1E"}
1
+ {"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/compile.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAoKzC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAsB1E"}
@@ -1,64 +1,136 @@
1
- import { execFileSync, spawn } from 'child_process';
2
- import { readFile, readdir, writeFile } from 'fs/promises';
1
+ import { findBbBinary } from '@aztec/bb.js';
2
+ import { getPackageVersion } from '@aztec/stdlib/update-checker';
3
+ import { execFileSync } from 'child_process';
4
+ import { readFile, writeFile } from 'fs/promises';
3
5
  import { join } from 'path';
4
- /** Spawns a command with inherited stdio and rejects on non-zero exit. */ function run(cmd, args) {
5
- return new Promise((resolve, reject)=>{
6
- const child = spawn(cmd, args, {
7
- stdio: 'inherit'
8
- });
9
- child.on('error', reject);
10
- child.on('close', (code)=>{
11
- if (code !== 0) {
12
- reject(new Error(`${cmd} exited with code ${code}`));
13
- } else {
14
- resolve();
15
- }
16
- });
17
- });
18
- }
19
- /** Returns paths to contract artifacts in the target directory.
20
- * Contract artifacts are identified by having a `functions` array in the JSON.
21
- */ async function collectContractArtifacts() {
6
+ import { readArtifactFiles } from './utils/artifacts.js';
7
+ import { needsRecompile } from './utils/needs_recompile.js';
8
+ import { run } from './utils/spawn.js';
9
+ import { warnIfAztecVersionMismatch } from './utils/warn_if_aztec_version_mismatch.js';
10
+ /** Returns paths to contract artifacts in the target directory. */ async function collectContractArtifacts() {
22
11
  let files;
23
12
  try {
24
- files = await readdir('target');
13
+ files = await readArtifactFiles('target');
25
14
  } catch (err) {
26
- if (err?.code === 'ENOENT') {
15
+ if (err?.message?.includes('does not exist')) {
27
16
  return [];
28
17
  }
29
- throw new Error(`Failed to read target directory: ${err.message}`);
30
- }
31
- const artifacts = [];
32
- for (const file of files){
33
- if (!file.endsWith('.json')) {
34
- continue;
35
- }
36
- const filePath = join('target', file);
37
- const content = JSON.parse(await readFile(filePath, 'utf-8'));
38
- if (Array.isArray(content.functions)) {
39
- artifacts.push(filePath);
40
- }
18
+ throw err;
41
19
  }
42
- return artifacts;
20
+ return files.filter((f)=>Array.isArray(f.content.functions)).map((f)=>f.filePath);
43
21
  }
44
- /** Strips the `__aztec_nr_internals__` prefix from function names in contract artifacts. */ async function stripInternalPrefixes(artifactPaths) {
22
+ /** Stamps the Aztec stack version into the contract artifacts. */ async function stampAztecVersion(artifactPaths) {
23
+ const version = getPackageVersion();
45
24
  for (const path of artifactPaths){
46
25
  const artifact = JSON.parse(await readFile(path, 'utf-8'));
47
- for (const fn of artifact.functions){
48
- if (typeof fn.name === 'string') {
49
- fn.name = fn.name.replace(/^__aztec_nr_internals__/, '');
26
+ // eslint-disable-next-line camelcase
27
+ artifact.aztec_version = version;
28
+ await writeFile(path, JSON.stringify(artifact, null, 2) + '\n');
29
+ }
30
+ }
31
+ /** Returns the set of package names that are contract crates in the current workspace. */ async function getContractPackageNames() {
32
+ const contractNames = new Set();
33
+ let rootToml;
34
+ try {
35
+ rootToml = await readFile('Nargo.toml', 'utf-8');
36
+ } catch {
37
+ return contractNames;
38
+ }
39
+ const membersMatch = rootToml.match(/members\s*=\s*\[([^\]]*)\]/);
40
+ if (membersMatch) {
41
+ const members = membersMatch[1].split(',').map((m)=>m.trim().replace(/^"|"$/g, '')).filter((m)=>m.length > 0);
42
+ for (const member of members){
43
+ try {
44
+ const memberToml = await readFile(join(member, 'Nargo.toml'), 'utf-8');
45
+ if (/type\s*=\s*"contract"/.test(memberToml)) {
46
+ const nameMatch = memberToml.match(/name\s*=\s*"([^"]+)"/);
47
+ if (nameMatch) {
48
+ contractNames.add(nameMatch[1]);
49
+ }
50
+ }
51
+ } catch {
52
+ // Member directory might not exist or have no Nargo.toml; skip.
50
53
  }
51
54
  }
52
- await writeFile(path, JSON.stringify(artifact, null, 2) + '\n');
55
+ } else {
56
+ // Single-crate project (no workspace): check if the root Nargo.toml itself is a contract.
57
+ if (/type\s*=\s*"contract"/.test(rootToml)) {
58
+ const nameMatch = rootToml.match(/name\s*=\s*"([^"]+)"/);
59
+ if (nameMatch) {
60
+ contractNames.add(nameMatch[1]);
61
+ }
62
+ }
63
+ }
64
+ return contractNames;
65
+ }
66
+ /** Checks that no tests exist in contract crates and fails with a helpful message if they do. */ async function checkNoTestsInContracts(nargo, log) {
67
+ const contractPackages = await getContractPackageNames();
68
+ if (contractPackages.size === 0) {
69
+ return;
70
+ }
71
+ let output;
72
+ try {
73
+ // We list tests for all the crates in the workspace
74
+ output = execFileSync(nargo, [
75
+ 'test',
76
+ '--list-tests',
77
+ '--silence-warnings'
78
+ ], {
79
+ encoding: 'utf-8',
80
+ stdio: [
81
+ 'pipe',
82
+ 'pipe',
83
+ 'inherit'
84
+ ]
85
+ });
86
+ } catch {
87
+ // If listing tests fails (e.g. test crate has compile errors), skip the check.
88
+ return;
89
+ }
90
+ // The output of the `nargo test --list-tests` command is as follows:
91
+ // ```
92
+ // crate_name_1 test_name_1
93
+ // crate_name_2 test_name_2
94
+ // ...
95
+ // crate_name_n test_name_n
96
+ // ```
97
+ //
98
+ // We parse the individual lines and then we check if any contract crate appeared in the parsed output.
99
+ const lines = output.trim().split('\n').filter((line)=>line.length > 0);
100
+ const testsInContracts = [];
101
+ for (const line of lines){
102
+ const spaceIndex = line.indexOf(' ');
103
+ if (spaceIndex === -1) {
104
+ continue;
105
+ }
106
+ const packageName = line.substring(0, spaceIndex);
107
+ const testName = line.substring(spaceIndex + 1);
108
+ if (contractPackages.has(packageName)) {
109
+ testsInContracts.push({
110
+ packageName,
111
+ testName
112
+ });
113
+ }
114
+ }
115
+ if (testsInContracts.length > 0) {
116
+ const details = testsInContracts.map((t)=>` ${t.packageName}::${t.testName}`).join('\n');
117
+ log(`WARNING: Found tests in contract crate(s):\n${details}\n\n` + `Tests should be in a dedicated test crate, not in the contract crate.\n` + `Learn more: https://docs.aztec.network/errors/1`);
53
118
  }
54
119
  }
55
120
  /** Compiles Aztec Noir contracts and postprocesses artifacts. */ async function compileAztecContract(nargoArgs, log) {
121
+ await warnIfAztecVersionMismatch(log);
122
+ if (!await needsRecompile()) {
123
+ log('No source changes detected, skipping compilation.');
124
+ return;
125
+ }
56
126
  const nargo = process.env.NARGO ?? 'nargo';
57
- const bb = process.env.BB ?? 'bb';
127
+ const bb = process.env.BB ?? findBbBinary() ?? 'bb';
58
128
  await run(nargo, [
59
129
  'compile',
60
130
  ...nargoArgs
61
131
  ]);
132
+ // Ensure contract crates contain no tests (tests belong in the test crate).
133
+ await checkNoTestsInContracts(nargo, log);
62
134
  const artifacts = await collectContractArtifacts();
63
135
  if (artifacts.length > 0) {
64
136
  log('Postprocessing contracts...');
@@ -70,8 +142,7 @@ import { join } from 'path';
70
142
  'aztec_process',
71
143
  ...bbArgs
72
144
  ]);
73
- // TODO: This should be part of bb aztec_process!
74
- await stripInternalPrefixes(artifacts);
145
+ await stampAztecVersion(artifacts);
75
146
  }
76
147
  log('Compilation complete!');
77
148
  }
@@ -0,0 +1,4 @@
1
+ import type { LogFn } from '@aztec/foundation/log';
2
+ import type { Command } from 'commander';
3
+ export declare function injectProfileCommand(program: Command, log: LogFn): Command;
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZmlsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3Byb2ZpbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbkQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBS3pDLHdCQUFnQixvQkFBb0IsQ0FBQyxPQUFPLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxLQUFLLEdBQUcsT0FBTyxDQWtCMUUifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/profile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKzC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAkB1E"}
@@ -0,0 +1,8 @@
1
+ import { profileFlamegraph } from './profile_flamegraph.js';
2
+ import { profileGates } from './profile_gates.js';
3
+ export function injectProfileCommand(program, log) {
4
+ const profile = program.command('profile').description('Profile compiled Aztec artifacts.');
5
+ profile.command('gates').argument('[target-dir]', 'Path to the compiled artifacts directory', './target').option('--json', 'Output gate counts as JSON instead of a table', false).description('Display gate counts for all compiled Aztec artifacts in a target directory.').action((targetDir, options)=>profileGates(targetDir, options.json, log));
6
+ profile.command('flamegraph').argument('<contract-artifact>', 'Path to the compiled contract artifact JSON').argument('<function>', 'Name of the contract function to profile').description('Generate a gate count flamegraph SVG for a contract function.').action((artifactPath, functionName)=>profileFlamegraph(artifactPath, functionName, log));
7
+ return program;
8
+ }
@@ -0,0 +1,4 @@
1
+ import type { LogFn } from '@aztec/foundation/log';
2
+ /** Generates a gate count flamegraph SVG for a single contract function. */
3
+ export declare function profileFlamegraph(artifactPath: string, functionName: string, log: LogFn): Promise<void>;
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZmlsZV9mbGFtZWdyYXBoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2NtZHMvcHJvZmlsZV9mbGFtZWdyYXBoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBU25ELDRFQUE0RTtBQUM1RSx3QkFBc0IsaUJBQWlCLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxLQUFLLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQW9EN0cifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"profile_flamegraph.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/profile_flamegraph.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AASnD,4EAA4E;AAC5E,wBAAsB,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAoD7G"}