@aztec/aztec 0.0.1-commit.aada20e3 → 0.0.1-commit.b2a5d0dd1

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.
Files changed (132) hide show
  1. package/dest/bin/index.js +7 -3
  2. package/dest/cli/admin_api_key_store.d.ts +45 -0
  3. package/dest/cli/admin_api_key_store.d.ts.map +1 -0
  4. package/dest/cli/admin_api_key_store.js +98 -0
  5. package/dest/cli/aztec_start_action.d.ts +1 -1
  6. package/dest/cli/aztec_start_action.d.ts.map +1 -1
  7. package/dest/cli/aztec_start_action.js +72 -18
  8. package/dest/cli/aztec_start_options.d.ts +2 -2
  9. package/dest/cli/aztec_start_options.d.ts.map +1 -1
  10. package/dest/cli/aztec_start_options.js +38 -9
  11. package/dest/cli/cli.d.ts +1 -1
  12. package/dest/cli/cli.d.ts.map +1 -1
  13. package/dest/cli/cli.js +3 -4
  14. package/dest/cli/cmds/compile.d.ts +4 -0
  15. package/dest/cli/cmds/compile.d.ts.map +1 -0
  16. package/dest/cli/cmds/compile.js +155 -0
  17. package/dest/cli/cmds/profile.d.ts +4 -0
  18. package/dest/cli/cmds/profile.d.ts.map +1 -0
  19. package/dest/cli/cmds/profile.js +8 -0
  20. package/dest/cli/cmds/profile_flamegraph.d.ts +4 -0
  21. package/dest/cli/cmds/profile_flamegraph.d.ts.map +1 -0
  22. package/dest/cli/cmds/profile_flamegraph.js +52 -0
  23. package/dest/cli/cmds/profile_gates.d.ts +4 -0
  24. package/dest/cli/cmds/profile_gates.d.ts.map +1 -0
  25. package/dest/cli/cmds/profile_gates.js +58 -0
  26. package/dest/cli/cmds/profile_utils.d.ts +18 -0
  27. package/dest/cli/cmds/profile_utils.d.ts.map +1 -0
  28. package/dest/cli/cmds/profile_utils.js +50 -0
  29. package/dest/cli/cmds/standby.d.ts +32 -0
  30. package/dest/cli/cmds/standby.d.ts.map +1 -0
  31. package/dest/cli/cmds/standby.js +97 -0
  32. package/dest/cli/cmds/start_archiver.d.ts +2 -2
  33. package/dest/cli/cmds/start_archiver.d.ts.map +1 -1
  34. package/dest/cli/cmds/start_archiver.js +4 -2
  35. package/dest/cli/cmds/start_bot.d.ts +3 -3
  36. package/dest/cli/cmds/start_bot.d.ts.map +1 -1
  37. package/dest/cli/cmds/start_bot.js +9 -5
  38. package/dest/cli/cmds/start_node.d.ts +3 -2
  39. package/dest/cli/cmds/start_node.d.ts.map +1 -1
  40. package/dest/cli/cmds/start_node.js +73 -31
  41. package/dest/cli/cmds/start_prover_agent.d.ts +1 -1
  42. package/dest/cli/cmds/start_prover_agent.d.ts.map +1 -1
  43. package/dest/cli/cmds/start_prover_agent.js +3 -15
  44. package/dest/cli/cmds/start_prover_broker.d.ts +1 -1
  45. package/dest/cli/cmds/start_prover_broker.d.ts.map +1 -1
  46. package/dest/cli/cmds/start_prover_broker.js +12 -6
  47. package/dest/cli/cmds/utils/artifacts.d.ts +21 -0
  48. package/dest/cli/cmds/utils/artifacts.d.ts.map +1 -0
  49. package/dest/cli/cmds/utils/artifacts.js +24 -0
  50. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts +21 -0
  51. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts.map +1 -0
  52. package/dest/cli/cmds/utils/collect_crate_dirs.js +114 -0
  53. package/dest/cli/cmds/utils/needs_recompile.d.ts +10 -0
  54. package/dest/cli/cmds/utils/needs_recompile.d.ts.map +1 -0
  55. package/dest/cli/cmds/utils/needs_recompile.js +90 -0
  56. package/dest/cli/cmds/utils/spawn.d.ts +3 -0
  57. package/dest/cli/cmds/utils/spawn.d.ts.map +1 -0
  58. package/dest/cli/cmds/utils/spawn.js +16 -0
  59. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts +4 -0
  60. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts.map +1 -0
  61. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.js +62 -0
  62. package/dest/cli/util.d.ts +7 -18
  63. package/dest/cli/util.d.ts.map +1 -1
  64. package/dest/cli/util.js +50 -86
  65. package/dest/examples/token.js +6 -6
  66. package/dest/local-network/banana_fpc.js +1 -1
  67. package/dest/local-network/local-network.d.ts +5 -4
  68. package/dest/local-network/local-network.d.ts.map +1 -1
  69. package/dest/local-network/local-network.js +53 -21
  70. package/dest/testing/anvil_test_watcher.d.ts +15 -3
  71. package/dest/testing/anvil_test_watcher.d.ts.map +1 -1
  72. package/dest/testing/anvil_test_watcher.js +85 -22
  73. package/dest/testing/cheat_codes.d.ts +11 -15
  74. package/dest/testing/cheat_codes.d.ts.map +1 -1
  75. package/dest/testing/cheat_codes.js +34 -32
  76. package/dest/testing/epoch_test_settler.d.ts +1 -1
  77. package/dest/testing/epoch_test_settler.d.ts.map +1 -1
  78. package/dest/testing/epoch_test_settler.js +3 -4
  79. package/dest/testing/index.d.ts +3 -2
  80. package/dest/testing/index.d.ts.map +1 -1
  81. package/dest/testing/index.js +1 -0
  82. package/dest/testing/token_allowed_setup.d.ts +7 -0
  83. package/dest/testing/token_allowed_setup.d.ts.map +1 -0
  84. package/dest/testing/token_allowed_setup.js +20 -0
  85. package/package.json +34 -34
  86. package/scripts/add_crate.sh +102 -0
  87. package/scripts/aztec.sh +15 -5
  88. package/scripts/init.sh +23 -19
  89. package/scripts/new.sh +48 -24
  90. package/scripts/setup_workspace.sh +68 -0
  91. package/src/bin/index.ts +7 -3
  92. package/src/cli/admin_api_key_store.ts +128 -0
  93. package/src/cli/aztec_start_action.ts +65 -14
  94. package/src/cli/aztec_start_options.ts +46 -10
  95. package/src/cli/cli.ts +3 -4
  96. package/src/cli/cmds/compile.ts +178 -0
  97. package/src/cli/cmds/profile.ts +25 -0
  98. package/src/cli/cmds/profile_flamegraph.ts +64 -0
  99. package/src/cli/cmds/profile_gates.ts +68 -0
  100. package/src/cli/cmds/profile_utils.ts +58 -0
  101. package/src/cli/cmds/standby.ts +132 -0
  102. package/src/cli/cmds/start_archiver.ts +8 -2
  103. package/src/cli/cmds/start_bot.ts +8 -5
  104. package/src/cli/cmds/start_node.ts +83 -35
  105. package/src/cli/cmds/start_prover_agent.ts +3 -6
  106. package/src/cli/cmds/start_prover_broker.ts +14 -14
  107. package/src/cli/cmds/utils/artifacts.ts +44 -0
  108. package/src/cli/cmds/utils/collect_crate_dirs.ts +118 -0
  109. package/src/cli/cmds/utils/needs_recompile.ts +98 -0
  110. package/src/cli/cmds/utils/spawn.ts +16 -0
  111. package/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts +77 -0
  112. package/src/cli/util.ts +57 -95
  113. package/src/examples/token.ts +8 -6
  114. package/src/local-network/banana_fpc.ts +1 -1
  115. package/src/local-network/local-network.ts +59 -22
  116. package/src/testing/anvil_test_watcher.ts +95 -20
  117. package/src/testing/cheat_codes.ts +42 -36
  118. package/src/testing/epoch_test_settler.ts +3 -4
  119. package/src/testing/index.ts +2 -1
  120. package/src/testing/token_allowed_setup.ts +19 -0
  121. package/dest/cli/cmds/start_prover_node.d.ts +0 -7
  122. package/dest/cli/cmds/start_prover_node.d.ts.map +0 -1
  123. package/dest/cli/cmds/start_prover_node.js +0 -108
  124. package/dest/cli/release_version.d.ts +0 -2
  125. package/dest/cli/release_version.d.ts.map +0 -1
  126. package/dest/cli/release_version.js +0 -14
  127. package/scripts/compile.sh +0 -44
  128. package/scripts/extract_function.js +0 -47
  129. package/scripts/flamegraph.sh +0 -59
  130. package/scripts/setup_project.sh +0 -31
  131. package/src/cli/cmds/start_prover_node.ts +0 -124
  132. package/src/cli/release_version.ts +0 -21
