@aztec/aztec 0.0.1-commit.181e2d196 → 0.0.1-commit.189eedb3

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 (124) hide show
  1. package/dest/bin/index.js +2 -2
  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 +36 -14
  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 +16 -17
  8. package/dest/cli/cli.js +3 -3
  9. package/dest/cli/cmds/compile.d.ts +1 -1
  10. package/dest/cli/cmds/compile.d.ts.map +1 -1
  11. package/dest/cli/cmds/compile.js +15 -9
  12. package/dest/cli/cmds/profile.d.ts +1 -1
  13. package/dest/cli/cmds/profile.d.ts.map +1 -1
  14. package/dest/cli/cmds/profile.js +1 -1
  15. package/dest/cli/cmds/profile_flamegraph.d.ts +1 -1
  16. package/dest/cli/cmds/profile_flamegraph.d.ts.map +1 -1
  17. package/dest/cli/cmds/profile_flamegraph.js +2 -1
  18. package/dest/cli/cmds/profile_gates.d.ts +2 -2
  19. package/dest/cli/cmds/profile_gates.d.ts.map +1 -1
  20. package/dest/cli/cmds/profile_gates.js +23 -4
  21. package/dest/cli/cmds/standby.d.ts +30 -0
  22. package/dest/cli/cmds/standby.d.ts.map +1 -0
  23. package/dest/cli/cmds/standby.js +97 -0
  24. package/dest/cli/cmds/start_bot.d.ts +1 -1
  25. package/dest/cli/cmds/start_bot.d.ts.map +1 -1
  26. package/dest/cli/cmds/start_bot.js +3 -3
  27. package/dest/cli/cmds/start_node.d.ts +3 -2
  28. package/dest/cli/cmds/start_node.d.ts.map +1 -1
  29. package/dest/cli/cmds/start_node.js +26 -96
  30. package/dest/cli/cmds/start_prover_agent.d.ts +1 -1
  31. package/dest/cli/cmds/start_prover_agent.d.ts.map +1 -1
  32. package/dest/cli/cmds/start_prover_agent.js +5 -17
  33. package/dest/cli/cmds/start_prover_broker.d.ts +1 -1
  34. package/dest/cli/cmds/start_prover_broker.d.ts.map +1 -1
  35. package/dest/cli/cmds/start_prover_broker.js +22 -13
  36. package/dest/cli/cmds/start_txe.d.ts +2 -2
  37. package/dest/cli/cmds/start_txe.d.ts.map +1 -1
  38. package/dest/cli/cmds/start_txe.js +6 -5
  39. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts +21 -0
  40. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts.map +1 -0
  41. package/dest/cli/cmds/utils/collect_crate_dirs.js +114 -0
  42. package/dest/cli/cmds/utils/needs_recompile.d.ts +10 -0
  43. package/dest/cli/cmds/utils/needs_recompile.d.ts.map +1 -0
  44. package/dest/cli/cmds/utils/needs_recompile.js +90 -0
  45. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts +4 -0
  46. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts.map +1 -0
  47. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.js +61 -0
  48. package/dest/cli/util.d.ts +3 -5
  49. package/dest/cli/util.d.ts.map +1 -1
  50. package/dest/cli/util.js +43 -82
  51. package/dest/examples/token.js +4 -4
  52. package/dest/local-network/auth_registry.d.ts +5 -0
  53. package/dest/local-network/auth_registry.d.ts.map +1 -0
  54. package/dest/local-network/auth_registry.js +17 -0
  55. package/dest/local-network/banana_fpc.d.ts +3 -2
  56. package/dest/local-network/banana_fpc.d.ts.map +1 -1
  57. package/dest/local-network/banana_fpc.js +12 -8
  58. package/dest/local-network/local-network.d.ts +5 -28
  59. package/dest/local-network/local-network.d.ts.map +1 -1
  60. package/dest/local-network/local-network.js +45 -15
  61. package/dest/testing/anvil_test_watcher.d.ts +15 -3
  62. package/dest/testing/anvil_test_watcher.d.ts.map +1 -1
  63. package/dest/testing/anvil_test_watcher.js +68 -14
  64. package/dest/testing/cheat_codes.d.ts +18 -17
  65. package/dest/testing/cheat_codes.d.ts.map +1 -1
  66. package/dest/testing/cheat_codes.js +72 -36
  67. package/dest/testing/epoch_test_settler.d.ts +1 -1
  68. package/dest/testing/epoch_test_settler.d.ts.map +1 -1
  69. package/dest/testing/epoch_test_settler.js +9 -8
  70. package/dest/testing/index.d.ts +3 -2
  71. package/dest/testing/index.d.ts.map +1 -1
  72. package/dest/testing/index.js +1 -0
  73. package/dest/testing/token_allowed_setup.d.ts +7 -0
  74. package/dest/testing/token_allowed_setup.d.ts.map +1 -0
  75. package/dest/testing/token_allowed_setup.js +20 -0
  76. package/package.json +35 -34
  77. package/scripts/add_crate.sh +53 -0
  78. package/scripts/aztec.sh +9 -2
  79. package/scripts/init.sh +18 -24
  80. package/scripts/new.sh +45 -22
  81. package/scripts/setup_workspace.sh +12 -67
  82. package/scripts/templates/blank/contract/Nargo.toml +6 -0
  83. package/scripts/templates/blank/contract/src/main.nr +10 -0
  84. package/scripts/templates/blank/test/Nargo.toml +7 -0
  85. package/scripts/templates/blank/test/src/lib.nr +11 -0
  86. package/scripts/templates/counter/contract/Nargo.toml +7 -0
  87. package/scripts/templates/counter/contract/src/main.nr +48 -0
  88. package/scripts/templates/counter/test/Nargo.toml +7 -0
  89. package/scripts/templates/counter/test/src/lib.nr +32 -0
  90. package/src/bin/index.ts +2 -2
  91. package/src/cli/aztec_start_action.ts +26 -14
  92. package/src/cli/aztec_start_options.ts +23 -25
  93. package/src/cli/cli.ts +3 -3
  94. package/src/cli/cmds/compile.ts +18 -10
  95. package/src/cli/cmds/profile.ts +2 -1
  96. package/src/cli/cmds/profile_flamegraph.ts +2 -1
  97. package/src/cli/cmds/profile_gates.ts +22 -5
  98. package/src/cli/cmds/standby.ts +132 -0
  99. package/src/cli/cmds/start_bot.ts +3 -5
  100. package/src/cli/cmds/start_node.ts +35 -119
  101. package/src/cli/cmds/start_prover_agent.ts +5 -8
  102. package/src/cli/cmds/start_prover_broker.ts +23 -24
  103. package/src/cli/cmds/start_txe.ts +7 -5
  104. package/src/cli/cmds/utils/collect_crate_dirs.ts +118 -0
  105. package/src/cli/cmds/utils/needs_recompile.ts +98 -0
  106. package/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts +76 -0
  107. package/src/cli/util.ts +47 -80
  108. package/src/examples/token.ts +6 -4
  109. package/src/local-network/auth_registry.ts +19 -0
  110. package/src/local-network/banana_fpc.ts +13 -9
  111. package/src/local-network/local-network.ts +45 -13
  112. package/src/testing/anvil_test_watcher.ts +76 -13
  113. package/src/testing/cheat_codes.ts +92 -39
  114. package/src/testing/epoch_test_settler.ts +6 -8
  115. package/src/testing/index.ts +2 -1
  116. package/src/testing/token_allowed_setup.ts +19 -0
  117. package/dest/cli/cmds/start_archiver.d.ts +0 -9
  118. package/dest/cli/cmds/start_archiver.d.ts.map +0 -1
  119. package/dest/cli/cmds/start_archiver.js +0 -48
  120. package/dest/cli/release_version.d.ts +0 -2
  121. package/dest/cli/release_version.d.ts.map +0 -1
  122. package/dest/cli/release_version.js +0 -14
  123. package/src/cli/cmds/start_archiver.ts +0 -50
  124. package/src/cli/release_version.ts +0 -21
