@aztec/aztec 0.0.1-commit.d431d1c → 0.0.1-commit.d939eb5aa
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 +71 -16
- 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 +36 -11
- 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 +168 -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 +4 -2
- 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 +73 -31
- package/dest/cli/cmds/start_p2p_bootstrap.d.ts +2 -2
- package/dest/cli/cmds/start_p2p_bootstrap.d.ts.map +1 -1
- package/dest/cli/cmds/start_p2p_bootstrap.js +1 -2
- 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 +4 -16
- 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 +14 -8
- 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/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/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/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 +7 -18
- package/dest/cli/util.d.ts.map +1 -1
- package/dest/cli/util.js +50 -86
- package/dest/examples/token.js +9 -9
- package/dest/local-network/banana_fpc.d.ts +1 -1
- package/dest/local-network/banana_fpc.d.ts.map +1 -1
- package/dest/local-network/banana_fpc.js +3 -3
- package/dest/local-network/local-network.d.ts +6 -6
- package/dest/local-network/local-network.d.ts.map +1 -1
- package/dest/local-network/local-network.js +55 -24
- 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 +81 -18
- 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 +4 -2
- package/dest/testing/epoch_test_settler.d.ts.map +1 -1
- package/dest/testing/epoch_test_settler.js +18 -9
- 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 +64 -12
- package/src/cli/aztec_start_options.ts +43 -11
- package/src/cli/cli.ts +3 -4
- package/src/cli/cmds/compile.ts +194 -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 +8 -2
- package/src/cli/cmds/start_bot.ts +8 -5
- package/src/cli/cmds/start_node.ts +83 -35
- package/src/cli/cmds/start_p2p_bootstrap.ts +2 -2
- package/src/cli/cmds/start_prover_agent.ts +5 -8
- package/src/cli/cmds/start_prover_broker.ts +19 -15
- package/src/cli/cmds/utils/artifacts.ts +44 -0
- 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/spawn.ts +16 -0
- package/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts +54 -0
- package/src/cli/util.ts +57 -95
- package/src/examples/token.ts +10 -10
- package/src/local-network/banana_fpc.ts +11 -7
- package/src/local-network/local-network.ts +67 -28
- package/src/testing/anvil_test_watcher.ts +85 -18
- package/src/testing/cheat_codes.ts +42 -36
- package/src/testing/epoch_test_settler.ts +19 -8
- 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
|
@@ -1,17 +1,20 @@
|
|
|
1
|
+
import { getActiveNetworkName } from '@aztec/foundation/config';
|
|
1
2
|
import {
|
|
2
3
|
type NamespacedApiHandlers,
|
|
3
4
|
createNamespacedSafeJsonRpcServer,
|
|
5
|
+
getApiKeyAuthMiddleware,
|
|
4
6
|
startHttpRpcServer,
|
|
5
7
|
} from '@aztec/foundation/json-rpc/server';
|
|
6
8
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
7
9
|
import type { ChainConfig } from '@aztec/stdlib/config';
|
|
8
|
-
import { AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
|
|
10
|
+
import { AztecNodeAdminApiSchema, AztecNodeApiSchema, AztecNodeDebugApiSchema } from '@aztec/stdlib/interfaces/client';
|
|
11
|
+
import { getPackageVersion } from '@aztec/stdlib/update-checker';
|
|
9
12
|
import { getVersioningMiddleware } from '@aztec/stdlib/versioning';
|
|
10
13
|
import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
|
|
11
14
|
|
|
12
15
|
import { createLocalNetwork } from '../local-network/index.js';
|
|
13
16
|
import { github, splash } from '../splash.js';
|
|
14
|
-
import {
|
|
17
|
+
import { resolveAdminApiKey } from './admin_api_key_store.js';
|
|
15
18
|
import { extractNamespacedOptions, installSignalHandlers } from './util.js';
|
|
16
19
|
import { getVersions } from './versioning.js';
|
|
17
20
|
|
|
@@ -20,14 +23,14 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
|
|
|
20
23
|
const signalHandlers: Array<() => Promise<void>> = [];
|
|
21
24
|
const services: NamespacedApiHandlers = {};
|
|
22
25
|
const adminServices: NamespacedApiHandlers = {};
|
|
26
|
+
const packageVersion = getPackageVersion();
|
|
23
27
|
let config: ChainConfig | undefined = undefined;
|
|
24
28
|
|
|
25
29
|
if (options.localNetwork) {
|
|
26
|
-
const cliVersion = getCliVersion();
|
|
27
30
|
const localNetwork = extractNamespacedOptions(options, 'local-network');
|
|
28
31
|
localNetwork.testAccounts = true;
|
|
29
32
|
userLog(`${splash}\n${github}\n\n`);
|
|
30
|
-
userLog(`Setting up Aztec local network ${
|
|
33
|
+
userLog(`Setting up Aztec local network ${packageVersion ?? 'unknown'}, please stand by...`);
|
|
31
34
|
|
|
32
35
|
const { node, stop } = await createLocalNetwork(
|
|
33
36
|
{
|
|
@@ -35,11 +38,11 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
|
|
|
35
38
|
l1RpcUrls: options.l1RpcUrls,
|
|
36
39
|
testAccounts: localNetwork.testAccounts,
|
|
37
40
|
realProofs: false,
|
|
38
|
-
// Setting the epoch duration to
|
|
41
|
+
// Setting the epoch duration to 2 by default for local network. This allows the epoch to be "proven" faster, so
|
|
39
42
|
// the users can consume out hash without having to wait for a long time.
|
|
40
43
|
// Note: We are not proving anything in the local network (realProofs == false). But in `createLocalNetwork`,
|
|
41
44
|
// the EpochTestSettler will set the out hash to the outbox when an epoch is complete.
|
|
42
|
-
aztecEpochDuration:
|
|
45
|
+
aztecEpochDuration: 2,
|
|
43
46
|
},
|
|
44
47
|
userLog,
|
|
45
48
|
);
|
|
@@ -47,16 +50,24 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
|
|
|
47
50
|
// Start Node and PXE JSON-RPC server
|
|
48
51
|
signalHandlers.push(stop);
|
|
49
52
|
services.node = [node, AztecNodeApiSchema];
|
|
53
|
+
adminServices.node = [node, AztecNodeAdminApiSchema];
|
|
54
|
+
services.nodeDebug = [node, AztecNodeDebugApiSchema];
|
|
50
55
|
} else {
|
|
56
|
+
// Route --prover-node through startNode
|
|
57
|
+
if (options.proverNode && !options.node) {
|
|
58
|
+
options.node = true;
|
|
59
|
+
}
|
|
60
|
+
|
|
51
61
|
if (options.node) {
|
|
52
62
|
const { startNode } = await import('./cmds/start_node.js');
|
|
53
|
-
|
|
63
|
+
const networkName = getActiveNetworkName(options.network);
|
|
64
|
+
({ config } = await startNode(options, signalHandlers, services, adminServices, userLog, networkName));
|
|
65
|
+
if (options.nodeDebug && services.node) {
|
|
66
|
+
services.nodeDebug = [services.node[0], AztecNodeDebugApiSchema];
|
|
67
|
+
}
|
|
54
68
|
} else if (options.bot) {
|
|
55
69
|
const { startBot } = await import('./cmds/start_bot.js');
|
|
56
70
|
await startBot(options, signalHandlers, services, userLog);
|
|
57
|
-
} else if (options.proverNode) {
|
|
58
|
-
const { startProverNode } = await import('./cmds/start_prover_node.js');
|
|
59
|
-
({ config } = await startProverNode(options, signalHandlers, services, userLog));
|
|
60
71
|
} else if (options.archiver) {
|
|
61
72
|
const { startArchiver } = await import('./cmds/start_archiver.js');
|
|
62
73
|
({ config } = await startArchiver(options, signalHandlers, services));
|
|
@@ -83,13 +94,14 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
|
|
|
83
94
|
|
|
84
95
|
installSignalHandlers(debugLogger.info, signalHandlers);
|
|
85
96
|
const versions = getVersions(config);
|
|
97
|
+
const versioningOpts = { packageVersion };
|
|
86
98
|
|
|
87
99
|
// Start the main JSON-RPC server
|
|
88
100
|
if (Object.entries(services).length > 0) {
|
|
89
101
|
const rpcServer = createNamespacedSafeJsonRpcServer(services, {
|
|
90
102
|
http200OnError: false,
|
|
91
103
|
log: debugLogger,
|
|
92
|
-
middlewares: [getOtelJsonRpcPropagationMiddleware(), getVersioningMiddleware(versions)],
|
|
104
|
+
middlewares: [getOtelJsonRpcPropagationMiddleware(), getVersioningMiddleware(versions, versioningOpts)],
|
|
93
105
|
maxBatchSize: options.rpcMaxBatchSize,
|
|
94
106
|
maxBodySizeBytes: options.rpcMaxBodySize,
|
|
95
107
|
});
|
|
@@ -99,14 +111,54 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
|
|
|
99
111
|
|
|
100
112
|
// If there are any admin services, start a separate JSON-RPC server for them
|
|
101
113
|
if (Object.entries(adminServices).length > 0) {
|
|
114
|
+
const adminMiddlewares = [getOtelJsonRpcPropagationMiddleware(), getVersioningMiddleware(versions, versioningOpts)];
|
|
115
|
+
|
|
116
|
+
// Resolve the admin API key (auto-generated and persisted, or opt-out)
|
|
117
|
+
const apiKeyResolution = await resolveAdminApiKey(
|
|
118
|
+
{
|
|
119
|
+
adminApiKeyHash: options.adminApiKeyHash,
|
|
120
|
+
disableAdminApiKey: options.disableAdminApiKey,
|
|
121
|
+
resetAdminApiKey: options.resetAdminApiKey,
|
|
122
|
+
dataDirectory: options.dataDirectory,
|
|
123
|
+
},
|
|
124
|
+
debugLogger,
|
|
125
|
+
);
|
|
126
|
+
if (apiKeyResolution) {
|
|
127
|
+
adminMiddlewares.unshift(getApiKeyAuthMiddleware(apiKeyResolution.apiKeyHash));
|
|
128
|
+
} else {
|
|
129
|
+
debugLogger.warn('No admin API key set — admin endpoint is unauthenticated');
|
|
130
|
+
}
|
|
131
|
+
|
|
102
132
|
const rpcServer = createNamespacedSafeJsonRpcServer(adminServices, {
|
|
103
133
|
http200OnError: false,
|
|
104
134
|
log: debugLogger,
|
|
105
|
-
middlewares:
|
|
135
|
+
middlewares: adminMiddlewares,
|
|
106
136
|
maxBatchSize: options.rpcMaxBatchSize,
|
|
107
137
|
maxBodySizeBytes: options.rpcMaxBodySize,
|
|
108
138
|
});
|
|
109
139
|
const { port } = await startHttpRpcServer(rpcServer, { port: options.adminPort });
|
|
110
140
|
debugLogger.info(`Aztec Server admin API listening on port ${port}`, versions);
|
|
141
|
+
|
|
142
|
+
// Display the API key after the server has started
|
|
143
|
+
// Uses userLog which is never filtered by LOG_LEVEL.
|
|
144
|
+
if (apiKeyResolution?.rawKey) {
|
|
145
|
+
const separator = '='.repeat(70);
|
|
146
|
+
userLog('');
|
|
147
|
+
userLog(separator);
|
|
148
|
+
userLog(' ADMIN API KEY (save this — it will NOT be shown again)');
|
|
149
|
+
userLog('');
|
|
150
|
+
userLog(` ${apiKeyResolution.rawKey}`);
|
|
151
|
+
userLog('');
|
|
152
|
+
userLog(` Use via header: x-api-key: <key>`);
|
|
153
|
+
userLog(` Or via header: Authorization: Bearer <key>`);
|
|
154
|
+
if (options.dataDirectory) {
|
|
155
|
+
userLog('');
|
|
156
|
+
userLog(' The key hash has been persisted — on next restart, the same key will be used.');
|
|
157
|
+
}
|
|
158
|
+
userLog('');
|
|
159
|
+
userLog(' To disable admin auth: --disable-admin-api-key or AZTEC_DISABLE_ADMIN_API_KEY=true');
|
|
160
|
+
userLog(separator);
|
|
161
|
+
userLog('');
|
|
162
|
+
}
|
|
111
163
|
}
|
|
112
164
|
}
|
|
@@ -12,14 +12,14 @@ import {
|
|
|
12
12
|
isBooleanConfigValue,
|
|
13
13
|
omitConfigMappings,
|
|
14
14
|
} from '@aztec/foundation/config';
|
|
15
|
-
import { dataConfigMappings } from '@aztec/kv-store/config';
|
|
16
15
|
import { sharedNodeConfigMappings } from '@aztec/node-lib/config';
|
|
17
16
|
import { bootnodeConfigMappings, p2pConfigMappings } from '@aztec/p2p/config';
|
|
18
17
|
import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/prover-client/broker/config';
|
|
19
18
|
import { proverNodeConfigMappings } from '@aztec/prover-node/config';
|
|
20
19
|
import { allPxeConfigMappings } from '@aztec/pxe/config';
|
|
21
20
|
import { sequencerClientConfigMappings } from '@aztec/sequencer-client/config';
|
|
22
|
-
import { chainConfigMappings } from '@aztec/stdlib/config';
|
|
21
|
+
import { chainConfigMappings, nodeRpcConfigMappings } from '@aztec/stdlib/config';
|
|
22
|
+
import { dataConfigMappings } from '@aztec/stdlib/kv-store';
|
|
23
23
|
import { telemetryClientConfigMappings } from '@aztec/telemetry-client/config';
|
|
24
24
|
import { worldStateConfigMappings } from '@aztec/world-state/config';
|
|
25
25
|
|
|
@@ -36,7 +36,7 @@ export interface AztecStartOption {
|
|
|
36
36
|
parseVal?: (val: string) => any;
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
-
export const getOptions = (namespace: string, configMappings: Record<string, ConfigMapping
|
|
39
|
+
export const getOptions = (namespace: string, configMappings: Record<string, ConfigMapping<unknown>>) => {
|
|
40
40
|
const options: AztecStartOption[] = [];
|
|
41
41
|
for (const [key, { env, defaultValue: def, parseEnv, description, printDefault, fallback }] of Object.entries(
|
|
42
42
|
configMappings,
|
|
@@ -58,7 +58,11 @@ export const getOptions = (namespace: string, configMappings: Record<string, Con
|
|
|
58
58
|
return options;
|
|
59
59
|
};
|
|
60
60
|
|
|
61
|
-
const configToFlag = (
|
|
61
|
+
const configToFlag = (
|
|
62
|
+
flag: string,
|
|
63
|
+
configMapping: ConfigMapping<unknown>,
|
|
64
|
+
overrideDefaultValue?: any,
|
|
65
|
+
): AztecStartOption => {
|
|
62
66
|
if (!configMapping.isBoolean) {
|
|
63
67
|
flag += ' <value>';
|
|
64
68
|
}
|
|
@@ -105,8 +109,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
105
109
|
env: 'NETWORK',
|
|
106
110
|
},
|
|
107
111
|
|
|
108
|
-
configToFlag('--
|
|
109
|
-
configToFlag('--auto-update-url', sharedNodeConfigMappings.autoUpdateUrl),
|
|
112
|
+
configToFlag('--enable-version-check', sharedNodeConfigMappings.enableVersionCheck),
|
|
110
113
|
|
|
111
114
|
configToFlag('--sync-mode', sharedNodeConfigMappings.syncMode),
|
|
112
115
|
configToFlag('--snapshots-urls', sharedNodeConfigMappings.snapshotsUrls),
|
|
@@ -142,12 +145,45 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
142
145
|
env: 'AZTEC_ADMIN_PORT',
|
|
143
146
|
parseVal: val => parseInt(val, 10),
|
|
144
147
|
},
|
|
148
|
+
{
|
|
149
|
+
flag: '--admin-api-key-hash <value>',
|
|
150
|
+
description:
|
|
151
|
+
'SHA-256 hex hash of a pre-generated admin API key. When set, the node uses this hash for authentication instead of auto-generating a key.',
|
|
152
|
+
defaultValue: undefined,
|
|
153
|
+
env: 'AZTEC_ADMIN_API_KEY_HASH',
|
|
154
|
+
},
|
|
155
|
+
{
|
|
156
|
+
flag: '--disable-admin-api-key',
|
|
157
|
+
description:
|
|
158
|
+
'Disable API key authentication on the admin RPC endpoint. By default, a key is auto-generated, displayed once, and its hash is persisted.',
|
|
159
|
+
defaultValue: false,
|
|
160
|
+
env: 'AZTEC_DISABLE_ADMIN_API_KEY',
|
|
161
|
+
// undefined means the flag was passed without a value (boolean toggle), treat as true.
|
|
162
|
+
parseVal: val => val === undefined || val === 'true' || val === '1',
|
|
163
|
+
},
|
|
164
|
+
{
|
|
165
|
+
flag: '--reset-admin-api-key',
|
|
166
|
+
description:
|
|
167
|
+
'Force-generate a new admin API key, replacing any previously persisted key hash. The new key is displayed once at startup.',
|
|
168
|
+
defaultValue: false,
|
|
169
|
+
env: 'AZTEC_RESET_ADMIN_API_KEY',
|
|
170
|
+
parseVal: val => val === 'true' || val === '1',
|
|
171
|
+
},
|
|
172
|
+
{
|
|
173
|
+
flag: '--node-debug',
|
|
174
|
+
description: 'Expose debug endpoints (e.g. mineBlock) on the main RPC port',
|
|
175
|
+
defaultValue: false,
|
|
176
|
+
env: 'AZTEC_NODE_DEBUG',
|
|
177
|
+
parseVal: val => val === undefined || val === 'true' || val === '1',
|
|
178
|
+
},
|
|
145
179
|
{
|
|
146
180
|
flag: '--api-prefix <value>',
|
|
147
181
|
description: 'Prefix for API routes on any service that is started',
|
|
148
182
|
defaultValue: '',
|
|
149
183
|
env: 'API_PREFIX',
|
|
150
184
|
},
|
|
185
|
+
configToFlag('--rpcMaxBatchSize', nodeRpcConfigMappings.rpcMaxBatchSize),
|
|
186
|
+
configToFlag('--rpcMaxBodySize', nodeRpcConfigMappings.rpcMaxBodySize),
|
|
151
187
|
],
|
|
152
188
|
ETHEREUM: [
|
|
153
189
|
configToFlag('--l1-chain-id', l1ReaderConfigMappings.l1ChainId),
|
|
@@ -168,7 +204,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
168
204
|
'WORLD STATE': [
|
|
169
205
|
configToFlag('--world-state-data-directory', worldStateConfigMappings.worldStateDataDirectory),
|
|
170
206
|
configToFlag('--world-state-db-map-size-kb', worldStateConfigMappings.worldStateDbMapSizeKb),
|
|
171
|
-
configToFlag('--world-state-
|
|
207
|
+
configToFlag('--world-state-checkpoint-history', worldStateConfigMappings.worldStateCheckpointHistory),
|
|
172
208
|
],
|
|
173
209
|
// We can't easily auto-generate node options as they're parts of modules defined below
|
|
174
210
|
'AZTEC NODE': [
|
|
@@ -220,12 +256,8 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
220
256
|
'proverNode',
|
|
221
257
|
omitConfigMappings(proverNodeConfigMappings, [
|
|
222
258
|
// filter out options passed separately
|
|
223
|
-
...getKeys(archiverConfigMappings),
|
|
224
259
|
...getKeys(proverBrokerConfigMappings),
|
|
225
260
|
...getKeys(proverAgentConfigMappings),
|
|
226
|
-
...getKeys(p2pConfigMappings),
|
|
227
|
-
...getKeys(worldStateConfigMappings),
|
|
228
|
-
...getKeys(sharedNodeConfigMappings),
|
|
229
261
|
]),
|
|
230
262
|
),
|
|
231
263
|
],
|
package/src/cli/cli.ts
CHANGED
|
@@ -37,10 +37,9 @@ export function injectAztecCommands(program: Command, userLog: LogFn, debugLogge
|
|
|
37
37
|
`
|
|
38
38
|
Additional commands:
|
|
39
39
|
|
|
40
|
-
init
|
|
41
|
-
new <
|
|
42
|
-
|
|
43
|
-
test [options] starts a TXE and runs "nargo test" using it as the oracle resolver.
|
|
40
|
+
init creates a new Aztec Noir workspace in the current directory.
|
|
41
|
+
new <name> creates a new Aztec Noir workspace in its own directory (or creates a new contract-test crates pair and adds it to the current workspace if run in workspace).
|
|
42
|
+
test [options] starts a TXE and runs "nargo test" using it as the oracle resolver.
|
|
44
43
|
`,
|
|
45
44
|
);
|
|
46
45
|
}
|
|
@@ -0,0 +1,194 @@
|
|
|
1
|
+
import { findBbBinary } from '@aztec/bb.js';
|
|
2
|
+
import type { LogFn } from '@aztec/foundation/log';
|
|
3
|
+
|
|
4
|
+
import { execFileSync } from 'child_process';
|
|
5
|
+
import type { Command } from 'commander';
|
|
6
|
+
import { readFile, writeFile } from 'fs/promises';
|
|
7
|
+
import { join } from 'path';
|
|
8
|
+
|
|
9
|
+
import { readArtifactFiles } from './utils/artifacts.js';
|
|
10
|
+
import { needsRecompile } from './utils/needs_recompile.js';
|
|
11
|
+
import { run } from './utils/spawn.js';
|
|
12
|
+
import { warnIfAztecVersionMismatch } from './utils/warn_if_aztec_version_mismatch.js';
|
|
13
|
+
|
|
14
|
+
/** Returns paths to contract artifacts in the target directory. */
|
|
15
|
+
async function collectContractArtifacts(): Promise<string[]> {
|
|
16
|
+
let files;
|
|
17
|
+
try {
|
|
18
|
+
files = await readArtifactFiles('target');
|
|
19
|
+
} catch (err: any) {
|
|
20
|
+
if (err?.message?.includes('does not exist')) {
|
|
21
|
+
return [];
|
|
22
|
+
}
|
|
23
|
+
throw err;
|
|
24
|
+
}
|
|
25
|
+
return files.filter(f => Array.isArray(f.content.functions)).map(f => f.filePath);
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/** Strips the `__aztec_nr_internals__` prefix from function names in contract artifacts. */
|
|
29
|
+
async function stripInternalPrefixes(artifactPaths: string[]): Promise<void> {
|
|
30
|
+
for (const path of artifactPaths) {
|
|
31
|
+
const artifact = JSON.parse(await readFile(path, 'utf-8'));
|
|
32
|
+
for (const fn of artifact.functions) {
|
|
33
|
+
if (typeof fn.name === 'string') {
|
|
34
|
+
fn.name = fn.name.replace(/^__aztec_nr_internals__/, '');
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
await writeFile(path, JSON.stringify(artifact, null, 2) + '\n');
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/** Returns the set of package names that are contract crates in the current workspace. */
|
|
42
|
+
async function getContractPackageNames(): Promise<Set<string>> {
|
|
43
|
+
const contractNames = new Set<string>();
|
|
44
|
+
|
|
45
|
+
let rootToml: string;
|
|
46
|
+
try {
|
|
47
|
+
rootToml = await readFile('Nargo.toml', 'utf-8');
|
|
48
|
+
} catch {
|
|
49
|
+
return contractNames;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
const membersMatch = rootToml.match(/members\s*=\s*\[([^\]]*)\]/);
|
|
53
|
+
if (membersMatch) {
|
|
54
|
+
const members = membersMatch[1]
|
|
55
|
+
.split(',')
|
|
56
|
+
.map(m => m.trim().replace(/^"|"$/g, ''))
|
|
57
|
+
.filter(m => m.length > 0);
|
|
58
|
+
|
|
59
|
+
for (const member of members) {
|
|
60
|
+
try {
|
|
61
|
+
const memberToml = await readFile(join(member, 'Nargo.toml'), 'utf-8');
|
|
62
|
+
if (/type\s*=\s*"contract"/.test(memberToml)) {
|
|
63
|
+
const nameMatch = memberToml.match(/name\s*=\s*"([^"]+)"/);
|
|
64
|
+
if (nameMatch) {
|
|
65
|
+
contractNames.add(nameMatch[1]);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
} catch {
|
|
69
|
+
// Member directory might not exist or have no Nargo.toml; skip.
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
} else {
|
|
73
|
+
// Single-crate project (no workspace): check if the root Nargo.toml itself is a contract.
|
|
74
|
+
if (/type\s*=\s*"contract"/.test(rootToml)) {
|
|
75
|
+
const nameMatch = rootToml.match(/name\s*=\s*"([^"]+)"/);
|
|
76
|
+
if (nameMatch) {
|
|
77
|
+
contractNames.add(nameMatch[1]);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
return contractNames;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
/** Checks that no tests exist in contract crates and fails with a helpful message if they do. */
|
|
86
|
+
async function checkNoTestsInContracts(nargo: string, log: LogFn): Promise<void> {
|
|
87
|
+
const contractPackages = await getContractPackageNames();
|
|
88
|
+
if (contractPackages.size === 0) {
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
let output: string;
|
|
93
|
+
try {
|
|
94
|
+
// We list tests for all the crates in the workspace
|
|
95
|
+
output = execFileSync(nargo, ['test', '--list-tests', '--silence-warnings'], {
|
|
96
|
+
encoding: 'utf-8',
|
|
97
|
+
stdio: ['pipe', 'pipe', 'inherit'],
|
|
98
|
+
});
|
|
99
|
+
} catch {
|
|
100
|
+
// If listing tests fails (e.g. test crate has compile errors), skip the check.
|
|
101
|
+
return;
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
// The output of the `nargo test --list-tests` command is as follows:
|
|
105
|
+
// ```
|
|
106
|
+
// crate_name_1 test_name_1
|
|
107
|
+
// crate_name_2 test_name_2
|
|
108
|
+
// ...
|
|
109
|
+
// crate_name_n test_name_n
|
|
110
|
+
// ```
|
|
111
|
+
//
|
|
112
|
+
// We parse the individual lines and then we check if any contract crate appeared in the parsed output.
|
|
113
|
+
const lines = output
|
|
114
|
+
.trim()
|
|
115
|
+
.split('\n')
|
|
116
|
+
.filter(line => line.length > 0);
|
|
117
|
+
const testsInContracts: { packageName: string; testName: string }[] = [];
|
|
118
|
+
|
|
119
|
+
for (const line of lines) {
|
|
120
|
+
const spaceIndex = line.indexOf(' ');
|
|
121
|
+
if (spaceIndex === -1) {
|
|
122
|
+
continue;
|
|
123
|
+
}
|
|
124
|
+
const packageName = line.substring(0, spaceIndex);
|
|
125
|
+
const testName = line.substring(spaceIndex + 1);
|
|
126
|
+
if (contractPackages.has(packageName)) {
|
|
127
|
+
testsInContracts.push({ packageName, testName });
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
if (testsInContracts.length > 0) {
|
|
132
|
+
const details = testsInContracts.map(t => ` ${t.packageName}::${t.testName}`).join('\n');
|
|
133
|
+
log(
|
|
134
|
+
`WARNING: Found tests in contract crate(s):\n${details}\n\n` +
|
|
135
|
+
`Tests should be in a dedicated test crate, not in the contract crate.\n` +
|
|
136
|
+
`Learn more: https://docs.aztec.network/errors/1`,
|
|
137
|
+
);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
/** Compiles Aztec Noir contracts and postprocesses artifacts. */
|
|
142
|
+
async function compileAztecContract(nargoArgs: string[], log: LogFn): Promise<void> {
|
|
143
|
+
await warnIfAztecVersionMismatch(log);
|
|
144
|
+
|
|
145
|
+
if (!(await needsRecompile())) {
|
|
146
|
+
log('No source changes detected, skipping compilation.');
|
|
147
|
+
return;
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
const nargo = process.env.NARGO ?? 'nargo';
|
|
151
|
+
const bb = process.env.BB ?? findBbBinary() ?? 'bb';
|
|
152
|
+
|
|
153
|
+
await run(nargo, ['compile', ...nargoArgs]);
|
|
154
|
+
|
|
155
|
+
// Ensure contract crates contain no tests (tests belong in the test crate).
|
|
156
|
+
await checkNoTestsInContracts(nargo, log);
|
|
157
|
+
|
|
158
|
+
const artifacts = await collectContractArtifacts();
|
|
159
|
+
|
|
160
|
+
if (artifacts.length > 0) {
|
|
161
|
+
log('Postprocessing contracts...');
|
|
162
|
+
const bbArgs = artifacts.flatMap(a => ['-i', a]);
|
|
163
|
+
await run(bb, ['aztec_process', ...bbArgs]);
|
|
164
|
+
|
|
165
|
+
// TODO: This should be part of bb aztec_process!
|
|
166
|
+
await stripInternalPrefixes(artifacts);
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
log('Compilation complete!');
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
export function injectCompileCommand(program: Command, log: LogFn): Command {
|
|
173
|
+
program
|
|
174
|
+
.command('compile')
|
|
175
|
+
.argument('[nargo-args...]')
|
|
176
|
+
.passThroughOptions()
|
|
177
|
+
.allowUnknownOption()
|
|
178
|
+
.description(
|
|
179
|
+
'Compile Aztec Noir contracts using nargo and postprocess them to generate transpiled artifacts and verification keys. All options are forwarded to nargo compile.',
|
|
180
|
+
)
|
|
181
|
+
.addHelpText('after', () => {
|
|
182
|
+
// Show nargo's own compile options so users see all available flags in one place.
|
|
183
|
+
const nargo = process.env.NARGO ?? 'nargo';
|
|
184
|
+
try {
|
|
185
|
+
const output = execFileSync(nargo, ['compile', '--help'], { encoding: 'utf-8' });
|
|
186
|
+
return `\nUnderlying nargo compile options:\n\n${output}`;
|
|
187
|
+
} catch {
|
|
188
|
+
return '\n(Run "nargo compile --help" to see available nargo options)';
|
|
189
|
+
}
|
|
190
|
+
})
|
|
191
|
+
.action((nargoArgs: string[]) => compileAztecContract(nargoArgs, log));
|
|
192
|
+
|
|
193
|
+
return program;
|
|
194
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type { LogFn } from '@aztec/foundation/log';
|
|
2
|
+
|
|
3
|
+
import type { Command } from 'commander';
|
|
4
|
+
|
|
5
|
+
import { profileFlamegraph } from './profile_flamegraph.js';
|
|
6
|
+
import { profileGates } from './profile_gates.js';
|
|
7
|
+
|
|
8
|
+
export function injectProfileCommand(program: Command, log: LogFn): Command {
|
|
9
|
+
const profile = program.command('profile').description('Profile compiled Aztec artifacts.');
|
|
10
|
+
|
|
11
|
+
profile
|
|
12
|
+
.command('gates')
|
|
13
|
+
.argument('[target-dir]', 'Path to the compiled artifacts directory', './target')
|
|
14
|
+
.description('Display gate counts for all compiled Aztec artifacts in a target directory.')
|
|
15
|
+
.action((targetDir: string) => profileGates(targetDir, log));
|
|
16
|
+
|
|
17
|
+
profile
|
|
18
|
+
.command('flamegraph')
|
|
19
|
+
.argument('<contract-artifact>', 'Path to the compiled contract artifact JSON')
|
|
20
|
+
.argument('<function>', 'Name of the contract function to profile')
|
|
21
|
+
.description('Generate a gate count flamegraph SVG for a contract function.')
|
|
22
|
+
.action((artifactPath: string, functionName: string) => profileFlamegraph(artifactPath, functionName, log));
|
|
23
|
+
|
|
24
|
+
return program;
|
|
25
|
+
}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { findBbBinary } from '@aztec/bb.js';
|
|
2
|
+
import type { LogFn } from '@aztec/foundation/log';
|
|
3
|
+
|
|
4
|
+
import { readFile, rename, rm, writeFile } from 'fs/promises';
|
|
5
|
+
import { basename, dirname, join } from 'path';
|
|
6
|
+
|
|
7
|
+
import { makeFunctionArtifact } from './profile_utils.js';
|
|
8
|
+
import type { CompiledArtifact } from './utils/artifacts.js';
|
|
9
|
+
import { run } from './utils/spawn.js';
|
|
10
|
+
|
|
11
|
+
/** Generates a gate count flamegraph SVG for a single contract function. */
|
|
12
|
+
export async function profileFlamegraph(artifactPath: string, functionName: string, log: LogFn): Promise<void> {
|
|
13
|
+
const raw = await readFile(artifactPath, 'utf-8');
|
|
14
|
+
const artifact: CompiledArtifact = JSON.parse(raw);
|
|
15
|
+
|
|
16
|
+
if (!Array.isArray(artifact.functions)) {
|
|
17
|
+
throw new Error(`${artifactPath} does not appear to be a contract artifact (no functions array)`);
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
const func = artifact.functions.find(f => f.name === functionName);
|
|
21
|
+
if (!func) {
|
|
22
|
+
const available = artifact.functions.map(f => f.name).join(', ');
|
|
23
|
+
throw new Error(`Function "${functionName}" not found in artifact. Available: ${available}`);
|
|
24
|
+
}
|
|
25
|
+
if (func.is_unconstrained) {
|
|
26
|
+
throw new Error(`Function "${functionName}" is unconstrained and cannot be profiled`);
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
const outputDir = dirname(artifactPath);
|
|
30
|
+
const contractName = basename(artifactPath, '.json');
|
|
31
|
+
const functionArtifact = join(outputDir, `${contractName}-${functionName}.json`);
|
|
32
|
+
|
|
33
|
+
try {
|
|
34
|
+
await writeFile(functionArtifact, makeFunctionArtifact(artifact, func));
|
|
35
|
+
|
|
36
|
+
const profiler = process.env.PROFILER_PATH ?? 'noir-profiler';
|
|
37
|
+
const bb = process.env.BB ?? findBbBinary() ?? 'bb';
|
|
38
|
+
|
|
39
|
+
await run(profiler, [
|
|
40
|
+
'gates',
|
|
41
|
+
'--artifact-path',
|
|
42
|
+
functionArtifact,
|
|
43
|
+
'--backend-path',
|
|
44
|
+
bb,
|
|
45
|
+
'--backend-gates-command',
|
|
46
|
+
'gates',
|
|
47
|
+
'--output',
|
|
48
|
+
outputDir,
|
|
49
|
+
'--scheme',
|
|
50
|
+
'chonk',
|
|
51
|
+
'--include_gates_per_opcode',
|
|
52
|
+
]);
|
|
53
|
+
|
|
54
|
+
// noir-profiler names the SVG using the internal function name which
|
|
55
|
+
// retains the __aztec_nr_internals__ prefix in the bytecode metadata.
|
|
56
|
+
const srcSvg = join(outputDir, `__aztec_nr_internals__${functionName}_gates.svg`);
|
|
57
|
+
const destSvg = join(outputDir, `${contractName}-${functionName}-flamegraph.svg`);
|
|
58
|
+
await rename(srcSvg, destSvg);
|
|
59
|
+
|
|
60
|
+
log(`Flamegraph written to ${destSvg}`);
|
|
61
|
+
} finally {
|
|
62
|
+
await rm(functionArtifact, { force: true });
|
|
63
|
+
}
|
|
64
|
+
}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { findBbBinary } from '@aztec/bb.js';
|
|
2
|
+
import { asyncPool } from '@aztec/foundation/async-pool';
|
|
3
|
+
import type { LogFn } from '@aztec/foundation/log';
|
|
4
|
+
|
|
5
|
+
import { execFile as execFileCb } from 'child_process';
|
|
6
|
+
import { rm } from 'fs/promises';
|
|
7
|
+
import { promisify } from 'util';
|
|
8
|
+
|
|
9
|
+
import { MAX_CONCURRENT, discoverArtifacts } from './profile_utils.js';
|
|
10
|
+
|
|
11
|
+
const execFile = promisify(execFileCb);
|
|
12
|
+
|
|
13
|
+
interface GateCountResult {
|
|
14
|
+
name: string;
|
|
15
|
+
gateCount: number;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
/** Parses circuit_size from bb gates JSON output: { "functions": [{ "circuit_size": N }] } */
|
|
19
|
+
function parseGateCount(stdout: string): number {
|
|
20
|
+
const parsed = JSON.parse(stdout);
|
|
21
|
+
const size = parsed?.functions?.[0]?.circuit_size;
|
|
22
|
+
if (typeof size !== 'number') {
|
|
23
|
+
throw new Error('Failed to parse circuit_size from bb gates output');
|
|
24
|
+
}
|
|
25
|
+
return size;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/** Runs bb gates on a single artifact file and returns the gate count. */
|
|
29
|
+
async function getGateCount(bb: string, artifactPath: string): Promise<number> {
|
|
30
|
+
const { stdout } = await execFile(bb, ['gates', '--scheme', 'chonk', '-b', artifactPath]);
|
|
31
|
+
return parseGateCount(stdout);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** Profiles all compiled artifacts in a target directory and prints gate counts. */
|
|
35
|
+
export async function profileGates(targetDir: string, log: LogFn): Promise<void> {
|
|
36
|
+
const bb = process.env.BB ?? findBbBinary() ?? 'bb';
|
|
37
|
+
const { artifacts, tmpDir } = await discoverArtifacts(targetDir);
|
|
38
|
+
|
|
39
|
+
if (artifacts.length === 0) {
|
|
40
|
+
log('No artifacts found in target directory.');
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
try {
|
|
45
|
+
const results: GateCountResult[] = await asyncPool(MAX_CONCURRENT, artifacts, async artifact => ({
|
|
46
|
+
name: artifact.name,
|
|
47
|
+
gateCount: await getGateCount(bb, artifact.filePath),
|
|
48
|
+
}));
|
|
49
|
+
results.sort((a, b) => a.name.localeCompare(b.name));
|
|
50
|
+
|
|
51
|
+
if (results.length === 0) {
|
|
52
|
+
log('No constrained circuits found.');
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
const maxNameLen = Math.max(...results.map(r => r.name.length));
|
|
57
|
+
log('');
|
|
58
|
+
log('Gate counts:');
|
|
59
|
+
log('-'.repeat(maxNameLen + 16));
|
|
60
|
+
for (const { name, gateCount } of results) {
|
|
61
|
+
log(`${name.padEnd(maxNameLen)} ${gateCount.toLocaleString().padStart(12)}`);
|
|
62
|
+
}
|
|
63
|
+
log('-'.repeat(maxNameLen + 16));
|
|
64
|
+
log(`Total: ${results.length} circuit(s)`);
|
|
65
|
+
} finally {
|
|
66
|
+
await rm(tmpDir, { recursive: true, force: true });
|
|
67
|
+
}
|
|
68
|
+
}
|