@aztec/aztec 0.0.1-commit.4d79d1f2d → 0.0.1-commit.4d9804df
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 +9 -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 +69 -32
- 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 +39 -23
- 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 +174 -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 +76 -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/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 +56 -0
- package/dest/cli/cmds/standby.d.ts.map +1 -0
- package/dest/cli/cmds/standby.js +140 -0
- package/dest/cli/cmds/start_bot.d.ts +2 -2
- package/dest/cli/cmds/start_bot.d.ts.map +1 -1
- package/dest/cli/cmds/start_bot.js +13 -7
- 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 +78 -49
- 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 +22 -13
- 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 +26 -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 +61 -0
- package/dest/cli/util.d.ts +10 -6
- package/dest/cli/util.d.ts.map +1 -1
- package/dest/cli/util.js +32 -96
- package/dest/examples/token.js +7 -7
- 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 +12 -8
- package/dest/local-network/local-network.d.ts +12 -32
- package/dest/local-network/local-network.d.ts.map +1 -1
- package/dest/local-network/local-network.js +77 -64
- 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 -26
- package/dest/testing/index.d.ts +3 -2
- package/dest/testing/index.d.ts.map +1 -1
- package/dest/testing/index.js +2 -1
- package/dest/testing/local-network.d.ts +51 -0
- package/dest/testing/local-network.d.ts.map +1 -0
- package/dest/testing/local-network.js +60 -0
- package/dest/testing/token_allowed_setup.d.ts +12 -0
- package/dest/testing/token_allowed_setup.d.ts.map +1 -0
- package/dest/testing/token_allowed_setup.js +24 -0
- package/package.json +35 -34
- package/scripts/add_crate.sh +53 -0
- package/scripts/aztec.sh +15 -5
- package/scripts/init.sh +23 -19
- package/scripts/new.sh +48 -24
- package/scripts/setup_workspace.sh +69 -0
- 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 +9 -3
- package/src/cli/admin_api_key_store.ts +128 -0
- package/src/cli/aztec_start_action.ts +69 -24
- package/src/cli/aztec_start_options.ts +48 -30
- package/src/cli/cli.ts +3 -4
- package/src/cli/cmds/compile.ts +205 -0
- package/src/cli/cmds/profile.ts +26 -0
- package/src/cli/cmds/profile_flamegraph.ts +64 -0
- package/src/cli/cmds/profile_gates.ts +84 -0
- package/src/cli/cmds/profile_utils.ts +58 -0
- package/src/cli/cmds/prover.ts +42 -0
- package/src/cli/cmds/standby.ts +184 -0
- package/src/cli/cmds/start_bot.ts +14 -8
- package/src/cli/cmds/start_node.ts +90 -50
- package/src/cli/cmds/start_prover_agent.ts +5 -8
- package/src/cli/cmds/start_prover_broker.ts +23 -24
- package/src/cli/cmds/start_txe.ts +7 -5
- package/src/cli/cmds/utils/artifacts.ts +49 -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 +76 -0
- package/src/cli/util.ts +33 -100
- package/src/examples/token.ts +17 -7
- package/src/local-network/auth_registry.ts +19 -0
- package/src/local-network/banana_fpc.ts +13 -9
- package/src/local-network/local-network.ts +94 -75
- package/src/testing/cheat_codes.ts +18 -49
- package/src/testing/epoch_test_settler.ts +8 -32
- package/src/testing/index.ts +2 -1
- package/src/testing/local-network.ts +97 -0
- package/src/testing/token_allowed_setup.ts +26 -0
- 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/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/dest/testing/anvil_test_watcher.d.ts +0 -34
- package/dest/testing/anvil_test_watcher.d.ts.map +0 -1
- package/dest/testing/anvil_test_watcher.js +0 -144
- 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_archiver.ts +0 -50
- package/src/cli/cmds/start_prover_node.ts +0 -124
- package/src/cli/release_version.ts +0 -21
- package/src/testing/anvil_test_watcher.ts +0 -166
|
@@ -12,7 +12,6 @@ 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';
|
|
@@ -20,6 +19,7 @@ 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
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('--auto-
|
|
109
|
-
configToFlag('--auto-update-url', sharedNodeConfigMappings.autoUpdateUrl),
|
|
112
|
+
configToFlag('--enable-auto-shutdown', sharedNodeConfigMappings.enableAutoShutdown),
|
|
110
113
|
|
|
111
114
|
configToFlag('--sync-mode', sharedNodeConfigMappings.syncMode),
|
|
112
115
|
configToFlag('--snapshots-urls', sharedNodeConfigMappings.snapshotsUrls),
|
|
@@ -126,6 +129,12 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
126
129
|
defaultValue: DefaultMnemonic,
|
|
127
130
|
env: 'MNEMONIC',
|
|
128
131
|
},
|
|
132
|
+
{
|
|
133
|
+
flag: '--local-network.testAccounts',
|
|
134
|
+
description: 'Deploy test accounts on local network start',
|
|
135
|
+
env: 'TEST_ACCOUNTS',
|
|
136
|
+
...booleanConfigHelper(true),
|
|
137
|
+
},
|
|
129
138
|
],
|
|
130
139
|
API: [
|
|
131
140
|
{
|
|
@@ -142,6 +151,37 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
142
151
|
env: 'AZTEC_ADMIN_PORT',
|
|
143
152
|
parseVal: val => parseInt(val, 10),
|
|
144
153
|
},
|
|
154
|
+
{
|
|
155
|
+
flag: '--admin-api-key-hash <value>',
|
|
156
|
+
description:
|
|
157
|
+
'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.',
|
|
158
|
+
defaultValue: undefined,
|
|
159
|
+
env: 'AZTEC_ADMIN_API_KEY_HASH',
|
|
160
|
+
},
|
|
161
|
+
{
|
|
162
|
+
flag: '--disable-admin-api-key',
|
|
163
|
+
description:
|
|
164
|
+
'Disable API key authentication on the admin RPC endpoint. By default, a key is auto-generated, displayed once, and its hash is persisted.',
|
|
165
|
+
defaultValue: false,
|
|
166
|
+
env: 'AZTEC_DISABLE_ADMIN_API_KEY',
|
|
167
|
+
// undefined means the flag was passed without a value (boolean toggle), treat as true.
|
|
168
|
+
parseVal: val => val === undefined || val === 'true' || val === '1',
|
|
169
|
+
},
|
|
170
|
+
{
|
|
171
|
+
flag: '--reset-admin-api-key',
|
|
172
|
+
description:
|
|
173
|
+
'Force-generate a new admin API key, replacing any previously persisted key hash. The new key is displayed once at startup.',
|
|
174
|
+
defaultValue: false,
|
|
175
|
+
env: 'AZTEC_RESET_ADMIN_API_KEY',
|
|
176
|
+
parseVal: val => val === 'true' || val === '1',
|
|
177
|
+
},
|
|
178
|
+
{
|
|
179
|
+
flag: '--node-debug',
|
|
180
|
+
description: 'Expose debug endpoints (e.g. mineBlock) on the main RPC port',
|
|
181
|
+
defaultValue: false,
|
|
182
|
+
env: 'AZTEC_NODE_DEBUG',
|
|
183
|
+
parseVal: val => val === undefined || val === 'true' || val === '1',
|
|
184
|
+
},
|
|
145
185
|
{
|
|
146
186
|
flag: '--api-prefix <value>',
|
|
147
187
|
description: 'Prefix for API routes on any service that is started',
|
|
@@ -170,7 +210,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
170
210
|
'WORLD STATE': [
|
|
171
211
|
configToFlag('--world-state-data-directory', worldStateConfigMappings.worldStateDataDirectory),
|
|
172
212
|
configToFlag('--world-state-db-map-size-kb', worldStateConfigMappings.worldStateDbMapSizeKb),
|
|
173
|
-
configToFlag('--world-state-
|
|
213
|
+
configToFlag('--world-state-checkpoint-history', worldStateConfigMappings.worldStateCheckpointHistory),
|
|
174
214
|
],
|
|
175
215
|
// We can't easily auto-generate node options as they're parts of modules defined below
|
|
176
216
|
'AZTEC NODE': [
|
|
@@ -182,12 +222,6 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
182
222
|
},
|
|
183
223
|
],
|
|
184
224
|
ARCHIVER: [
|
|
185
|
-
{
|
|
186
|
-
flag: '--archiver',
|
|
187
|
-
description: 'Starts Aztec Archiver with options',
|
|
188
|
-
defaultValue: undefined,
|
|
189
|
-
env: undefined,
|
|
190
|
-
},
|
|
191
225
|
...getOptions(
|
|
192
226
|
'archiver',
|
|
193
227
|
omitConfigMappings(archiverConfigMappings, Object.keys(l1ContractsConfigMappings) as (keyof ArchiverConfig)[]),
|
|
@@ -222,12 +256,8 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
222
256
|
'proverNode',
|
|
223
257
|
omitConfigMappings(proverNodeConfigMappings, [
|
|
224
258
|
// filter out options passed separately
|
|
225
|
-
...getKeys(archiverConfigMappings),
|
|
226
259
|
...getKeys(proverBrokerConfigMappings),
|
|
227
260
|
...getKeys(proverAgentConfigMappings),
|
|
228
|
-
...getKeys(p2pConfigMappings),
|
|
229
|
-
...getKeys(worldStateConfigMappings),
|
|
230
|
-
...getKeys(sharedNodeConfigMappings),
|
|
231
261
|
]),
|
|
232
262
|
),
|
|
233
263
|
],
|
|
@@ -238,11 +268,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
238
268
|
defaultValue: undefined,
|
|
239
269
|
env: undefined,
|
|
240
270
|
},
|
|
241
|
-
...getOptions(
|
|
242
|
-
'proverBroker',
|
|
243
|
-
// filter out archiver options from prover node options as they're passed separately in --archiver
|
|
244
|
-
proverBrokerConfigMappings,
|
|
245
|
-
),
|
|
271
|
+
...getOptions('proverBroker', proverBrokerConfigMappings),
|
|
246
272
|
],
|
|
247
273
|
'PROVER AGENT': [
|
|
248
274
|
{
|
|
@@ -290,15 +316,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
290
316
|
},
|
|
291
317
|
...getOptions('bot', botConfigMappings),
|
|
292
318
|
],
|
|
293
|
-
PXE: [
|
|
294
|
-
{
|
|
295
|
-
flag: '--pxe',
|
|
296
|
-
description: 'Starts Aztec PXE with options',
|
|
297
|
-
defaultValue: undefined,
|
|
298
|
-
env: undefined,
|
|
299
|
-
},
|
|
300
|
-
...getOptions('pxe', allPxeConfigMappings),
|
|
301
|
-
],
|
|
319
|
+
PXE: [...getOptions('pxe', allPxeConfigMappings)],
|
|
302
320
|
TXE: [
|
|
303
321
|
{
|
|
304
322
|
flag: '--txe',
|
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,205 @@
|
|
|
1
|
+
import { findBbBinary } from '@aztec/bb.js';
|
|
2
|
+
import type { LogFn } from '@aztec/foundation/log';
|
|
3
|
+
import { getPackageVersion } from '@aztec/stdlib/update-checker';
|
|
4
|
+
|
|
5
|
+
import { execFileSync } from 'child_process';
|
|
6
|
+
import type { Command } from 'commander';
|
|
7
|
+
import { readFile, writeFile } from 'fs/promises';
|
|
8
|
+
import { join } from 'path';
|
|
9
|
+
|
|
10
|
+
import { readArtifactFiles } from './utils/artifacts.js';
|
|
11
|
+
import { needsRecompile } from './utils/needs_recompile.js';
|
|
12
|
+
import { run } from './utils/spawn.js';
|
|
13
|
+
import { warnIfAztecVersionMismatch } from './utils/warn_if_aztec_version_mismatch.js';
|
|
14
|
+
|
|
15
|
+
/** Returns contract artifacts in the target directory along with whether each has already been postprocessed. */
|
|
16
|
+
async function collectContractArtifacts(): Promise<ContractArtifactInfo[]> {
|
|
17
|
+
let files;
|
|
18
|
+
try {
|
|
19
|
+
files = await readArtifactFiles('target');
|
|
20
|
+
} catch (err: any) {
|
|
21
|
+
if (err?.message?.includes('does not exist')) {
|
|
22
|
+
return [];
|
|
23
|
+
}
|
|
24
|
+
throw err;
|
|
25
|
+
}
|
|
26
|
+
return files
|
|
27
|
+
.filter(f => Array.isArray(f.content.functions))
|
|
28
|
+
.map(f => ({ filePath: f.filePath, transpiled: f.content.transpiled === true }));
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/** Stamps the Aztec stack version into the contract artifacts. */
|
|
32
|
+
async function stampAztecVersion(artifactPaths: string[]): Promise<void> {
|
|
33
|
+
const version = getPackageVersion();
|
|
34
|
+
for (const path of artifactPaths) {
|
|
35
|
+
const artifact = JSON.parse(await readFile(path, 'utf-8'));
|
|
36
|
+
// eslint-disable-next-line camelcase
|
|
37
|
+
artifact.aztec_version = version;
|
|
38
|
+
await writeFile(path, JSON.stringify(artifact, null, 2) + '\n');
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/** Returns the set of package names that are contract crates in the current workspace. */
|
|
43
|
+
async function getContractPackageNames(): Promise<Set<string>> {
|
|
44
|
+
const contractNames = new Set<string>();
|
|
45
|
+
|
|
46
|
+
let rootToml: string;
|
|
47
|
+
try {
|
|
48
|
+
rootToml = await readFile('Nargo.toml', 'utf-8');
|
|
49
|
+
} catch {
|
|
50
|
+
return contractNames;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
const membersMatch = rootToml.match(/members\s*=\s*\[([^\]]*)\]/);
|
|
54
|
+
if (membersMatch) {
|
|
55
|
+
const members = membersMatch[1]
|
|
56
|
+
.split(',')
|
|
57
|
+
.map(m => m.trim().replace(/^"|"$/g, ''))
|
|
58
|
+
.filter(m => m.length > 0);
|
|
59
|
+
|
|
60
|
+
for (const member of members) {
|
|
61
|
+
try {
|
|
62
|
+
const memberToml = await readFile(join(member, 'Nargo.toml'), 'utf-8');
|
|
63
|
+
if (/type\s*=\s*"contract"/.test(memberToml)) {
|
|
64
|
+
const nameMatch = memberToml.match(/name\s*=\s*"([^"]+)"/);
|
|
65
|
+
if (nameMatch) {
|
|
66
|
+
contractNames.add(nameMatch[1]);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
} catch {
|
|
70
|
+
// Member directory might not exist or have no Nargo.toml; skip.
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
} else {
|
|
74
|
+
// Single-crate project (no workspace): check if the root Nargo.toml itself is a contract.
|
|
75
|
+
if (/type\s*=\s*"contract"/.test(rootToml)) {
|
|
76
|
+
const nameMatch = rootToml.match(/name\s*=\s*"([^"]+)"/);
|
|
77
|
+
if (nameMatch) {
|
|
78
|
+
contractNames.add(nameMatch[1]);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
return contractNames;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
/** Checks that no tests exist in contract crates and fails with a helpful message if they do. */
|
|
87
|
+
async function checkNoTestsInContracts(nargo: string, log: LogFn): Promise<void> {
|
|
88
|
+
const contractPackages = await getContractPackageNames();
|
|
89
|
+
if (contractPackages.size === 0) {
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
let output: string;
|
|
94
|
+
try {
|
|
95
|
+
// We list tests for all the crates in the workspace
|
|
96
|
+
output = execFileSync(nargo, ['test', '--list-tests', '--silence-warnings'], {
|
|
97
|
+
encoding: 'utf-8',
|
|
98
|
+
stdio: ['pipe', 'pipe', 'inherit'],
|
|
99
|
+
});
|
|
100
|
+
} catch {
|
|
101
|
+
// If listing tests fails (e.g. test crate has compile errors), skip the check.
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
// The output of the `nargo test --list-tests` command is as follows:
|
|
106
|
+
// ```
|
|
107
|
+
// crate_name_1 test_name_1
|
|
108
|
+
// crate_name_2 test_name_2
|
|
109
|
+
// ...
|
|
110
|
+
// crate_name_n test_name_n
|
|
111
|
+
// ```
|
|
112
|
+
//
|
|
113
|
+
// We parse the individual lines and then we check if any contract crate appeared in the parsed output.
|
|
114
|
+
const lines = output
|
|
115
|
+
.trim()
|
|
116
|
+
.split('\n')
|
|
117
|
+
.filter(line => line.length > 0);
|
|
118
|
+
const testsInContracts: { packageName: string; testName: string }[] = [];
|
|
119
|
+
|
|
120
|
+
for (const line of lines) {
|
|
121
|
+
const spaceIndex = line.indexOf(' ');
|
|
122
|
+
if (spaceIndex === -1) {
|
|
123
|
+
continue;
|
|
124
|
+
}
|
|
125
|
+
const packageName = line.substring(0, spaceIndex);
|
|
126
|
+
const testName = line.substring(spaceIndex + 1);
|
|
127
|
+
if (contractPackages.has(packageName)) {
|
|
128
|
+
testsInContracts.push({ packageName, testName });
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
if (testsInContracts.length > 0) {
|
|
133
|
+
const details = testsInContracts.map(t => ` ${t.packageName}::${t.testName}`).join('\n');
|
|
134
|
+
log(
|
|
135
|
+
`WARNING: Found tests in contract crate(s):\n${details}\n\n` +
|
|
136
|
+
`Tests should be in a dedicated test crate, not in the contract crate.\n` +
|
|
137
|
+
`Learn more: https://docs.aztec.network/errors/1`,
|
|
138
|
+
);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
/** Compiles Aztec Noir contracts and postprocesses artifacts. */
|
|
143
|
+
async function compileAztecContract(nargoArgs: string[], log: LogFn): Promise<void> {
|
|
144
|
+
await warnIfAztecVersionMismatch(log);
|
|
145
|
+
|
|
146
|
+
const nargo = process.env.NARGO ?? 'nargo';
|
|
147
|
+
const bb = process.env.BB ?? findBbBinary() ?? 'bb';
|
|
148
|
+
|
|
149
|
+
const shouldRecompile = await needsRecompile();
|
|
150
|
+
if (shouldRecompile) {
|
|
151
|
+
await run(nargo, ['compile', ...nargoArgs]);
|
|
152
|
+
|
|
153
|
+
// Ensure contract crates contain no tests (tests belong in the test crate).
|
|
154
|
+
await checkNoTestsInContracts(nargo, log);
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
// Postprocess any untranspiled artifacts: those just produced by nargo above, and any left behind by a bare
|
|
158
|
+
// `nargo compile` run outside `aztec compile`.
|
|
159
|
+
const unprocessed = (await collectContractArtifacts()).filter(a => !a.transpiled).map(a => a.filePath);
|
|
160
|
+
|
|
161
|
+
if (unprocessed.length > 0) {
|
|
162
|
+
log('Postprocessing contracts...');
|
|
163
|
+
const bbArgs = unprocessed.flatMap(a => ['-i', a]);
|
|
164
|
+
await run(bb, ['aztec_process', ...bbArgs]);
|
|
165
|
+
|
|
166
|
+
await stampAztecVersion(unprocessed);
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
if (shouldRecompile || unprocessed.length > 0) {
|
|
170
|
+
log('Compilation complete!');
|
|
171
|
+
} else {
|
|
172
|
+
log('No source changes detected, skipping compilation.');
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
export function injectCompileCommand(program: Command, log: LogFn): Command {
|
|
177
|
+
program
|
|
178
|
+
.command('compile')
|
|
179
|
+
.argument('[nargo-args...]')
|
|
180
|
+
.passThroughOptions()
|
|
181
|
+
.allowUnknownOption()
|
|
182
|
+
.description(
|
|
183
|
+
'Compile Aztec Noir contracts using nargo and postprocess them to generate transpiled artifacts and verification keys. All options are forwarded to nargo compile.',
|
|
184
|
+
)
|
|
185
|
+
.addHelpText('after', () => {
|
|
186
|
+
// Show nargo's own compile options so users see all available flags in one place.
|
|
187
|
+
const nargo = process.env.NARGO ?? 'nargo';
|
|
188
|
+
try {
|
|
189
|
+
const output = execFileSync(nargo, ['compile', '--help'], { encoding: 'utf-8' });
|
|
190
|
+
return `\nUnderlying nargo compile options:\n\n${output}`;
|
|
191
|
+
} catch {
|
|
192
|
+
return '\n(Run "nargo compile --help" to see available nargo options)';
|
|
193
|
+
}
|
|
194
|
+
})
|
|
195
|
+
.action((nargoArgs: string[]) => compileAztecContract(nargoArgs, log));
|
|
196
|
+
|
|
197
|
+
return program;
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
interface ContractArtifactInfo {
|
|
201
|
+
/** Path to the artifact JSON in the target directory. */
|
|
202
|
+
filePath: string;
|
|
203
|
+
/** Whether the artifact has already been transpiled and had its verification keys generated. */
|
|
204
|
+
transpiled: boolean;
|
|
205
|
+
}
|
|
@@ -0,0 +1,26 @@
|
|
|
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
|
+
.option('--json', 'Output gate counts as JSON instead of a table', false)
|
|
15
|
+
.description('Display gate counts for all compiled Aztec artifacts in a target directory.')
|
|
16
|
+
.action((targetDir: string, options: { json: boolean }) => profileGates(targetDir, options.json, log));
|
|
17
|
+
|
|
18
|
+
profile
|
|
19
|
+
.command('flamegraph')
|
|
20
|
+
.argument('<contract-artifact>', 'Path to the compiled contract artifact JSON')
|
|
21
|
+
.argument('<function>', 'Name of the contract function to profile')
|
|
22
|
+
.description('Generate a gate count flamegraph SVG for a contract function.')
|
|
23
|
+
.action((artifactPath: string, functionName: string) => profileFlamegraph(artifactPath, functionName, log));
|
|
24
|
+
|
|
25
|
+
return program;
|
|
26
|
+
}
|
|
@@ -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,84 @@
|
|
|
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 { type DiscoveredArtifact, MAX_CONCURRENT, discoverArtifacts } from './profile_utils.js';
|
|
10
|
+
|
|
11
|
+
const execFile = promisify(execFileCb);
|
|
12
|
+
|
|
13
|
+
interface GateCountResult {
|
|
14
|
+
name: string;
|
|
15
|
+
type: DiscoveredArtifact['type'];
|
|
16
|
+
gateCount: number;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
/** Parses circuit_size from bb gates JSON output: { "functions": [{ "circuit_size": N }] } */
|
|
20
|
+
function parseGateCount(stdout: string): number {
|
|
21
|
+
const parsed = JSON.parse(stdout);
|
|
22
|
+
const size = parsed?.functions?.[0]?.circuit_size;
|
|
23
|
+
if (typeof size !== 'number') {
|
|
24
|
+
throw new Error('Failed to parse circuit_size from bb gates output');
|
|
25
|
+
}
|
|
26
|
+
return size;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/** Runs bb gates on a single artifact file and returns the gate count. */
|
|
30
|
+
async function getGateCount(bb: string, artifactPath: string): Promise<number> {
|
|
31
|
+
const { stdout } = await execFile(bb, ['gates', '--scheme', 'chonk', '-b', artifactPath]);
|
|
32
|
+
return parseGateCount(stdout);
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
/** Profiles all compiled artifacts in a target directory and prints gate counts. */
|
|
36
|
+
export async function profileGates(targetDir: string, json: boolean, log: LogFn): Promise<void> {
|
|
37
|
+
const bb = process.env.BB ?? findBbBinary() ?? 'bb';
|
|
38
|
+
const { artifacts, tmpDir } = await discoverArtifacts(targetDir);
|
|
39
|
+
|
|
40
|
+
if (artifacts.length === 0) {
|
|
41
|
+
if (json) {
|
|
42
|
+
log('[]');
|
|
43
|
+
} else {
|
|
44
|
+
log('No artifacts found in target directory.');
|
|
45
|
+
}
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
try {
|
|
50
|
+
const results: GateCountResult[] = await asyncPool(MAX_CONCURRENT, artifacts, async artifact => ({
|
|
51
|
+
name: artifact.name,
|
|
52
|
+
type: artifact.type,
|
|
53
|
+
gateCount: await getGateCount(bb, artifact.filePath),
|
|
54
|
+
}));
|
|
55
|
+
results.sort((a, b) => a.name.localeCompare(b.name));
|
|
56
|
+
|
|
57
|
+
if (results.length === 0) {
|
|
58
|
+
if (json) {
|
|
59
|
+
log('[]');
|
|
60
|
+
} else {
|
|
61
|
+
log('No constrained circuits found.');
|
|
62
|
+
}
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
if (json) {
|
|
67
|
+
const entries = results.map(r => ({ name: r.name, type: r.type, gates: r.gateCount }));
|
|
68
|
+
log(JSON.stringify(entries, null, 2));
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
const maxNameLen = Math.max(...results.map(r => r.name.length));
|
|
73
|
+
log('');
|
|
74
|
+
log('Gate counts:');
|
|
75
|
+
log('-'.repeat(maxNameLen + 16));
|
|
76
|
+
for (const { name, gateCount } of results) {
|
|
77
|
+
log(`${name.padEnd(maxNameLen)} ${gateCount.toLocaleString().padStart(12)}`);
|
|
78
|
+
}
|
|
79
|
+
log('-'.repeat(maxNameLen + 16));
|
|
80
|
+
log(`Total: ${results.length} circuit(s)`);
|
|
81
|
+
} finally {
|
|
82
|
+
await rm(tmpDir, { recursive: true, force: true });
|
|
83
|
+
}
|
|
84
|
+
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import { mkdtemp, writeFile } from 'fs/promises';
|
|
2
|
+
import { tmpdir } from 'os';
|
|
3
|
+
import { join } from 'path';
|
|
4
|
+
|
|
5
|
+
import type { CompiledArtifact, ContractFunction } from './utils/artifacts.js';
|
|
6
|
+
import { readArtifactFiles } from './utils/artifacts.js';
|
|
7
|
+
|
|
8
|
+
export const MAX_CONCURRENT = 4;
|
|
9
|
+
|
|
10
|
+
export interface DiscoveredArtifact {
|
|
11
|
+
name: string;
|
|
12
|
+
filePath: string;
|
|
13
|
+
type: 'contract-function' | 'program';
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Reads a target directory and returns a list of discovered artifacts with temp files
|
|
18
|
+
* created for contract functions. Caller must clean up tmpDir when done.
|
|
19
|
+
*/
|
|
20
|
+
export async function discoverArtifacts(
|
|
21
|
+
targetDir: string,
|
|
22
|
+
): Promise<{ artifacts: DiscoveredArtifact[]; tmpDir: string }> {
|
|
23
|
+
const files = await readArtifactFiles(targetDir);
|
|
24
|
+
const tmpDir = await mkdtemp(join(tmpdir(), 'aztec-profile-'));
|
|
25
|
+
const artifacts: DiscoveredArtifact[] = [];
|
|
26
|
+
|
|
27
|
+
for (const file of files) {
|
|
28
|
+
if (Array.isArray(file.content.functions)) {
|
|
29
|
+
for (const func of file.content.functions) {
|
|
30
|
+
if (!func.bytecode || func.is_unconstrained) {
|
|
31
|
+
continue;
|
|
32
|
+
}
|
|
33
|
+
const name = `${file.name}::${func.name}`;
|
|
34
|
+
const tmpPath = join(tmpDir, `${file.name}-${func.name}.json`);
|
|
35
|
+
await writeFile(tmpPath, makeFunctionArtifact(file.content, func));
|
|
36
|
+
artifacts.push({ name, filePath: tmpPath, type: 'contract-function' });
|
|
37
|
+
}
|
|
38
|
+
} else if (file.content.bytecode) {
|
|
39
|
+
artifacts.push({ name: file.name, filePath: file.filePath, type: 'program' });
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
return { artifacts, tmpDir };
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/** Extracts a contract function as a standalone program artifact JSON string. */
|
|
47
|
+
export function makeFunctionArtifact(artifact: CompiledArtifact, func: ContractFunction) {
|
|
48
|
+
/* eslint-disable camelcase */
|
|
49
|
+
return JSON.stringify({
|
|
50
|
+
noir_version: artifact.noir_version,
|
|
51
|
+
hash: 0,
|
|
52
|
+
abi: func.abi,
|
|
53
|
+
bytecode: func.bytecode,
|
|
54
|
+
debug_symbols: func.debug_symbols,
|
|
55
|
+
file_map: artifact.file_map,
|
|
56
|
+
});
|
|
57
|
+
/* eslint-enable camelcase */
|
|
58
|
+
}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { jsonStringify } from '@aztec/foundation/json-rpc';
|
|
2
|
+
import type { LogFn } from '@aztec/foundation/log';
|
|
3
|
+
import { createProverNodeAdminClient } from '@aztec/stdlib/interfaces/server';
|
|
4
|
+
|
|
5
|
+
import { type Command, InvalidArgumentError } from 'commander';
|
|
6
|
+
|
|
7
|
+
function parseEpoch(value: string): number {
|
|
8
|
+
const parsed = Number(value);
|
|
9
|
+
if (!Number.isInteger(parsed) || parsed < 0) {
|
|
10
|
+
throw new InvalidArgumentError('Epoch must be a non-negative integer.');
|
|
11
|
+
}
|
|
12
|
+
return parsed;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export function injectProverCommand(program: Command, log: LogFn): Command {
|
|
16
|
+
const proverCommand = program.command('prover').description('Operate a prover node via its admin JSON-RPC endpoint');
|
|
17
|
+
|
|
18
|
+
proverCommand
|
|
19
|
+
.command('start-proof')
|
|
20
|
+
.description('Schedules proving for the given epoch')
|
|
21
|
+
.requiredOption('--epoch <n>', 'Epoch number to prove', parseEpoch)
|
|
22
|
+
.requiredOption('--admin-url <url>', 'URL of the prover node admin JSON-RPC endpoint')
|
|
23
|
+
.option('--api-key <key>', 'Admin API key', process.env.AZTEC_ADMIN_API_KEY)
|
|
24
|
+
.action(async options => {
|
|
25
|
+
const client = createProverNodeAdminClient(options.adminUrl, {}, undefined, options.apiKey);
|
|
26
|
+
const jobId = await client.startProof(options.epoch);
|
|
27
|
+
log(`Started proving job ${jobId} for epoch ${options.epoch}`);
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
proverCommand
|
|
31
|
+
.command('get-jobs')
|
|
32
|
+
.description('Lists the prover node proving jobs')
|
|
33
|
+
.requiredOption('--admin-url <url>', 'URL of the prover node admin JSON-RPC endpoint')
|
|
34
|
+
.option('--api-key <key>', 'Admin API key', process.env.AZTEC_ADMIN_API_KEY)
|
|
35
|
+
.action(async options => {
|
|
36
|
+
const client = createProverNodeAdminClient(options.adminUrl, {}, undefined, options.apiKey);
|
|
37
|
+
const jobs = await client.getJobs();
|
|
38
|
+
log(jsonStringify(jobs, true));
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
return program;
|
|
42
|
+
}
|