@aztec/aztec 0.0.1-commit.a89ec08 → 0.0.1-commit.aa0c64f
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/bin/index.js +3 -1
- package/dest/cli/aztec_start_action.d.ts +1 -1
- package/dest/cli/aztec_start_action.d.ts.map +1 -1
- package/dest/cli/aztec_start_action.js +16 -34
- package/dest/cli/aztec_start_options.d.ts +2 -2
- package/dest/cli/aztec_start_options.d.ts.map +1 -1
- package/dest/cli/aztec_start_options.js +9 -16
- package/dest/cli/cmds/compile.d.ts +1 -1
- package/dest/cli/cmds/compile.d.ts.map +1 -1
- package/dest/cli/cmds/compile.js +30 -24
- package/dest/cli/cmds/profile.d.ts +1 -1
- package/dest/cli/cmds/profile.d.ts.map +1 -1
- package/dest/cli/cmds/profile.js +1 -1
- package/dest/cli/cmds/profile_gates.d.ts +2 -2
- package/dest/cli/cmds/profile_gates.d.ts.map +1 -1
- package/dest/cli/cmds/profile_gates.js +21 -3
- package/dest/cli/cmds/prover.d.ts +4 -0
- package/dest/cli/cmds/prover.d.ts.map +1 -0
- package/dest/cli/cmds/prover.js +24 -0
- package/dest/cli/cmds/standby.d.ts +30 -6
- package/dest/cli/cmds/standby.d.ts.map +1 -1
- package/dest/cli/cmds/standby.js +48 -5
- package/dest/cli/cmds/start_bot.d.ts +1 -1
- package/dest/cli/cmds/start_bot.d.ts.map +1 -1
- package/dest/cli/cmds/start_bot.js +8 -4
- package/dest/cli/cmds/start_node.d.ts +1 -1
- package/dest/cli/cmds/start_node.d.ts.map +1 -1
- package/dest/cli/cmds/start_node.js +19 -32
- package/dest/cli/cmds/start_prover_agent.js +2 -2
- package/dest/cli/cmds/start_prover_broker.d.ts +1 -1
- package/dest/cli/cmds/start_prover_broker.d.ts.map +1 -1
- package/dest/cli/cmds/start_prover_broker.js +11 -8
- package/dest/cli/cmds/start_txe.d.ts +2 -2
- package/dest/cli/cmds/start_txe.d.ts.map +1 -1
- package/dest/cli/cmds/start_txe.js +6 -5
- package/dest/cli/cmds/utils/artifacts.d.ts +6 -1
- package/dest/cli/cmds/utils/artifacts.d.ts.map +1 -1
- package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts +2 -2
- package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts.map +1 -1
- package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.js +35 -15
- package/dest/cli/util.d.ts +10 -5
- package/dest/cli/util.d.ts.map +1 -1
- package/dest/cli/util.js +29 -56
- package/dest/examples/token.js +3 -3
- package/dest/local-network/auth_registry.d.ts +5 -0
- package/dest/local-network/auth_registry.d.ts.map +1 -0
- package/dest/local-network/auth_registry.js +17 -0
- package/dest/local-network/banana_fpc.d.ts +3 -2
- package/dest/local-network/banana_fpc.d.ts.map +1 -1
- package/dest/local-network/banana_fpc.js +11 -7
- package/dest/local-network/local-network.d.ts +10 -32
- package/dest/local-network/local-network.d.ts.map +1 -1
- package/dest/local-network/local-network.js +52 -73
- package/dest/testing/cheat_codes.d.ts +16 -18
- package/dest/testing/cheat_codes.d.ts.map +1 -1
- package/dest/testing/cheat_codes.js +17 -45
- package/dest/testing/epoch_test_settler.d.ts +2 -2
- package/dest/testing/epoch_test_settler.d.ts.map +1 -1
- package/dest/testing/epoch_test_settler.js +6 -25
- package/dest/testing/index.d.ts +2 -2
- package/dest/testing/index.d.ts.map +1 -1
- package/dest/testing/index.js +1 -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 +9 -4
- package/dest/testing/token_allowed_setup.d.ts.map +1 -1
- package/dest/testing/token_allowed_setup.js +12 -8
- package/package.json +34 -34
- package/scripts/add_crate.sh +11 -60
- package/scripts/aztec.sh +7 -4
- package/scripts/init.sh +5 -5
- package/scripts/new.sh +2 -2
- package/scripts/setup_workspace.sh +3 -2
- package/scripts/templates/blank/contract/Nargo.toml +6 -0
- package/scripts/templates/blank/contract/src/main.nr +10 -0
- package/scripts/templates/blank/test/Nargo.toml +7 -0
- package/scripts/templates/blank/test/src/lib.nr +11 -0
- package/scripts/templates/counter/contract/Nargo.toml +7 -0
- package/scripts/templates/counter/contract/src/main.nr +48 -0
- package/scripts/templates/counter/test/Nargo.toml +7 -0
- package/scripts/templates/counter/test/src/lib.nr +32 -0
- package/src/bin/index.ts +3 -1
- package/src/cli/aztec_start_action.ts +14 -21
- package/src/cli/aztec_start_options.ts +16 -24
- package/src/cli/cmds/compile.ts +35 -24
- package/src/cli/cmds/profile.ts +2 -1
- package/src/cli/cmds/profile_gates.ts +20 -4
- package/src/cli/cmds/prover.ts +42 -0
- package/src/cli/cmds/standby.ts +59 -7
- package/src/cli/cmds/start_bot.ts +9 -6
- package/src/cli/cmds/start_node.ts +22 -32
- package/src/cli/cmds/start_prover_agent.ts +2 -2
- package/src/cli/cmds/start_prover_broker.ts +10 -11
- package/src/cli/cmds/start_txe.ts +7 -5
- package/src/cli/cmds/utils/artifacts.ts +5 -0
- package/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts +37 -15
- package/src/cli/util.ts +29 -70
- package/src/examples/token.ts +11 -3
- package/src/local-network/auth_registry.ts +19 -0
- package/src/local-network/banana_fpc.ts +12 -8
- package/src/local-network/local-network.ts +61 -83
- package/src/testing/cheat_codes.ts +17 -54
- package/src/testing/epoch_test_settler.ts +8 -31
- package/src/testing/index.ts +1 -1
- package/src/testing/local-network.ts +97 -0
- package/src/testing/token_allowed_setup.ts +15 -8
- package/dest/cli/cmds/start_archiver.d.ts +0 -9
- package/dest/cli/cmds/start_archiver.d.ts.map +0 -1
- package/dest/cli/cmds/start_archiver.js +0 -48
- package/dest/testing/anvil_test_watcher.d.ts +0 -42
- package/dest/testing/anvil_test_watcher.d.ts.map +0 -1
- package/dest/testing/anvil_test_watcher.js +0 -207
- package/src/cli/cmds/start_archiver.ts +0 -50
- package/src/testing/anvil_test_watcher.ts +0 -233
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { registerAztecNodeRpcHandlers } from '@aztec/aztec-node';
|
|
1
2
|
import { getActiveNetworkName } from '@aztec/foundation/config';
|
|
2
3
|
import {
|
|
3
4
|
type NamespacedApiHandlers,
|
|
@@ -7,10 +8,9 @@ import {
|
|
|
7
8
|
} from '@aztec/foundation/json-rpc/server';
|
|
8
9
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
9
10
|
import type { ChainConfig } from '@aztec/stdlib/config';
|
|
10
|
-
import { AztecNodeAdminApiSchema, AztecNodeApiSchema, AztecNodeDebugApiSchema } from '@aztec/stdlib/interfaces/client';
|
|
11
11
|
import { getPackageVersion } from '@aztec/stdlib/update-checker';
|
|
12
12
|
import { getVersioningMiddleware } from '@aztec/stdlib/versioning';
|
|
13
|
-
import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
|
|
13
|
+
import { getOtelJsonRpcDiagnosticsMiddleware, getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
|
|
14
14
|
|
|
15
15
|
import { createLocalNetwork } from '../local-network/index.js';
|
|
16
16
|
import { github, splash } from '../splash.js';
|
|
@@ -27,31 +27,22 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
|
|
|
27
27
|
let config: ChainConfig | undefined = undefined;
|
|
28
28
|
|
|
29
29
|
if (options.localNetwork) {
|
|
30
|
-
const localNetwork = extractNamespacedOptions(options, '
|
|
31
|
-
localNetwork.testAccounts = true;
|
|
30
|
+
const localNetwork = extractNamespacedOptions(options, 'localNetwork');
|
|
32
31
|
userLog(`${splash}\n${github}\n\n`);
|
|
33
|
-
userLog(`Setting up Aztec local network ${packageVersion
|
|
32
|
+
userLog(`Setting up Aztec local network ${packageVersion}, please stand by...`);
|
|
34
33
|
|
|
35
34
|
const { node, stop } = await createLocalNetwork(
|
|
36
35
|
{
|
|
37
36
|
l1Mnemonic: localNetwork.l1Mnemonic,
|
|
38
37
|
l1RpcUrls: options.l1RpcUrls,
|
|
39
38
|
testAccounts: localNetwork.testAccounts,
|
|
40
|
-
realProofs: false,
|
|
41
|
-
// Setting the epoch duration to 2 by default for local network. This allows the epoch to be "proven" faster, so
|
|
42
|
-
// the users can consume out hash without having to wait for a long time.
|
|
43
|
-
// Note: We are not proving anything in the local network (realProofs == false). But in `createLocalNetwork`,
|
|
44
|
-
// the EpochTestSettler will set the out hash to the outbox when an epoch is complete.
|
|
45
|
-
aztecEpochDuration: 2,
|
|
46
39
|
},
|
|
47
40
|
userLog,
|
|
48
41
|
);
|
|
49
42
|
|
|
50
43
|
// Start Node and PXE JSON-RPC server
|
|
51
44
|
signalHandlers.push(stop);
|
|
52
|
-
|
|
53
|
-
adminServices.node = [node, AztecNodeAdminApiSchema];
|
|
54
|
-
services.nodeDebug = [node, AztecNodeDebugApiSchema];
|
|
45
|
+
registerAztecNodeRpcHandlers(node, services, adminServices, { debug: true });
|
|
55
46
|
} else {
|
|
56
47
|
// Route --prover-node through startNode
|
|
57
48
|
if (options.proverNode && !options.node) {
|
|
@@ -62,15 +53,9 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
|
|
|
62
53
|
const { startNode } = await import('./cmds/start_node.js');
|
|
63
54
|
const networkName = getActiveNetworkName(options.network);
|
|
64
55
|
({ config } = await startNode(options, signalHandlers, services, adminServices, userLog, networkName));
|
|
65
|
-
if (options.nodeDebug && services.node) {
|
|
66
|
-
services.nodeDebug = [services.node[0], AztecNodeDebugApiSchema];
|
|
67
|
-
}
|
|
68
56
|
} else if (options.bot) {
|
|
69
57
|
const { startBot } = await import('./cmds/start_bot.js');
|
|
70
58
|
await startBot(options, signalHandlers, services, userLog);
|
|
71
|
-
} else if (options.archiver) {
|
|
72
|
-
const { startArchiver } = await import('./cmds/start_archiver.js');
|
|
73
|
-
({ config } = await startArchiver(options, signalHandlers, services));
|
|
74
59
|
} else if (options.p2pBootstrap) {
|
|
75
60
|
const { startP2PBootstrap } = await import('./cmds/start_p2p_bootstrap.js');
|
|
76
61
|
({ config } = await startP2PBootstrap(options, signalHandlers, services, userLog));
|
|
@@ -82,7 +67,7 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
|
|
|
82
67
|
await startProverBroker(options, signalHandlers, services, userLog);
|
|
83
68
|
} else if (options.txe) {
|
|
84
69
|
const { startTXE } = await import('./cmds/start_txe.js');
|
|
85
|
-
await startTXE(options, debugLogger);
|
|
70
|
+
await startTXE(options, signalHandlers, debugLogger);
|
|
86
71
|
} else if (options.sequencer) {
|
|
87
72
|
userLog(`Cannot run a standalone sequencer without a node`);
|
|
88
73
|
process.exit(1);
|
|
@@ -98,7 +83,14 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
|
|
|
98
83
|
|
|
99
84
|
// Start the main JSON-RPC server
|
|
100
85
|
if (Object.entries(services).length > 0) {
|
|
86
|
+
if (services.aztec) {
|
|
87
|
+
const { BarretenbergSync } = await import('@aztec/bb.js');
|
|
88
|
+
// JSON-RPC schema parsing may decompress compressed Chonk proofs before the node handler runs.
|
|
89
|
+
await BarretenbergSync.initSingleton();
|
|
90
|
+
}
|
|
91
|
+
|
|
101
92
|
const rpcServer = createNamespacedSafeJsonRpcServer(services, {
|
|
93
|
+
diagnostic: getOtelJsonRpcDiagnosticsMiddleware(),
|
|
102
94
|
http200OnError: false,
|
|
103
95
|
log: debugLogger,
|
|
104
96
|
middlewares: [getOtelJsonRpcPropagationMiddleware(), getVersioningMiddleware(versions, versioningOpts)],
|
|
@@ -130,6 +122,7 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
|
|
|
130
122
|
}
|
|
131
123
|
|
|
132
124
|
const rpcServer = createNamespacedSafeJsonRpcServer(adminServices, {
|
|
125
|
+
diagnostic: getOtelJsonRpcDiagnosticsMiddleware(),
|
|
133
126
|
http200OnError: false,
|
|
134
127
|
log: debugLogger,
|
|
135
128
|
middlewares: adminMiddlewares,
|
|
@@ -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,7 +109,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
105
109
|
env: 'NETWORK',
|
|
106
110
|
},
|
|
107
111
|
|
|
108
|
-
configToFlag('--enable-
|
|
112
|
+
configToFlag('--enable-auto-shutdown', sharedNodeConfigMappings.enableAutoShutdown),
|
|
109
113
|
|
|
110
114
|
configToFlag('--sync-mode', sharedNodeConfigMappings.syncMode),
|
|
111
115
|
configToFlag('--snapshots-urls', sharedNodeConfigMappings.snapshotsUrls),
|
|
@@ -125,6 +129,12 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
125
129
|
defaultValue: DefaultMnemonic,
|
|
126
130
|
env: 'MNEMONIC',
|
|
127
131
|
},
|
|
132
|
+
{
|
|
133
|
+
flag: '--local-network.testAccounts',
|
|
134
|
+
description: 'Deploy test accounts on local network start',
|
|
135
|
+
env: 'TEST_ACCOUNTS',
|
|
136
|
+
...booleanConfigHelper(true),
|
|
137
|
+
},
|
|
128
138
|
],
|
|
129
139
|
API: [
|
|
130
140
|
{
|
|
@@ -212,12 +222,6 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
212
222
|
},
|
|
213
223
|
],
|
|
214
224
|
ARCHIVER: [
|
|
215
|
-
{
|
|
216
|
-
flag: '--archiver',
|
|
217
|
-
description: 'Starts Aztec Archiver with options',
|
|
218
|
-
defaultValue: undefined,
|
|
219
|
-
env: undefined,
|
|
220
|
-
},
|
|
221
225
|
...getOptions(
|
|
222
226
|
'archiver',
|
|
223
227
|
omitConfigMappings(archiverConfigMappings, Object.keys(l1ContractsConfigMappings) as (keyof ArchiverConfig)[]),
|
|
@@ -264,11 +268,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
264
268
|
defaultValue: undefined,
|
|
265
269
|
env: undefined,
|
|
266
270
|
},
|
|
267
|
-
...getOptions(
|
|
268
|
-
'proverBroker',
|
|
269
|
-
// filter out archiver options from prover node options as they're passed separately in --archiver
|
|
270
|
-
proverBrokerConfigMappings,
|
|
271
|
-
),
|
|
271
|
+
...getOptions('proverBroker', proverBrokerConfigMappings),
|
|
272
272
|
],
|
|
273
273
|
'PROVER AGENT': [
|
|
274
274
|
{
|
|
@@ -316,15 +316,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
|
|
|
316
316
|
},
|
|
317
317
|
...getOptions('bot', botConfigMappings),
|
|
318
318
|
],
|
|
319
|
-
PXE: [
|
|
320
|
-
{
|
|
321
|
-
flag: '--pxe',
|
|
322
|
-
description: 'Starts Aztec PXE with options',
|
|
323
|
-
defaultValue: undefined,
|
|
324
|
-
env: undefined,
|
|
325
|
-
},
|
|
326
|
-
...getOptions('pxe', allPxeConfigMappings),
|
|
327
|
-
],
|
|
319
|
+
PXE: [...getOptions('pxe', allPxeConfigMappings)],
|
|
328
320
|
TXE: [
|
|
329
321
|
{
|
|
330
322
|
flag: '--txe',
|
package/src/cli/cmds/compile.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { findBbBinary } from '@aztec/bb.js';
|
|
2
2
|
import type { LogFn } from '@aztec/foundation/log';
|
|
3
|
+
import { getPackageVersion } from '@aztec/stdlib/update-checker';
|
|
3
4
|
|
|
4
5
|
import { execFileSync } from 'child_process';
|
|
5
6
|
import type { Command } from 'commander';
|
|
@@ -11,8 +12,8 @@ import { needsRecompile } from './utils/needs_recompile.js';
|
|
|
11
12
|
import { run } from './utils/spawn.js';
|
|
12
13
|
import { warnIfAztecVersionMismatch } from './utils/warn_if_aztec_version_mismatch.js';
|
|
13
14
|
|
|
14
|
-
/** Returns
|
|
15
|
-
async function collectContractArtifacts(): Promise<
|
|
15
|
+
/** Returns contract artifacts in the target directory along with whether each has already been postprocessed. */
|
|
16
|
+
async function collectContractArtifacts(): Promise<ContractArtifactInfo[]> {
|
|
16
17
|
let files;
|
|
17
18
|
try {
|
|
18
19
|
files = await readArtifactFiles('target');
|
|
@@ -22,18 +23,18 @@ async function collectContractArtifacts(): Promise<string[]> {
|
|
|
22
23
|
}
|
|
23
24
|
throw err;
|
|
24
25
|
}
|
|
25
|
-
return files
|
|
26
|
+
return files
|
|
27
|
+
.filter(f => Array.isArray(f.content.functions))
|
|
28
|
+
.map(f => ({ filePath: f.filePath, transpiled: f.content.transpiled === true }));
|
|
26
29
|
}
|
|
27
30
|
|
|
28
|
-
/**
|
|
29
|
-
async function
|
|
31
|
+
/** Stamps the Aztec stack version into the contract artifacts. */
|
|
32
|
+
async function stampAztecVersion(artifactPaths: string[]): Promise<void> {
|
|
33
|
+
const version = getPackageVersion();
|
|
30
34
|
for (const path of artifactPaths) {
|
|
31
35
|
const artifact = JSON.parse(await readFile(path, 'utf-8'));
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
fn.name = fn.name.replace(/^__aztec_nr_internals__/, '');
|
|
35
|
-
}
|
|
36
|
-
}
|
|
36
|
+
// eslint-disable-next-line camelcase
|
|
37
|
+
artifact.aztec_version = version;
|
|
37
38
|
await writeFile(path, JSON.stringify(artifact, null, 2) + '\n');
|
|
38
39
|
}
|
|
39
40
|
}
|
|
@@ -142,31 +143,34 @@ async function checkNoTestsInContracts(nargo: string, log: LogFn): Promise<void>
|
|
|
142
143
|
async function compileAztecContract(nargoArgs: string[], log: LogFn): Promise<void> {
|
|
143
144
|
await warnIfAztecVersionMismatch(log);
|
|
144
145
|
|
|
145
|
-
if (!(await needsRecompile())) {
|
|
146
|
-
log('No source changes detected, skipping compilation.');
|
|
147
|
-
return;
|
|
148
|
-
}
|
|
149
|
-
|
|
150
146
|
const nargo = process.env.NARGO ?? 'nargo';
|
|
151
147
|
const bb = process.env.BB ?? findBbBinary() ?? 'bb';
|
|
152
148
|
|
|
153
|
-
await
|
|
149
|
+
const shouldRecompile = await needsRecompile();
|
|
150
|
+
if (shouldRecompile) {
|
|
151
|
+
await run(nargo, ['compile', ...nargoArgs]);
|
|
154
152
|
|
|
155
|
-
|
|
156
|
-
|
|
153
|
+
// Ensure contract crates contain no tests (tests belong in the test crate).
|
|
154
|
+
await checkNoTestsInContracts(nargo, log);
|
|
155
|
+
}
|
|
157
156
|
|
|
158
|
-
|
|
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);
|
|
159
160
|
|
|
160
|
-
if (
|
|
161
|
+
if (unprocessed.length > 0) {
|
|
161
162
|
log('Postprocessing contracts...');
|
|
162
|
-
const bbArgs =
|
|
163
|
+
const bbArgs = unprocessed.flatMap(a => ['-i', a]);
|
|
163
164
|
await run(bb, ['aztec_process', ...bbArgs]);
|
|
164
165
|
|
|
165
|
-
|
|
166
|
-
await stripInternalPrefixes(artifacts);
|
|
166
|
+
await stampAztecVersion(unprocessed);
|
|
167
167
|
}
|
|
168
168
|
|
|
169
|
-
|
|
169
|
+
if (shouldRecompile || unprocessed.length > 0) {
|
|
170
|
+
log('Compilation complete!');
|
|
171
|
+
} else {
|
|
172
|
+
log('No source changes detected, skipping compilation.');
|
|
173
|
+
}
|
|
170
174
|
}
|
|
171
175
|
|
|
172
176
|
export function injectCompileCommand(program: Command, log: LogFn): Command {
|
|
@@ -192,3 +196,10 @@ export function injectCompileCommand(program: Command, log: LogFn): Command {
|
|
|
192
196
|
|
|
193
197
|
return program;
|
|
194
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
|
+
}
|
package/src/cli/cmds/profile.ts
CHANGED
|
@@ -11,8 +11,9 @@ export function injectProfileCommand(program: Command, log: LogFn): Command {
|
|
|
11
11
|
profile
|
|
12
12
|
.command('gates')
|
|
13
13
|
.argument('[target-dir]', 'Path to the compiled artifacts directory', './target')
|
|
14
|
+
.option('--json', 'Output gate counts as JSON instead of a table', false)
|
|
14
15
|
.description('Display gate counts for all compiled Aztec artifacts in a target directory.')
|
|
15
|
-
.action((targetDir: string) => profileGates(targetDir, log));
|
|
16
|
+
.action((targetDir: string, options: { json: boolean }) => profileGates(targetDir, options.json, log));
|
|
16
17
|
|
|
17
18
|
profile
|
|
18
19
|
.command('flamegraph')
|
|
@@ -6,12 +6,13 @@ import { execFile as execFileCb } from 'child_process';
|
|
|
6
6
|
import { rm } from 'fs/promises';
|
|
7
7
|
import { promisify } from 'util';
|
|
8
8
|
|
|
9
|
-
import { MAX_CONCURRENT, discoverArtifacts } from './profile_utils.js';
|
|
9
|
+
import { type DiscoveredArtifact, MAX_CONCURRENT, discoverArtifacts } from './profile_utils.js';
|
|
10
10
|
|
|
11
11
|
const execFile = promisify(execFileCb);
|
|
12
12
|
|
|
13
13
|
interface GateCountResult {
|
|
14
14
|
name: string;
|
|
15
|
+
type: DiscoveredArtifact['type'];
|
|
15
16
|
gateCount: number;
|
|
16
17
|
}
|
|
17
18
|
|
|
@@ -32,24 +33,39 @@ async function getGateCount(bb: string, artifactPath: string): Promise<number> {
|
|
|
32
33
|
}
|
|
33
34
|
|
|
34
35
|
/** Profiles all compiled artifacts in a target directory and prints gate counts. */
|
|
35
|
-
export async function profileGates(targetDir: string, log: LogFn): Promise<void> {
|
|
36
|
+
export async function profileGates(targetDir: string, json: boolean, log: LogFn): Promise<void> {
|
|
36
37
|
const bb = process.env.BB ?? findBbBinary() ?? 'bb';
|
|
37
38
|
const { artifacts, tmpDir } = await discoverArtifacts(targetDir);
|
|
38
39
|
|
|
39
40
|
if (artifacts.length === 0) {
|
|
40
|
-
|
|
41
|
+
if (json) {
|
|
42
|
+
log('[]');
|
|
43
|
+
} else {
|
|
44
|
+
log('No artifacts found in target directory.');
|
|
45
|
+
}
|
|
41
46
|
return;
|
|
42
47
|
}
|
|
43
48
|
|
|
44
49
|
try {
|
|
45
50
|
const results: GateCountResult[] = await asyncPool(MAX_CONCURRENT, artifacts, async artifact => ({
|
|
46
51
|
name: artifact.name,
|
|
52
|
+
type: artifact.type,
|
|
47
53
|
gateCount: await getGateCount(bb, artifact.filePath),
|
|
48
54
|
}));
|
|
49
55
|
results.sort((a, b) => a.name.localeCompare(b.name));
|
|
50
56
|
|
|
51
57
|
if (results.length === 0) {
|
|
52
|
-
|
|
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));
|
|
53
69
|
return;
|
|
54
70
|
}
|
|
55
71
|
|
|
@@ -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
|
+
}
|
package/src/cli/cmds/standby.ts
CHANGED
|
@@ -6,13 +6,16 @@ import type { GenesisStateConfig } from '@aztec/ethereum/config';
|
|
|
6
6
|
import { RegistryContract, RollupContract } from '@aztec/ethereum/contracts';
|
|
7
7
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
8
8
|
import { startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
|
|
9
|
-
import type
|
|
9
|
+
import { type LogFn, createLogger } from '@aztec/foundation/log';
|
|
10
10
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
11
11
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
12
|
+
import type { VersionCheck } from '@aztec/stdlib/update-checker';
|
|
12
13
|
import { getGenesisValues } from '@aztec/world-state/testing';
|
|
13
14
|
|
|
14
15
|
import Koa from 'koa';
|
|
15
16
|
|
|
17
|
+
import { isShuttingDown, softShutdown } from '../util.js';
|
|
18
|
+
|
|
16
19
|
const ROLLUP_POLL_INTERVAL_S = 60;
|
|
17
20
|
|
|
18
21
|
/**
|
|
@@ -23,19 +26,24 @@ const ROLLUP_POLL_INTERVAL_S = 60;
|
|
|
23
26
|
export async function computeExpectedGenesisRoot(config: GenesisStateConfig, userLog: LogFn) {
|
|
24
27
|
const testAccounts = config.testAccounts ? (await getInitialTestAccountsData()).map(a => a.address) : [];
|
|
25
28
|
const sponsoredFPCAccounts = config.sponsoredFPC ? [await getSponsoredFPCAddress()] : [];
|
|
26
|
-
const prefundAddresses = (config.prefundAddresses ?? []).map(a => AztecAddress.
|
|
29
|
+
const prefundAddresses = (config.prefundAddresses ?? []).map(a => AztecAddress.fromStringUnsafe(a));
|
|
27
30
|
const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts).concat(prefundAddresses);
|
|
28
31
|
|
|
29
32
|
userLog(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
|
|
30
33
|
|
|
31
|
-
const { genesisArchiveRoot,
|
|
34
|
+
const { genesisArchiveRoot, genesis } = await getGenesisValues(initialFundedAccounts);
|
|
32
35
|
|
|
33
36
|
userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
34
37
|
|
|
35
|
-
return { genesisArchiveRoot,
|
|
38
|
+
return { genesisArchiveRoot, genesis };
|
|
36
39
|
}
|
|
37
40
|
|
|
38
|
-
|
|
41
|
+
/**
|
|
42
|
+
* Compares the rollup's on-chain protocol constants (genesis archive root, VK tree root, protocol
|
|
43
|
+
* contracts hash) against the node's expected local values. Returns a list of human-readable mismatch
|
|
44
|
+
* descriptions, empty if the rollup is compatible.
|
|
45
|
+
*/
|
|
46
|
+
export async function checkRollupCompatibility(
|
|
39
47
|
rollup: RollupContract,
|
|
40
48
|
expected: { genesisArchiveRoot: Fr; vkTreeRoot: Fr; protocolContractsHash: Fr },
|
|
41
49
|
): Promise<string[]> {
|
|
@@ -67,7 +75,7 @@ export async function waitForCompatibleRollup(
|
|
|
67
75
|
config: {
|
|
68
76
|
l1RpcUrls: string[];
|
|
69
77
|
l1ChainId: number;
|
|
70
|
-
|
|
78
|
+
registryAddress: EthAddress;
|
|
71
79
|
rollupVersion?: number;
|
|
72
80
|
},
|
|
73
81
|
expected: { genesisArchiveRoot: Fr; vkTreeRoot: Fr; protocolContractsHash: Fr },
|
|
@@ -77,7 +85,7 @@ export async function waitForCompatibleRollup(
|
|
|
77
85
|
const publicClient = getPublicClient(config);
|
|
78
86
|
const rollupVersion: number | 'canonical' = config.rollupVersion ?? 'canonical';
|
|
79
87
|
|
|
80
|
-
const registry = new RegistryContract(publicClient, config.
|
|
88
|
+
const registry = new RegistryContract(publicClient, config.registryAddress);
|
|
81
89
|
const rollupAddress = await registry.getRollupAddress(rollupVersion);
|
|
82
90
|
const rollup = new RollupContract(publicClient, rollupAddress.toString());
|
|
83
91
|
|
|
@@ -130,3 +138,47 @@ export async function waitForCompatibleRollup(
|
|
|
130
138
|
await new Promise<void>((resolve, reject) => standbyServer.close(err => (err ? reject(err) : resolve())));
|
|
131
139
|
}
|
|
132
140
|
}
|
|
141
|
+
|
|
142
|
+
/**
|
|
143
|
+
* Polls the canonical rollup's protocol constants every 10 minutes and soft-shuts-down the node once they
|
|
144
|
+
* diverge from the node's expected local values (i.e. an incompatible rollup has become canonical on L1).
|
|
145
|
+
* The HTTP health server is left running so K8s probes keep passing on the wound-down pod. This is the
|
|
146
|
+
* inverse of {@link waitForCompatibleRollup}; it should only be set up for nodes following the canonical
|
|
147
|
+
* rollup. Reuses the {@link checkRollupCompatibility} diff and the generic VersionChecker poll primitive.
|
|
148
|
+
*/
|
|
149
|
+
export async function setupAutoShutdown(
|
|
150
|
+
config: { l1RpcUrls: string[]; l1ChainId: number },
|
|
151
|
+
registryAddress: EthAddress,
|
|
152
|
+
rollupVersion: number | 'canonical',
|
|
153
|
+
expected: { genesisArchiveRoot: Fr; vkTreeRoot: Fr; protocolContractsHash: Fr },
|
|
154
|
+
signalHandlers: Array<() => Promise<void>>,
|
|
155
|
+
): Promise<void> {
|
|
156
|
+
const { VersionChecker } = await import('@aztec/stdlib/update-checker');
|
|
157
|
+
|
|
158
|
+
const logger = createLogger('auto_shutdown');
|
|
159
|
+
const publicClient = getPublicClient(config);
|
|
160
|
+
const registry = new RegistryContract(publicClient, registryAddress);
|
|
161
|
+
|
|
162
|
+
const check: VersionCheck = {
|
|
163
|
+
name: 'rollup',
|
|
164
|
+
currentVersion: 'compatible',
|
|
165
|
+
getLatestVersion: async () => {
|
|
166
|
+
const rollupAddress = await registry.getRollupAddress(rollupVersion);
|
|
167
|
+
const rollup = new RollupContract(publicClient, rollupAddress.toString());
|
|
168
|
+
const mismatches = await checkRollupCompatibility(rollup, expected);
|
|
169
|
+
return mismatches.length === 0 ? 'compatible' : `incompatible: ${mismatches.join('; ')}`;
|
|
170
|
+
},
|
|
171
|
+
};
|
|
172
|
+
|
|
173
|
+
const checker = new VersionChecker([check], 600_000, logger);
|
|
174
|
+
checker.on('newVersion', ({ latestVersion }) => {
|
|
175
|
+
if (isShuttingDown()) {
|
|
176
|
+
return;
|
|
177
|
+
}
|
|
178
|
+
logger.warn('Canonical rollup is no longer compatible; auto-shutting down node', { latestVersion });
|
|
179
|
+
// softShutdown never rejects (it awaits handlers via allSettled); fire-and-forget from the listener.
|
|
180
|
+
void softShutdown(logger.info.bind(logger), signalHandlers);
|
|
181
|
+
});
|
|
182
|
+
checker.start();
|
|
183
|
+
signalHandlers.push(() => checker.stop());
|
|
184
|
+
}
|
|
@@ -21,11 +21,9 @@ export async function startBot(
|
|
|
21
21
|
services: NamespacedApiHandlers,
|
|
22
22
|
userLog: LogFn,
|
|
23
23
|
) {
|
|
24
|
-
const { proverNode,
|
|
25
|
-
if (proverNode ||
|
|
26
|
-
userLog(
|
|
27
|
-
`Starting a bot with --prover-node, --prover, --archiver, --sequencer, --p2p-bootstrap, or --txe is not supported.`,
|
|
28
|
-
);
|
|
24
|
+
const { proverNode, sequencer, p2pBootstrap, txe, prover } = options;
|
|
25
|
+
if (proverNode || sequencer || p2pBootstrap || txe || prover) {
|
|
26
|
+
userLog(`Starting a bot with --prover-node, --prover, --sequencer, --p2p-bootstrap, or --txe is not supported.`);
|
|
29
27
|
process.exit(1);
|
|
30
28
|
}
|
|
31
29
|
|
|
@@ -58,6 +56,11 @@ export async function addBot(
|
|
|
58
56
|
const config = extractRelevantOptions<BotConfig>(options, botConfigMappings, 'bot');
|
|
59
57
|
userLog?.(`Starting bot with config ${stringifyConfig(config)}`);
|
|
60
58
|
|
|
59
|
+
// The bot wallet's embedded PXE syncs to this tip (see start_bot.ts/start_node.ts which build the wallet from the
|
|
60
|
+
// same options). L1-to-L2 readiness checks must be evaluated at this tip rather than at 'latest', or the bot can
|
|
61
|
+
// consider a message ready while the PXE simulation anchors to an older block that cannot prove its membership yet.
|
|
62
|
+
const { syncChainTip } = extractRelevantOptions<PXEConfig & CliPXEOptions>(options, allPxeConfigMappings, 'pxe');
|
|
63
|
+
|
|
61
64
|
const db = await (config.dataDirectory
|
|
62
65
|
? createStore('bot', BotStore.SCHEMA_VERSION, config)
|
|
63
66
|
: openTmpStore('bot', true, config.dataStoreMapSizeKb));
|
|
@@ -65,7 +68,7 @@ export async function addBot(
|
|
|
65
68
|
const store = new BotStore(db);
|
|
66
69
|
await store.cleanupOldClaims();
|
|
67
70
|
|
|
68
|
-
const botRunner = new BotRunner(config, wallet, aztecNode, telemetry, aztecNodeAdmin, store);
|
|
71
|
+
const botRunner = new BotRunner(config, wallet, aztecNode, telemetry, aztecNodeAdmin, store, syncChainTip);
|
|
69
72
|
if (!config.noStart) {
|
|
70
73
|
void botRunner.start(); // Do not block since bot setup takes time
|
|
71
74
|
}
|