@aztec/aztec 0.0.1-commit.db765a8 → 0.0.1-commit.ddcf04837
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/bin/index.js +2 -2
- package/dest/cli/aztec_start_action.d.ts +1 -1
- package/dest/cli/aztec_start_action.d.ts.map +1 -1
- package/dest/cli/aztec_start_action.js +26 -7
- package/dest/cli/aztec_start_options.d.ts +2 -2
- package/dest/cli/aztec_start_options.d.ts.map +1 -1
- package/dest/cli/aztec_start_options.js +9 -3
- package/dest/cli/cmds/compile.d.ts +1 -1
- package/dest/cli/cmds/compile.d.ts.map +1 -1
- package/dest/cli/cmds/compile.js +9 -1
- package/dest/cli/cmds/profile_flamegraph.d.ts +1 -1
- package/dest/cli/cmds/profile_flamegraph.d.ts.map +1 -1
- package/dest/cli/cmds/profile_flamegraph.js +2 -1
- package/dest/cli/cmds/profile_gates.d.ts +1 -1
- package/dest/cli/cmds/profile_gates.d.ts.map +1 -1
- package/dest/cli/cmds/profile_gates.js +2 -1
- package/dest/cli/cmds/standby.d.ts +32 -0
- package/dest/cli/cmds/standby.d.ts.map +1 -0
- package/dest/cli/cmds/standby.js +97 -0
- package/dest/cli/cmds/start_archiver.d.ts +2 -2
- package/dest/cli/cmds/start_archiver.d.ts.map +1 -1
- package/dest/cli/cmds/start_archiver.js +4 -2
- package/dest/cli/cmds/start_node.d.ts +3 -2
- package/dest/cli/cmds/start_node.d.ts.map +1 -1
- package/dest/cli/cmds/start_node.js +24 -90
- package/dest/cli/cmds/start_prover_agent.d.ts +1 -1
- package/dest/cli/cmds/start_prover_agent.d.ts.map +1 -1
- package/dest/cli/cmds/start_prover_agent.js +3 -15
- package/dest/cli/cmds/start_prover_broker.d.ts +1 -1
- package/dest/cli/cmds/start_prover_broker.d.ts.map +1 -1
- package/dest/cli/cmds/start_prover_broker.js +12 -6
- package/dest/cli/cmds/utils/collect_crate_dirs.d.ts +21 -0
- package/dest/cli/cmds/utils/collect_crate_dirs.d.ts.map +1 -0
- package/dest/cli/cmds/utils/collect_crate_dirs.js +114 -0
- package/dest/cli/cmds/utils/needs_recompile.d.ts +10 -0
- package/dest/cli/cmds/utils/needs_recompile.d.ts.map +1 -0
- package/dest/cli/cmds/utils/needs_recompile.js +90 -0
- package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts +4 -0
- package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts.map +1 -0
- package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.js +41 -0
- package/dest/cli/util.d.ts +3 -5
- package/dest/cli/util.d.ts.map +1 -1
- package/dest/cli/util.js +37 -78
- package/dest/local-network/local-network.d.ts +3 -4
- package/dest/local-network/local-network.d.ts.map +1 -1
- package/dest/local-network/local-network.js +12 -4
- package/dest/testing/anvil_test_watcher.d.ts +1 -1
- package/dest/testing/anvil_test_watcher.d.ts.map +1 -1
- package/dest/testing/anvil_test_watcher.js +36 -10
- package/dest/testing/cheat_codes.d.ts +11 -15
- package/dest/testing/cheat_codes.d.ts.map +1 -1
- package/dest/testing/cheat_codes.js +34 -32
- package/dest/testing/epoch_test_settler.d.ts +1 -1
- package/dest/testing/epoch_test_settler.d.ts.map +1 -1
- package/dest/testing/epoch_test_settler.js +3 -4
- package/dest/testing/index.d.ts +2 -1
- package/dest/testing/index.d.ts.map +1 -1
- package/dest/testing/index.js +1 -0
- package/dest/testing/token_allowed_setup.d.ts +7 -0
- package/dest/testing/token_allowed_setup.d.ts.map +1 -0
- package/dest/testing/token_allowed_setup.js +20 -0
- package/package.json +34 -34
- package/scripts/aztec.sh +4 -1
- package/src/bin/index.ts +2 -2
- package/src/cli/aztec_start_action.ts +15 -7
- package/src/cli/aztec_start_options.ts +15 -5
- package/src/cli/cmds/compile.ts +11 -1
- package/src/cli/cmds/profile_flamegraph.ts +2 -1
- package/src/cli/cmds/profile_gates.ts +2 -1
- package/src/cli/cmds/standby.ts +132 -0
- package/src/cli/cmds/start_archiver.ts +8 -2
- package/src/cli/cmds/start_node.ts +32 -112
- package/src/cli/cmds/start_prover_agent.ts +3 -6
- package/src/cli/cmds/start_prover_broker.ts +14 -14
- package/src/cli/cmds/utils/collect_crate_dirs.ts +118 -0
- package/src/cli/cmds/utils/needs_recompile.ts +98 -0
- package/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts +54 -0
- package/src/cli/util.ts +41 -74
- package/src/local-network/local-network.ts +11 -5
- package/src/testing/anvil_test_watcher.ts +33 -10
- package/src/testing/cheat_codes.ts +42 -36
- package/src/testing/epoch_test_settler.ts +3 -4
- package/src/testing/index.ts +1 -0
- package/src/testing/token_allowed_setup.ts +19 -0
- package/dest/cli/release_version.d.ts +0 -2
- package/dest/cli/release_version.d.ts.map +0 -1
- package/dest/cli/release_version.js +0 -14
- package/src/cli/release_version.ts +0 -21
|
@@ -1,18 +1,19 @@
|
|
|
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 {
|
|
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 {
|
|
15
|
-
import {
|
|
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
18
|
import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
|
|
18
19
|
import { P2PApiSchema, ProverNodeApiSchema, type ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
|
|
@@ -23,92 +24,25 @@ import {
|
|
|
23
24
|
telemetryClientConfigMappings,
|
|
24
25
|
} from '@aztec/telemetry-client';
|
|
25
26
|
import { EmbeddedWallet } from '@aztec/wallets/embedded';
|
|
26
|
-
import { getGenesisValues } from '@aztec/world-state/testing';
|
|
27
|
-
|
|
28
|
-
import Koa from 'koa';
|
|
29
27
|
|
|
30
28
|
import { createAztecNode } from '../../local-network/index.js';
|
|
31
29
|
import {
|
|
32
30
|
extractNamespacedOptions,
|
|
33
31
|
extractRelevantOptions,
|
|
34
32
|
preloadCrsDataForVerifying,
|
|
35
|
-
|
|
33
|
+
setupVersionChecker,
|
|
36
34
|
} from '../util.js';
|
|
37
35
|
import { getVersions } from '../versioning.js';
|
|
36
|
+
import { computeExpectedGenesisRoot, waitForCompatibleRollup } from './standby.js';
|
|
38
37
|
import { startProverBroker } from './start_prover_broker.js';
|
|
39
38
|
|
|
40
|
-
const ROLLUP_POLL_INTERVAL_MS = 600_000;
|
|
41
|
-
|
|
42
|
-
/**
|
|
43
|
-
* Waits until the canonical rollup's genesis archive root matches the expected local genesis root.
|
|
44
|
-
* If the rollup is not yet compatible (e.g. during L1 contract upgrades), enters standby mode:
|
|
45
|
-
* starts a lightweight HTTP server for K8s liveness probes and polls until a compatible rollup appears.
|
|
46
|
-
*/
|
|
47
|
-
async function waitForCompatibleRollup(
|
|
48
|
-
publicClient: ReturnType<typeof getPublicClient>,
|
|
49
|
-
registryAddress: EthAddress,
|
|
50
|
-
rollupVersion: number | 'canonical',
|
|
51
|
-
expectedGenesisRoot: Fr,
|
|
52
|
-
port: number | undefined,
|
|
53
|
-
userLog: LogFn,
|
|
54
|
-
): Promise<void> {
|
|
55
|
-
const registry = new RegistryContract(publicClient, registryAddress);
|
|
56
|
-
const rollupAddress = await registry.getRollupAddress(rollupVersion);
|
|
57
|
-
const rollup = new RollupContract(publicClient, rollupAddress.toString());
|
|
58
|
-
|
|
59
|
-
let l1GenesisRoot: Fr;
|
|
60
|
-
try {
|
|
61
|
-
l1GenesisRoot = await rollup.getGenesisArchiveTreeRoot();
|
|
62
|
-
} catch (err: any) {
|
|
63
|
-
throw new Error(
|
|
64
|
-
`Could not retrieve genesis archive root from canonical rollup at ${rollupAddress}: ${err.message}`,
|
|
65
|
-
);
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
if (l1GenesisRoot.equals(expectedGenesisRoot)) {
|
|
69
|
-
return;
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
userLog(
|
|
73
|
-
`Genesis root mismatch: expected ${expectedGenesisRoot}, got ${l1GenesisRoot} from rollup at ${rollupAddress}. ` +
|
|
74
|
-
`Entering standby mode. Will poll every ${ROLLUP_POLL_INTERVAL_MS / 1000}s for a compatible rollup...`,
|
|
75
|
-
);
|
|
76
|
-
|
|
77
|
-
const standbyServer = await startHttpRpcServer({ getApp: () => new Koa(), isHealthy: () => true }, { port });
|
|
78
|
-
userLog(`Standby status server listening on port ${standbyServer.port}`);
|
|
79
|
-
|
|
80
|
-
try {
|
|
81
|
-
while (true) {
|
|
82
|
-
await sleep(ROLLUP_POLL_INTERVAL_MS);
|
|
83
|
-
|
|
84
|
-
const currentRollupAddress = await registry.getRollupAddress(rollupVersion);
|
|
85
|
-
const currentRollup = new RollupContract(publicClient, currentRollupAddress.toString());
|
|
86
|
-
|
|
87
|
-
try {
|
|
88
|
-
l1GenesisRoot = await currentRollup.getGenesisArchiveTreeRoot();
|
|
89
|
-
} catch {
|
|
90
|
-
userLog(`Failed to fetch genesis root from rollup at ${currentRollupAddress}. Retrying...`);
|
|
91
|
-
continue;
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
if (l1GenesisRoot.equals(expectedGenesisRoot)) {
|
|
95
|
-
userLog(`Compatible rollup found at ${currentRollupAddress}. Exiting standby mode.`);
|
|
96
|
-
return;
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
userLog(`Still waiting. Rollup at ${currentRollupAddress} has genesis root ${l1GenesisRoot}.`);
|
|
100
|
-
}
|
|
101
|
-
} finally {
|
|
102
|
-
await new Promise<void>((resolve, reject) => standbyServer.close(err => (err ? reject(err) : resolve())));
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
|
|
106
39
|
export async function startNode(
|
|
107
40
|
options: any,
|
|
108
41
|
signalHandlers: (() => Promise<void>)[],
|
|
109
42
|
services: NamespacedApiHandlers,
|
|
110
43
|
adminServices: NamespacedApiHandlers,
|
|
111
44
|
userLog: LogFn,
|
|
45
|
+
networkName: NetworkNames,
|
|
112
46
|
): Promise<{ config: AztecNodeConfig }> {
|
|
113
47
|
// All options set from environment variables
|
|
114
48
|
const configFromEnvVars = getConfigEnvVars();
|
|
@@ -135,12 +69,8 @@ export async function startNode(
|
|
|
135
69
|
if (nodeConfig.proverBrokerUrl) {
|
|
136
70
|
// at 1TPS we'd enqueue ~1k chonk verifier proofs and ~1k AVM proofs immediately
|
|
137
71
|
// set a lower connection limit such that we don't overload the server
|
|
138
|
-
//
|
|
139
|
-
const fetch = makeTracedFetch(
|
|
140
|
-
[1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3],
|
|
141
|
-
false,
|
|
142
|
-
makeUndiciFetch(new Agent({ connections: 100 })),
|
|
143
|
-
);
|
|
72
|
+
// Retry indefinitely until the epoch proving times out and the chain reorgs
|
|
73
|
+
const fetch = makeTracedFetch(proverBrokerBackoff, false, makeUndiciFetch(new Agent({ connections: 100 })));
|
|
144
74
|
broker = createProvingJobBrokerClient(nodeConfig.proverBrokerUrl, getVersions(nodeConfig), fetch);
|
|
145
75
|
} else if (options.proverBroker) {
|
|
146
76
|
({ broker } = await startProverBroker(options, signalHandlers, services, userLog));
|
|
@@ -152,15 +82,8 @@ export async function startNode(
|
|
|
152
82
|
|
|
153
83
|
await preloadCrsDataForVerifying(nodeConfig, userLog);
|
|
154
84
|
|
|
155
|
-
const
|
|
156
|
-
const
|
|
157
|
-
const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts);
|
|
158
|
-
|
|
159
|
-
userLog(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
|
|
160
|
-
|
|
161
|
-
const { genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
|
|
162
|
-
|
|
163
|
-
userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
85
|
+
const genesisConfig = getGenesisStateConfigEnvVars();
|
|
86
|
+
const { genesisArchiveRoot, genesis } = await computeExpectedGenesisRoot(genesisConfig, userLog);
|
|
164
87
|
|
|
165
88
|
const followsCanonicalRollup =
|
|
166
89
|
typeof nodeConfig.rollupVersion !== 'number' || (nodeConfig.rollupVersion as unknown as string) === 'canonical';
|
|
@@ -171,13 +94,9 @@ export async function startNode(
|
|
|
171
94
|
|
|
172
95
|
// Wait for a compatible rollup before proceeding with full L1 config fetch.
|
|
173
96
|
// This prevents crashes when the canonical rollup hasn't been upgraded yet.
|
|
174
|
-
const publicClient = getPublicClient(nodeConfig);
|
|
175
|
-
const rollupVersion: number | 'canonical' = nodeConfig.rollupVersion ?? 'canonical';
|
|
176
97
|
await waitForCompatibleRollup(
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
rollupVersion,
|
|
180
|
-
genesisArchiveRoot,
|
|
98
|
+
nodeConfig,
|
|
99
|
+
{ genesisArchiveRoot, vkTreeRoot: getVKTreeRoot(), protocolContractsHash },
|
|
181
100
|
options.port,
|
|
182
101
|
userLog,
|
|
183
102
|
);
|
|
@@ -197,12 +116,10 @@ export async function startNode(
|
|
|
197
116
|
);
|
|
198
117
|
}
|
|
199
118
|
|
|
200
|
-
// TODO(#12272): will clean this up.
|
|
201
119
|
nodeConfig = {
|
|
202
120
|
...nodeConfig,
|
|
203
121
|
l1Contracts: {
|
|
204
122
|
...addresses,
|
|
205
|
-
slashFactoryAddress: nodeConfig.l1Contracts.slashFactoryAddress,
|
|
206
123
|
},
|
|
207
124
|
...config,
|
|
208
125
|
};
|
|
@@ -239,7 +156,7 @@ export async function startNode(
|
|
|
239
156
|
const telemetry = await initTelemetryClient(telemetryConfig);
|
|
240
157
|
|
|
241
158
|
// Create and start Aztec Node
|
|
242
|
-
const node = await createAztecNode(nodeConfig, { telemetry, proverBroker: broker }, {
|
|
159
|
+
const node = await createAztecNode(nodeConfig, { telemetry, proverBroker: broker }, { genesis });
|
|
243
160
|
|
|
244
161
|
// Add node and p2p to services list
|
|
245
162
|
services.node = [node, AztecNodeApiSchema];
|
|
@@ -268,16 +185,19 @@ export async function startNode(
|
|
|
268
185
|
await addBot(options, signalHandlers, services, wallet, node, telemetry, undefined);
|
|
269
186
|
}
|
|
270
187
|
|
|
271
|
-
if (nodeConfig.
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
188
|
+
if (nodeConfig.enableVersionCheck && networkName !== 'local') {
|
|
189
|
+
const cacheDir = process.env.DATA_DIRECTORY ? `${process.env.DATA_DIRECTORY}/cache` : undefined;
|
|
190
|
+
try {
|
|
191
|
+
await setupVersionChecker(
|
|
192
|
+
networkName,
|
|
193
|
+
followsCanonicalRollup,
|
|
194
|
+
getPublicClient(nodeConfig!),
|
|
195
|
+
signalHandlers,
|
|
196
|
+
cacheDir,
|
|
197
|
+
);
|
|
198
|
+
} catch {
|
|
199
|
+
/* no-op */
|
|
200
|
+
}
|
|
281
201
|
}
|
|
282
202
|
|
|
283
203
|
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';
|
|
@@ -45,12 +46,8 @@ export async function startProverAgent(
|
|
|
45
46
|
|
|
46
47
|
await preloadCrsDataForServerSideProving(config, userLog);
|
|
47
48
|
|
|
48
|
-
|
|
49
|
-
|
|
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 {
|
|
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
|
|
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,
|
|
@@ -35,7 +38,15 @@ export async function startProverBroker(
|
|
|
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
|
|
41
|
+
const genesisConfig = getGenesisStateConfigEnvVars();
|
|
42
|
+
const { genesisArchiveRoot } = await computeExpectedGenesisRoot(genesisConfig, userLog);
|
|
43
|
+
await waitForCompatibleRollup(
|
|
44
|
+
config,
|
|
45
|
+
{ genesisArchiveRoot, vkTreeRoot: getVKTreeRoot(), protocolContractsHash },
|
|
46
|
+
options.port,
|
|
47
|
+
userLog,
|
|
48
|
+
);
|
|
49
|
+
|
|
39
50
|
const { addresses, config: rollupConfig } = await getL1Config(
|
|
40
51
|
config.l1Contracts.registryAddress,
|
|
41
52
|
config.l1RpcUrls,
|
|
@@ -49,17 +60,6 @@ export async function startProverBroker(
|
|
|
49
60
|
const client = await initTelemetryClient(getTelemetryClientConfig());
|
|
50
61
|
const broker = await createAndStartProvingBroker(config, client);
|
|
51
62
|
|
|
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
63
|
services.proverBroker = [
|
|
64
64
|
broker,
|
|
65
65
|
config.proverBrokerDebugReplayEnabled ? ProvingJobBrokerSchemaWithDebug : ProvingJobBrokerSchema,
|
|
@@ -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,54 @@
|
|
|
1
|
+
import type { LogFn } from '@aztec/foundation/log';
|
|
2
|
+
import { 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
|
+
/** Warns if the `aztec` dependency tag in any crate's Nargo.toml doesn't match the CLI version. */
|
|
11
|
+
export async function warnIfAztecVersionMismatch(log: LogFn, cliVersion?: string): Promise<void> {
|
|
12
|
+
const version = cliVersion ?? getPackageVersion();
|
|
13
|
+
if (!version) {
|
|
14
|
+
log(`WARNING: aztec CLI version not found. Skipping dependency compatibility check.`);
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
const expectedTag = `v${version}`;
|
|
19
|
+
const mismatches: { file: string; tag: string }[] = [];
|
|
20
|
+
|
|
21
|
+
const crateDirs = await collectCrateDirs('.', { skipGitDeps: true });
|
|
22
|
+
|
|
23
|
+
for (const dir of crateDirs) {
|
|
24
|
+
const tomlPath = join(dir, 'Nargo.toml');
|
|
25
|
+
let content: string;
|
|
26
|
+
try {
|
|
27
|
+
content = await readFile(tomlPath, 'utf-8');
|
|
28
|
+
} catch {
|
|
29
|
+
continue;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
const parsed = TOML.parse(content) as Record<string, any>;
|
|
33
|
+
const aztecDep = (parsed.dependencies as Record<string, any>)?.aztec;
|
|
34
|
+
if (!aztecDep || typeof aztecDep !== 'object' || typeof aztecDep.tag !== 'string') {
|
|
35
|
+
// If a dep called "aztec" doesn't exist or it does not get parsed to an object or it doesn't have a tag defined
|
|
36
|
+
// we skip the check.
|
|
37
|
+
continue;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
if (aztecDep.tag !== expectedTag) {
|
|
41
|
+
mismatches.push({ file: tomlPath, tag: aztecDep.tag });
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
if (mismatches.length > 0) {
|
|
46
|
+
const details = mismatches.map(m => ` ${m.file} (${m.tag})`).join('\n');
|
|
47
|
+
log(
|
|
48
|
+
`WARNING: Aztec dependency version mismatch detected.\n` +
|
|
49
|
+
`The following crates have an aztec dependency that does not match the CLI version (${expectedTag}):\n` +
|
|
50
|
+
`${details}\n\n` +
|
|
51
|
+
`See https://docs.aztec.network/errors/9 for how to update your dependencies.`,
|
|
52
|
+
);
|
|
53
|
+
}
|
|
54
|
+
}
|