@aztec/aztec 0.0.1-commit.3fd054f6 → 0.0.1-commit.431c48d

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 (157) hide show
  1. package/dest/bin/index.js +3 -1
  2. package/dest/cli/aztec_start_action.d.ts +1 -1
  3. package/dest/cli/aztec_start_action.d.ts.map +1 -1
  4. package/dest/cli/aztec_start_action.js +33 -33
  5. package/dest/cli/aztec_start_options.d.ts +2 -2
  6. package/dest/cli/aztec_start_options.d.ts.map +1 -1
  7. package/dest/cli/aztec_start_options.js +21 -16
  8. package/dest/cli/cmds/compile.d.ts +1 -1
  9. package/dest/cli/cmds/compile.d.ts.map +1 -1
  10. package/dest/cli/cmds/compile.js +32 -24
  11. package/dest/cli/cmds/profile.d.ts +1 -1
  12. package/dest/cli/cmds/profile.d.ts.map +1 -1
  13. package/dest/cli/cmds/profile.js +1 -1
  14. package/dest/cli/cmds/profile_gates.d.ts +2 -2
  15. package/dest/cli/cmds/profile_gates.d.ts.map +1 -1
  16. package/dest/cli/cmds/profile_gates.js +21 -3
  17. package/dest/cli/cmds/prover.d.ts +4 -0
  18. package/dest/cli/cmds/prover.d.ts.map +1 -0
  19. package/dest/cli/cmds/prover.js +24 -0
  20. package/dest/cli/cmds/standby.d.ts +30 -6
  21. package/dest/cli/cmds/standby.d.ts.map +1 -1
  22. package/dest/cli/cmds/standby.js +48 -5
  23. package/dest/cli/cmds/start_bot.d.ts +1 -1
  24. package/dest/cli/cmds/start_bot.d.ts.map +1 -1
  25. package/dest/cli/cmds/start_bot.js +8 -4
  26. package/dest/cli/cmds/start_node.d.ts +1 -1
  27. package/dest/cli/cmds/start_node.d.ts.map +1 -1
  28. package/dest/cli/cmds/start_node.js +23 -47
  29. package/dest/cli/cmds/start_prover_agent.d.ts +1 -1
  30. package/dest/cli/cmds/start_prover_agent.d.ts.map +1 -1
  31. package/dest/cli/cmds/start_prover_agent.js +5 -17
  32. package/dest/cli/cmds/start_prover_broker.d.ts +1 -1
  33. package/dest/cli/cmds/start_prover_broker.d.ts.map +1 -1
  34. package/dest/cli/cmds/start_prover_broker.js +11 -8
  35. package/dest/cli/cmds/start_txe.d.ts +2 -2
  36. package/dest/cli/cmds/start_txe.d.ts.map +1 -1
  37. package/dest/cli/cmds/start_txe.js +6 -5
  38. package/dest/cli/cmds/utils/artifacts.d.ts +6 -1
  39. package/dest/cli/cmds/utils/artifacts.d.ts.map +1 -1
  40. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts +21 -0
  41. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts.map +1 -0
  42. package/dest/cli/cmds/utils/collect_crate_dirs.js +114 -0
  43. package/dest/cli/cmds/utils/needs_recompile.d.ts +1 -1
  44. package/dest/cli/cmds/utils/needs_recompile.d.ts.map +1 -1
  45. package/dest/cli/cmds/utils/needs_recompile.js +9 -53
  46. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts +4 -0
  47. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts.map +1 -0
  48. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.js +61 -0
  49. package/dest/cli/util.d.ts +10 -5
  50. package/dest/cli/util.d.ts.map +1 -1
  51. package/dest/cli/util.js +26 -53
  52. package/dest/deploy/bridging.d.ts +84 -0
  53. package/dest/deploy/bridging.d.ts.map +1 -0
  54. package/dest/deploy/bridging.js +121 -0
  55. package/dest/deploy/fees.d.ts +120 -0
  56. package/dest/deploy/fees.d.ts.map +1 -0
  57. package/dest/deploy/fees.js +278 -0
  58. package/dest/deploy/graph.d.ts +40 -0
  59. package/dest/deploy/graph.d.ts.map +1 -0
  60. package/dest/deploy/graph.js +120 -0
  61. package/dest/deploy/index.d.ts +19 -0
  62. package/dest/deploy/index.d.ts.map +1 -0
  63. package/dest/deploy/index.js +15 -0
  64. package/dest/deploy/reporter.d.ts +106 -0
  65. package/dest/deploy/reporter.d.ts.map +1 -0
  66. package/dest/deploy/reporter.js +76 -0
  67. package/dest/deploy/runner.d.ts +8 -0
  68. package/dest/deploy/runner.d.ts.map +1 -0
  69. package/dest/deploy/runner.js +886 -0
  70. package/dest/deploy/state.d.ts +19 -0
  71. package/dest/deploy/state.d.ts.map +1 -0
  72. package/dest/deploy/state.js +59 -0
  73. package/dest/deploy/types.d.ts +233 -0
  74. package/dest/deploy/types.d.ts.map +1 -0
  75. package/dest/deploy/types.js +9 -0
  76. package/dest/examples/token.js +3 -3
  77. package/dest/local-network/auth_registry.d.ts +5 -0
  78. package/dest/local-network/auth_registry.d.ts.map +1 -0
  79. package/dest/local-network/auth_registry.js +17 -0
  80. package/dest/local-network/banana_fpc.d.ts +3 -2
  81. package/dest/local-network/banana_fpc.d.ts.map +1 -1
  82. package/dest/local-network/banana_fpc.js +11 -7
  83. package/dest/local-network/local-network.d.ts +10 -32
  84. package/dest/local-network/local-network.d.ts.map +1 -1
  85. package/dest/local-network/local-network.js +52 -73
  86. package/dest/testing/cheat_codes.d.ts +17 -23
  87. package/dest/testing/cheat_codes.d.ts.map +1 -1
  88. package/dest/testing/cheat_codes.js +17 -43
  89. package/dest/testing/epoch_test_settler.d.ts +2 -2
  90. package/dest/testing/epoch_test_settler.d.ts.map +1 -1
  91. package/dest/testing/epoch_test_settler.js +6 -25
  92. package/dest/testing/index.d.ts +2 -2
  93. package/dest/testing/index.d.ts.map +1 -1
  94. package/dest/testing/index.js +1 -1
  95. package/dest/testing/local-network.d.ts +51 -0
  96. package/dest/testing/local-network.d.ts.map +1 -0
  97. package/dest/testing/local-network.js +60 -0
  98. package/dest/testing/token_allowed_setup.d.ts +9 -4
  99. package/dest/testing/token_allowed_setup.d.ts.map +1 -1
  100. package/dest/testing/token_allowed_setup.js +12 -8
  101. package/package.json +37 -34
  102. package/scripts/add_crate.sh +11 -60
  103. package/scripts/aztec.sh +6 -2
  104. package/scripts/init.sh +5 -5
  105. package/scripts/new.sh +2 -2
  106. package/scripts/setup_workspace.sh +3 -2
  107. package/scripts/templates/blank/contract/Nargo.toml +6 -0
  108. package/scripts/templates/blank/contract/src/main.nr +10 -0
  109. package/scripts/templates/blank/test/Nargo.toml +7 -0
  110. package/scripts/templates/blank/test/src/lib.nr +11 -0
  111. package/scripts/templates/counter/contract/Nargo.toml +7 -0
  112. package/scripts/templates/counter/contract/src/main.nr +48 -0
  113. package/scripts/templates/counter/test/Nargo.toml +7 -0
  114. package/scripts/templates/counter/test/src/lib.nr +32 -0
  115. package/src/bin/index.ts +3 -1
  116. package/src/cli/aztec_start_action.ts +38 -25
  117. package/src/cli/aztec_start_options.ts +27 -23
  118. package/src/cli/cmds/compile.ts +37 -23
  119. package/src/cli/cmds/profile.ts +2 -1
  120. package/src/cli/cmds/profile_gates.ts +20 -4
  121. package/src/cli/cmds/prover.ts +42 -0
  122. package/src/cli/cmds/standby.ts +59 -7
  123. package/src/cli/cmds/start_bot.ts +9 -6
  124. package/src/cli/cmds/start_node.ts +32 -39
  125. package/src/cli/cmds/start_prover_agent.ts +5 -8
  126. package/src/cli/cmds/start_prover_broker.ts +10 -11
  127. package/src/cli/cmds/start_txe.ts +7 -5
  128. package/src/cli/cmds/utils/artifacts.ts +5 -0
  129. package/src/cli/cmds/utils/collect_crate_dirs.ts +118 -0
  130. package/src/cli/cmds/utils/needs_recompile.ts +8 -61
  131. package/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts +76 -0
  132. package/src/cli/util.ts +27 -68
  133. package/src/deploy/bridging.ts +191 -0
  134. package/src/deploy/fees.ts +322 -0
  135. package/src/deploy/graph.ts +137 -0
  136. package/src/deploy/index.ts +41 -0
  137. package/src/deploy/reporter.ts +184 -0
  138. package/src/deploy/runner.ts +936 -0
  139. package/src/deploy/state.ts +66 -0
  140. package/src/deploy/types.ts +244 -0
  141. package/src/examples/token.ts +11 -3
  142. package/src/local-network/auth_registry.ts +19 -0
  143. package/src/local-network/banana_fpc.ts +12 -8
  144. package/src/local-network/local-network.ts +61 -83
  145. package/src/testing/cheat_codes.ts +18 -49
  146. package/src/testing/epoch_test_settler.ts +8 -31
  147. package/src/testing/index.ts +1 -1
  148. package/src/testing/local-network.ts +97 -0
  149. package/src/testing/token_allowed_setup.ts +15 -8
  150. package/dest/cli/cmds/start_archiver.d.ts +0 -9
  151. package/dest/cli/cmds/start_archiver.d.ts.map +0 -1
  152. package/dest/cli/cmds/start_archiver.js +0 -48
  153. package/dest/testing/anvil_test_watcher.d.ts +0 -42
  154. package/dest/testing/anvil_test_watcher.d.ts.map +0 -1
  155. package/dest/testing/anvil_test_watcher.js +0 -181
  156. package/src/cli/cmds/start_archiver.ts +0 -50
  157. package/src/testing/anvil_test_watcher.ts +0 -210