@@ -1,20 +1,20 @@
1
- import { getInitialTestAccountsData } from '@aztec/accounts/testing';
2
1
  import { type AztecNodeConfig, aztecNodeConfigMappings, getConfigEnvVars } from '@aztec/aztec-node';
3
2
  import { Fr } from '@aztec/aztec.js/fields';
4
- import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
5
3
  import { getL1Config } from '@aztec/cli/config';
6
4
  import { getPublicClient } from '@aztec/ethereum/client';
7
- import { RegistryContract, RollupContract } from '@aztec/ethereum/contracts';
8
- import { SecretValue } from '@aztec/foundation/config';
9
- import { EthAddress } from '@aztec/foundation/eth-address';
5
+ import { getGenesisStateConfigEnvVars } from '@aztec/ethereum/config';
6
+ import { type NetworkNames, SecretValue } from '@aztec/foundation/config';
10
7
  import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
11
- import { startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
12
8
  import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
13
9
  import type { LogFn } from '@aztec/foundation/log';
14
- import { sleep } from '@aztec/foundation/sleep';
15
- import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker';
10
+ import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
11
+ import { protocolContractsHash } from '@aztec/protocol-contracts';
12
+ import {
13
+ ProvingJobConsumerSchema,
14
+ createProvingJobBrokerClient,
15
+ proverBrokerBackoff,
16
+ } from '@aztec/prover-client/broker';
16
17
  import { type CliPXEOptions, type PXEConfig, allPxeConfigMappings } from '@aztec/pxe/config';
17
- import { AztecAddress } from '@aztec/stdlib/aztec-address';
18
18
  import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
19
19
  import { P2PApiSchema, ProverNodeApiSchema, type ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
20
20
  import {
@@ -24,92 +24,25 @@ import {
24
24
  telemetryClientConfigMappings,
25
25
  } from '@aztec/telemetry-client';
26
26
  import { EmbeddedWallet } from '@aztec/wallets/embedded';
27
- import { getGenesisValues } from '@aztec/world-state/testing';
28
-
29
- import Koa from 'koa';
30
27
 
31
28
  import { createAztecNode } from '../../local-network/index.js';
32
29
  import {
33
30
  extractNamespacedOptions,
34
31
  extractRelevantOptions,
35
32
  preloadCrsDataForVerifying,
36
- setupUpdateMonitor,
33
+ setupVersionChecker,
37
34
  } from '../util.js';
38
35
  import { getVersions } from '../versioning.js';
36
+ import { computeExpectedGenesisRoot, waitForCompatibleRollup } from './standby.js';
39
37
  import { startProverBroker } from './start_prover_broker.js';
40
38
 
41
- const ROLLUP_POLL_INTERVAL_MS = 600_000;
42
-
43
- /**
44
- * Waits until the canonical rollup's genesis archive root matches the expected local genesis root.
45
- * If the rollup is not yet compatible (e.g. during L1 contract upgrades), enters standby mode:
46
- * starts a lightweight HTTP server for K8s liveness probes and polls until a compatible rollup appears.
47
- */
48
- async function waitForCompatibleRollup(
49
- publicClient: ReturnType<typeof getPublicClient>,
50
- registryAddress: EthAddress,
51
- rollupVersion: number | 'canonical',
52
- expectedGenesisRoot: Fr,
53
- port: number | undefined,
54
- userLog: LogFn,
55
- ): Promise<void> {
56
- const registry = new RegistryContract(publicClient, registryAddress);
57
- const rollupAddress = await registry.getRollupAddress(rollupVersion);
58
- const rollup = new RollupContract(publicClient, rollupAddress.toString());
59
-
60
- let l1GenesisRoot: Fr;
61
- try {
62
- l1GenesisRoot = await rollup.getGenesisArchiveTreeRoot();
63
- } catch (err: any) {
64
- throw new Error(
65
- `Could not retrieve genesis archive root from canonical rollup at ${rollupAddress}: ${err.message}`,
66
- );
67
- }
68
-
69
- if (l1GenesisRoot.equals(expectedGenesisRoot)) {
70
- return;
71
- }
72
-
73
- userLog(
74
- `Genesis root mismatch: expected ${expectedGenesisRoot}, got ${l1GenesisRoot} from rollup at ${rollupAddress}. ` +
75
- `Entering standby mode. Will poll every ${ROLLUP_POLL_INTERVAL_MS / 1000}s for a compatible rollup...`,
76
- );
77
-
78
- const standbyServer = await startHttpRpcServer({ getApp: () => new Koa(), isHealthy: () => true }, { port });
79
- userLog(`Standby status server listening on port ${standbyServer.port}`);
80
-
81
- try {
82
- while (true) {
83
- await sleep(ROLLUP_POLL_INTERVAL_MS);
84
-
85
- const currentRollupAddress = await registry.getRollupAddress(rollupVersion);
86
- const currentRollup = new RollupContract(publicClient, currentRollupAddress.toString());
87
-
88
- try {
89
- l1GenesisRoot = await currentRollup.getGenesisArchiveTreeRoot();
90
- } catch {
91
- userLog(`Failed to fetch genesis root from rollup at ${currentRollupAddress}. Retrying...`);
92
- continue;
93
- }
94
-
95
- if (l1GenesisRoot.equals(expectedGenesisRoot)) {
96
- userLog(`Compatible rollup found at ${currentRollupAddress}. Exiting standby mode.`);
97
- return;
98
- }
99
-
100
- userLog(`Still waiting. Rollup at ${currentRollupAddress} has genesis root ${l1GenesisRoot}.`);
101
- }
102
- } finally {
103
- await new Promise<void>((resolve, reject) => standbyServer.close(err => (err ? reject(err) : resolve())));
104
- }
105
- }
106
-
107
39
  export async function startNode(
108
40
  options: any,
109
41
  signalHandlers: (() => Promise<void>)[],
110
42
  services: NamespacedApiHandlers,
111
43
  adminServices: NamespacedApiHandlers,
112
44
  userLog: LogFn,
45
+ networkName: NetworkNames,
113
46
  ): Promise<{ config: AztecNodeConfig }> {
114
47
  // All options set from environment variables
115
48
  const configFromEnvVars = getConfigEnvVars();
@@ -136,12 +69,8 @@ export async function startNode(
136
69
  if (nodeConfig.proverBrokerUrl) {
137
70
  // at 1TPS we'd enqueue ~1k chonk verifier proofs and ~1k AVM proofs immediately
138
71
  // set a lower connection limit such that we don't overload the server
139
- // Keep retrying up to 30s
140
- const fetch = makeTracedFetch(
141
- [1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3],
142
- false,
143
- makeUndiciFetch(new Agent({ connections: 100 })),
144
- );
72
+ // Retry indefinitely until the epoch proving times out and the chain reorgs
73
+ const fetch = makeTracedFetch(proverBrokerBackoff, false, makeUndiciFetch(new Agent({ connections: 100 })));
145
74
  broker = createProvingJobBrokerClient(nodeConfig.proverBrokerUrl, getVersions(nodeConfig), fetch);
146
75
  } else if (options.proverBroker) {
147
76
  ({ broker } = await startProverBroker(options, signalHandlers, services, userLog));
@@ -153,39 +82,27 @@ export async function startNode(
153
82
 
154
83
  await preloadCrsDataForVerifying(nodeConfig, userLog);
155
84
 
156
- const testAccounts = nodeConfig.testAccounts ? (await getInitialTestAccountsData()).map(a => a.address) : [];
157
- const sponsoredFPCAccounts = nodeConfig.sponsoredFPC ? [await getSponsoredFPCAddress()] : [];
158
- const prefundAddresses = (nodeConfig.prefundAddresses ?? []).map(a => AztecAddress.fromString(a));
159
- const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts).concat(prefundAddresses);
160
-
161
- userLog(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
162
-
163
- const { genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
164
-
165
- userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
85
+ const genesisConfig = getGenesisStateConfigEnvVars();
86
+ const { genesisArchiveRoot, genesis } = await computeExpectedGenesisRoot(genesisConfig, userLog);
166
87
 
167
88
  const followsCanonicalRollup =
168
89
  typeof nodeConfig.rollupVersion !== 'number' || (nodeConfig.rollupVersion as unknown as string) === 'canonical';
169
90
 
170
- if (!nodeConfig.l1Contracts.registryAddress || nodeConfig.l1Contracts.registryAddress.isZero()) {
91
+ if (!nodeConfig.registryAddress || nodeConfig.registryAddress.isZero()) {
171
92
  throw new Error('L1 registry address is required to start Aztec Node');
172
93
  }
173
94
 
174
95
  // Wait for a compatible rollup before proceeding with full L1 config fetch.
175
96
  // This prevents crashes when the canonical rollup hasn't been upgraded yet.
176
- const publicClient = getPublicClient(nodeConfig);
177
- const rollupVersion: number | 'canonical' = nodeConfig.rollupVersion ?? 'canonical';
178
97
  await waitForCompatibleRollup(
179
- publicClient,
180
- nodeConfig.l1Contracts.registryAddress,
181
- rollupVersion,
182
- genesisArchiveRoot,
98
+ nodeConfig,
99
+ { genesisArchiveRoot, vkTreeRoot: getVKTreeRoot(), protocolContractsHash },
183
100
  options.port,
184
101
  userLog,
185
102
  );
186
103
 
187
104
  const { addresses, config } = await getL1Config(
188
- nodeConfig.l1Contracts.registryAddress,
105
+ nodeConfig.registryAddress,
189
106
  nodeConfig.l1RpcUrls,
190
107
  nodeConfig.l1ChainId,
191
108
  nodeConfig.rollupVersion,
@@ -199,13 +116,9 @@ export async function startNode(
199
116
  );
200
117
  }
201
118
 
202
- // TODO(#12272): will clean this up.
203
119
  nodeConfig = {
204
120
  ...nodeConfig,
205
- l1Contracts: {
206
- ...addresses,
207
- slashFactoryAddress: nodeConfig.l1Contracts.slashFactoryAddress,
208
- },
121
+ ...addresses,
209
122
  ...config,
210
123
  };
211
124
 
@@ -241,7 +154,7 @@ export async function startNode(
241
154
  const telemetry = await initTelemetryClient(telemetryConfig);
242
155
 
243
156
  // Create and start Aztec Node
244
- const node = await createAztecNode(nodeConfig, { telemetry, proverBroker: broker }, { prefilledPublicData });
157
+ const node = await createAztecNode(nodeConfig, { telemetry, proverBroker: broker }, { genesis });
245
158
 
246
159
  // Add node and p2p to services list
247
160
  services.node = [node, AztecNodeApiSchema];
@@ -270,16 +183,19 @@ export async function startNode(
270
183
  await addBot(options, signalHandlers, services, wallet, node, telemetry, undefined);
271
184
  }
272
185
 
273
- if (nodeConfig.autoUpdate !== 'disabled' && nodeConfig.autoUpdateUrl) {
274
- await setupUpdateMonitor(
275
- nodeConfig.autoUpdate,
276
- new URL(nodeConfig.autoUpdateUrl),
277
- followsCanonicalRollup,
278
- getPublicClient(nodeConfig!),
279
- nodeConfig.l1Contracts.registryAddress,
280
- signalHandlers,
281
- async config => node.setConfig((await AztecNodeAdminApiSchema.setConfig.parameters().parseAsync([config]))[0]),
282
- );
186
+ if (nodeConfig.enableVersionCheck && networkName !== 'local') {
187
+ const cacheDir = process.env.DATA_DIRECTORY ? `${process.env.DATA_DIRECTORY}/cache` : undefined;
188
+ try {
189
+ await setupVersionChecker(
190
+ networkName,
191
+ followsCanonicalRollup,
192
+ getPublicClient(nodeConfig!),
193
+ signalHandlers,
194
+ cacheDir,
195
+ );
196
+ } catch {
197
+ /* no-op */
198
+ }
283
199
  }
284
200
 
285
201
  return { config: nodeConfig };
@@ -9,6 +9,7 @@ import {
9
9
  createProofStore,
10
10
  createProvingJobBrokerClient,
11
11
  proverAgentConfigMappings,
12
+ proverBrokerBackoff,
12
13
  } from '@aztec/prover-client/broker';
13
14
  import { getProverNodeAgentConfigFromEnv } from '@aztec/prover-node';
14
15
  import { ProverAgentApiSchema } from '@aztec/stdlib/interfaces/server';
@@ -23,8 +24,8 @@ export async function startProverAgent(
23
24
  services: NamespacedApiHandlers,
24
25
  userLog: LogFn,
25
26
  ) {
26
- if (options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
27
- userLog(`Starting a prover agent with --node, --sequencer, --pxe, --p2p-bootstrap, or --txe is not supported.`);
27
+ if (options.node || options.sequencer || options.p2pBootstrap || options.txe) {
28
+ userLog(`Starting a prover agent with --node, --sequencer, --p2p-bootstrap, or --txe is not supported.`);
28
29
  process.exit(1);
29
30
  }
30
31
 
@@ -45,12 +46,8 @@ export async function startProverAgent(
45
46
 
46
47
  await preloadCrsDataForServerSideProving(config, userLog);
47
48
 
48
- const fetch = makeTracedFetch(
49
- // retry connections every 3s, up to 30s before giving up
50
- [1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3],
51
- false,
52
- makeUndiciFetch(new Agent({ connections: 10 })),
53
- );
49
+ // Retry indefinitely until the epoch proving times out and the chain reorgs
50
+ const fetch = makeTracedFetch(proverBrokerBackoff, false, makeUndiciFetch(new Agent({ connections: 10 })));
54
51
  const broker = createProvingJobBrokerClient(config.proverBrokerUrl, getVersions(), fetch);
55
52
 
56
53
  const telemetry = await initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
@@ -1,7 +1,9 @@
1
1
  import { getL1Config } from '@aztec/cli/config';
2
- import { getPublicClient } from '@aztec/ethereum/client';
2
+ import { getGenesisStateConfigEnvVars } from '@aztec/ethereum/config';
3
3
  import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
4
4
  import type { LogFn } from '@aztec/foundation/log';
5
+ import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
6
+ import { protocolContractsHash } from '@aztec/protocol-contracts';
5
7
  import {
6
8
  type ProverBrokerConfig,
7
9
  ProvingJobBrokerSchema,
@@ -13,7 +15,8 @@ import { getProverNodeBrokerConfigFromEnv } from '@aztec/prover-node';
13
15
  import type { ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
14
16
  import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
15
17
 
16
- import { extractRelevantOptions, setupUpdateMonitor } from '../util.js';
18
+ import { extractRelevantOptions } from '../util.js';
19
+ import { computeExpectedGenesisRoot, waitForCompatibleRollup } from './standby.js';
17
20
 
18
21
  export async function startProverBroker(
19
22
  options: any,
@@ -21,45 +24,41 @@ export async function startProverBroker(
21
24
  services: NamespacedApiHandlers,
22
25
  userLog: LogFn,
23
26
  ): Promise<{ broker: ProvingJobBroker; config: ProverBrokerConfig }> {
24
- if (options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
25
- userLog(`Starting a prover broker with --node, --sequencer, --pxe, --p2p-bootstrap, or --txe is not supported.`);
27
+ if (options.node || options.sequencer || options.p2pBootstrap || options.txe) {
28
+ userLog(`Starting a prover broker with --node, --sequencer, --p2p-bootstrap, or --txe is not supported.`);
26
29
  process.exit(1);
27
30
  }
28
31
 
29
- const config: ProverBrokerConfig = {
32
+ const baseConfig: ProverBrokerConfig = {
30
33
  ...getProverNodeBrokerConfigFromEnv(), // get default config from env
31
34
  ...extractRelevantOptions<ProverBrokerConfig>(options, proverBrokerConfigMappings, 'proverBroker'), // override with command line options
32
35
  };
33
36
 
34
- if (!config.l1Contracts.registryAddress || config.l1Contracts.registryAddress.isZero()) {
37
+ if (!baseConfig.registryAddress || baseConfig.registryAddress.isZero()) {
35
38
  throw new Error('L1 registry address is required to start Aztec Node without --deploy-aztec-contracts option');
36
39
  }
37
40
 
38
- const followsCanonicalRollup = typeof config.rollupVersion !== 'number';
41
+ const genesisConfig = getGenesisStateConfigEnvVars();
42
+ const { genesisArchiveRoot } = await computeExpectedGenesisRoot(genesisConfig, userLog);
43
+ await waitForCompatibleRollup(
44
+ baseConfig,
45
+ { genesisArchiveRoot, vkTreeRoot: getVKTreeRoot(), protocolContractsHash },
46
+ options.port,
47
+ userLog,
48
+ );
49
+
39
50
  const { addresses, config: rollupConfig } = await getL1Config(
40
- config.l1Contracts.registryAddress,
41
- config.l1RpcUrls,
42
- config.l1ChainId,
43
- config.rollupVersion,
51
+ baseConfig.registryAddress,
52
+ baseConfig.l1RpcUrls,
53
+ baseConfig.l1ChainId,
54
+ baseConfig.rollupVersion,
44
55
  );
45
56
 
46
- config.l1Contracts = addresses;
47
- config.rollupVersion = rollupConfig.rollupVersion;
57
+ const config: ProverBrokerConfig = { ...baseConfig, ...addresses, rollupVersion: rollupConfig.rollupVersion };
48
58
 
49
59
  const client = await initTelemetryClient(getTelemetryClientConfig());
50
60
  const broker = await createAndStartProvingBroker(config, client);
51
61
 
52
- if (options.autoUpdate !== 'disabled' && options.autoUpdateUrl) {
53
- await setupUpdateMonitor(
54
- options.autoUpdate,
55
- new URL(options.autoUpdateUrl),
56
- followsCanonicalRollup,
57
- getPublicClient(config),
58
- config.l1Contracts.registryAddress,
59
- signalHandlers,
60
- );
61
- }
62
-
63
62
  services.proverBroker = [
64
63
  broker,
65
64
  config.proverBrokerDebugReplayEnabled ? ProvingJobBrokerSchemaWithDebug : ProvingJobBrokerSchema,
@@ -1,15 +1,17 @@
1
1
  import { startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
2
2
  import type { Logger } from '@aztec/foundation/log';
3
- import { createTXERpcServer } from '@aztec/txe';
3
+ import { createTXERpcServer } from '@aztec/txe/server';
4
4
 
5
- export async function startTXE(options: any, debugLogger: Logger) {
5
+ export async function startTXE(options: any, signalHandlers: Array<() => Promise<void>>, debugLogger: Logger) {
6
6
  debugLogger.info(`Setting up TXE...`);
7
7
 
8
- const txeServer = createTXERpcServer(debugLogger);
9
- const { port } = await startHttpRpcServer(txeServer, {
8
+ const txeServer = await createTXERpcServer(debugLogger);
9
+ const httpServer = await startHttpRpcServer(txeServer, {
10
10
  port: options.port,
11
11
  timeoutMs: 1e3 * 60 * 5,
12
12
  });
13
13
 
14
- debugLogger.info(`TXE listening on port ${port}`);
14
+ signalHandlers.push(() => new Promise<void>(resolve => httpServer.close(() => resolve())));
15
+
16
+ debugLogger.info(`TXE listening on port ${httpServer.port}`);
15
17
  }
@@ -0,0 +1,118 @@
1
+ import TOML from '@iarna/toml';
2
+ import { existsSync } from 'fs';
3
+ import { mkdir, readFile, stat } from 'fs/promises';
4
+ import { homedir } from 'os';
5
+ import { dirname, join, resolve } from 'path';
6
+
7
+ import { run } from './spawn.js';
8
+
9
+ /**
10
+ * Recursively collects crate directories starting from startCrateDir by following dependencies declared in Nargo.toml
11
+ * files.
12
+ *
13
+ * When `skipGitDeps` is false (default), git-based deps are followed and fetched into the nargo cache
14
+ * (`$HOME/nargo/<domain>/<repo-path>/<tag>`) if not already present.
15
+ *
16
+ * When `skipGitDeps` is true, git-based deps are ignored entirely.
17
+ */
18
+ export async function collectCrateDirs(startCrateDir: string, opts?: { skipGitDeps?: boolean }): Promise<string[]> {
19
+ const { skipGitDeps = false } = opts ?? {};
20
+ const visited = new Set<string>();
21
+
22
+ async function visit(crateDir: string): Promise<void> {
23
+ const absDir = resolve(crateDir);
24
+ if (visited.has(absDir)) {
25
+ return;
26
+ }
27
+ visited.add(absDir);
28
+
29
+ const tomlPath = join(absDir, 'Nargo.toml');
30
+ const content = await readFile(tomlPath, 'utf-8').catch(() => {
31
+ throw new Error(`Incorrectly defined dependency. Nargo.toml not found in ${absDir}`);
32
+ });
33
+
34
+ const parsed = TOML.parse(content) as Record<string, any>;
35
+ const members = (parsed.workspace as Record<string, any>)?.members as string[] | undefined;
36
+
37
+ // A Nargo.toml is either a workspace root (has workspace.members) or a single crate (has dependencies).
38
+ if (Array.isArray(members)) {
39
+ // The crate is a workspace root and has members defined so we visit the members
40
+ for (const member of members) {
41
+ await visit(resolve(absDir, member));
42
+ }
43
+ } else {
44
+ // Single crate — follow its deps
45
+ const deps = (parsed.dependencies as Record<string, any>) ?? {};
46
+ for (const dep of Object.values(deps)) {
47
+ if (!dep || typeof dep !== 'object') {
48
+ continue;
49
+ }
50
+ if (typeof dep.path === 'string') {
51
+ // Dependency contains "path" hence it's a local dependency. We just check it's a real directory and then we
52
+ // recursively search through it
53
+ const depPath = resolve(absDir, dep.path);
54
+ const s = await stat(depPath);
55
+ if (!s.isDirectory()) {
56
+ throw new Error(
57
+ `Dependency path "${dep.path}" in ${tomlPath} resolves to ${depPath} which is not a directory`,
58
+ );
59
+ }
60
+ await visit(depPath);
61
+ } else if (!skipGitDeps && typeof dep.git === 'string' && typeof dep.tag === 'string') {
62
+ // Dependency contains "git" hence it's a git dependency. We ensure it has been fetched and fetch it if
63
+ // it's not the case and then we recursively search through it.
64
+ await fetchAndVisit(dep.git, dep.tag, dep.directory);
65
+ }
66
+ }
67
+ }
68
+ }
69
+
70
+ async function fetchAndVisit(gitUrl: string, tag: string, directory?: string): Promise<void> {
71
+ // `directory` is set when the dep lives in a subdirectory of a repository, e.g.:
72
+ // aztec = { git = "https://github.com/AztecProtocol/aztec-packages", tag = "v0.82.0",
73
+ // directory = "noir-projects/aztec-nr/aztec" }
74
+ // In that case nargo clones the whole repo and the crate root is <cachePath>/<directory>.
75
+ const cachePath = nargoGitDepPath(gitUrl, tag);
76
+ const crateDir = directory ? join(cachePath, directory) : cachePath;
77
+ await ensureGitDepCached(gitUrl, tag, cachePath);
78
+ await visit(crateDir);
79
+ }
80
+
81
+ await visit(startCrateDir);
82
+ return [...visited];
83
+ }
84
+
85
+ /**
86
+ * Computes the local nargo cache path for a git dependency, mirroring nargo's own `git_dep_location` function.
87
+ * Path format: `$HOME/nargo/<domain>/<repo-path>/<tag>`
88
+ * e.g. `~/nargo/github.com/AztecProtocol/aztec-packages/v0.82.0`
89
+ *
90
+ * Source: noir/noir-repo/tooling/nargo_toml/src/git.rs
91
+ */
92
+ export function nargoGitDepPath(gitUrl: string, tag: string): string {
93
+ const url = new URL(gitUrl);
94
+ const domain = url.hostname;
95
+ const repoPath = url.pathname.replace(/^\//, '');
96
+ return join(process.env.HOME ?? homedir(), 'nargo', domain, repoPath, tag);
97
+ }
98
+
99
+ /**
100
+ * Ensures a git dep is present in the nargo cache, cloning it if it isn't. Mirrors nargo's `clone_git_repo`.
101
+ * If cloning fails (e.g. no network), throws with a message suggesting `nargo check` to prime the cache.
102
+ *
103
+ * Source: noir/noir-repo/tooling/nargo_toml/src/git.rs
104
+ */
105
+ async function ensureGitDepCached(gitUrl: string, tag: string, cachePath: string): Promise<void> {
106
+ if (existsSync(cachePath)) {
107
+ return;
108
+ }
109
+ await mkdir(dirname(cachePath), { recursive: true });
110
+ try {
111
+ await run('git', ['-c', 'advice.detachedHead=false', 'clone', '--depth', '1', '--branch', tag, gitUrl, cachePath]);
112
+ } catch (err: any) {
113
+ throw new Error(
114
+ `Failed to fetch git dependency ${gitUrl}@${tag}: ${err?.message ?? err}.\n` +
115
+ `Try running \`nargo check\` first to prime the dependency cache.`,
116
+ );
117
+ }
118
+ }
@@ -0,0 +1,98 @@
1
+ import { readdir, stat } from 'fs/promises';
2
+ import { join } from 'path';
3
+
4
+ import { collectCrateDirs } from './collect_crate_dirs.js';
5
+
6
+ /**
7
+ * Returns true if recompilation is needed: either no artifacts exist in target/ or any .nr or Nargo.toml source file
8
+ * (including path-based dependencies) is newer than the oldest artifact. We compare against the oldest artifact so
9
+ * that a source change between the oldest and newest compilation (e.g. in a multi-contract workspace) still triggers
10
+ * a recompile.
11
+ *
12
+ * Note: The above implies that if there is a random json file in the target dir we would be always recompiling.
13
+ */
14
+ export async function needsRecompile(): Promise<boolean> {
15
+ const oldestArtifactMs = await getOldestArtifactModificationTime('target');
16
+ if (oldestArtifactMs === undefined) {
17
+ return true;
18
+ }
19
+
20
+ // Git deps are pinned to a specific tag in Nargo.toml and nargo always fetches an exact tag, so their contents never
21
+ // change without Nargo.toml itself changing — and Nargo.toml is already tracked as a source file. Hence we can
22
+ // safely ignore checking source files of git deps.
23
+ const crateDirs = await collectCrateDirs('.', { skipGitDeps: true });
24
+ return hasNewerSourceFile(crateDirs, oldestArtifactMs);
25
+ }
26
+
27
+ /**
28
+ * Returns the last modification time (timestamp in ms) of the oldest .json artifact in targetDir, or undefined if
29
+ * none exist.
30
+ */
31
+ async function getOldestArtifactModificationTime(targetDir: string): Promise<number | undefined> {
32
+ let entries: string[];
33
+ try {
34
+ entries = (await readdir(targetDir)).filter(f => f.endsWith('.json'));
35
+ } catch (err: any) {
36
+ if (err?.code === 'ENOENT') {
37
+ return undefined;
38
+ }
39
+ throw err;
40
+ }
41
+
42
+ if (entries.length === 0) {
43
+ return undefined;
44
+ }
45
+
46
+ let oldest = Infinity;
47
+ for (const entry of entries) {
48
+ const s = await stat(join(targetDir, entry));
49
+ if (s.mtimeMs < oldest) {
50
+ oldest = s.mtimeMs;
51
+ }
52
+ }
53
+ return oldest;
54
+ }
55
+
56
+ /**
57
+ * Walks crate dirs looking for .nr and Nargo.toml files newer than thresholdMs. Short-circuits on the first match.
58
+ */
59
+ async function hasNewerSourceFile(crateDirs: string[], thresholdMs: number): Promise<boolean> {
60
+ // Returns true if it find a new file than thresholdMs, false otherwise
61
+ async function walkForNewer(dir: string): Promise<boolean> {
62
+ let entries;
63
+ try {
64
+ entries = await readdir(dir, { withFileTypes: true });
65
+ } catch {
66
+ return false;
67
+ }
68
+
69
+ // We iterate over the entries in the dir
70
+ for (const entry of entries) {
71
+ const fullPath = join(dir, entry.name);
72
+ if (entry.isDirectory()) {
73
+ // If the entry is a dir and it's not called `target` we recursively enter it
74
+ if (entry.name === 'target') {
75
+ continue;
76
+ }
77
+ if (await walkForNewer(fullPath)) {
78
+ return true;
79
+ }
80
+ } else if (entry.name === 'Nargo.toml' || entry.name.endsWith('.nr')) {
81
+ // The entry is a Nargo.toml file or *.nr file so we check the timestamp
82
+ const s = await stat(fullPath);
83
+ if (s.mtimeMs > thresholdMs) {
84
+ return true;
85
+ }
86
+ }
87
+ }
88
+ return false;
89
+ }
90
+
91
+ // We search through the crate dirs
92
+ for (const dir of crateDirs) {
93
+ if (await walkForNewer(dir)) {
94
+ return true;
95
+ }
96
+ }
97
+ return false;
98
+ }
@@ -0,0 +1,76 @@
1
+ import type { LogFn } from '@aztec/foundation/log';
2
+ import { DEV_VERSION, getPackageVersion } from '@aztec/stdlib/update-checker';
3
+
4
+ import TOML from '@iarna/toml';
5
+ import { readFile } from 'fs/promises';
6
+ import { join } from 'path';
7
+
8
+ import { collectCrateDirs } from './collect_crate_dirs.js';
9
+
10
+ /** Returns true if the given git URL points to the AztecProtocol/aztec-nr repository. */
11
+ function isAztecNrGitUrl(gitUrl: string): boolean {
12
+ let url: URL;
13
+ try {
14
+ url = new URL(gitUrl);
15
+ } catch {
16
+ return false;
17
+ }
18
+ if (url.hostname !== 'github.com') {
19
+ return false;
20
+ }
21
+ const repoPath = url.pathname
22
+ .replace(/^\//, '')
23
+ .replace(/\.git$/, '')
24
+ .replace(/\/$/, '');
25
+ return repoPath === 'AztecProtocol/aztec-nr';
26
+ }
27
+
28
+ /** Warns if any aztec-nr git dependency in a crate's Nargo.toml has a tag that doesn't match the CLI version. */
29
+ export async function warnIfAztecVersionMismatch(log: LogFn, cliVersion?: string): Promise<void> {
30
+ const version = cliVersion ?? getPackageVersion();
31
+ if (version === DEV_VERSION) {
32
+ return;
33
+ }
34
+
35
+ const expectedTag = `v${version}`;
36
+ const mismatches: { file: string; depName: string; tag: string }[] = [];
37
+
38
+ const crateDirs = await collectCrateDirs('.', { skipGitDeps: true });
39
+
40
+ for (const dir of crateDirs) {
41
+ const tomlPath = join(dir, 'Nargo.toml');
42
+ let content: string;
43
+ try {
44
+ content = await readFile(tomlPath, 'utf-8');
45
+ } catch {
46
+ continue;
47
+ }
48
+
49
+ const parsed = TOML.parse(content) as Record<string, any>;
50
+ const deps = (parsed.dependencies as Record<string, any>) ?? {};
51
+
52
+ for (const [depName, dep] of Object.entries(deps)) {
53
+ // Skip non-object deps (e.g. malformed entries) and anything that isn't a tagged git dep.
54
+ if (!dep || typeof dep !== 'object' || typeof dep.git !== 'string' || typeof dep.tag !== 'string') {
55
+ continue;
56
+ }
57
+ // Only flag deps that are sourced from the aztec-nr repo.
58
+ if (!isAztecNrGitUrl(dep.git)) {
59
+ continue;
60
+ }
61
+ if (dep.tag !== expectedTag) {
62
+ mismatches.push({ file: tomlPath, depName, tag: dep.tag });
63
+ }
64
+ }
65
+ }
66
+
67
+ if (mismatches.length > 0) {
68
+ const details = mismatches.map(m => ` ${m.file} — ${m.depName} (${m.tag})`).join('\n');
69
+ log(
70
+ `WARNING: Aztec dependency version mismatch detected.\n` +
71
+ `The following aztec-nr dependencies do not match the CLI version (${expectedTag}):\n` +
72
+ `${details}\n\n` +
73
+ `See https://docs.aztec.network/errors/9 for how to update your dependencies.`,
74
+ );
75
+ }
76
+ }