@@ -0,0 +1,77 @@
1
+ import type { LogFn } from '@aztec/foundation/log';
2
+ import { getPackageVersion } from '@aztec/stdlib/update-checker';
3
+
4
+ import TOML from '@iarna/toml';
5
+ import { readFile } from 'fs/promises';
6
+ import { join } from 'path';
7
+
8
+ import { collectCrateDirs } from './collect_crate_dirs.js';
9
+
10
+ /** Returns true if the given git URL points to the AztecProtocol/aztec-nr repository. */
11
+ function isAztecNrGitUrl(gitUrl: string): boolean {
12
+ let url: URL;
13
+ try {
14
+ url = new URL(gitUrl);
15
+ } catch {
16
+ return false;
17
+ }
18
+ if (url.hostname !== 'github.com') {
19
+ return false;
20
+ }
21
+ const repoPath = url.pathname
22
+ .replace(/^\//, '')
23
+ .replace(/\.git$/, '')
24
+ .replace(/\/$/, '');
25
+ return repoPath === 'AztecProtocol/aztec-nr';
26
+ }
27
+
28
+ /** Warns if any aztec-nr git dependency in a crate's Nargo.toml has a tag that doesn't match the CLI version. */
29
+ export async function warnIfAztecVersionMismatch(log: LogFn, cliVersion?: string): Promise<void> {
30
+ const version = cliVersion ?? getPackageVersion();
31
+ if (!version) {
32
+ log(`WARNING: aztec CLI version not found. Skipping dependency compatibility check.`);
33
+ return;
34
+ }
35
+
36
+ const expectedTag = `v${version}`;
37
+ const mismatches: { file: string; depName: string; tag: string }[] = [];
38
+
39
+ const crateDirs = await collectCrateDirs('.', { skipGitDeps: true });
40
+
41
+ for (const dir of crateDirs) {
42
+ const tomlPath = join(dir, 'Nargo.toml');
43
+ let content: string;
44
+ try {
45
+ content = await readFile(tomlPath, 'utf-8');
46
+ } catch {
47
+ continue;
48
+ }
49
+
50
+ const parsed = TOML.parse(content) as Record<string, any>;
51
+ const deps = (parsed.dependencies as Record<string, any>) ?? {};
52
+
53
+ for (const [depName, dep] of Object.entries(deps)) {
54
+ // Skip non-object deps (e.g. malformed entries) and anything that isn't a tagged git dep.
55
+ if (!dep || typeof dep !== 'object' || typeof dep.git !== 'string' || typeof dep.tag !== 'string') {
56
+ continue;
57
+ }
58
+ // Only flag deps that are sourced from the aztec-nr repo.
59
+ if (!isAztecNrGitUrl(dep.git)) {
60
+ continue;
61
+ }
62
+ if (dep.tag !== expectedTag) {
63
+ mismatches.push({ file: tomlPath, depName, tag: dep.tag });
64
+ }
65
+ }
66
+ }
67
+
68
+ if (mismatches.length > 0) {
69
+ const details = mismatches.map(m => ` ${m.file} — ${m.depName} (${m.tag})`).join('\n');
70
+ log(
71
+ `WARNING: Aztec dependency version mismatch detected.\n` +
72
+ `The following aztec-nr dependencies do not match the CLI version (${expectedTag}):\n` +
73
+ `${details}\n\n` +
74
+ `See https://docs.aztec.network/errors/9 for how to update your dependencies.`,
75
+ );
76
+ }
77
+ }
package/src/cli/util.ts CHANGED
@@ -1,17 +1,18 @@
1
1
  import type { AztecNodeConfig } from '@aztec/aztec-node';
2
2
  import type { AccountManager } from '@aztec/aztec.js/wallet';
3
+ import { getNetworkConfig } from '@aztec/cli/config';
4
+ import { RegistryContract } from '@aztec/ethereum/contracts';
3
5
  import type { ViemClient } from '@aztec/ethereum/types';
4
- import type { ConfigMappingsType } from '@aztec/foundation/config';
5
- import { Fr } from '@aztec/foundation/curves/bn254';
6
- import { EthAddress } from '@aztec/foundation/eth-address';
6
+ import type { ConfigMappingsType, NetworkNames } from '@aztec/foundation/config';
7
+ import { jsonStringify } from '@aztec/foundation/json-rpc';
7
8
  import { type LogFn, createLogger } from '@aztec/foundation/log';
8
- import type { SharedNodeConfig } from '@aztec/node-lib/config';
9
9
  import type { ProverConfig } from '@aztec/stdlib/interfaces/server';
10
- import { getTelemetryClient } from '@aztec/telemetry-client/start';
11
- import type { TestWallet } from '@aztec/test-wallet/server';
10
+ import { type VersionCheck, getPackageVersion } from '@aztec/stdlib/update-checker';
11
+ import type { EmbeddedWallet } from '@aztec/wallets/embedded';
12
12
 
13
13
  import chalk from 'chalk';
14
14
  import type { Command } from 'commander';
15
+ import type { Hex } from 'viem';
15
16
 
16
17
  import { type AztecStartOption, aztecStartOptions } from './aztec_start_options.js';
17
18
 
@@ -68,30 +69,19 @@ export const installSignalHandlers = (logFn: LogFn, cb?: Array<() => Promise<voi
68
69
  /**
69
70
  * Creates logs for the initial accounts
70
71
  * @param accounts - The initial accounts
71
- * @param wallet - A TestWallet instance to get the registered accounts
72
+ * @param wallet - A EmbeddedWallet instance to get the registered accounts
72
73
  * @returns A string array containing the initial accounts details
73
74
  */
74
- export async function createAccountLogs(
75
- accountsWithSecretKeys: {
76
- /**
77
- * The account object
78
- */
79
- account: AccountManager;
80
- /**
81
- * The secret key of the account
82
- */
83
- secretKey: Fr;
84
- }[],
85
- wallet: TestWallet,
86
- ) {
75
+ export async function createAccountLogs(accountManagers: AccountManager[], wallet: EmbeddedWallet) {
87
76
  const registeredAccounts = await wallet.getAccounts();
88
77
  const accountLogStrings = [`Initial Accounts:\n\n`];
89
- for (const accountWithSecretKey of accountsWithSecretKeys) {
90
- const completeAddress = await accountWithSecretKey.account.getCompleteAddress();
78
+ for (const accountManager of accountManagers) {
79
+ const account = await accountManager.getAccount();
80
+ const completeAddress = account.getCompleteAddress();
91
81
  if (registeredAccounts.find(a => a.item.equals(completeAddress.address))) {
92
82
  accountLogStrings.push(` Address: ${completeAddress.address.toString()}\n`);
93
83
  accountLogStrings.push(` Partial Address: ${completeAddress.partialAddress.toString()}\n`);
94
- accountLogStrings.push(` Secret Key: ${accountWithSecretKey.secretKey.toString()}\n`);
84
+ accountLogStrings.push(` Secret Key: ${account.getSecretKey().toString()}\n`);
95
85
  accountLogStrings.push(
96
86
  ` Master nullifier public key: ${completeAddress.publicKeys.masterNullifierPublicKey.toString()}\n`,
97
87
  );
@@ -282,7 +272,7 @@ export async function preloadCrsDataForVerifying(
282
272
  ): Promise<void> {
283
273
  if (realProofs) {
284
274
  const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
285
- await Promise.all([Crs.new(2 ** 1, undefined, log), GrumpkinCrs.new(2 ** 16 + 1, undefined, log)]);
275
+ await Promise.all([Crs.new(2 ** 1, undefined, log), GrumpkinCrs.new(2 ** 16, undefined, log)]);
286
276
  }
287
277
  }
288
278
 
@@ -297,94 +287,66 @@ export async function preloadCrsDataForServerSideProving(
297
287
  ): Promise<void> {
298
288
  if (realProofs) {
299
289
  const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
300
- await Promise.all([Crs.new(2 ** 25 + 1, undefined, log), GrumpkinCrs.new(2 ** 18 + 1, undefined, log)]);
290
+ await Promise.all([Crs.new(2 ** 25, undefined, log), GrumpkinCrs.new(2 ** 18, undefined, log)]);
301
291
  }
302
292
  }
303
293
 
304
- export async function setupUpdateMonitor(
305
- autoUpdateMode: SharedNodeConfig['autoUpdate'],
306
- updatesLocation: URL,
294
+ export async function setupVersionChecker(
295
+ network: NetworkNames,
307
296
  followsCanonicalRollup: boolean,
308
297
  publicClient: ViemClient,
309
- registryContractAddress: EthAddress,
310
298
  signalHandlers: Array<() => Promise<void>>,
311
- updateNodeConfig?: (config: object) => Promise<void>,
312
- ) {
313
- const logger = createLogger('update-check');
314
- const { UpdateChecker } = await import('@aztec/stdlib/update-checker');
315
- const checker = await UpdateChecker.new({
316
- baseURL: updatesLocation,
317
- publicClient,
318
- registryContractAddress,
319
- });
299
+ cacheDir?: string,
300
+ ): Promise<void> {
301
+ const networkConfig = await getNetworkConfig(network, cacheDir);
302
+ if (!networkConfig) {
303
+ return;
304
+ }
320
305
 
321
- // eslint-disable-next-line @typescript-eslint/no-misused-promises
322
- checker.on('newRollupVersion', async ({ latestVersion, currentVersion }) => {
323
- if (isShuttingDown()) {
324
- return;
325
- }
306
+ const { VersionChecker } = await import('@aztec/stdlib/update-checker');
326
307
 
327
- // if node follows canonical rollup then this is equivalent to a config update
328
- if (!followsCanonicalRollup) {
329
- return;
330
- }
308
+ const logger = createLogger('version_check');
309
+ const registry = new RegistryContract(publicClient, networkConfig.registryAddress as Hex);
331
310
 
332
- if (autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') {
333
- logger.info(`New rollup version detected. Please restart the node`, { latestVersion, currentVersion });
334
- await shutdown(logger.info, ExitCode.ROLLUP_UPGRADE, signalHandlers);
335
- } else if (autoUpdateMode === 'notify') {
336
- logger.warn(`New rollup detected. Please restart the node`, { latestVersion, currentVersion });
337
- }
311
+ const checks: Array<VersionCheck> = [];
312
+ checks.push({
313
+ name: 'node',
314
+ currentVersion: getPackageVersion() ?? 'unknown',
315
+ getLatestVersion: async () => {
316
+ const cfg = await getNetworkConfig(network, cacheDir);
317
+ return cfg?.nodeVersion;
318
+ },
338
319
  });
339
320
 
340
- // eslint-disable-next-line @typescript-eslint/no-misused-promises
341
- checker.on('newNodeVersion', async ({ latestVersion, currentVersion }) => {
342
- if (isShuttingDown()) {
343
- return;
344
- }
345
- if (autoUpdateMode === 'config-and-version') {
346
- logger.info(`New node version detected. Please update and restart the node`, { latestVersion, currentVersion });
347
- await shutdown(logger.info, ExitCode.VERSION_UPGRADE, signalHandlers);
348
- } else if (autoUpdateMode === 'notify') {
349
- logger.info(`New node version detected. Please update and restart the node`, { latestVersion, currentVersion });
321
+ if (followsCanonicalRollup) {
322
+ const getLatestVersion = async () => {
323
+ const version = (await registry.getRollupVersions()).at(-1);
324
+ return version !== undefined ? String(version) : undefined;
325
+ };
326
+ const currentVersion = await getLatestVersion();
327
+ if (currentVersion !== undefined) {
328
+ checks.push({
329
+ name: 'rollup',
330
+ currentVersion,
331
+ getLatestVersion,
332
+ });
350
333
  }
351
- });
334
+ }
352
335
 
353
- // eslint-disable-next-line @typescript-eslint/no-misused-promises
354
- checker.on('updateNodeConfig', async config => {
336
+ const checker = new VersionChecker(checks, 600_000, logger);
337
+ checker.on('newVersion', ({ name, latestVersion, currentVersion }) => {
355
338
  if (isShuttingDown()) {
356
339
  return;
357
340
  }
358
341
 
359
- if ((autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') && updateNodeConfig) {
360
- logger.warn(`Config change detected. Updating node`, config);
361
- try {
362
- await updateNodeConfig(config);
363
- } catch (err) {
364
- logger.warn('Failed to update config', { err });
365
- }
366
- }
367
- // don't notify on these config changes
342
+ logger.warn(`New ${name} version available`, { latestVersion, currentVersion });
368
343
  });
369
-
370
- checker.on('updatePublicTelemetryConfig', config => {
371
- if (autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') {
372
- logger.warn(`Public telemetry config change detected. Updating telemetry client`, config);
373
- try {
374
- const publicIncludeMetrics: unknown = (config as any).publicIncludeMetrics;
375
- if (Array.isArray(publicIncludeMetrics) && publicIncludeMetrics.every(m => typeof m === 'string')) {
376
- getTelemetryClient().setExportedPublicTelemetry(publicIncludeMetrics);
377
- }
378
- const publicMetricsCollectFrom: unknown = (config as any).publicMetricsCollectFrom;
379
- if (Array.isArray(publicMetricsCollectFrom) && publicMetricsCollectFrom.every(m => typeof m === 'string')) {
380
- getTelemetryClient().setPublicTelemetryCollectFrom(publicMetricsCollectFrom);
381
- }
382
- } catch (err) {
383
- logger.warn('Failed to update config', { err });
384
- }
385
- }
386
- // don't notify on these config changes
387
- });
388
-
389
344
  checker.start();
345
+ signalHandlers.push(() => checker.stop());
346
+ }
347
+
348
+ export function stringifyConfig(config: object): string {
349
+ return Object.entries(config)
350
+ .map(([key, value]) => `${key}=${jsonStringify(value)}`)
351
+ .join(' ');
390
352
  }
@@ -2,7 +2,7 @@ import { getInitialTestAccountsData } from '@aztec/accounts/testing';
2
2
  import { createAztecNodeClient } from '@aztec/aztec.js/node';
3
3
  import { createLogger } from '@aztec/foundation/log';
4
4
  import { TokenContract } from '@aztec/noir-contracts.js/Token';
5
- import { TestWallet } from '@aztec/test-wallet/server';
5
+ import { EmbeddedWallet } from '@aztec/wallets/embedded';
6
6
 
7
7
  const logger = createLogger('example:token');
8
8
 
@@ -19,7 +19,7 @@ const TRANSFER_AMOUNT = 33n;
19
19
  async function main() {
20
20
  logger.info('Running token contract test on HTTP interface.');
21
21
 
22
- const wallet = await TestWallet.create(node);
22
+ const wallet = await EmbeddedWallet.create(node);
23
23
 
24
24
  // During local network setup we deploy a few accounts. Below we add them to our wallet.
25
25
  const [aliceInitialAccountData, bobInitialAccountData] = await getInitialTestAccountsData();
@@ -32,7 +32,9 @@ async function main() {
32
32
  logger.info(`Fetched Alice and Bob accounts: ${alice.toString()}, ${bob.toString()}`);
33
33
 
34
34
  logger.info('Deploying Token...');
35
- const token = await TokenContract.deploy(wallet, alice, 'TokenName', 'TokenSymbol', 18).send({ from: alice });
35
+ const { contract: token } = await TokenContract.deploy(wallet, alice, 'TokenName', 'TokenSymbol', 18).send({
36
+ from: alice,
37
+ });
36
38
  logger.info('Token deployed');
37
39
 
38
40
  // Mint tokens to Alice
@@ -41,7 +43,7 @@ async function main() {
41
43
 
42
44
  logger.info(`${ALICE_MINT_BALANCE} tokens were successfully minted by Alice and transferred to private`);
43
45
 
44
- const balanceAfterMint = await token.methods.balance_of_private(alice).simulate({ from: alice });
46
+ const { result: balanceAfterMint } = await token.methods.balance_of_private(alice).simulate({ from: alice });
45
47
  logger.info(`Tokens successfully minted. New Alice's balance: ${balanceAfterMint}`);
46
48
 
47
49
  // We will now transfer tokens from Alice to Bob
@@ -49,10 +51,10 @@ async function main() {
49
51
  await token.methods.transfer(bob, TRANSFER_AMOUNT).send({ from: alice });
50
52
 
51
53
  // Check the new balances
52
- const aliceBalance = await token.methods.balance_of_private(alice).simulate({ from: alice });
54
+ const { result: aliceBalance } = await token.methods.balance_of_private(alice).simulate({ from: alice });
53
55
  logger.info(`Alice's balance ${aliceBalance}`);
54
56
 
55
- const bobBalance = await token.methods.balance_of_private(bob).simulate({ from: bob });
57
+ const { result: bobBalance } = await token.methods.balance_of_private(bob).simulate({ from: bob });
56
58
  logger.info(`Bob's balance ${bobBalance}`);
57
59
  }
58
60
 
@@ -48,7 +48,7 @@ export async function getBananaFPCAddress(initialAccounts: InitialAccountData[])
48
48
  export async function setupBananaFPC(initialAccounts: InitialAccountData[], wallet: Wallet, log: LogFn) {
49
49
  const bananaCoinAddress = await getBananaCoinAddress(initialAccounts);
50
50
  const admin = getBananaAdmin(initialAccounts);
51
- const [bananaCoin, fpc] = await Promise.all([
51
+ const [{ contract: bananaCoin }, { contract: fpc }] = await Promise.all([
52
52
  TokenContract.deploy(wallet, admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal).send({
53
53
  from: admin,
54
54
  contractAddressSalt: BANANA_COIN_SALT,
@@ -18,13 +18,17 @@ import type { LogFn } from '@aztec/foundation/log';
18
18
  import { DateProvider, TestDateProvider } from '@aztec/foundation/timer';
19
19
  import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
20
20
  import { protocolContractsHash } from '@aztec/protocol-contracts';
21
- import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
21
+ import { SequencerState } from '@aztec/sequencer-client';
22
+ import { AztecAddress } from '@aztec/stdlib/aztec-address';
23
+ import type { ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
24
+ import type { GenesisData } from '@aztec/stdlib/world-state';
22
25
  import {
23
26
  type TelemetryClient,
24
27
  getConfigEnvVars as getTelemetryClientConfig,
25
28
  initTelemetryClient,
26
29
  } from '@aztec/telemetry-client';
27
- import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
30
+ import { EmbeddedWallet } from '@aztec/wallets/embedded';
31
+ import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
28
32
  import { getGenesisValues } from '@aztec/world-state/testing';
29
33
 
30
34
  import { type Hex, createPublicClient, fallback, http as httpViemTransport } from 'viem';
@@ -35,6 +39,7 @@ import { createAccountLogs } from '../cli/util.js';
35
39
  import { DefaultMnemonic } from '../mnemonic.js';
36
40
  import { AnvilTestWatcher } from '../testing/anvil_test_watcher.js';
37
41
  import { EpochTestSettler } from '../testing/epoch_test_settler.js';
42
+ import { getTokenAllowedSetupFunctions } from '../testing/token_allowed_setup.js';
38
43
  import { getBananaFPCAddress, setupBananaFPC } from './banana_fpc.js';
39
44
  import { getSponsoredFPCAddress } from './sponsored_fpc.js';
40
45
 
@@ -65,7 +70,7 @@ export async function deployContractsToL1(
65
70
  genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
66
71
  feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
67
72
  aztecTargetCommitteeSize: 0, // no committee in local network
68
- slasherFlavor: 'none', // no slashing in local network
73
+ slasherEnabled: false, // no slashing in local network
69
74
  realVerifier: false,
70
75
  });
71
76
 
@@ -98,18 +103,25 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
98
103
  logger.warn(`Multiple L1 RPC URLs provided. Local networks will only use the first one: ${l1RpcUrl}`);
99
104
  }
100
105
 
106
+ // The local network deploys a banana FPC with Token contracts, so include Token entries
107
+ // in the setup allowlist so FPC-based fee payments work out of the box.
108
+ const tokenAllowList = await getTokenAllowedSetupFunctions();
109
+
101
110
  const aztecNodeConfig: AztecNodeConfig = {
102
111
  ...getConfigEnvVars(),
103
112
  ...config,
113
+ txPublicSetupAllowListExtend: [...tokenAllowList, ...(config.txPublicSetupAllowListExtend ?? [])],
104
114
  };
105
115
  const hdAccount = mnemonicToAccount(config.l1Mnemonic || DefaultMnemonic);
106
116
  if (
107
- aztecNodeConfig.publisherPrivateKeys == undefined ||
108
- !aztecNodeConfig.publisherPrivateKeys.length ||
109
- aztecNodeConfig.publisherPrivateKeys[0].getValue() === NULL_KEY
117
+ aztecNodeConfig.sequencerPublisherPrivateKeys == undefined ||
118
+ !aztecNodeConfig.sequencerPublisherPrivateKeys.length ||
119
+ aztecNodeConfig.sequencerPublisherPrivateKeys[0].getValue() === NULL_KEY
110
120
  ) {
111
121
  const privKey = hdAccount.getHdKey().privateKey;
112
- aztecNodeConfig.publisherPrivateKeys = [new SecretValue(`0x${Buffer.from(privKey!).toString('hex')}` as const)];
122
+ aztecNodeConfig.sequencerPublisherPrivateKeys = [
123
+ new SecretValue(`0x${Buffer.from(privKey!).toString('hex')}` as const),
124
+ ];
113
125
  }
114
126
  if (!aztecNodeConfig.validatorPrivateKeys?.getValue().length) {
115
127
  const privKey = hdAccount.getHdKey().privateKey;
@@ -133,10 +145,13 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
133
145
 
134
146
  const bananaFPC = await getBananaFPCAddress(initialAccounts);
135
147
  const sponsoredFPC = await getSponsoredFPCAddress();
136
- const fundedAddresses = initialAccounts.length
137
- ? [...initialAccounts.map(a => a.address), bananaFPC, sponsoredFPC]
138
- : [];
139
- const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(fundedAddresses);
148
+ const prefundAddresses = (aztecNodeConfig.prefundAddresses ?? []).map(a => AztecAddress.fromString(a));
149
+ const fundedAddresses = [
150
+ ...initialAccounts.map(a => a.address),
151
+ ...(initialAccounts.length ? [bananaFPC, sponsoredFPC] : []),
152
+ ...prefundAddresses,
153
+ ];
154
+ const { genesisArchiveRoot, genesis, fundingNeeded } = await getGenesisValues(fundedAddresses);
140
155
 
141
156
  const dateProvider = new TestDateProvider();
142
157
 
@@ -175,7 +190,22 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
175
190
  const telemetry = await initTelemetryClient(getTelemetryClientConfig());
176
191
  // Create a local blob client client inside the local network, no http connectivity
177
192
  const blobClient = createBlobClient();
178
- const node = await createAztecNode(aztecNodeConfig, { telemetry, blobClient, dateProvider }, { prefilledPublicData });
193
+ const node = await createAztecNode(aztecNodeConfig, { telemetry, blobClient, dateProvider }, { genesis });
194
+
195
+ // Now that the node is up, let the watcher check for pending txs so it can skip unfilled slots faster when
196
+ // transactions are waiting in the mempool. Also let it check if the sequencer is actively building, to avoid
197
+ // warping time out from under an in-progress block.
198
+ watcher?.setGetPendingTxCount(() => node.getPendingTxCount());
199
+ const sequencer = node.getSequencer()?.getSequencer();
200
+ if (sequencer) {
201
+ const idleStates: Set<string> = new Set([
202
+ SequencerState.STOPPED,
203
+ SequencerState.STOPPING,
204
+ SequencerState.IDLE,
205
+ SequencerState.SYNCHRONIZING,
206
+ ]);
207
+ watcher?.setIsSequencerBuilding(() => !idleStates.has(sequencer.getState()));
208
+ }
179
209
 
180
210
  let epochTestSettler: EpochTestSettler | undefined;
181
211
  if (!aztecNodeConfig.p2pEnabled) {
@@ -190,16 +220,14 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
190
220
  }
191
221
 
192
222
  if (initialAccounts.length) {
193
- const PXEConfig = { proverEnabled: aztecNodeConfig.realProofs };
194
- const wallet = await TestWallet.create(node, PXEConfig);
223
+ const wallet = await EmbeddedWallet.create(node, {
224
+ pxeConfig: { proverEnabled: aztecNodeConfig.realProofs },
225
+ ephemeral: true,
226
+ });
195
227
 
196
228
  userLog('Setting up funded test accounts...');
197
229
  const accountManagers = await deployFundedSchnorrAccounts(wallet, initialAccounts);
198
- const accountsWithSecrets = accountManagers.map((manager, i) => ({
199
- account: manager,
200
- secretKey: initialAccounts[i].secret,
201
- }));
202
- const accLogs = await createAccountLogs(accountsWithSecrets, wallet);
230
+ const accLogs = await createAccountLogs(accountManagers, wallet);
203
231
  userLog(accLogs.join(''));
204
232
 
205
233
  await setupBananaFPC(initialAccounts, wallet, userLog);
@@ -225,8 +253,13 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
225
253
  */
226
254
  export async function createAztecNode(
227
255
  config: Partial<AztecNodeConfig> = {},
228
- deps: { telemetry?: TelemetryClient; blobClient?: BlobClientInterface; dateProvider?: DateProvider } = {},
229
- options: { prefilledPublicData?: PublicDataTreeLeaf[] } = {},
256
+ deps: {
257
+ telemetry?: TelemetryClient;
258
+ blobClient?: BlobClientInterface;
259
+ dateProvider?: DateProvider;
260
+ proverBroker?: ProvingJobBroker;
261
+ } = {},
262
+ options: { genesis?: GenesisData } = {},
230
263
  ) {
231
264
  // TODO(#12272): will clean this up. This is criminal.
232
265
  const { l1Contracts, ...rest } = getConfigEnvVars();
@@ -235,6 +268,10 @@ export async function createAztecNode(
235
268
  ...config,
236
269
  l1Contracts: { ...l1Contracts, ...config.l1Contracts },
237
270
  };
238
- const node = await AztecNodeService.createAndSync(aztecNodeConfig, deps, options);
271
+ const node = await AztecNodeService.createAndSync(
272
+ aztecNodeConfig,
273
+ { ...deps, proverNodeDeps: { broker: deps.proverBroker } },
274
+ options,
275
+ );
239
276
  return node;
240
277
  }