package/dest/bin/index.js CHANGED
@@ -16,6 +16,7 @@ import { Command } from 'commander';
16
16
  import { injectCompileCommand } from '../cli/cmds/compile.js';
17
17
  import { injectMigrateCommand } from '../cli/cmds/migrate_ha_db.js';
18
18
  import { injectProfileCommand } from '../cli/cmds/profile.js';
19
+ import { injectProverCommand } from '../cli/cmds/prover.js';
19
20
  import { injectAztecCommands } from '../cli/index.js';
20
21
  const NETWORK_FLAG = 'network';
21
22
  const userLog = createConsoleLogger();
@@ -36,7 +37,7 @@ const debugLogger = createLogger('cli');
36
37
  const networkName = getActiveNetworkName(networkValue);
37
38
  await enrichEnvironmentWithNetworkConfig(networkName);
38
39
  enrichEnvironmentWithChainName(networkName);
39
- const cliVersion = getPackageVersion() ?? 'unknown';
40
+ const cliVersion = getPackageVersion();
40
41
  let program = new Command('aztec');
41
42
  program.description('Aztec command line interface').version(cliVersion).enablePositionalOptions();
42
43
  program = injectAztecCommands(program, userLog, debugLogger);
@@ -50,6 +51,7 @@ const debugLogger = createLogger('cli');
50
51
  program = injectCompileCommand(program, userLog);
