@aztec/aztec 0.0.1-commit.87a0206 → 0.0.1-commit.88c5703d4
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 +7 -3
- package/dest/cli/admin_api_key_store.d.ts +45 -0
- package/dest/cli/admin_api_key_store.d.ts.map +1 -0
- package/dest/cli/admin_api_key_store.js +98 -0
- 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 +61 -16
- package/dest/cli/aztec_start_options.d.ts +1 -1
- package/dest/cli/aztec_start_options.d.ts.map +1 -1
- package/dest/cli/aztec_start_options.js +25 -9
- package/dest/cli/cli.d.ts +1 -1
- package/dest/cli/cli.d.ts.map +1 -1
- package/dest/cli/cli.js +3 -4
- package/dest/cli/cmds/compile.d.ts +4 -0
- package/dest/cli/cmds/compile.d.ts.map +1 -0
- package/dest/cli/cmds/compile.js +166 -0
- package/dest/cli/cmds/profile.d.ts +4 -0
- package/dest/cli/cmds/profile.d.ts.map +1 -0
- package/dest/cli/cmds/profile.js +8 -0
- package/dest/cli/cmds/profile_flamegraph.d.ts +4 -0
- package/dest/cli/cmds/profile_flamegraph.d.ts.map +1 -0
- package/dest/cli/cmds/profile_flamegraph.js +52 -0
- package/dest/cli/cmds/profile_gates.d.ts +4 -0
- package/dest/cli/cmds/profile_gates.d.ts.map +1 -0
- package/dest/cli/cmds/profile_gates.js +58 -0
- package/dest/cli/cmds/profile_utils.d.ts +18 -0
- package/dest/cli/cmds/profile_utils.d.ts.map +1 -0
- package/dest/cli/cmds/profile_utils.js +50 -0
- 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 +1 -1
- package/dest/cli/cmds/start_bot.d.ts +3 -3
- package/dest/cli/cmds/start_bot.d.ts.map +1 -1
- package/dest/cli/cmds/start_bot.js +9 -5
- 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 +83 -27
- 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/artifacts.d.ts +21 -0
- package/dest/cli/cmds/utils/artifacts.d.ts.map +1 -0
- package/dest/cli/cmds/utils/artifacts.js +24 -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 +134 -0
- package/dest/cli/cmds/utils/spawn.d.ts +3 -0
- package/dest/cli/cmds/utils/spawn.d.ts.map +1 -0
- package/dest/cli/cmds/utils/spawn.js +16 -0
- package/dest/cli/util.d.ts +7 -18
- package/dest/cli/util.d.ts.map +1 -1
- package/dest/cli/util.js +50 -86
- package/dest/examples/token.js +6 -6
- package/dest/local-network/banana_fpc.js +1 -1
- package/dest/local-network/local-network.d.ts +3 -1
- package/dest/local-network/local-network.d.ts.map +1 -1
- package/dest/local-network/local-network.js +50 -18
- package/dest/testing/anvil_test_watcher.d.ts +9 -1
- package/dest/testing/anvil_test_watcher.d.ts.map +1 -1
- package/dest/testing/anvil_test_watcher.js +52 -15
- 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/add_crate.sh +102 -0
- package/scripts/aztec.sh +11 -5
- package/scripts/init.sh +23 -19
- package/scripts/new.sh +48 -24
- package/scripts/setup_workspace.sh +68 -0
- package/src/bin/index.ts +7 -3
- package/src/cli/admin_api_key_store.ts +128 -0
- package/src/cli/aztec_start_action.ts +60 -12
- package/src/cli/aztec_start_options.ts +27 -8
- package/src/cli/cli.ts +3 -4
- package/src/cli/cmds/compile.ts +191 -0
- package/src/cli/cmds/profile.ts +25 -0
- package/src/cli/cmds/profile_flamegraph.ts +64 -0
- package/src/cli/cmds/profile_gates.ts +68 -0
- package/src/cli/cmds/profile_utils.ts +58 -0
- package/src/cli/cmds/standby.ts +132 -0
- package/src/cli/cmds/start_archiver.ts +1 -1
- package/src/cli/cmds/start_bot.ts +8 -5
- package/src/cli/cmds/start_node.ts +83 -33
- package/src/cli/cmds/start_prover_broker.ts +14 -14
- package/src/cli/cmds/utils/artifacts.ts +44 -0
- package/src/cli/cmds/utils/needs_recompile.ts +151 -0
- package/src/cli/cmds/utils/spawn.ts +16 -0
- package/src/cli/util.ts +57 -95
- package/src/examples/token.ts +8 -6
- package/src/local-network/banana_fpc.ts +1 -1
- package/src/local-network/local-network.ts +54 -17
- package/src/testing/anvil_test_watcher.ts +59 -15
- 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/cmds/start_prover_node.d.ts +0 -7
- package/dest/cli/cmds/start_prover_node.d.ts.map +0 -1
- package/dest/cli/cmds/start_prover_node.js +0 -108
- 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/scripts/compile.sh +0 -44
- package/scripts/extract_function.js +0 -47
- package/scripts/flamegraph.sh +0 -59
- package/scripts/setup_project.sh +0 -31
- package/src/cli/cmds/start_prover_node.ts +0 -124
- package/src/cli/release_version.ts +0 -21
|
@@ -0,0 +1,132 @@
|
|
|
1
|
+
import { getInitialTestAccountsData } from '@aztec/accounts/testing';
|
|
2
|
+
import type { Fr } from '@aztec/aztec.js/fields';
|
|
3
|
+
import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
|
|
4
|
+
import { getPublicClient } from '@aztec/ethereum/client';
|
|
5
|
+
import type { GenesisStateConfig } from '@aztec/ethereum/config';
|
|
6
|
+
import { RegistryContract, RollupContract } from '@aztec/ethereum/contracts';
|
|
7
|
+
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
8
|
+
import { startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
|
|
9
|
+
import type { LogFn } from '@aztec/foundation/log';
|
|
10
|
+
import { retryUntil } from '@aztec/foundation/retry';
|
|
11
|
+
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
12
|
+
import { getGenesisValues } from '@aztec/world-state/testing';
|
|
13
|
+
|
|
14
|
+
import Koa from 'koa';
|
|
15
|
+
|
|
16
|
+
const ROLLUP_POLL_INTERVAL_S = 60;
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Computes the expected genesis archive root from the genesis state config.
|
|
20
|
+
* Reads test accounts and sponsored FPC addresses as specified, then computes
|
|
21
|
+
* the genesis values including the archive root and prefilled public data.
|
|
22
|
+
*/
|
|
23
|
+
export async function computeExpectedGenesisRoot(config: GenesisStateConfig, userLog: LogFn) {
|
|
24
|
+
const testAccounts = config.testAccounts ? (await getInitialTestAccountsData()).map(a => a.address) : [];
|
|
25
|
+
const sponsoredFPCAccounts = config.sponsoredFPC ? [await getSponsoredFPCAddress()] : [];
|
|
26
|
+
const prefundAddresses = (config.prefundAddresses ?? []).map(a => AztecAddress.fromString(a));
|
|
27
|
+
const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts).concat(prefundAddresses);
|
|
28
|
+
|
|
29
|
+
userLog(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
|
|
30
|
+
|
|
31
|
+
const { genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
|
|
32
|
+
|
|
33
|
+
userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
34
|
+
|
|
35
|
+
return { genesisArchiveRoot, prefilledPublicData };
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
async function checkRollupCompatibility(
|
|
39
|
+
rollup: RollupContract,
|
|
40
|
+
expected: { genesisArchiveRoot: Fr; vkTreeRoot: Fr; protocolContractsHash: Fr },
|
|
41
|
+
): Promise<string[]> {
|
|
42
|
+
const mismatches: string[] = [];
|
|
43
|
+
const [l1Genesis, l1Vk, l1Protocol] = await Promise.all([
|
|
44
|
+
rollup.getGenesisArchiveTreeRoot(),
|
|
45
|
+
rollup.getVkTreeRoot(),
|
|
46
|
+
rollup.getProtocolContractsHash(),
|
|
47
|
+
]);
|
|
48
|
+
if (!l1Genesis.equals(expected.genesisArchiveRoot)) {
|
|
49
|
+
mismatches.push(`genesis archive root (expected ${expected.genesisArchiveRoot}, got ${l1Genesis})`);
|
|
50
|
+
}
|
|
51
|
+
if (!l1Vk.equals(expected.vkTreeRoot)) {
|
|
52
|
+
mismatches.push(`VK tree root (expected ${expected.vkTreeRoot}, got ${l1Vk})`);
|
|
53
|
+
}
|
|
54
|
+
if (!l1Protocol.equals(expected.protocolContractsHash)) {
|
|
55
|
+
mismatches.push(`protocol contracts hash (expected ${expected.protocolContractsHash}, got ${l1Protocol})`);
|
|
56
|
+
}
|
|
57
|
+
return mismatches;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/**
|
|
61
|
+
* Waits until the canonical rollup's genesis archive root, VK tree root, and protocol contracts hash
|
|
62
|
+
* all match the expected local values. If the rollup is not yet compatible (e.g. during L1 contract upgrades),
|
|
63
|
+
* enters standby mode: starts a lightweight HTTP server for K8s liveness probes and polls every 60s
|
|
64
|
+
* until a compatible rollup appears.
|
|
65
|
+
*/
|
|
66
|
+
export async function waitForCompatibleRollup(
|
|
67
|
+
config: {
|
|
68
|
+
l1RpcUrls: string[];
|
|
69
|
+
l1ChainId: number;
|
|
70
|
+
l1Contracts: { registryAddress: EthAddress };
|
|
71
|
+
rollupVersion?: number;
|
|
72
|
+
},
|
|
73
|
+
expected: { genesisArchiveRoot: Fr; vkTreeRoot: Fr; protocolContractsHash: Fr },
|
|
74
|
+
port: number | undefined,
|
|
75
|
+
userLog: LogFn,
|
|
76
|
+
): Promise<void> {
|
|
77
|
+
const publicClient = getPublicClient(config);
|
|
78
|
+
const rollupVersion: number | 'canonical' = config.rollupVersion ?? 'canonical';
|
|
79
|
+
|
|
80
|
+
const registry = new RegistryContract(publicClient, config.l1Contracts.registryAddress);
|
|
81
|
+
const rollupAddress = await registry.getRollupAddress(rollupVersion);
|
|
82
|
+
const rollup = new RollupContract(publicClient, rollupAddress.toString());
|
|
83
|
+
|
|
84
|
+
let mismatches: string[];
|
|
85
|
+
try {
|
|
86
|
+
mismatches = await checkRollupCompatibility(rollup, expected);
|
|
87
|
+
} catch (err: any) {
|
|
88
|
+
throw new Error(`Could not retrieve rollup config from canonical rollup at ${rollupAddress}: ${err.message}`);
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
if (mismatches.length === 0) {
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
userLog(
|
|
96
|
+
`Rollup at ${rollupAddress} is incompatible: ${mismatches.join('; ')}. ` +
|
|
97
|
+
`Entering standby mode. Will poll every ${ROLLUP_POLL_INTERVAL_S}s for a compatible rollup...`,
|
|
98
|
+
);
|
|
99
|
+
|
|
100
|
+
const standbyServer = await startHttpRpcServer({ getApp: () => new Koa(), isHealthy: () => true }, { port });
|
|
101
|
+
userLog(`Standby status server listening on port ${standbyServer.port}`);
|
|
102
|
+
|
|
103
|
+
try {
|
|
104
|
+
await retryUntil(
|
|
105
|
+
async () => {
|
|
106
|
+
const currentRollupAddress = await registry.getRollupAddress(rollupVersion);
|
|
107
|
+
const currentRollup = new RollupContract(publicClient, currentRollupAddress.toString());
|
|
108
|
+
|
|
109
|
+
let currentMismatches: string[];
|
|
110
|
+
try {
|
|
111
|
+
currentMismatches = await checkRollupCompatibility(currentRollup, expected);
|
|
112
|
+
} catch {
|
|
113
|
+
userLog(`Failed to fetch rollup config from rollup at ${currentRollupAddress}. Retrying...`);
|
|
114
|
+
return undefined;
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
if (currentMismatches.length === 0) {
|
|
118
|
+
userLog(`Compatible rollup found at ${currentRollupAddress}. Exiting standby mode.`);
|
|
119
|
+
return true;
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
userLog(`Still waiting. Rollup at ${currentRollupAddress}: ${currentMismatches.join('; ')}.`);
|
|
123
|
+
return undefined;
|
|
124
|
+
},
|
|
125
|
+
'compatible rollup',
|
|
126
|
+
0,
|
|
127
|
+
ROLLUP_POLL_INTERVAL_S,
|
|
128
|
+
);
|
|
129
|
+
} finally {
|
|
130
|
+
await new Promise<void>((resolve, reject) => standbyServer.close(err => (err ? reject(err) : resolve())));
|
|
131
|
+
}
|
|
132
|
+
}
|
|
@@ -3,8 +3,8 @@ import { createLogger } from '@aztec/aztec.js/log';
|
|
|
3
3
|
import { type BlobClientConfig, blobClientConfigMapping, createBlobClient } from '@aztec/blob-client/client';
|
|
4
4
|
import { getL1Config } from '@aztec/cli/config';
|
|
5
5
|
import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
|
|
6
|
-
import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
|
|
7
6
|
import { ArchiverApiSchema } from '@aztec/stdlib/interfaces/server';
|
|
7
|
+
import { type DataStoreConfig, dataConfigMappings } from '@aztec/stdlib/kv-store';
|
|
8
8
|
import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
|
|
9
9
|
|
|
10
10
|
import { extractRelevantOptions } from '../util.js';
|
|
@@ -10,9 +10,9 @@ import {
|
|
|
10
10
|
initTelemetryClient,
|
|
11
11
|
makeTracedFetch,
|
|
12
12
|
} from '@aztec/telemetry-client';
|
|
13
|
-
import {
|
|
13
|
+
import { EmbeddedWallet } from '@aztec/wallets/embedded';
|
|
14
14
|
|
|
15
|
-
import { extractRelevantOptions } from '../util.js';
|
|
15
|
+
import { extractRelevantOptions, stringifyConfig } from '../util.js';
|
|
16
16
|
import { getVersions } from '../versioning.js';
|
|
17
17
|
|
|
18
18
|
export async function startBot(
|
|
@@ -38,22 +38,25 @@ export async function startBot(
|
|
|
38
38
|
const aztecNode = createAztecNodeClient(config.nodeUrl, getVersions(), fetch);
|
|
39
39
|
|
|
40
40
|
const pxeConfig = extractRelevantOptions<PXEConfig & CliPXEOptions>(options, allPxeConfigMappings, 'pxe');
|
|
41
|
-
|
|
41
|
+
userLog(`Creating bot wallet with config ${stringifyConfig(pxeConfig)}`);
|
|
42
|
+
const wallet = await EmbeddedWallet.create(aztecNode, { pxeConfig });
|
|
42
43
|
|
|
43
44
|
const telemetry = await initTelemetryClient(getTelemetryClientConfig());
|
|
44
|
-
await addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, undefined);
|
|
45
|
+
await addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, undefined, userLog);
|
|
45
46
|
}
|
|
46
47
|
|
|
47
48
|
export async function addBot(
|
|
48
49
|
options: any,
|
|
49
50
|
signalHandlers: (() => Promise<void>)[],
|
|
50
51
|
services: NamespacedApiHandlers,
|
|
51
|
-
wallet:
|
|
52
|
+
wallet: EmbeddedWallet,
|
|
52
53
|
aztecNode: AztecNode,
|
|
53
54
|
telemetry: TelemetryClient,
|
|
54
55
|
aztecNodeAdmin?: AztecNodeAdmin,
|
|
56
|
+
userLog?: LogFn,
|
|
55
57
|
) {
|
|
56
58
|
const config = extractRelevantOptions<BotConfig>(options, botConfigMappings, 'bot');
|
|
59
|
+
userLog?.(`Starting bot with config ${stringifyConfig(config)}`);
|
|
57
60
|
|
|
58
61
|
const db = await (config.dataDirectory
|
|
59
62
|
? createStore('bot', BotStore.SCHEMA_VERSION, config)
|
|
@@ -1,30 +1,36 @@
|
|
|
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 {
|
|
5
|
+
import { getGenesisStateConfigEnvVars } from '@aztec/ethereum/config';
|
|
6
|
+
import { type NetworkNames, SecretValue } from '@aztec/foundation/config';
|
|
8
7
|
import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
|
|
8
|
+
import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
|
|
9
9
|
import type { LogFn } from '@aztec/foundation/log';
|
|
10
|
+
import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
|
|
11
|
+
import { protocolContractsHash } from '@aztec/protocol-contracts';
|
|
12
|
+
import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker';
|
|
10
13
|
import { type CliPXEOptions, type PXEConfig, allPxeConfigMappings } from '@aztec/pxe/config';
|
|
11
14
|
import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
|
|
12
|
-
import { P2PApiSchema } from '@aztec/stdlib/interfaces/server';
|
|
15
|
+
import { P2PApiSchema, ProverNodeApiSchema, type ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
|
|
13
16
|
import {
|
|
14
17
|
type TelemetryClientConfig,
|
|
15
18
|
initTelemetryClient,
|
|
19
|
+
makeTracedFetch,
|
|
16
20
|
telemetryClientConfigMappings,
|
|
17
21
|
} from '@aztec/telemetry-client';
|
|
18
|
-
import {
|
|
19
|
-
import { getGenesisValues } from '@aztec/world-state/testing';
|
|
22
|
+
import { EmbeddedWallet } from '@aztec/wallets/embedded';
|
|
20
23
|
|
|
21
24
|
import { createAztecNode } from '../../local-network/index.js';
|
|
22
25
|
import {
|
|
23
26
|
extractNamespacedOptions,
|
|
24
27
|
extractRelevantOptions,
|
|
25
28
|
preloadCrsDataForVerifying,
|
|
26
|
-
|
|
29
|
+
setupVersionChecker,
|
|
27
30
|
} from '../util.js';
|
|
31
|
+
import { getVersions } from '../versioning.js';
|
|
32
|
+
import { computeExpectedGenesisRoot, waitForCompatibleRollup } from './standby.js';
|
|
33
|
+
import { startProverBroker } from './start_prover_broker.js';
|
|
28
34
|
|
|
29
35
|
export async function startNode(
|
|
30
36
|
options: any,
|
|
@@ -32,6 +38,7 @@ export async function startNode(
|
|
|
32
38
|
services: NamespacedApiHandlers,
|
|
33
39
|
adminServices: NamespacedApiHandlers,
|
|
34
40
|
userLog: LogFn,
|
|
41
|
+
networkName: NetworkNames,
|
|
35
42
|
): Promise<{ config: AztecNodeConfig }> {
|
|
36
43
|
// All options set from environment variables
|
|
37
44
|
const configFromEnvVars = getConfigEnvVars();
|
|
@@ -45,22 +52,38 @@ export async function startNode(
|
|
|
45
52
|
...relevantOptions,
|
|
46
53
|
};
|
|
47
54
|
|
|
55
|
+
// Prover node configuration and broker setup
|
|
56
|
+
// REFACTOR: Move the broker setup out of here and into the prover-node factory
|
|
57
|
+
let broker: ProvingJobBroker | undefined = undefined;
|
|
48
58
|
if (options.proverNode) {
|
|
49
|
-
|
|
50
|
-
|
|
59
|
+
nodeConfig.enableProverNode = true;
|
|
60
|
+
if (nodeConfig.proverAgentCount === 0) {
|
|
61
|
+
userLog(
|
|
62
|
+
`Running prover node without local prover agent. Connect prover agents or pass --proverAgent.proverAgentCount`,
|
|
63
|
+
);
|
|
64
|
+
}
|
|
65
|
+
if (nodeConfig.proverBrokerUrl) {
|
|
66
|
+
// at 1TPS we'd enqueue ~1k chonk verifier proofs and ~1k AVM proofs immediately
|
|
67
|
+
// set a lower connection limit such that we don't overload the server
|
|
68
|
+
// Keep retrying up to 30s
|
|
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
|
+
);
|
|
74
|
+
broker = createProvingJobBrokerClient(nodeConfig.proverBrokerUrl, getVersions(nodeConfig), fetch);
|
|
75
|
+
} else if (options.proverBroker) {
|
|
76
|
+
({ broker } = await startProverBroker(options, signalHandlers, services, userLog));
|
|
77
|
+
} else {
|
|
78
|
+
userLog(`--prover-broker-url or --prover-broker is required to start a Prover Node`);
|
|
79
|
+
process.exit(1);
|
|
80
|
+
}
|
|
51
81
|
}
|
|
52
82
|
|
|
53
83
|
await preloadCrsDataForVerifying(nodeConfig, userLog);
|
|
54
84
|
|
|
55
|
-
const
|
|
56
|
-
const
|
|
57
|
-
const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts);
|
|
58
|
-
|
|
59
|
-
userLog(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
|
|
60
|
-
|
|
61
|
-
const { genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
|
|
62
|
-
|
|
63
|
-
userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
85
|
+
const genesisConfig = getGenesisStateConfigEnvVars();
|
|
86
|
+
const { genesisArchiveRoot, prefilledPublicData } = await computeExpectedGenesisRoot(genesisConfig, userLog);
|
|
64
87
|
|
|
65
88
|
const followsCanonicalRollup =
|
|
66
89
|
typeof nodeConfig.rollupVersion !== 'number' || (nodeConfig.rollupVersion as unknown as string) === 'canonical';
|
|
@@ -68,6 +91,16 @@ export async function startNode(
|
|
|
68
91
|
if (!nodeConfig.l1Contracts.registryAddress || nodeConfig.l1Contracts.registryAddress.isZero()) {
|
|
69
92
|
throw new Error('L1 registry address is required to start Aztec Node');
|
|
70
93
|
}
|
|
94
|
+
|
|
95
|
+
// Wait for a compatible rollup before proceeding with full L1 config fetch.
|
|
96
|
+
// This prevents crashes when the canonical rollup hasn't been upgraded yet.
|
|
97
|
+
await waitForCompatibleRollup(
|
|
98
|
+
nodeConfig,
|
|
99
|
+
{ genesisArchiveRoot, vkTreeRoot: getVKTreeRoot(), protocolContractsHash },
|
|
100
|
+
options.port,
|
|
101
|
+
userLog,
|
|
102
|
+
);
|
|
103
|
+
|
|
71
104
|
const { addresses, config } = await getL1Config(
|
|
72
105
|
nodeConfig.l1Contracts.registryAddress,
|
|
73
106
|
nodeConfig.l1RpcUrls,
|
|
@@ -101,12 +134,17 @@ export async function startNode(
|
|
|
101
134
|
...extractNamespacedOptions(options, 'sequencer'),
|
|
102
135
|
};
|
|
103
136
|
// If no publisher private keys have been given, use the first validator key
|
|
104
|
-
if (
|
|
137
|
+
if (
|
|
138
|
+
sequencerConfig.sequencerPublisherPrivateKeys === undefined ||
|
|
139
|
+
!sequencerConfig.sequencerPublisherPrivateKeys.length
|
|
140
|
+
) {
|
|
105
141
|
if (sequencerConfig.validatorPrivateKeys?.getValue().length) {
|
|
106
|
-
sequencerConfig.
|
|
142
|
+
sequencerConfig.sequencerPublisherPrivateKeys = [
|
|
143
|
+
new SecretValue(sequencerConfig.validatorPrivateKeys.getValue()[0]),
|
|
144
|
+
];
|
|
107
145
|
}
|
|
108
146
|
}
|
|
109
|
-
nodeConfig.
|
|
147
|
+
nodeConfig.sequencerPublisherPrivateKeys = sequencerConfig.sequencerPublisherPrivateKeys;
|
|
110
148
|
}
|
|
111
149
|
|
|
112
150
|
if (nodeConfig.p2pEnabled) {
|
|
@@ -120,13 +158,22 @@ export async function startNode(
|
|
|
120
158
|
const telemetry = await initTelemetryClient(telemetryConfig);
|
|
121
159
|
|
|
122
160
|
// Create and start Aztec Node
|
|
123
|
-
const node = await createAztecNode(nodeConfig, { telemetry }, { prefilledPublicData });
|
|
161
|
+
const node = await createAztecNode(nodeConfig, { telemetry, proverBroker: broker }, { prefilledPublicData });
|
|
124
162
|
|
|
125
163
|
// Add node and p2p to services list
|
|
126
164
|
services.node = [node, AztecNodeApiSchema];
|
|
127
165
|
services.p2p = [node.getP2P(), P2PApiSchema];
|
|
128
166
|
adminServices.nodeAdmin = [node, AztecNodeAdminApiSchema];
|
|
129
167
|
|
|
168
|
+
// Register prover-node services if the prover node subsystem is running
|
|
169
|
+
const proverNode = node.getProverNode();
|
|
170
|
+
if (proverNode) {
|
|
171
|
+
services.prover = [proverNode, ProverNodeApiSchema];
|
|
172
|
+
if (!nodeConfig.proverBrokerUrl) {
|
|
173
|
+
services.provingJobSource = [proverNode.getProver().getProvingJobSource(), ProvingJobConsumerSchema];
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
|
|
130
177
|
// Add node stop function to signal handlers
|
|
131
178
|
signalHandlers.push(node.stop.bind(node));
|
|
132
179
|
|
|
@@ -135,21 +182,24 @@ export async function startNode(
|
|
|
135
182
|
const { addBot } = await import('./start_bot.js');
|
|
136
183
|
|
|
137
184
|
const pxeConfig = extractRelevantOptions<PXEConfig & CliPXEOptions>(options, allPxeConfigMappings, 'pxe');
|
|
138
|
-
const wallet = await
|
|
185
|
+
const wallet = await EmbeddedWallet.create(node, { pxeConfig });
|
|
139
186
|
|
|
140
187
|
await addBot(options, signalHandlers, services, wallet, node, telemetry, undefined);
|
|
141
188
|
}
|
|
142
189
|
|
|
143
|
-
if (nodeConfig.
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
190
|
+
if (nodeConfig.enableVersionCheck && networkName !== 'local') {
|
|
191
|
+
const cacheDir = process.env.DATA_DIRECTORY ? `${process.env.DATA_DIRECTORY}/cache` : undefined;
|
|
192
|
+
try {
|
|
193
|
+
await setupVersionChecker(
|
|
194
|
+
networkName,
|
|
195
|
+
followsCanonicalRollup,
|
|
196
|
+
getPublicClient(nodeConfig!),
|
|
197
|
+
signalHandlers,
|
|
198
|
+
cacheDir,
|
|
199
|
+
);
|
|
200
|
+
} catch {
|
|
201
|
+
/* no-op */
|
|
202
|
+
}
|
|
153
203
|
}
|
|
154
204
|
|
|
155
205
|
return { config: nodeConfig };
|
|
@@ -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,44 @@
|
|
|
1
|
+
import { readFile, readdir } from 'fs/promises';
|
|
2
|
+
import { join } from 'path';
|
|
3
|
+
|
|
4
|
+
export interface CompiledArtifact {
|
|
5
|
+
noir_version: string;
|
|
6
|
+
file_map: unknown;
|
|
7
|
+
functions: ContractFunction[];
|
|
8
|
+
bytecode?: string;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
export interface ContractFunction {
|
|
12
|
+
name: string;
|
|
13
|
+
abi: unknown;
|
|
14
|
+
bytecode: string;
|
|
15
|
+
debug_symbols: unknown;
|
|
16
|
+
is_unconstrained?: boolean;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export interface ArtifactFile {
|
|
20
|
+
name: string;
|
|
21
|
+
filePath: string;
|
|
22
|
+
content: CompiledArtifact;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
/** Reads all JSON artifact files from a target directory and returns their parsed contents. */
|
|
26
|
+
export async function readArtifactFiles(targetDir: string): Promise<ArtifactFile[]> {
|
|
27
|
+
let entries: string[];
|
|
28
|
+
try {
|
|
29
|
+
entries = (await readdir(targetDir)).filter(f => f.endsWith('.json'));
|
|
30
|
+
} catch (err: any) {
|
|
31
|
+
if (err?.code === 'ENOENT') {
|
|
32
|
+
throw new Error(`Target directory '${targetDir}' does not exist. Compile first with 'aztec compile'.`);
|
|
33
|
+
}
|
|
34
|
+
throw err;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
const artifacts: ArtifactFile[] = [];
|
|
38
|
+
for (const file of entries) {
|
|
39
|
+
const filePath = join(targetDir, file);
|
|
40
|
+
const content = JSON.parse(await readFile(filePath, 'utf-8')) as CompiledArtifact;
|
|
41
|
+
artifacts.push({ name: file.replace('.json', ''), filePath, content });
|
|
42
|
+
}
|
|
43
|
+
return artifacts;
|
|
44
|
+
}
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
import TOML from '@iarna/toml';
|
|
2
|
+
import { readFile, readdir, stat } from 'fs/promises';
|
|
3
|
+
import { join, resolve } from 'path';
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Returns true if recompilation is needed: either no artifacts exist in target/ or any .nr or Nargo.toml source file
|
|
7
|
+
* (including path-based dependencies) is newer than the oldest artifact. We compare against the oldest artifact so
|
|
8
|
+
* that a source change between the oldest and newest compilation (e.g. in a multi-contract workspace) still triggers
|
|
9
|
+
* a recompile.
|
|
10
|
+
*
|
|
11
|
+
* Note: The above implies that if there is a random json file in the target dir we would be always recompiling.
|
|
12
|
+
*/
|
|
13
|
+
export async function needsRecompile(): Promise<boolean> {
|
|
14
|
+
const oldestArtifactMs = await getOldestArtifactModificationTime('target');
|
|
15
|
+
if (oldestArtifactMs === undefined) {
|
|
16
|
+
return true;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
const crateDirs = await collectCrateDirs('.');
|
|
20
|
+
return hasNewerSourceFile(crateDirs, oldestArtifactMs);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* Returns the last modification time (timestamp in ms) of the oldest .json artifact in targetDir, or undefined if
|
|
25
|
+
* none exist.
|
|
26
|
+
*/
|
|
27
|
+
async function getOldestArtifactModificationTime(targetDir: string): Promise<number | undefined> {
|
|
28
|
+
let entries: string[];
|
|
29
|
+
try {
|
|
30
|
+
entries = (await readdir(targetDir)).filter(f => f.endsWith('.json'));
|
|
31
|
+
} catch (err: any) {
|
|
32
|
+
if (err?.code === 'ENOENT') {
|
|
33
|
+
return undefined;
|
|
34
|
+
}
|
|
35
|
+
throw err;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
if (entries.length === 0) {
|
|
39
|
+
return undefined;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
let oldest = Infinity;
|
|
43
|
+
for (const entry of entries) {
|
|
44
|
+
const s = await stat(join(targetDir, entry));
|
|
45
|
+
if (s.mtimeMs < oldest) {
|
|
46
|
+
oldest = s.mtimeMs;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
return oldest;
|
|
50
|
+
}
|
|
51
|
+
|
|
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
|
+
/**
|
|
110
|
+
* Walks crate dirs looking for .nr and Nargo.toml files newer than thresholdMs. Short-circuits on the first match.
|
|
111
|
+
*/
|
|
112
|
+
async function hasNewerSourceFile(crateDirs: string[], thresholdMs: number): Promise<boolean> {
|
|
113
|
+
// Returns true if it find a new file than thresholdMs, false otherwise
|
|
114
|
+
async function walkForNewer(dir: string): Promise<boolean> {
|
|
115
|
+
let entries;
|
|
116
|
+
try {
|
|
117
|
+
entries = await readdir(dir, { withFileTypes: true });
|
|
118
|
+
} catch {
|
|
119
|
+
return false;
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
// We iterate over the entries in the dir
|
|
123
|
+
for (const entry of entries) {
|
|
124
|
+
const fullPath = join(dir, entry.name);
|
|
125
|
+
if (entry.isDirectory()) {
|
|
126
|
+
// If the entry is a dir and it's not called `target` we recursively enter it
|
|
127
|
+
if (entry.name === 'target') {
|
|
128
|
+
continue;
|
|
129
|
+
}
|
|
130
|
+
if (await walkForNewer(fullPath)) {
|
|
131
|
+
return true;
|
|
132
|
+
}
|
|
133
|
+
} else if (entry.name === 'Nargo.toml' || entry.name.endsWith('.nr')) {
|
|
134
|
+
// The entry is a Nargo.toml file or *.nr file so we check the timestamp
|
|
135
|
+
const s = await stat(fullPath);
|
|
136
|
+
if (s.mtimeMs > thresholdMs) {
|
|
137
|
+
return true;
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
return false;
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
// We search through the crate dirs
|
|
145
|
+
for (const dir of crateDirs) {
|
|
146
|
+
if (await walkForNewer(dir)) {
|
|
147
|
+
return true;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
return false;
|
|
151
|
+
}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { spawn } from 'child_process';
|
|
2
|
+
|
|
3
|
+
/** Spawns a command with inherited stdio and rejects on non-zero exit. */
|
|
4
|
+
export function run(cmd: string, args: string[]): Promise<void> {
|
|
5
|
+
return new Promise((resolve, reject) => {
|
|
6
|
+
const child = spawn(cmd, args, { stdio: 'inherit' });
|
|
7
|
+
child.on('error', reject);
|
|
8
|
+
child.on('close', code => {
|
|
9
|
+
if (code !== 0) {
|
|
10
|
+
reject(new Error(`${cmd} exited with code ${code}`));
|
|
11
|
+
} else {
|
|
12
|
+
resolve();
|
|
13
|
+
}
|
|
14
|
+
});
|
|
15
|
+
});
|
|
16
|
+
}
|