@aztec/aztec 5.0.0-private.20260319 → 5.0.0-rc.2
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 +3 -1
- 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 +16 -24
- 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 +15 -15
- 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 +32 -24
- package/dest/cli/cmds/profile.d.ts +1 -1
- package/dest/cli/cmds/profile.d.ts.map +1 -1
- package/dest/cli/cmds/profile.js +1 -1
- package/dest/cli/cmds/profile_gates.d.ts +2 -2
- package/dest/cli/cmds/profile_gates.d.ts.map +1 -1
- package/dest/cli/cmds/profile_gates.js +21 -3
- package/dest/cli/cmds/prover.d.ts +4 -0
- package/dest/cli/cmds/prover.d.ts.map +1 -0
- package/dest/cli/cmds/prover.js +24 -0
- package/dest/cli/cmds/standby.d.ts +30 -6
- package/dest/cli/cmds/standby.d.ts.map +1 -1
- package/dest/cli/cmds/standby.js +48 -5
- package/dest/cli/cmds/start_bot.d.ts +1 -1
- package/dest/cli/cmds/start_bot.d.ts.map +1 -1
- package/dest/cli/cmds/start_bot.js +8 -4
- package/dest/cli/cmds/start_node.d.ts +1 -1
- package/dest/cli/cmds/start_node.d.ts.map +1 -1
- package/dest/cli/cmds/start_node.js +22 -47
- 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 +5 -17
- 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 +11 -8
- package/dest/cli/cmds/start_txe.d.ts +2 -2
- package/dest/cli/cmds/start_txe.d.ts.map +1 -1
- package/dest/cli/cmds/start_txe.js +6 -5
- package/dest/cli/cmds/utils/artifacts.d.ts +6 -1
- package/dest/cli/cmds/utils/artifacts.d.ts.map +1 -1
- 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 +1 -1
- package/dest/cli/cmds/utils/needs_recompile.d.ts.map +1 -1
- package/dest/cli/cmds/utils/needs_recompile.js +9 -53
- 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 +61 -0
- package/dest/cli/util.d.ts +10 -5
- package/dest/cli/util.d.ts.map +1 -1
- package/dest/cli/util.js +25 -52
- package/dest/examples/token.js +3 -3
- package/dest/local-network/auth_registry.d.ts +5 -0
- package/dest/local-network/auth_registry.d.ts.map +1 -0
- package/dest/local-network/auth_registry.js +17 -0
- package/dest/local-network/banana_fpc.d.ts +3 -2
- package/dest/local-network/banana_fpc.d.ts.map +1 -1
- package/dest/local-network/banana_fpc.js +11 -7
- package/dest/local-network/local-network.d.ts +8 -32
- package/dest/local-network/local-network.d.ts.map +1 -1
- package/dest/local-network/local-network.js +48 -73
- package/dest/testing/cheat_codes.d.ts +17 -23
- package/dest/testing/cheat_codes.d.ts.map +1 -1
- package/dest/testing/cheat_codes.js +17 -43
- package/dest/testing/epoch_test_settler.d.ts +2 -2
- package/dest/testing/epoch_test_settler.d.ts.map +1 -1
- package/dest/testing/epoch_test_settler.js +6 -25
- package/dest/testing/index.d.ts +1 -2
- package/dest/testing/index.d.ts.map +1 -1
- package/dest/testing/index.js +0 -1
- package/dest/testing/token_allowed_setup.d.ts +9 -4
- package/dest/testing/token_allowed_setup.d.ts.map +1 -1
- package/dest/testing/token_allowed_setup.js +12 -8
- package/package.json +34 -33
- package/scripts/add_crate.sh +11 -60
- package/scripts/aztec.sh +6 -2
- package/scripts/init.sh +5 -5
- package/scripts/new.sh +2 -2
- package/scripts/setup_workspace.sh +3 -2
- package/scripts/templates/blank/contract/Nargo.toml +6 -0
- package/scripts/templates/blank/contract/src/main.nr +10 -0
- package/scripts/templates/blank/test/Nargo.toml +7 -0
- package/scripts/templates/blank/test/src/lib.nr +11 -0
- package/scripts/templates/counter/contract/Nargo.toml +7 -0
- package/scripts/templates/counter/contract/src/main.nr +48 -0
- package/scripts/templates/counter/test/Nargo.toml +7 -0
- package/scripts/templates/counter/test/src/lib.nr +32 -0
- package/src/bin/index.ts +3 -1
- package/src/cli/aztec_start_action.ts +14 -17
- package/src/cli/aztec_start_options.ts +22 -23
- package/src/cli/cmds/compile.ts +37 -23
- package/src/cli/cmds/profile.ts +2 -1
- package/src/cli/cmds/profile_gates.ts +20 -4
- package/src/cli/cmds/prover.ts +42 -0
- package/src/cli/cmds/standby.ts +59 -7
- package/src/cli/cmds/start_bot.ts +9 -6
- package/src/cli/cmds/start_node.ts +29 -39
- package/src/cli/cmds/start_prover_agent.ts +5 -8
- package/src/cli/cmds/start_prover_broker.ts +10 -11
- package/src/cli/cmds/start_txe.ts +7 -5
- package/src/cli/cmds/utils/artifacts.ts +5 -0
- package/src/cli/cmds/utils/collect_crate_dirs.ts +118 -0
- package/src/cli/cmds/utils/needs_recompile.ts +8 -61
- package/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts +76 -0
- package/src/cli/util.ts +26 -67
- package/src/examples/token.ts +3 -3
- package/src/local-network/auth_registry.ts +19 -0
- package/src/local-network/banana_fpc.ts +12 -8
- package/src/local-network/local-network.ts +52 -83
- package/src/testing/cheat_codes.ts +18 -49
- package/src/testing/epoch_test_settler.ts +8 -31
- package/src/testing/index.ts +0 -1
- package/src/testing/token_allowed_setup.ts +15 -8
- package/dest/cli/cmds/start_archiver.d.ts +0 -9
- package/dest/cli/cmds/start_archiver.d.ts.map +0 -1
- package/dest/cli/cmds/start_archiver.js +0 -48
- package/dest/testing/anvil_test_watcher.d.ts +0 -42
- package/dest/testing/anvil_test_watcher.d.ts.map +0 -1
- package/dest/testing/anvil_test_watcher.js +0 -181
- package/src/cli/cmds/start_archiver.ts +0 -50
- package/src/testing/anvil_test_watcher.ts +0 -210
|
@@ -21,11 +21,9 @@ export async function startBot(
|
|
|
21
21
|
services: NamespacedApiHandlers,
|
|
22
22
|
userLog: LogFn,
|
|
23
23
|
) {
|
|
24
|
-
const { proverNode,
|
|
25
|
-
if (proverNode ||
|
|
26
|
-
userLog(
|
|
27
|
-
`Starting a bot with --prover-node, --prover, --archiver, --sequencer, --p2p-bootstrap, or --txe is not supported.`,
|
|
28
|
-
);
|
|
24
|
+
const { proverNode, sequencer, p2pBootstrap, txe, prover } = options;
|
|
25
|
+
if (proverNode || sequencer || p2pBootstrap || txe || prover) {
|
|
26
|
+
userLog(`Starting a bot with --prover-node, --prover, --sequencer, --p2p-bootstrap, or --txe is not supported.`);
|
|
29
27
|
process.exit(1);
|
|
30
28
|
}
|
|
31
29
|
|
|
@@ -58,6 +56,11 @@ export async function addBot(
|
|
|
58
56
|
const config = extractRelevantOptions<BotConfig>(options, botConfigMappings, 'bot');
|
|
59
57
|
userLog?.(`Starting bot with config ${stringifyConfig(config)}`);
|
|
60
58
|
|
|
59
|
+
// The bot wallet's embedded PXE syncs to this tip (see start_bot.ts/start_node.ts which build the wallet from the
|
|
60
|
+
// same options). L1-to-L2 readiness checks must be evaluated at this tip rather than at 'latest', or the bot can
|
|
61
|
+
// consider a message ready while the PXE simulation anchors to an older block that cannot prove its membership yet.
|
|
62
|
+
const { syncChainTip } = extractRelevantOptions<PXEConfig & CliPXEOptions>(options, allPxeConfigMappings, 'pxe');
|
|
63
|
+
|
|
61
64
|
const db = await (config.dataDirectory
|
|
62
65
|
? createStore('bot', BotStore.SCHEMA_VERSION, config)
|
|
63
66
|
: openTmpStore('bot', true, config.dataStoreMapSizeKb));
|
|
@@ -65,7 +68,7 @@ export async function addBot(
|
|
|
65
68
|
const store = new BotStore(db);
|
|
66
69
|
await store.cleanupOldClaims();
|
|
67
70
|
|
|
68
|
-
const botRunner = new BotRunner(config, wallet, aztecNode, telemetry, aztecNodeAdmin, store);
|
|
71
|
+
const botRunner = new BotRunner(config, wallet, aztecNode, telemetry, aztecNodeAdmin, store, syncChainTip);
|
|
69
72
|
if (!config.noStart) {
|
|
70
73
|
void botRunner.start(); // Do not block since bot setup takes time
|
|
71
74
|
}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
type AztecNodeConfig,
|
|
3
|
+
aztecNodeConfigMappings,
|
|
4
|
+
getConfigEnvVars,
|
|
5
|
+
registerAztecNodeRpcHandlers,
|
|
6
|
+
} from '@aztec/aztec-node';
|
|
2
7
|
import { Fr } from '@aztec/aztec.js/fields';
|
|
3
8
|
import { getL1Config } from '@aztec/cli/config';
|
|
4
|
-
import { getPublicClient } from '@aztec/ethereum/client';
|
|
5
9
|
import { getGenesisStateConfigEnvVars } from '@aztec/ethereum/config';
|
|
6
10
|
import { type NetworkNames, SecretValue } from '@aztec/foundation/config';
|
|
7
11
|
import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
|
|
@@ -9,10 +13,13 @@ import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
|
|
|
9
13
|
import type { LogFn } from '@aztec/foundation/log';
|
|
10
14
|
import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
|
|
11
15
|
import { protocolContractsHash } from '@aztec/protocol-contracts';
|
|
12
|
-
import {
|
|
16
|
+
import {
|
|
17
|
+
ProvingJobConsumerSchema,
|
|
18
|
+
createProvingJobBrokerClient,
|
|
19
|
+
proverBrokerBackoff,
|
|
20
|
+
} from '@aztec/prover-client/broker';
|
|
13
21
|
import { type CliPXEOptions, type PXEConfig, allPxeConfigMappings } from '@aztec/pxe/config';
|
|
14
|
-
import {
|
|
15
|
-
import { P2PApiSchema, ProverNodeApiSchema, type ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
|
|
22
|
+
import { ProverNodeApiSchema, type ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
|
|
16
23
|
import {
|
|
17
24
|
type TelemetryClientConfig,
|
|
18
25
|
initTelemetryClient,
|
|
@@ -22,14 +29,9 @@ import {
|
|
|
22
29
|
import { EmbeddedWallet } from '@aztec/wallets/embedded';
|
|
23
30
|
|
|
24
31
|
import { createAztecNode } from '../../local-network/index.js';
|
|
25
|
-
import {
|
|
26
|
-
extractNamespacedOptions,
|
|
27
|
-
extractRelevantOptions,
|
|
28
|
-
preloadCrsDataForVerifying,
|
|
29
|
-
setupVersionChecker,
|
|
30
|
-
} from '../util.js';
|
|
32
|
+
import { extractNamespacedOptions, extractRelevantOptions, preloadCrsDataForVerifying } from '../util.js';
|
|
31
33
|
import { getVersions } from '../versioning.js';
|
|
32
|
-
import { computeExpectedGenesisRoot, waitForCompatibleRollup } from './standby.js';
|
|
34
|
+
import { computeExpectedGenesisRoot, setupAutoShutdown, waitForCompatibleRollup } from './standby.js';
|
|
33
35
|
import { startProverBroker } from './start_prover_broker.js';
|
|
34
36
|
|
|
35
37
|
export async function startNode(
|
|
@@ -65,12 +67,8 @@ export async function startNode(
|
|
|
65
67
|
if (nodeConfig.proverBrokerUrl) {
|
|
66
68
|
// at 1TPS we'd enqueue ~1k chonk verifier proofs and ~1k AVM proofs immediately
|
|
67
69
|
// set a lower connection limit such that we don't overload the server
|
|
68
|
-
//
|
|
69
|
-
const fetch = makeTracedFetch(
|
|
70
|
-
[1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3],
|
|
71
|
-
false,
|
|
72
|
-
makeUndiciFetch(new Agent({ connections: 100 })),
|
|
73
|
-
);
|
|
70
|
+
// Retry indefinitely until the epoch proving times out and the chain reorgs
|
|
71
|
+
const fetch = makeTracedFetch(proverBrokerBackoff, false, makeUndiciFetch(new Agent({ connections: 100 })));
|
|
74
72
|
broker = createProvingJobBrokerClient(nodeConfig.proverBrokerUrl, getVersions(nodeConfig), fetch);
|
|
75
73
|
} else if (options.proverBroker) {
|
|
76
74
|
({ broker } = await startProverBroker(options, signalHandlers, services, userLog));
|
|
@@ -83,12 +81,12 @@ export async function startNode(
|
|
|
83
81
|
await preloadCrsDataForVerifying(nodeConfig, userLog);
|
|
84
82
|
|
|
85
83
|
const genesisConfig = getGenesisStateConfigEnvVars();
|
|
86
|
-
const { genesisArchiveRoot,
|
|
84
|
+
const { genesisArchiveRoot, genesis } = await computeExpectedGenesisRoot(genesisConfig, userLog);
|
|
87
85
|
|
|
88
86
|
const followsCanonicalRollup =
|
|
89
87
|
typeof nodeConfig.rollupVersion !== 'number' || (nodeConfig.rollupVersion as unknown as string) === 'canonical';
|
|
90
88
|
|
|
91
|
-
if (!nodeConfig.
|
|
89
|
+
if (!nodeConfig.registryAddress || nodeConfig.registryAddress.isZero()) {
|
|
92
90
|
throw new Error('L1 registry address is required to start Aztec Node');
|
|
93
91
|
}
|
|
94
92
|
|
|
@@ -102,7 +100,7 @@ export async function startNode(
|
|
|
102
100
|
);
|
|
103
101
|
|
|
104
102
|
const { addresses, config } = await getL1Config(
|
|
105
|
-
nodeConfig.
|
|
103
|
+
nodeConfig.registryAddress,
|
|
106
104
|
nodeConfig.l1RpcUrls,
|
|
107
105
|
nodeConfig.l1ChainId,
|
|
108
106
|
nodeConfig.rollupVersion,
|
|
@@ -116,13 +114,9 @@ export async function startNode(
|
|
|
116
114
|
);
|
|
117
115
|
}
|
|
118
116
|
|
|
119
|
-
// TODO(#12272): will clean this up.
|
|
120
117
|
nodeConfig = {
|
|
121
118
|
...nodeConfig,
|
|
122
|
-
|
|
123
|
-
...addresses,
|
|
124
|
-
slashFactoryAddress: nodeConfig.l1Contracts.slashFactoryAddress,
|
|
125
|
-
},
|
|
119
|
+
...addresses,
|
|
126
120
|
...config,
|
|
127
121
|
};
|
|
128
122
|
|
|
@@ -158,17 +152,14 @@ export async function startNode(
|
|
|
158
152
|
const telemetry = await initTelemetryClient(telemetryConfig);
|
|
159
153
|
|
|
160
154
|
// Create and start Aztec Node
|
|
161
|
-
const node = await createAztecNode(nodeConfig, { telemetry, proverBroker: broker }, {
|
|
155
|
+
const node = await createAztecNode(nodeConfig, { telemetry, proverBroker: broker }, { genesis });
|
|
162
156
|
|
|
163
|
-
|
|
164
|
-
services.node = [node, AztecNodeApiSchema];
|
|
165
|
-
services.p2p = [node.getP2P(), P2PApiSchema];
|
|
166
|
-
adminServices.nodeAdmin = [node, AztecNodeAdminApiSchema];
|
|
157
|
+
registerAztecNodeRpcHandlers(node, services, adminServices, { debug: options.nodeDebug });
|
|
167
158
|
|
|
168
159
|
// Register prover-node services if the prover node subsystem is running
|
|
169
160
|
const proverNode = node.getProverNode();
|
|
170
161
|
if (proverNode) {
|
|
171
|
-
|
|
162
|
+
adminServices.prover = [proverNode, ProverNodeApiSchema];
|
|
172
163
|
if (!nodeConfig.proverBrokerUrl) {
|
|
173
164
|
services.provingJobSource = [proverNode.getProver().getProvingJobSource(), ProvingJobConsumerSchema];
|
|
174
165
|
}
|
|
@@ -187,15 +178,14 @@ export async function startNode(
|
|
|
187
178
|
await addBot(options, signalHandlers, services, wallet, node, telemetry, undefined);
|
|
188
179
|
}
|
|
189
180
|
|
|
190
|
-
if (nodeConfig.
|
|
191
|
-
const cacheDir = process.env.DATA_DIRECTORY ? `${process.env.DATA_DIRECTORY}/cache` : undefined;
|
|
181
|
+
if (nodeConfig.enableAutoShutdown && networkName !== 'local' && followsCanonicalRollup) {
|
|
192
182
|
try {
|
|
193
|
-
await
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
183
|
+
await setupAutoShutdown(
|
|
184
|
+
nodeConfig,
|
|
185
|
+
nodeConfig.registryAddress,
|
|
186
|
+
(nodeConfig.rollupVersion as number | 'canonical') ?? 'canonical',
|
|
187
|
+
{ genesisArchiveRoot, vkTreeRoot: getVKTreeRoot(), protocolContractsHash },
|
|
197
188
|
signalHandlers,
|
|
198
|
-
cacheDir,
|
|
199
189
|
);
|
|
200
190
|
} catch {
|
|
201
191
|
/* no-op */
|
|
@@ -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.
|
|
27
|
-
userLog(`Starting a prover agent with --node, --sequencer, --
|
|
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
|
-
|
|
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'));
|
|
@@ -24,38 +24,37 @@ export async function startProverBroker(
|
|
|
24
24
|
services: NamespacedApiHandlers,
|
|
25
25
|
userLog: LogFn,
|
|
26
26
|
): Promise<{ broker: ProvingJobBroker; config: ProverBrokerConfig }> {
|
|
27
|
-
if (options.node || options.sequencer || options.
|
|
28
|
-
userLog(`Starting a prover broker with --node, --sequencer, --
|
|
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.`);
|
|
29
29
|
process.exit(1);
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
const
|
|
32
|
+
const baseConfig: ProverBrokerConfig = {
|
|
33
33
|
...getProverNodeBrokerConfigFromEnv(), // get default config from env
|
|
34
34
|
...extractRelevantOptions<ProverBrokerConfig>(options, proverBrokerConfigMappings, 'proverBroker'), // override with command line options
|
|
35
35
|
};
|
|
36
36
|
|
|
37
|
-
if (!
|
|
37
|
+
if (!baseConfig.registryAddress || baseConfig.registryAddress.isZero()) {
|
|
38
38
|
throw new Error('L1 registry address is required to start Aztec Node without --deploy-aztec-contracts option');
|
|
39
39
|
}
|
|
40
40
|
|
|
41
41
|
const genesisConfig = getGenesisStateConfigEnvVars();
|
|
42
42
|
const { genesisArchiveRoot } = await computeExpectedGenesisRoot(genesisConfig, userLog);
|
|
43
43
|
await waitForCompatibleRollup(
|
|
44
|
-
|
|
44
|
+
baseConfig,
|
|
45
45
|
{ genesisArchiveRoot, vkTreeRoot: getVKTreeRoot(), protocolContractsHash },
|
|
46
46
|
options.port,
|
|
47
47
|
userLog,
|
|
48
48
|
);
|
|
49
49
|
|
|
50
50
|
const { addresses, config: rollupConfig } = await getL1Config(
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
51
|
+
baseConfig.registryAddress,
|
|
52
|
+
baseConfig.l1RpcUrls,
|
|
53
|
+
baseConfig.l1ChainId,
|
|
54
|
+
baseConfig.rollupVersion,
|
|
55
55
|
);
|
|
56
56
|
|
|
57
|
-
config
|
|
58
|
-
config.rollupVersion = rollupConfig.rollupVersion;
|
|
57
|
+
const config: ProverBrokerConfig = { ...baseConfig, ...addresses, rollupVersion: rollupConfig.rollupVersion };
|
|
59
58
|
|
|
60
59
|
const client = await initTelemetryClient(getTelemetryClientConfig());
|
|
61
60
|
const broker = await createAndStartProvingBroker(config, client);
|
|
@@ -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
|
|
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
|
-
|
|
14
|
+
signalHandlers.push(() => new Promise<void>(resolve => httpServer.close(() => resolve())));
|
|
15
|
+
|
|
16
|
+
debugLogger.info(`TXE listening on port ${httpServer.port}`);
|
|
15
17
|
}
|
|
@@ -6,6 +6,11 @@ export interface CompiledArtifact {
|
|
|
6
6
|
file_map: unknown;
|
|
7
7
|
functions: ContractFunction[];
|
|
8
8
|
bytecode?: string;
|
|
9
|
+
/**
|
|
10
|
+
* Set to true by the AVM transpiler (invoked via `bb aztec_process`) once the contract has been transpiled and its
|
|
11
|
+
* verification keys generated. Absent on raw `nargo compile` output, hence optional.
|
|
12
|
+
*/
|
|
13
|
+
transpiled?: boolean;
|
|
9
14
|
}
|
|
10
15
|
|
|
11
16
|
export interface ContractFunction {
|
|
@@ -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
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
|
|
1
|
+
import { readdir, stat } from 'fs/promises';
|
|
2
|
+
import { join } from 'path';
|
|
3
|
+
|
|
4
|
+
import { collectCrateDirs } from './collect_crate_dirs.js';
|
|
4
5
|
|
|
5
6
|
/**
|
|
6
7
|
* Returns true if recompilation is needed: either no artifacts exist in target/ or any .nr or Nargo.toml source file
|
|
@@ -16,7 +17,10 @@ export async function needsRecompile(): Promise<boolean> {
|
|
|
16
17
|
return true;
|
|
17
18
|
}
|
|
18
19
|
|
|
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 });
|
|
20
24
|
return hasNewerSourceFile(crateDirs, oldestArtifactMs);
|
|
21
25
|
}
|
|
22
26
|
|
|
@@ -49,63 +53,6 @@ async function getOldestArtifactModificationTime(targetDir: string): Promise<num
|
|
|
49
53
|
return oldest;
|
|
50
54
|
}
|
|
51
55
|
|
|
52
|
-
/**
|
|
53
|
-
* Recursively collects crate directories starting from startCrateDir by following path-based dependencies declared in
|
|
54
|
-
* Nargo.toml files. Git-based deps are ignored (they only change when Nargo.toml itself is modified since the deps are
|
|
55
|
-
* tagged).
|
|
56
|
-
*/
|
|
57
|
-
async function collectCrateDirs(startCrateDir: string): Promise<string[]> {
|
|
58
|
-
// We have a set of visited dirs we check against when entering a new dir because we could stumble upon a directory
|
|
59
|
-
// multiple times in case multiple deps shared a dep (e.g. dep A and dep B both sharing dep C).
|
|
60
|
-
const visited = new Set<string>();
|
|
61
|
-
|
|
62
|
-
async function visit(crateDir: string): Promise<void> {
|
|
63
|
-
const absDir = resolve(crateDir);
|
|
64
|
-
if (visited.has(absDir)) {
|
|
65
|
-
return;
|
|
66
|
-
}
|
|
67
|
-
visited.add(absDir);
|
|
68
|
-
|
|
69
|
-
// Every dep is its own crate and every crate needs to have Nargo.toml defined in the root so we try to load it and
|
|
70
|
-
// error out if it's not the case.
|
|
71
|
-
const tomlPath = join(absDir, 'Nargo.toml');
|
|
72
|
-
const content = await readFile(tomlPath, 'utf-8').catch(() => {
|
|
73
|
-
throw new Error(`Incorrectly defined dependency. Nargo.toml not found in ${absDir}`);
|
|
74
|
-
});
|
|
75
|
-
|
|
76
|
-
const parsed = TOML.parse(content) as Record<string, any>;
|
|
77
|
-
|
|
78
|
-
const members = (parsed.workspace as Record<string, any>)?.members as string[] | undefined;
|
|
79
|
-
|
|
80
|
-
// A Nargo.toml is either a workspace root (has workspace.members) or a single crate (has dependencies).
|
|
81
|
-
if (Array.isArray(members)) {
|
|
82
|
-
// The crate is a workspace root and has members defined so we visit the members
|
|
83
|
-
for (const member of members) {
|
|
84
|
-
const memberPath = resolve(absDir, member);
|
|
85
|
-
await visit(memberPath);
|
|
86
|
-
}
|
|
87
|
-
} else {
|
|
88
|
-
// The crate is not a workspace root so we check for dependencies
|
|
89
|
-
const deps = (parsed.dependencies as Record<string, any>) ?? {};
|
|
90
|
-
for (const dep of Object.values(deps)) {
|
|
91
|
-
if (dep && typeof dep === 'object' && typeof dep.path === 'string') {
|
|
92
|
-
const depPath = resolve(absDir, dep.path);
|
|
93
|
-
const s = await stat(depPath);
|
|
94
|
-
if (!s.isDirectory()) {
|
|
95
|
-
throw new Error(
|
|
96
|
-
`Dependency path "${dep.path}" in ${tomlPath} resolves to ${depPath} which is not a directory`,
|
|
97
|
-
);
|
|
98
|
-
}
|
|
99
|
-
await visit(depPath);
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
await visit(startCrateDir);
|
|
106
|
-
return [...visited];
|
|
107
|
-
}
|
|
108
|
-
|
|
109
56
|
/**
|
|
110
57
|
* Walks crate dirs looking for .nr and Nargo.toml files newer than thresholdMs. Short-circuits on the first match.
|
|
111
58
|
*/
|
|
@@ -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
|
+
}
|