51
52
  program = injectProfileCommand(program, userLog);
52
53
  program = injectMigrateCommand(program, userLog);
54
+ program = injectProverCommand(program, userLog);
53
55
  await program.parseAsync(process.argv);
54
56
  }
55
57
  main().catch((err)=>{
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfYWN0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2F6dGVjX3N0YXJ0X2FjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFhM0Qsd0JBQXNCLFVBQVUsQ0FBQyxPQUFPLEVBQUUsR0FBRyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBMklqRiJ9
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfYWN0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2F6dGVjX3N0YXJ0X2FjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFRQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFnQjNELHdCQUFzQixVQUFVLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQW9KakYifQ==
@@ -1 +1 @@
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,iBA2IjF"}
1
+ {"version":3,"file":"aztec_start_action.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_action.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAgB3D,wBAAsB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,iBAoJjF"}
@@ -1,9 +1,10 @@
1
+ import { registerAztecNodeRpcHandlers } from '@aztec/aztec-node';
1
2
  import { getActiveNetworkName } from '@aztec/foundation/config';
2
3
  import { createNamespacedSafeJsonRpcServer, getApiKeyAuthMiddleware, startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
3
- import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
4
+ import { getRpcCorsAllowedOrigins } from '@aztec/stdlib/config';
4
5
  import { getPackageVersion } from '@aztec/stdlib/update-checker';
5
6
  import { getVersioningMiddleware } from '@aztec/stdlib/versioning';
6
- import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
7
+ import { getOtelJsonRpcDiagnosticsMiddleware, getOtelJsonRpcPropagationMiddleware, getOtelJsonRpcServerMetricsMiddleware } from '@aztec/telemetry-client';
7
8
  import { createLocalNetwork } from '../local-network/index.js';
8
9
  import { github, splash } from '../splash.js';
9
10
  import { resolveAdminApiKey } from './admin_api_key_store.js';
@@ -17,31 +18,19 @@ export async function aztecStart(options, userLog, debugLogger) {
17
18
  const packageVersion = getPackageVersion();
18
19
  let config = undefined;
19
20
  if (options.localNetwork) {
20
- const localNetwork = extractNamespacedOptions(options, 'local-network');
21
- localNetwork.testAccounts = true;
21
+ const localNetwork = extractNamespacedOptions(options, 'localNetwork');
22
22
  userLog(`${splash}\n${github}\n\n`);
23
- userLog(`Setting up Aztec local network ${packageVersion ?? 'unknown'}, please stand by...`);
23
+ userLog(`Setting up Aztec local network ${packageVersion}, please stand by...`);
24
24
  const { node, stop } = await createLocalNetwork({
25
25
  l1Mnemonic: localNetwork.l1Mnemonic,
26
26
  l1RpcUrls: options.l1RpcUrls,
27
- testAccounts: localNetwork.testAccounts,
28
- realProofs: false,
29
- // Setting the epoch duration to 2 by default for local network. This allows the epoch to be "proven" faster, so
30
- // the users can consume out hash without having to wait for a long time.
31
- // Note: We are not proving anything in the local network (realProofs == false). But in `createLocalNetwork`,
32
- // the EpochTestSettler will set the out hash to the outbox when an epoch is complete.
33
- aztecEpochDuration: 2
27
+ testAccounts: localNetwork.testAccounts
34
28
  }, userLog);
35
29
  // Start Node and PXE JSON-RPC server
36
30
  signalHandlers.push(stop);
37
- services.node = [
38
- node,
39
- AztecNodeApiSchema
40
- ];
41
- adminServices.node = [
42
- node,
43
- AztecNodeAdminApiSchema
44
- ];
31
+ registerAztecNodeRpcHandlers(node, services, adminServices, {
32
+ debug: true
33
+ });
45
34
  } else {
46
35
  // Route --prover-node through startNode
47
36
  if (options.proverNode && !options.node) {
@@ -54,9 +43,6 @@ export async function aztecStart(options, userLog, debugLogger) {
54
43
  } else if (options.bot) {
55
44
  const { startBot } = await import('./cmds/start_bot.js');
56
45
  await startBot(options, signalHandlers, services, userLog);
57
- } else if (options.archiver) {
58
- const { startArchiver } = await import('./cmds/start_archiver.js');
59
- ({ config } = await startArchiver(options, signalHandlers, services));
60
46
  } else if (options.p2pBootstrap) {
61
47
  const { startP2PBootstrap } = await import('./cmds/start_p2p_bootstrap.js');
62
48
  ({ config } = await startP2PBootstrap(options, signalHandlers, services, userLog));
@@ -68,7 +54,7 @@ export async function aztecStart(options, userLog, debugLogger) {
68
54
  await startProverBroker(options, signalHandlers, services, userLog);
69
55
  } else if (options.txe) {
70
56
  const { startTXE } = await import('./cmds/start_txe.js');
71
- await startTXE(options, debugLogger);
57
+ await startTXE(options, signalHandlers, debugLogger);
72
58
  } else if (options.sequencer) {
73
59
  userLog(`Cannot run a standalone sequencer without a node`);
74
60
  process.exit(1);
@@ -84,27 +70,34 @@ export async function aztecStart(options, userLog, debugLogger) {
84
70
  };
85
71
  // Start the main JSON-RPC server
86
72
  if (Object.entries(services).length > 0) {
73
+ if (services.aztec) {
74
+ const { BarretenbergSync } = await import('@aztec/bb.js');
75
+ // JSON-RPC schema parsing may decompress compressed Chonk proofs before the node handler runs.
76
+ await BarretenbergSync.initSingleton();
77
+ }
87
78
  const rpcServer = createNamespacedSafeJsonRpcServer(services, {
79
+ diagnostic: getOtelJsonRpcDiagnosticsMiddleware(),
88
80
  http200OnError: false,
89
81
  log: debugLogger,
90
82
  middlewares: [
83
+ getOtelJsonRpcServerMetricsMiddleware(),
91
84
  getOtelJsonRpcPropagationMiddleware(),
92
85
  getVersioningMiddleware(versions, versioningOpts)
93
86
  ],
94
87
  maxBatchSize: options.rpcMaxBatchSize,
95
- maxBodySizeBytes: options.rpcMaxBodySize
88
+ maxBodySizeBytes: options.rpcMaxBodySize,
89
+ corsAllowedHeaders: options.rpcCorsAllowedHeaders ?? [],
90
+ corsAllowedOrigins: getRpcCorsAllowedOrigins(options)
96
91
  });
97
92
  const { port } = await startHttpRpcServer(rpcServer, {
98
- port: options.port
93
+ port: options.port,
94
+ keepAliveTimeoutMs: options.rpcHttpKeepAliveTimeoutMs,
95
+ headersTimeoutMs: options.rpcHttpHeadersTimeoutMs
99
96
  });
100
97
  debugLogger.info(`Aztec Server listening on port ${port}`, versions);
101
98
  }
102
99
  // If there are any admin services, start a separate JSON-RPC server for them
103
100
  if (Object.entries(adminServices).length > 0) {
104
- const adminMiddlewares = [
105
- getOtelJsonRpcPropagationMiddleware(),
106
- getVersioningMiddleware(versions, versioningOpts)
107
- ];
108
101
  // Resolve the admin API key (auto-generated and persisted, or opt-out)
109
102
  const apiKeyResolution = await resolveAdminApiKey({
110
103
  adminApiKeyHash: options.adminApiKeyHash,
@@ -112,12 +105,19 @@ export async function aztecStart(options, userLog, debugLogger) {
112
105
  resetAdminApiKey: options.resetAdminApiKey,
113
106
  dataDirectory: options.dataDirectory
114
107
  }, debugLogger);
115
- if (apiKeyResolution) {
116
- adminMiddlewares.unshift(getApiKeyAuthMiddleware(apiKeyResolution.apiKeyHash));
117
- } else {
108
+ if (!apiKeyResolution) {
118
109
  debugLogger.warn('No admin API key set — admin endpoint is unauthenticated');
119
110
  }
111
+ const adminMiddlewares = [
112
+ getOtelJsonRpcServerMetricsMiddleware(),
113
+ ...apiKeyResolution ? [
114
+ getApiKeyAuthMiddleware(apiKeyResolution.apiKeyHash)
115
+ ] : [],
116
+ getOtelJsonRpcPropagationMiddleware(),
117
+ getVersioningMiddleware(versions, versioningOpts)
118
+ ];
120
119
  const rpcServer = createNamespacedSafeJsonRpcServer(adminServices, {
120
+ diagnostic: getOtelJsonRpcDiagnosticsMiddleware(),
121
121
  http200OnError: false,
122
122
  log: debugLogger,
123
123
  middlewares: adminMiddlewares,
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfb3B0aW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9henRlY19zdGFydF9vcHRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sRUFDTCxLQUFLLGFBQWEsRUFDbEIsS0FBSyxNQUFNLEVBSVosTUFBTSwwQkFBMEIsQ0FBQztBQWVsQyxNQUFNLFdBQVcsZ0JBQWdCO0lBQy9CLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixXQUFXLEVBQUUsTUFBTSxDQUFDO0lBQ3BCLFlBQVksRUFBRSxHQUFHLENBQUM7SUFDbEIsWUFBWSxDQUFDLEVBQUUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxLQUFLLE1BQU0sQ0FBQztJQUNwQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUN4QixRQUFRLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNwQixRQUFRLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEtBQUssR0FBRyxDQUFDO0NBQ2pDO0FBRUQsZUFBTyxNQUFNLFVBQVUsbUdBb0J0QixDQUFDO0FBMkJGLGVBQU8sTUFBTSxnQkFBZ0IsVUFZNUIsQ0FBQztBQUVGLGVBQU8sTUFBTSxZQUFZLFlBQVksQ0FBQztBQUd0QyxlQUFPLE1BQU0saUJBQWlCLEVBQUU7SUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLEVBQUUsQ0FBQTtDQXNPbEUsQ0FBQyJ9
@@ -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;CAsOlE,CAAC"}
@@ -76,7 +76,7 @@ export const aztecStartOptions = {
76
76
  defaultValue: undefined,
77
77
  env: 'NETWORK'
78
78
  },
79
- configToFlag('--enable-version-check', sharedNodeConfigMappings.enableVersionCheck),
79
+ configToFlag('--enable-auto-shutdown', sharedNodeConfigMappings.enableAutoShutdown),
80
80
  configToFlag('--sync-mode', sharedNodeConfigMappings.syncMode),
81
81
  configToFlag('--snapshots-urls', sharedNodeConfigMappings.snapshotsUrls),
82
82
  configToFlag('--fisherman-mode', sharedNodeConfigMappings.fishermanMode)
@@ -93,6 +93,12 @@ export const aztecStartOptions = {
93
93
  description: 'Mnemonic for L1 accounts. Will be used ',
94
94
  defaultValue: DefaultMnemonic,
95
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)
96
102
  }
97
103
  ],
98
104
  API: [
@@ -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',
@@ -138,7 +151,12 @@ export const aztecStartOptions = {
138
151
  env: 'API_PREFIX'
139
152
  },
140
153
  configToFlag('--rpcMaxBatchSize', nodeRpcConfigMappings.rpcMaxBatchSize),
141
- configToFlag('--rpcMaxBodySize', nodeRpcConfigMappings.rpcMaxBodySize)
154
+ configToFlag('--rpcMaxBodySize', nodeRpcConfigMappings.rpcMaxBodySize),
155
+ configToFlag('--rpc-http-keep-alive-timeout-ms', nodeRpcConfigMappings.rpcHttpKeepAliveTimeoutMs),
156
+ configToFlag('--rpc-http-headers-timeout-ms', nodeRpcConfigMappings.rpcHttpHeadersTimeoutMs),
157
+ configToFlag('--rpc-cors-allowed-headers', nodeRpcConfigMappings.rpcCorsAllowedHeaders),
158
+ configToFlag('--rpc-cors-allowed-origins', nodeRpcConfigMappings.rpcCorsAllowedOrigins),
159
+ configToFlag('--rpc-cors-allow-any-origin', nodeRpcConfigMappings.rpcCorsAllowAnyOrigin)
142
160
  ],
143
161
  ETHEREUM: [
144
162
  configToFlag('--l1-chain-id', l1ReaderConfigMappings.l1ChainId),
@@ -174,12 +192,6 @@ export const aztecStartOptions = {
174
192
  }
175
193
  ],
176
194
  ARCHIVER: [
177
- {
178
- flag: '--archiver',
179
- description: 'Starts Aztec Archiver with options',
180
- defaultValue: undefined,
181
- env: undefined
182
- },
183
195
  ...getOptions('archiver', omitConfigMappings(archiverConfigMappings, Object.keys(l1ContractsConfigMappings)))
184
196
  ],
185
197
  SEQUENCER: [
@@ -217,8 +229,7 @@ export const aztecStartOptions = {
217
229
  defaultValue: undefined,
218
230
  env: undefined
219
231
  },
220
- ...getOptions('proverBroker', // filter out archiver options from prover node options as they're passed separately in --archiver
221
- proverBrokerConfigMappings)
232
+ ...getOptions('proverBroker', proverBrokerConfigMappings)
222
233
  ],
223
234
  'PROVER AGENT': [
224
235
  {
@@ -266,12 +277,6 @@ export const aztecStartOptions = {
266
277
  ...getOptions('bot', botConfigMappings)
267
278
  ],
268
279
  PXE: [
269
- {
270
- flag: '--pxe',
271
- description: 'Starts Aztec PXE with options',
272
- defaultValue: undefined,
273
- env: undefined
274
- },
275
280
  ...getOptions('pxe', allPxeConfigMappings)
276
281
  ],
277
282
  TXE: [
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGlsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL2NvbXBpbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHbkQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBb0t6Qyx3QkFBZ0Isb0JBQW9CLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxHQUFHLE9BQU8sQ0FzQjFFIn0=
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGlsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL2NvbXBpbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFJbkQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBMEt6Qyx3QkFBZ0Isb0JBQW9CLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxHQUFHLE9BQU8sQ0FzQjFFIn0=
@@ -1 +1 @@
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;AAGnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAoKzC,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;AA0KzC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAsB1E"}
@@ -1,11 +1,13 @@
1
1
  import { findBbBinary } from '@aztec/bb.js';
2
+ import { getPackageVersion } from '@aztec/stdlib/update-checker';
2
3
  import { execFileSync } from 'child_process';
3
4
  import { readFile, writeFile } from 'fs/promises';
4
5
  import { join } from 'path';
5
6
  import { readArtifactFiles } from './utils/artifacts.js';
6
7
  import { needsRecompile } from './utils/needs_recompile.js';
7
8
  import { run } from './utils/spawn.js';
8
- /** Returns paths to contract artifacts in the target directory. */ async function collectContractArtifacts() {
9
+ import { warnIfAztecVersionMismatch } from './utils/warn_if_aztec_version_mismatch.js';
10
+ /** Returns contract artifacts in the target directory along with whether each has already been postprocessed. */ async function collectContractArtifacts() {
9
11
  let files;
10
12
  try {
11
13
  files = await readArtifactFiles('target');
@@ -15,16 +17,17 @@ import { run } from './utils/spawn.js';
15
17
  }
16
18
  throw err;
17
19
  }
18
- return files.filter((f)=>Array.isArray(f.content.functions)).map((f)=>f.filePath);
20
+ return files.filter((f)=>Array.isArray(f.content.functions)).map((f)=>({
21
+ filePath: f.filePath,
22
+ transpiled: f.content.transpiled === true
23
+ }));
19
24
  }
20
- /** Strips the `__aztec_nr_internals__` prefix from function names in contract artifacts. */ async function stripInternalPrefixes(artifactPaths) {
25
+ /** Stamps the Aztec stack version into the contract artifacts. */ async function stampAztecVersion(artifactPaths) {
26
+ const version = getPackageVersion();
21
27
  for (const path of artifactPaths){
22
28
  const artifact = JSON.parse(await readFile(path, 'utf-8'));
23
- for (const fn of artifact.functions){
24
- if (typeof fn.name === 'string') {
25
- fn.name = fn.name.replace(/^__aztec_nr_internals__/, '');
26
- }
27
- }
29
+ // eslint-disable-next-line camelcase
30
+ artifact.aztec_version = version;
28
31
  await writeFile(path, JSON.stringify(artifact, null, 2) + '\n');
29
32
  }
30
33
  }
@@ -118,22 +121,24 @@ import { run } from './utils/spawn.js';
118
121
  }
119
122
  }
120
123
  /** Compiles Aztec Noir contracts and postprocesses artifacts. */ async function compileAztecContract(nargoArgs, log) {
121
- if (!await needsRecompile()) {
122
- log('No source changes detected, skipping compilation.');
123
- return;
124
- }
124
+ await warnIfAztecVersionMismatch(log);
125
125
  const nargo = process.env.NARGO ?? 'nargo';
126
126
  const bb = process.env.BB ?? findBbBinary() ?? 'bb';
127
- await run(nargo, [
128
- 'compile',
129
- ...nargoArgs
130
- ]);
131
- // Ensure contract crates contain no tests (tests belong in the test crate).
132
- await checkNoTestsInContracts(nargo, log);
133
- const artifacts = await collectContractArtifacts();
134
- if (artifacts.length > 0) {
127
+ const shouldRecompile = await needsRecompile();
128
+ if (shouldRecompile) {
129
+ await run(nargo, [
130
+ 'compile',
131
+ ...nargoArgs
132
+ ]);
133
+ // Ensure contract crates contain no tests (tests belong in the test crate).
134
+ await checkNoTestsInContracts(nargo, log);
135
+ }
136
+ // Postprocess any untranspiled artifacts: those just produced by nargo above, and any left behind by a bare
137
+ // `nargo compile` run outside `aztec compile`.
138
+ const unprocessed = (await collectContractArtifacts()).filter((a)=>!a.transpiled).map((a)=>a.filePath);
139
+ if (unprocessed.length > 0) {
135
140
  log('Postprocessing contracts...');
136
- const bbArgs = artifacts.flatMap((a)=>[
141
+ const bbArgs = unprocessed.flatMap((a)=>[
137
142
  '-i',
138
143
  a
139
144
  ]);
@@ -141,10 +146,13 @@ import { run } from './utils/spawn.js';
141
146
  'aztec_process',
142
147
  ...bbArgs
143
148
  ]);
144
- // TODO: This should be part of bb aztec_process!
145
- await stripInternalPrefixes(artifacts);
149
+ await stampAztecVersion(unprocessed);
150
+ }
151
+ if (shouldRecompile || unprocessed.length > 0) {
152
+ log('Compilation complete!');
153
+ } else {
154
+ log('No source changes detected, skipping compilation.');
146
155
  }
147
- log('Compilation complete!');
148
156
  }
149
157
  export function injectCompileCommand(program, log) {
150
158
  program.command('compile').argument('[nargo-args...]').passThroughOptions().allowUnknownOption().description('Compile Aztec Noir contracts using nargo and postprocess them to generate transpiled artifacts and verification keys. All options are forwarded to nargo compile.').addHelpText('after', ()=>{
@@ -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 injectProfileCommand(program: Command, log: LogFn): Command;
4
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZmlsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3Byb2ZpbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbkQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBS3pDLHdCQUFnQixvQkFBb0IsQ0FBQyxPQUFPLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxLQUFLLEdBQUcsT0FBTyxDQWlCMUUifQ==
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZmlsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3Byb2ZpbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbkQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBS3pDLHdCQUFnQixvQkFBb0IsQ0FBQyxPQUFPLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxLQUFLLEdBQUcsT0FBTyxDQWtCMUUifQ==
@@ -1 +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,CAiB1E"}
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"}
@@ -2,7 +2,7 @@ import { profileFlamegraph } from './profile_flamegraph.js';
2
2
  import { profileGates } from './profile_gates.js';
3
3
  export function injectProfileCommand(program, log) {
4
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').description('Display gate counts for all compiled Aztec artifacts in a target directory.').action((targetDir)=>profileGates(targetDir, log));
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
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
7
  return program;
8
8
  }
@@ -1,4 +1,4 @@
1
1
  import type { LogFn } from '@aztec/foundation/log';
2
2
  /** Profiles all compiled artifacts in a target directory and prints gate counts. */
3
- export declare function profileGates(targetDir: string, log: LogFn): Promise<void>;
4
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZmlsZV9nYXRlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3Byb2ZpbGVfZ2F0ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUErQm5ELG9GQUFvRjtBQUNwRix3QkFBc0IsWUFBWSxDQUFDLFNBQVMsRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLEtBQUssR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBaUMvRSJ9
3
+ export declare function profileGates(targetDir: string, json: boolean, log: LogFn): Promise<void>;
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZmlsZV9nYXRlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3Byb2ZpbGVfZ2F0ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFnQ25ELG9GQUFvRjtBQUNwRix3QkFBc0IsWUFBWSxDQUFDLFNBQVMsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FnRDlGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"profile_gates.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/profile_gates.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AA+BnD,oFAAoF;AACpF,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAiC/E"}
1
+ {"version":3,"file":"profile_gates.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/profile_gates.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAgCnD,oFAAoF;AACpF,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAgD9F"}
@@ -23,21 +23,39 @@ const execFile = promisify(execFileCb);
23
23
  ]);
24
24
  return parseGateCount(stdout);
25
25
  }
26
- /** Profiles all compiled artifacts in a target directory and prints gate counts. */ export async function profileGates(targetDir, log) {
26
+ /** Profiles all compiled artifacts in a target directory and prints gate counts. */ export async function profileGates(targetDir, json, log) {
27
27
  const bb = process.env.BB ?? findBbBinary() ?? 'bb';
28
28
  const { artifacts, tmpDir } = await discoverArtifacts(targetDir);
29
29
  if (artifacts.length === 0) {
30
- log('No artifacts found in target directory.');
30
+ if (json) {
31
+ log('[]');
32
+ } else {
33
+ log('No artifacts found in target directory.');
34
+ }
31
35
  return;
32
36
  }
33
37
  try {
34
38
  const results = await asyncPool(MAX_CONCURRENT, artifacts, async (artifact)=>({
35
39
  name: artifact.name,
40
+ type: artifact.type,
36
41
  gateCount: await getGateCount(bb, artifact.filePath)
37
42
  }));
38
43
  results.sort((a, b)=>a.name.localeCompare(b.name));
39
44
  if (results.length === 0) {
40
- log('No constrained circuits found.');
45
+ if (json) {
46
+ log('[]');
47
+ } else {
48
+ log('No constrained circuits found.');
49
+ }
50
+ return;
51
+ }
52
+ if (json) {
53
+ const entries = results.map((r)=>({
54
+ name: r.name,
55
+ type: r.type,
56
+ gates: r.gateCount
57
+ }));
58
+ log(JSON.stringify(entries, null, 2));
41
59
  return;
42
60
  }
43
61
  const maxNameLen = Math.max(...results.map((r)=>r.name.length));
@@ -0,0 +1,4 @@
1
+ import type { LogFn } from '@aztec/foundation/log';
2
+ import { type Command } from 'commander';
3
+ export declare function injectProverCommand(program: Command, log: LogFn): Command;
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2NtZHMvcHJvdmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR25ELE9BQU8sRUFBRSxLQUFLLE9BQU8sRUFBd0IsTUFBTSxXQUFXLENBQUM7QUFVL0Qsd0JBQWdCLG1CQUFtQixDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsR0FBRyxFQUFFLEtBQUssR0FBRyxPQUFPLENBMkJ6RSJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"prover.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/prover.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,KAAK,OAAO,EAAwB,MAAM,WAAW,CAAC;AAU/D,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CA2BzE"}
@@ -0,0 +1,24 @@
1
+ import { jsonStringify } from '@aztec/foundation/json-rpc';
2
+ import { createProverNodeAdminClient } from '@aztec/stdlib/interfaces/server';
3
+ import { InvalidArgumentError } from 'commander';
4
+ function parseEpoch(value) {
5
+ const parsed = Number(value);
6
+ if (!Number.isInteger(parsed) || parsed < 0) {
7
+ throw new InvalidArgumentError('Epoch must be a non-negative integer.');
8
+ }
9
+ return parsed;
10
+ }
11
+ export function injectProverCommand(program, log) {
12
+ const proverCommand = program.command('prover').description('Operate a prover node via its admin JSON-RPC endpoint');
13
+ proverCommand.command('start-proof').description('Schedules proving for the given epoch').requiredOption('--epoch <n>', 'Epoch number to prove', parseEpoch).requiredOption('--admin-url <url>', 'URL of the prover node admin JSON-RPC endpoint').option('--api-key <key>', 'Admin API key', process.env.AZTEC_ADMIN_API_KEY).action(async (options)=>{
14
+ const client = createProverNodeAdminClient(options.adminUrl, {}, undefined, options.apiKey);
15
+ const jobId = await client.startProof(options.epoch);
16
+ log(`Started proving job ${jobId} for epoch ${options.epoch}`);
17
+ });
18
+ proverCommand.command('get-jobs').description('Lists the prover node proving jobs').requiredOption('--admin-url <url>', 'URL of the prover node admin JSON-RPC endpoint').option('--api-key <key>', 'Admin API key', process.env.AZTEC_ADMIN_API_KEY).action(async (options)=>{
19
+ const client = createProverNodeAdminClient(options.adminUrl, {}, undefined, options.apiKey);
20
+ const jobs = await client.getJobs();
21
+ log(jsonStringify(jobs, true));
22
+ });
23
+ return program;
24
+ }
@@ -1,7 +1,8 @@
1
1
  import type { Fr } from '@aztec/aztec.js/fields';
2
2
  import type { GenesisStateConfig } from '@aztec/ethereum/config';
3
+ import { RollupContract } from '@aztec/ethereum/contracts';
3
4
  import type { EthAddress } from '@aztec/foundation/eth-address';
4
- import type { LogFn } from '@aztec/foundation/log';
5
+ import { type LogFn } from '@aztec/foundation/log';
5
6
  /**
6
7
  * Computes the expected genesis archive root from the genesis state config.
7
8
  * Reads test accounts and sponsored FPC addresses as specified, then computes
@@ -9,8 +10,18 @@ import type { LogFn } from '@aztec/foundation/log';
9
10
  */
10
11
  export declare function computeExpectedGenesisRoot(config: GenesisStateConfig, userLog: LogFn): Promise<{
11
12
  genesisArchiveRoot: Fr;
12
- prefilledPublicData: import("@aztec/stdlib/trees").PublicDataTreeLeaf[];
13
+ genesis: import("@aztec/stdlib/world-state").GenesisData;
13
14
  }>;
15
+ /**
16
+ * Compares the rollup's on-chain protocol constants (genesis archive root, VK tree root, protocol
17
+ * contracts hash) against the node's expected local values. Returns a list of human-readable mismatch
18
+ * descriptions, empty if the rollup is compatible.
19
+ */
20
+ export declare function checkRollupCompatibility(rollup: RollupContract, expected: {
21
+ genesisArchiveRoot: Fr;
22
+ vkTreeRoot: Fr;
23
+ protocolContractsHash: Fr;
24
+ }): Promise<string[]>;
14
25
  /**
15
26
  * Waits until the canonical rollup's genesis archive root, VK tree root, and protocol contracts hash
16
27
  * all match the expected local values. If the rollup is not yet compatible (e.g. during L1 contract upgrades),
@@ -20,13 +31,26 @@ export declare function computeExpectedGenesisRoot(config: GenesisStateConfig, u
20
31
  export declare function waitForCompatibleRollup(config: {
21
32
  l1RpcUrls: string[];
22
33
  l1ChainId: number;
23
- l1Contracts: {
24
- registryAddress: EthAddress;
25
- };
34
+ registryAddress: EthAddress;
26
35
  rollupVersion?: number;
27
36
  }, expected: {
28
37
  genesisArchiveRoot: Fr;
29
38
  vkTreeRoot: Fr;
30
39
  protocolContractsHash: Fr;
31
40
  }, port: number | undefined, userLog: LogFn): Promise<void>;
32
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhbmRieS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YW5kYnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHakQsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVqRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQVNuRDs7OztHQUlHO0FBQ0gsd0JBQXNCLDBCQUEwQixDQUFDLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxPQUFPLEVBQUUsS0FBSzs7O0dBYTFGO0FBd0JEOzs7OztHQUtHO0FBQ0gsd0JBQXNCLHVCQUF1QixDQUMzQyxNQUFNLEVBQUU7SUFDTixTQUFTLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDcEIsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixXQUFXLEVBQUU7UUFBRSxlQUFlLEVBQUUsVUFBVSxDQUFBO0tBQUUsQ0FBQztJQUM3QyxhQUFhLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDeEIsRUFDRCxRQUFRLEVBQUU7SUFBRSxrQkFBa0IsRUFBRSxFQUFFLENBQUM7SUFBQyxVQUFVLEVBQUUsRUFBRSxDQUFDO0lBQUMscUJBQXFCLEVBQUUsRUFBRSxDQUFBO0NBQUUsRUFDL0UsSUFBSSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQ3hCLE9BQU8sRUFBRSxLQUFLLEdBQ2IsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXdEZiJ9
41
+ /**
42
+ * Polls the canonical rollup's protocol constants every 10 minutes and soft-shuts-down the node once they
43
+ * diverge from the node's expected local values (i.e. an incompatible rollup has become canonical on L1).
44
+ * The HTTP health server is left running so K8s probes keep passing on the wound-down pod. This is the
45
+ * inverse of {@link waitForCompatibleRollup}; it should only be set up for nodes following the canonical
46
+ * rollup. Reuses the {@link checkRollupCompatibility} diff and the generic VersionChecker poll primitive.
47
+ */
48
+ export declare function setupAutoShutdown(config: {
49
+ l1RpcUrls: string[];
50
+ l1ChainId: number;
51
+ }, registryAddress: EthAddress, rollupVersion: number | 'canonical', expected: {
52
+ genesisArchiveRoot: Fr;
53
+ vkTreeRoot: Fr;
54
+ protocolContractsHash: Fr;
55
+ }, signalHandlers: Array<() => Promise<void>>): Promise<void>;
56
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhbmRieS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YW5kYnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHakQsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNqRSxPQUFPLEVBQW9CLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzdFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRWhFLE9BQU8sRUFBRSxLQUFLLEtBQUssRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQVlqRTs7OztHQUlHO0FBQ0gsd0JBQXNCLDBCQUEwQixDQUFDLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxPQUFPLEVBQUUsS0FBSzs7O0dBYTFGO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFzQix3QkFBd0IsQ0FDNUMsTUFBTSxFQUFFLGNBQWMsRUFDdEIsUUFBUSxFQUFFO0lBQUUsa0JBQWtCLEVBQUUsRUFBRSxDQUFDO0lBQUMsVUFBVSxFQUFFLEVBQUUsQ0FBQztJQUFDLHFCQUFxQixFQUFFLEVBQUUsQ0FBQTtDQUFFLEdBQzlFLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQWlCbkI7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFzQix1QkFBdUIsQ0FDM0MsTUFBTSxFQUFFO0lBQ04sU0FBUyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3BCLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsZUFBZSxFQUFFLFVBQVUsQ0FBQztJQUM1QixhQUFhLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDeEIsRUFDRCxRQUFRLEVBQUU7SUFBRSxrQkFBa0IsRUFBRSxFQUFFLENBQUM7SUFBQyxVQUFVLEVBQUUsRUFBRSxDQUFDO0lBQUMscUJBQXFCLEVBQUUsRUFBRSxDQUFBO0NBQUUsRUFDL0UsSUFBSSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQ3hCLE9BQU8sRUFBRSxLQUFLLEdBQ2IsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXdEZjtBQUVEOzs7Ozs7R0FNRztBQUNILHdCQUFzQixpQkFBaUIsQ0FDckMsTUFBTSxFQUFFO0lBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQTtDQUFFLEVBQ2xELGVBQWUsRUFBRSxVQUFVLEVBQzNCLGFBQWEsRUFBRSxNQUFNLEdBQUcsV0FBVyxFQUNuQyxRQUFRLEVBQUU7SUFBRSxrQkFBa0IsRUFBRSxFQUFFLENBQUM7SUFBQyxVQUFVLEVBQUUsRUFBRSxDQUFDO0lBQUMscUJBQXFCLEVBQUUsRUFBRSxDQUFBO0NBQUUsRUFDL0UsY0FBYyxFQUFFLEtBQUssQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUN6QyxPQUFPLENBQUMsSUFBSSxDQUFDLENBNkJmIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"standby.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/standby.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAGjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AASnD;;;;GAIG;AACH,wBAAsB,0BAA0B,CAAC,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK;;;GAa1F;AAwBD;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE;IACN,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE;QAAE,eAAe,EAAE,UAAU,CAAA;KAAE,CAAC;IAC7C,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,EACD,QAAQ,EAAE;IAAE,kBAAkB,EAAE,EAAE,CAAC;IAAC,UAAU,EAAE,EAAE,CAAC;IAAC,qBAAqB,EAAE,EAAE,CAAA;CAAE,EAC/E,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,OAAO,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC,CAwDf"}
1
+ {"version":3,"file":"standby.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/standby.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAGjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAoB,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AAYjE;;;;GAIG;AACH,wBAAsB,0BAA0B,CAAC,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK;;;GAa1F;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE;IAAE,kBAAkB,EAAE,EAAE,CAAC;IAAC,UAAU,EAAE,EAAE,CAAC;IAAC,qBAAqB,EAAE,EAAE,CAAA;CAAE,GAC9E,OAAO,CAAC,MAAM,EAAE,CAAC,CAiBnB;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE;IACN,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,UAAU,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,EACD,QAAQ,EAAE;IAAE,kBAAkB,EAAE,EAAE,CAAC;IAAC,UAAU,EAAE,EAAE,CAAC;IAAC,qBAAqB,EAAE,EAAE,CAAA;CAAE,EAC/E,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,OAAO,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC,CAwDf;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE;IAAE,SAAS,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAClD,eAAe,EAAE,UAAU,EAC3B,aAAa,EAAE,MAAM,GAAG,WAAW,EACnC,QAAQ,EAAE;IAAE,kBAAkB,EAAE,EAAE,CAAC;IAAC,UAAU,EAAE,EAAE,CAAC;IAAC,qBAAqB,EAAE,EAAE,CAAA;CAAE,EAC/E,cAAc,EAAE,KAAK,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GACzC,OAAO,CAAC,IAAI,CAAC,CA6Bf"}