@aztec/aztec 0.0.0-test.1 → 0.0.1-commit.017a351

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 (217) hide show
  1. package/README.md +1 -1
  2. package/dest/bin/index.d.ts +1 -1
  3. package/dest/bin/index.js +28 -13
  4. package/dest/cli/admin_api_key_store.d.ts +45 -0
  5. package/dest/cli/admin_api_key_store.d.ts.map +1 -0
  6. package/dest/cli/admin_api_key_store.js +98 -0
  7. package/dest/cli/aztec_start_action.d.ts +1 -1
  8. package/dest/cli/aztec_start_action.d.ts.map +1 -1
  9. package/dest/cli/aztec_start_action.js +107 -49
  10. package/dest/cli/aztec_start_options.d.ts +6 -4
  11. package/dest/cli/aztec_start_options.d.ts.map +1 -1
  12. package/dest/cli/aztec_start_options.js +160 -223
  13. package/dest/cli/cli.d.ts +1 -1
  14. package/dest/cli/cli.d.ts.map +1 -1
  15. package/dest/cli/cli.js +11 -7
  16. package/dest/cli/cmds/compile.d.ts +4 -0
  17. package/dest/cli/cmds/compile.d.ts.map +1 -0
  18. package/dest/cli/cmds/compile.js +166 -0
  19. package/dest/cli/cmds/migrate_ha_db.d.ts +3 -0
  20. package/dest/cli/cmds/migrate_ha_db.d.ts.map +1 -0
  21. package/dest/cli/cmds/migrate_ha_db.js +27 -0
  22. package/dest/cli/cmds/profile.d.ts +4 -0
  23. package/dest/cli/cmds/profile.d.ts.map +1 -0
  24. package/dest/cli/cmds/profile.js +8 -0
  25. package/dest/cli/cmds/profile_flamegraph.d.ts +4 -0
  26. package/dest/cli/cmds/profile_flamegraph.d.ts.map +1 -0
  27. package/dest/cli/cmds/profile_flamegraph.js +52 -0
  28. package/dest/cli/cmds/profile_gates.d.ts +4 -0
  29. package/dest/cli/cmds/profile_gates.d.ts.map +1 -0
  30. package/dest/cli/cmds/profile_gates.js +76 -0
  31. package/dest/cli/cmds/profile_utils.d.ts +18 -0
  32. package/dest/cli/cmds/profile_utils.d.ts.map +1 -0
  33. package/dest/cli/cmds/profile_utils.js +50 -0
  34. package/dest/cli/cmds/standby.d.ts +30 -0
  35. package/dest/cli/cmds/standby.d.ts.map +1 -0
  36. package/dest/cli/cmds/standby.js +97 -0
  37. package/dest/cli/cmds/start_bot.d.ts +4 -7
  38. package/dest/cli/cmds/start_bot.d.ts.map +1 -1
  39. package/dest/cli/cmds/start_bot.js +32 -17
  40. package/dest/cli/cmds/start_node.d.ts +3 -2
  41. package/dest/cli/cmds/start_node.d.ts.map +1 -1
  42. package/dest/cli/cmds/start_node.js +113 -86
  43. package/dest/cli/cmds/start_p2p_bootstrap.d.ts +2 -2
  44. package/dest/cli/cmds/start_p2p_bootstrap.d.ts.map +1 -1
  45. package/dest/cli/cmds/start_p2p_bootstrap.js +10 -6
  46. package/dest/cli/cmds/start_prover_agent.d.ts +1 -1
  47. package/dest/cli/cmds/start_prover_agent.d.ts.map +1 -1
  48. package/dest/cli/cmds/start_prover_agent.js +29 -12
  49. package/dest/cli/cmds/start_prover_broker.d.ts +1 -1
  50. package/dest/cli/cmds/start_prover_broker.d.ts.map +1 -1
  51. package/dest/cli/cmds/start_prover_broker.js +25 -10
  52. package/dest/cli/cmds/start_txe.d.ts +2 -2
  53. package/dest/cli/cmds/start_txe.d.ts.map +1 -1
  54. package/dest/cli/cmds/start_txe.js +6 -5
  55. package/dest/cli/cmds/utils/artifacts.d.ts +21 -0
  56. package/dest/cli/cmds/utils/artifacts.d.ts.map +1 -0
  57. package/dest/cli/cmds/utils/artifacts.js +24 -0
  58. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts +21 -0
  59. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts.map +1 -0
  60. package/dest/cli/cmds/utils/collect_crate_dirs.js +114 -0
  61. package/dest/cli/cmds/utils/needs_recompile.d.ts +10 -0
  62. package/dest/cli/cmds/utils/needs_recompile.d.ts.map +1 -0
  63. package/dest/cli/cmds/utils/needs_recompile.js +90 -0
  64. package/dest/cli/cmds/utils/spawn.d.ts +3 -0
  65. package/dest/cli/cmds/utils/spawn.d.ts.map +1 -0
  66. package/dest/cli/cmds/utils/spawn.js +16 -0
  67. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts +4 -0
  68. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts.map +1 -0
  69. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.js +61 -0
  70. package/dest/cli/index.d.ts +1 -1
  71. package/dest/cli/preload_crs.d.ts +3 -0
  72. package/dest/cli/preload_crs.d.ts.map +1 -0
  73. package/dest/cli/preload_crs.js +6 -0
  74. package/dest/cli/util.d.ts +37 -17
  75. package/dest/cli/util.d.ts.map +1 -1
  76. package/dest/cli/util.js +171 -35
  77. package/dest/cli/versioning.d.ts +1 -1
  78. package/dest/cli/versioning.js +3 -3
  79. package/dest/examples/token.d.ts +1 -1
  80. package/dest/examples/token.js +31 -18
  81. package/dest/examples/util.d.ts +5 -6
  82. package/dest/examples/util.d.ts.map +1 -1
  83. package/dest/examples/util.js +5 -6
  84. package/dest/index.d.ts +2 -2
  85. package/dest/index.d.ts.map +1 -1
  86. package/dest/index.js +1 -1
  87. package/dest/local-network/auth_registry.d.ts +5 -0
  88. package/dest/local-network/auth_registry.d.ts.map +1 -0
  89. package/dest/local-network/auth_registry.js +17 -0
  90. package/dest/local-network/banana_fpc.d.ts +11 -0
  91. package/dest/local-network/banana_fpc.d.ts.map +1 -0
  92. package/dest/{sandbox → local-network}/banana_fpc.js +29 -27
  93. package/dest/local-network/index.d.ts +4 -0
  94. package/dest/local-network/index.d.ts.map +1 -0
  95. package/dest/local-network/index.js +3 -0
  96. package/dest/local-network/local-network.d.ts +50 -0
  97. package/dest/local-network/local-network.d.ts.map +1 -0
  98. package/dest/local-network/local-network.js +248 -0
  99. package/dest/local-network/sponsored_fpc.d.ts +5 -0
  100. package/dest/local-network/sponsored_fpc.d.ts.map +1 -0
  101. package/dest/local-network/sponsored_fpc.js +18 -0
  102. package/dest/mnemonic.d.ts +1 -1
  103. package/dest/splash.d.ts +1 -1
  104. package/dest/testing/anvil_test_watcher.d.ts +54 -0
  105. package/dest/testing/anvil_test_watcher.d.ts.map +1 -0
  106. package/dest/testing/anvil_test_watcher.js +235 -0
  107. package/dest/testing/cheat_codes.d.ts +44 -0
  108. package/dest/testing/cheat_codes.d.ts.map +1 -0
  109. package/dest/testing/cheat_codes.js +98 -0
  110. package/dest/testing/epoch_test_settler.d.ts +19 -0
  111. package/dest/testing/epoch_test_settler.d.ts.map +1 -0
  112. package/dest/testing/epoch_test_settler.js +63 -0
  113. package/dest/testing/index.d.ts +6 -0
  114. package/dest/testing/index.d.ts.map +1 -0
  115. package/dest/testing/index.js +5 -0
  116. package/dest/testing/token_allowed_setup.d.ts +7 -0
  117. package/dest/testing/token_allowed_setup.d.ts.map +1 -0
  118. package/dest/testing/token_allowed_setup.js +20 -0
  119. package/package.json +56 -45
  120. package/scripts/add_crate.sh +53 -0
  121. package/scripts/aztec.sh +73 -0
  122. package/scripts/init.sh +39 -0
  123. package/scripts/new.sh +83 -0
  124. package/scripts/setup_workspace.sh +69 -0
  125. package/scripts/templates/blank/contract/Nargo.toml +6 -0
  126. package/scripts/templates/blank/contract/src/main.nr +10 -0
  127. package/scripts/templates/blank/test/Nargo.toml +7 -0
  128. package/scripts/templates/blank/test/src/lib.nr +11 -0
  129. package/scripts/templates/counter/contract/Nargo.toml +7 -0
  130. package/scripts/templates/counter/contract/src/main.nr +48 -0
  131. package/scripts/templates/counter/test/Nargo.toml +7 -0
  132. package/scripts/templates/counter/test/src/lib.nr +32 -0
  133. package/src/bin/index.ts +33 -13
  134. package/src/cli/admin_api_key_store.ts +128 -0
  135. package/src/cli/aztec_start_action.ts +100 -46
  136. package/src/cli/aztec_start_options.ts +183 -226
  137. package/src/cli/cli.ts +19 -11
  138. package/src/cli/cmds/compile.ts +192 -0
  139. package/src/cli/cmds/migrate_ha_db.ts +43 -0
  140. package/src/cli/cmds/profile.ts +26 -0
  141. package/src/cli/cmds/profile_flamegraph.ts +64 -0
  142. package/src/cli/cmds/profile_gates.ts +84 -0
  143. package/src/cli/cmds/profile_utils.ts +58 -0
  144. package/src/cli/cmds/standby.ts +132 -0
  145. package/src/cli/cmds/start_bot.ts +43 -19
  146. package/src/cli/cmds/start_node.ts +142 -91
  147. package/src/cli/cmds/start_p2p_bootstrap.ts +14 -6
  148. package/src/cli/cmds/start_prover_agent.ts +25 -16
  149. package/src/cli/cmds/start_prover_broker.ts +32 -9
  150. package/src/cli/cmds/start_txe.ts +7 -5
  151. package/src/cli/cmds/utils/artifacts.ts +44 -0
  152. package/src/cli/cmds/utils/collect_crate_dirs.ts +118 -0
  153. package/src/cli/cmds/utils/needs_recompile.ts +98 -0
  154. package/src/cli/cmds/utils/spawn.ts +16 -0
  155. package/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts +76 -0
  156. package/src/cli/preload_crs.ts +7 -0
  157. package/src/cli/util.ts +192 -56
  158. package/src/cli/versioning.ts +3 -3
  159. package/src/examples/token.ts +23 -19
  160. package/src/examples/util.ts +6 -8
  161. package/src/index.ts +5 -6
  162. package/src/local-network/auth_registry.ts +19 -0
  163. package/src/{sandbox → local-network}/banana_fpc.ts +32 -29
  164. package/src/local-network/index.ts +7 -0
  165. package/src/local-network/local-network.ts +303 -0
  166. package/src/local-network/sponsored_fpc.ts +26 -0
  167. package/src/testing/anvil_test_watcher.ts +273 -0
  168. package/src/testing/cheat_codes.ts +132 -0
  169. package/src/testing/epoch_test_settler.ts +69 -0
  170. package/src/testing/index.ts +5 -0
  171. package/src/testing/token_allowed_setup.ts +19 -0
  172. package/dest/cli/chain_l2_config.d.ts +0 -19
  173. package/dest/cli/chain_l2_config.d.ts.map +0 -1
  174. package/dest/cli/chain_l2_config.js +0 -56
  175. package/dest/cli/cmds/start_archiver.d.ts +0 -9
  176. package/dest/cli/cmds/start_archiver.d.ts.map +0 -1
  177. package/dest/cli/cmds/start_archiver.js +0 -42
  178. package/dest/cli/cmds/start_blob_sink.d.ts +0 -3
  179. package/dest/cli/cmds/start_blob_sink.d.ts.map +0 -1
  180. package/dest/cli/cmds/start_blob_sink.js +0 -17
  181. package/dest/cli/cmds/start_faucet.d.ts +0 -4
  182. package/dest/cli/cmds/start_faucet.d.ts.map +0 -1
  183. package/dest/cli/cmds/start_faucet.js +0 -20
  184. package/dest/cli/cmds/start_prover_node.d.ts +0 -7
  185. package/dest/cli/cmds/start_prover_node.d.ts.map +0 -1
  186. package/dest/cli/cmds/start_prover_node.js +0 -110
  187. package/dest/cli/cmds/start_pxe.d.ts +0 -16
  188. package/dest/cli/cmds/start_pxe.d.ts.map +0 -1
  189. package/dest/cli/cmds/start_pxe.js +0 -95
  190. package/dest/cli/get_l1_config.d.ts +0 -7
  191. package/dest/cli/get_l1_config.d.ts.map +0 -1
  192. package/dest/cli/get_l1_config.js +0 -13
  193. package/dest/sandbox/banana_fpc.d.ts +0 -11
  194. package/dest/sandbox/banana_fpc.d.ts.map +0 -1
  195. package/dest/sandbox/index.d.ts +0 -5
  196. package/dest/sandbox/index.d.ts.map +0 -1
  197. package/dest/sandbox/index.js +0 -4
  198. package/dest/sandbox/sandbox.d.ts +0 -76
  199. package/dest/sandbox/sandbox.d.ts.map +0 -1
  200. package/dest/sandbox/sandbox.js +0 -181
  201. package/dest/sandbox/sponsored_fee_payment_method.d.ts +0 -23
  202. package/dest/sandbox/sponsored_fee_payment_method.d.ts.map +0 -1
  203. package/dest/sandbox/sponsored_fee_payment_method.js +0 -36
  204. package/dest/sandbox/sponsored_fpc.d.ts +0 -6
  205. package/dest/sandbox/sponsored_fpc.d.ts.map +0 -1
  206. package/dest/sandbox/sponsored_fpc.js +0 -26
  207. package/src/cli/chain_l2_config.ts +0 -74
  208. package/src/cli/cmds/start_archiver.ts +0 -55
  209. package/src/cli/cmds/start_blob_sink.ts +0 -31
  210. package/src/cli/cmds/start_faucet.ts +0 -34
  211. package/src/cli/cmds/start_prover_node.ts +0 -121
  212. package/src/cli/cmds/start_pxe.ts +0 -129
  213. package/src/cli/get_l1_config.ts +0 -18
  214. package/src/sandbox/index.ts +0 -5
  215. package/src/sandbox/sandbox.ts +0 -229
  216. package/src/sandbox/sponsored_fee_payment_method.ts +0 -46
  217. package/src/sandbox/sponsored_fpc.ts +0 -38
@@ -0,0 +1,118 @@
1
+ import TOML from '@iarna/toml';
2
+ import { existsSync } from 'fs';
3
+ import { mkdir, readFile, stat } from 'fs/promises';
4
+ import { homedir } from 'os';
5
+ import { dirname, join, resolve } from 'path';
6
+
7
+ import { run } from './spawn.js';
8
+
9
+ /**
10
+ * Recursively collects crate directories starting from startCrateDir by following dependencies declared in Nargo.toml
11
+ * files.
12
+ *
13
+ * When `skipGitDeps` is false (default), git-based deps are followed and fetched into the nargo cache
14
+ * (`$HOME/nargo/<domain>/<repo-path>/<tag>`) if not already present.
15
+ *
16
+ * When `skipGitDeps` is true, git-based deps are ignored entirely.
17
+ */
18
+ export async function collectCrateDirs(startCrateDir: string, opts?: { skipGitDeps?: boolean }): Promise<string[]> {
19
+ const { skipGitDeps = false } = opts ?? {};
20
+ const visited = new Set<string>();
21
+
22
+ async function visit(crateDir: string): Promise<void> {
23
+ const absDir = resolve(crateDir);
24
+ if (visited.has(absDir)) {
25
+ return;
26
+ }
27
+ visited.add(absDir);
28
+
29
+ const tomlPath = join(absDir, 'Nargo.toml');
30
+ const content = await readFile(tomlPath, 'utf-8').catch(() => {
31
+ throw new Error(`Incorrectly defined dependency. Nargo.toml not found in ${absDir}`);
32
+ });
33
+
34
+ const parsed = TOML.parse(content) as Record<string, any>;
35
+ const members = (parsed.workspace as Record<string, any>)?.members as string[] | undefined;
36
+
37
+ // A Nargo.toml is either a workspace root (has workspace.members) or a single crate (has dependencies).
38
+ if (Array.isArray(members)) {
39
+ // The crate is a workspace root and has members defined so we visit the members
40
+ for (const member of members) {
41
+ await visit(resolve(absDir, member));
42
+ }
43
+ } else {
44
+ // Single crate — follow its deps
45
+ const deps = (parsed.dependencies as Record<string, any>) ?? {};
46
+ for (const dep of Object.values(deps)) {
47
+ if (!dep || typeof dep !== 'object') {
48
+ continue;
49
+ }
50
+ if (typeof dep.path === 'string') {
51
+ // Dependency contains "path" hence it's a local dependency. We just check it's a real directory and then we
52
+ // recursively search through it
53
+ const depPath = resolve(absDir, dep.path);
54
+ const s = await stat(depPath);
55
+ if (!s.isDirectory()) {
56
+ throw new Error(
57
+ `Dependency path "${dep.path}" in ${tomlPath} resolves to ${depPath} which is not a directory`,
58
+ );
59
+ }
60
+ await visit(depPath);
61
+ } else if (!skipGitDeps && typeof dep.git === 'string' && typeof dep.tag === 'string') {
62
+ // Dependency contains "git" hence it's a git dependency. We ensure it has been fetched and fetch it if
63
+ // it's not the case and then we recursively search through it.
64
+ await fetchAndVisit(dep.git, dep.tag, dep.directory);
65
+ }
66
+ }
67
+ }
68
+ }
69
+
70
+ async function fetchAndVisit(gitUrl: string, tag: string, directory?: string): Promise<void> {
71
+ // `directory` is set when the dep lives in a subdirectory of a repository, e.g.:
72
+ // aztec = { git = "https://github.com/AztecProtocol/aztec-packages", tag = "v0.82.0",
73
+ // directory = "noir-projects/aztec-nr/aztec" }
74
+ // In that case nargo clones the whole repo and the crate root is <cachePath>/<directory>.
75
+ const cachePath = nargoGitDepPath(gitUrl, tag);
76
+ const crateDir = directory ? join(cachePath, directory) : cachePath;
77
+ await ensureGitDepCached(gitUrl, tag, cachePath);
78
+ await visit(crateDir);
79
+ }
80
+
81
+ await visit(startCrateDir);
82
+ return [...visited];
83
+ }
84
+
85
+ /**
86
+ * Computes the local nargo cache path for a git dependency, mirroring nargo's own `git_dep_location` function.
87
+ * Path format: `$HOME/nargo/<domain>/<repo-path>/<tag>`
88
+ * e.g. `~/nargo/github.com/AztecProtocol/aztec-packages/v0.82.0`
89
+ *
90
+ * Source: noir/noir-repo/tooling/nargo_toml/src/git.rs
91
+ */
92
+ export function nargoGitDepPath(gitUrl: string, tag: string): string {
93
+ const url = new URL(gitUrl);
94
+ const domain = url.hostname;
95
+ const repoPath = url.pathname.replace(/^\//, '');
96
+ return join(process.env.HOME ?? homedir(), 'nargo', domain, repoPath, tag);
97
+ }
98
+
99
+ /**
100
+ * Ensures a git dep is present in the nargo cache, cloning it if it isn't. Mirrors nargo's `clone_git_repo`.
101
+ * If cloning fails (e.g. no network), throws with a message suggesting `nargo check` to prime the cache.
102
+ *
103
+ * Source: noir/noir-repo/tooling/nargo_toml/src/git.rs
104
+ */
105
+ async function ensureGitDepCached(gitUrl: string, tag: string, cachePath: string): Promise<void> {
106
+ if (existsSync(cachePath)) {
107
+ return;
108
+ }
109
+ await mkdir(dirname(cachePath), { recursive: true });
110
+ try {
111
+ await run('git', ['-c', 'advice.detachedHead=false', 'clone', '--depth', '1', '--branch', tag, gitUrl, cachePath]);
112
+ } catch (err: any) {
113
+ throw new Error(
114
+ `Failed to fetch git dependency ${gitUrl}@${tag}: ${err?.message ?? err}.\n` +
115
+ `Try running \`nargo check\` first to prime the dependency cache.`,
116
+ );
117
+ }
118
+ }
@@ -0,0 +1,98 @@
1
+ import { readdir, stat } from 'fs/promises';
2
+ import { join } from 'path';
3
+
4
+ import { collectCrateDirs } from './collect_crate_dirs.js';
5
+
6
+ /**
7
+ * Returns true if recompilation is needed: either no artifacts exist in target/ or any .nr or Nargo.toml source file
8
+ * (including path-based dependencies) is newer than the oldest artifact. We compare against the oldest artifact so
9
+ * that a source change between the oldest and newest compilation (e.g. in a multi-contract workspace) still triggers
10
+ * a recompile.
11
+ *
12
+ * Note: The above implies that if there is a random json file in the target dir we would be always recompiling.
13
+ */
14
+ export async function needsRecompile(): Promise<boolean> {
15
+ const oldestArtifactMs = await getOldestArtifactModificationTime('target');
16
+ if (oldestArtifactMs === undefined) {
17
+ return true;
18
+ }
19
+
20
+ // Git deps are pinned to a specific tag in Nargo.toml and nargo always fetches an exact tag, so their contents never
21
+ // change without Nargo.toml itself changing — and Nargo.toml is already tracked as a source file. Hence we can
22
+ // safely ignore checking source files of git deps.
23
+ const crateDirs = await collectCrateDirs('.', { skipGitDeps: true });
24
+ return hasNewerSourceFile(crateDirs, oldestArtifactMs);
25
+ }
26
+
27
+ /**
28
+ * Returns the last modification time (timestamp in ms) of the oldest .json artifact in targetDir, or undefined if
29
+ * none exist.
30
+ */
31
+ async function getOldestArtifactModificationTime(targetDir: string): Promise<number | undefined> {
32
+ let entries: string[];
33
+ try {
34
+ entries = (await readdir(targetDir)).filter(f => f.endsWith('.json'));
35
+ } catch (err: any) {
36
+ if (err?.code === 'ENOENT') {
37
+ return undefined;
38
+ }
39
+ throw err;
40
+ }
41
+
42
+ if (entries.length === 0) {
43
+ return undefined;
44
+ }
45
+
46
+ let oldest = Infinity;
47
+ for (const entry of entries) {
48
+ const s = await stat(join(targetDir, entry));
49
+ if (s.mtimeMs < oldest) {
50
+ oldest = s.mtimeMs;
51
+ }
52
+ }
53
+ return oldest;
54
+ }
55
+
56
+ /**
57
+ * Walks crate dirs looking for .nr and Nargo.toml files newer than thresholdMs. Short-circuits on the first match.
58
+ */
59
+ async function hasNewerSourceFile(crateDirs: string[], thresholdMs: number): Promise<boolean> {
60
+ // Returns true if it find a new file than thresholdMs, false otherwise
61
+ async function walkForNewer(dir: string): Promise<boolean> {
62
+ let entries;
63
+ try {
64
+ entries = await readdir(dir, { withFileTypes: true });
65
+ } catch {
66
+ return false;
67
+ }
68
+
69
+ // We iterate over the entries in the dir
70
+ for (const entry of entries) {
71
+ const fullPath = join(dir, entry.name);
72
+ if (entry.isDirectory()) {
73
+ // If the entry is a dir and it's not called `target` we recursively enter it
74
+ if (entry.name === 'target') {
75
+ continue;
76
+ }
77
+ if (await walkForNewer(fullPath)) {
78
+ return true;
79
+ }
80
+ } else if (entry.name === 'Nargo.toml' || entry.name.endsWith('.nr')) {
81
+ // The entry is a Nargo.toml file or *.nr file so we check the timestamp
82
+ const s = await stat(fullPath);
83
+ if (s.mtimeMs > thresholdMs) {
84
+ return true;
85
+ }
86
+ }
87
+ }
88
+ return false;
89
+ }
90
+
91
+ // We search through the crate dirs
92
+ for (const dir of crateDirs) {
93
+ if (await walkForNewer(dir)) {
94
+ return true;
95
+ }
96
+ }
97
+ return false;
98
+ }
@@ -0,0 +1,16 @@
1
+ import { spawn } from 'child_process';
2
+
3
+ /** Spawns a command with inherited stdio and rejects on non-zero exit. */
4
+ export function run(cmd: string, args: string[]): Promise<void> {
5
+ return new Promise((resolve, reject) => {
6
+ const child = spawn(cmd, args, { stdio: 'inherit' });
7
+ child.on('error', reject);
8
+ child.on('close', code => {
9
+ if (code !== 0) {
10
+ reject(new Error(`${cmd} exited with code ${code}`));
11
+ } else {
12
+ resolve();
13
+ }
14
+ });
15
+ });
16
+ }
@@ -0,0 +1,76 @@
1
+ import type { LogFn } from '@aztec/foundation/log';
2
+ import { DEV_VERSION, 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 === DEV_VERSION) {
32
+ return;
33
+ }
34
+
35
+ const expectedTag = `v${version}`;
36
+ const mismatches: { file: string; depName: string; tag: string }[] = [];
37
+
38
+ const crateDirs = await collectCrateDirs('.', { skipGitDeps: true });
39
+
40
+ for (const dir of crateDirs) {
41
+ const tomlPath = join(dir, 'Nargo.toml');
42
+ let content: string;
43
+ try {
44
+ content = await readFile(tomlPath, 'utf-8');
45
+ } catch {
46
+ continue;
47
+ }
48
+
49
+ const parsed = TOML.parse(content) as Record<string, any>;
50
+ const deps = (parsed.dependencies as Record<string, any>) ?? {};
51
+
52
+ for (const [depName, dep] of Object.entries(deps)) {
53
+ // Skip non-object deps (e.g. malformed entries) and anything that isn't a tagged git dep.
54
+ if (!dep || typeof dep !== 'object' || typeof dep.git !== 'string' || typeof dep.tag !== 'string') {
55
+ continue;
56
+ }
57
+ // Only flag deps that are sourced from the aztec-nr repo.
58
+ if (!isAztecNrGitUrl(dep.git)) {
59
+ continue;
60
+ }
61
+ if (dep.tag !== expectedTag) {
62
+ mismatches.push({ file: tomlPath, depName, tag: dep.tag });
63
+ }
64
+ }
65
+ }
66
+
67
+ if (mismatches.length > 0) {
68
+ const details = mismatches.map(m => ` ${m.file} — ${m.depName} (${m.tag})`).join('\n');
69
+ log(
70
+ `WARNING: Aztec dependency version mismatch detected.\n` +
71
+ `The following aztec-nr dependencies do not match the CLI version (${expectedTag}):\n` +
72
+ `${details}\n\n` +
73
+ `See https://docs.aztec.network/errors/9 for how to update your dependencies.`,
74
+ );
75
+ }
76
+ }
@@ -0,0 +1,7 @@
1
+ import type { LogFn, Logger } from '@aztec/foundation/log';
2
+
3
+ import { preloadCrsDataForServerSideProving } from './util.js';
4
+
5
+ export async function preloadCrs(_options: any, userLog: LogFn, _debugLogger: Logger) {
6
+ await preloadCrsDataForServerSideProving({ realProofs: true }, userLog);
7
+ }
package/src/cli/util.ts CHANGED
@@ -1,67 +1,98 @@
1
- import type { AccountManager, Fr } from '@aztec/aztec.js';
2
- import type { ConfigMappingsType } from '@aztec/foundation/config';
3
- import type { LogFn } from '@aztec/foundation/log';
4
- import type { PXEService } from '@aztec/pxe/server';
1
+ import type { AztecNodeConfig } from '@aztec/aztec-node';
2
+ import type { AccountManager } from '@aztec/aztec.js/wallet';
3
+ import { getNetworkConfig } from '@aztec/cli/config';
4
+ import { RegistryContract } from '@aztec/ethereum/contracts';
5
+ import type { ViemClient } from '@aztec/ethereum/types';
6
+ import type { ConfigMappingsType, NetworkNames } from '@aztec/foundation/config';
7
+ import { jsonStringify } from '@aztec/foundation/json-rpc';
8
+ import { type LogFn, createLogger } from '@aztec/foundation/log';
9
+ import type { ProverConfig } from '@aztec/stdlib/interfaces/server';
10
+ import { type VersionCheck, getPackageVersion } from '@aztec/stdlib/update-checker';
11
+ import type { EmbeddedWallet } from '@aztec/wallets/embedded';
5
12
 
6
13
  import chalk from 'chalk';
7
14
  import type { Command } from 'commander';
15
+ import type { Hex } from 'viem';
8
16
 
9
17
  import { type AztecStartOption, aztecStartOptions } from './aztec_start_options.js';
10
18
 
19
+ export const enum ExitCode {
20
+ SUCCESS = 0,
21
+ ERROR = 1,
22
+ ROLLUP_UPGRADE = 78, // EX_CONFIG from FreeBSD (https://man.freebsd.org/cgi/man.cgi?query=sysexits)
23
+ VERSION_UPGRADE = 79, // prev + 1 because there's nothing better
24
+ // 128 + int(SIGNAL)
25
+ SIGHUP = 129,
26
+ SIGINT = 130,
27
+ SIGQUIT = 131,
28
+ SIGTERM = 143,
29
+ }
30
+
31
+ let shutdownPromise: Promise<never> | undefined;
32
+ export function shutdown(logFn: LogFn, exitCode: ExitCode, cb?: Array<() => Promise<void>>): Promise<never> {
33
+ if (shutdownPromise) {
34
+ logFn('Already shutting down.');
35
+ return shutdownPromise;
36
+ }
37
+
38
+ logFn('Shutting down...', { exitCode });
39
+ if (cb) {
40
+ shutdownPromise = Promise.allSettled(cb.map(fn => fn())).then(() => process.exit(exitCode));
41
+ } else {
42
+ // synchronously shuts down the process
43
+ // no need to set shutdownPromise on this branch of the if statement because no more code will be executed
44
+ process.exit(exitCode);
45
+ }
46
+
47
+ return shutdownPromise;
48
+ }
49
+
50
+ export function isShuttingDown(): boolean {
51
+ return shutdownPromise !== undefined;
52
+ }
53
+
11
54
  export const installSignalHandlers = (logFn: LogFn, cb?: Array<() => Promise<void>>) => {
12
- const shutdown = async () => {
13
- logFn('Shutting down...');
14
- if (cb) {
15
- await Promise.all(cb);
16
- }
17
- process.exit(0);
18
- };
19
- process.removeAllListeners('SIGINT');
20
- process.removeAllListeners('SIGTERM');
21
- // eslint-disable-next-line @typescript-eslint/no-misused-promises
22
- process.once('SIGINT', shutdown);
23
- // eslint-disable-next-line @typescript-eslint/no-misused-promises
24
- process.once('SIGTERM', shutdown);
55
+ const signals = [
56
+ ['SIGINT', ExitCode.SIGINT],
57
+ ['SIGTERM', ExitCode.SIGTERM],
58
+ ['SIGHUP', ExitCode.SIGHUP],
59
+ ['SIQUIT', ExitCode.SIGQUIT],
60
+ ] as const;
61
+
62
+ for (const [signal, exitCode] of signals) {
63
+ process.removeAllListeners(signal);
64
+ // eslint-disable-next-line @typescript-eslint/no-misused-promises
65
+ process.once(signal, () => shutdown(logFn, exitCode, cb));
66
+ }
25
67
  };
26
68
 
27
69
  /**
28
70
  * Creates logs for the initial accounts
29
71
  * @param accounts - The initial accounts
30
- * @param pxe - A PXE instance to get the registered accounts
72
+ * @param wallet - A EmbeddedWallet instance to get the registered accounts
31
73
  * @returns A string array containing the initial accounts details
32
74
  */
33
- export async function createAccountLogs(
34
- accountsWithSecretKeys: {
35
- /**
36
- * The account object
37
- */
38
- account: AccountManager;
39
- /**
40
- * The secret key of the account
41
- */
42
- secretKey: Fr;
43
- }[],
44
- pxe: PXEService,
45
- ) {
46
- const registeredAccounts = await pxe.getRegisteredAccounts();
75
+ export async function createAccountLogs(accountManagers: AccountManager[], wallet: EmbeddedWallet) {
76
+ const registeredAccounts = await wallet.getAccounts();
47
77
  const accountLogStrings = [`Initial Accounts:\n\n`];
48
- for (const accountWithSecretKey of accountsWithSecretKeys) {
49
- const completeAddress = await accountWithSecretKey.account.getCompleteAddress();
50
- if (registeredAccounts.find(a => a.equals(completeAddress))) {
78
+ for (const accountManager of accountManagers) {
79
+ const account = await accountManager.getAccount();
80
+ const completeAddress = account.getCompleteAddress();
81
+ if (registeredAccounts.find(a => a.item.equals(completeAddress.address))) {
51
82
  accountLogStrings.push(` Address: ${completeAddress.address.toString()}\n`);
52
83
  accountLogStrings.push(` Partial Address: ${completeAddress.partialAddress.toString()}\n`);
53
- accountLogStrings.push(` Secret Key: ${accountWithSecretKey.secretKey.toString()}\n`);
84
+ accountLogStrings.push(` Secret Key: ${account.getSecretKey().toString()}\n`);
85
+ accountLogStrings.push(` Master nullifier public key hash: ${completeAddress.publicKeys.npkMHash.toString()}\n`);
86
+ accountLogStrings.push(` Master incoming viewing public key: ${completeAddress.publicKeys.ivpkM.toString()}\n\n`);
54
87
  accountLogStrings.push(
55
- ` Master nullifier public key: ${completeAddress.publicKeys.masterNullifierPublicKey.toString()}\n`,
88
+ ` Master outgoing viewing public key hash: ${completeAddress.publicKeys.ovpkMHash.toString()}\n\n`,
56
89
  );
90
+ accountLogStrings.push(` Master tagging public key hash: ${completeAddress.publicKeys.tpkMHash.toString()}\n\n`);
57
91
  accountLogStrings.push(
58
- ` Master incoming viewing public key: ${completeAddress.publicKeys.masterIncomingViewingPublicKey.toString()}\n\n`,
92
+ ` Master message-signing public key hash: ${completeAddress.publicKeys.mspkMHash.toString()}\n\n`,
59
93
  );
60
94
  accountLogStrings.push(
61
- ` Master outgoing viewing public key: ${completeAddress.publicKeys.masterOutgoingViewingPublicKey.toString()}\n\n`,
62
- );
63
- accountLogStrings.push(
64
- ` Master tagging public key: ${completeAddress.publicKeys.masterTaggingPublicKey.toString()}\n\n`,
95
+ ` Master fallback public key hash: ${completeAddress.publicKeys.fbpkMHash.toString()}\n\n`,
65
96
  );
66
97
  }
67
98
  }
@@ -102,18 +133,32 @@ export function formatHelpLine(
102
133
 
103
134
  const getDefaultOrEnvValue = (opt: AztecStartOption) => {
104
135
  let val;
105
- // if the option is set in the environment, use that & parse it
106
- if (opt.envVar && process.env[opt.envVar]) {
107
- val = process.env[opt.envVar];
108
- if (val && opt.parseVal) {
109
- return opt.parseVal(val);
136
+
137
+ // if the option is set in the environment, use that
138
+ if (opt.env) {
139
+ val = process.env[opt.env];
140
+ }
141
+
142
+ // if we have fallback env vars, check those
143
+ if (!val && opt.fallback && opt.fallback.length > 0) {
144
+ for (const fallback of opt.fallback) {
145
+ val = process.env[fallback];
146
+ if (val) {
147
+ break;
148
+ }
110
149
  }
111
- // if no env variable, use the default value
112
- } else if (opt.defaultValue) {
113
- val = opt.defaultValue;
114
150
  }
115
151
 
116
- return val;
152
+ // if we have a value, optionally parse it and return
153
+ if (val) {
154
+ if (opt.parseVal) {
155
+ return opt.parseVal(val);
156
+ }
157
+ return val;
158
+ } else if (opt.defaultValue !== undefined) {
159
+ return opt.defaultValue;
160
+ }
161
+ return undefined;
117
162
  };
118
163
 
119
164
  // Function to add options dynamically
@@ -121,7 +166,7 @@ export const addOptions = (cmd: Command, options: AztecStartOption[]) => {
121
166
  options.forEach(opt => {
122
167
  cmd.option(
123
168
  opt.flag,
124
- `${opt.description} (default: ${opt.defaultValue}) ($${opt.envVar})`,
169
+ `${opt.description} (default: ${opt.defaultValue}) ($${opt.env})`,
125
170
  opt.parseVal ? opt.parseVal : val => val,
126
171
  getDefaultOrEnvValue(opt),
127
172
  );
@@ -137,10 +182,11 @@ export const printAztecStartHelpText = () => {
137
182
  helpTextLines.push('');
138
183
 
139
184
  aztecStartOptions[category].forEach(opt => {
140
- const defaultValueText = opt.defaultValue
141
- ? `(default: ${opt.printDefault ? opt.printDefault(opt.defaultValue) : opt.defaultValue})`
142
- : '';
143
- const envVarText = opt.envVar ? `($${opt.envVar})` : '';
185
+ const defaultValueText =
186
+ opt.defaultValue || (Array.isArray(opt.defaultValue) && opt.defaultValue.length > 0)
187
+ ? `(default: ${opt.printDefault ? opt.printDefault(opt.defaultValue) : opt.defaultValue})`
188
+ : '';
189
+ const envVarText = opt.env ? `($${opt.env})` : '';
144
190
  const flagText = `${opt.flag}`;
145
191
 
146
192
  const paddedText = formatHelpLine(flagText, defaultValueText, envVarText, maxFlagLength, maxDefaultLength);
@@ -214,3 +260,93 @@ export const extractRelevantOptions = <T>(
214
260
 
215
261
  return relevantOptions;
216
262
  };
263
+
264
+ /**
265
+ * Downloads just enough points to be able to verify Chonk proofs.
266
+ * @param opts - Whether proof are to be verifier
267
+ * @param log - Logging function
268
+ */
269
+ export async function preloadCrsDataForVerifying(
270
+ { realProofs }: Pick<AztecNodeConfig, 'realProofs'>,
271
+ log: LogFn,
272
+ ): Promise<void> {
273
+ if (realProofs) {
274
+ const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
275
+ await Promise.all([Crs.new(2 ** 1, undefined, log), GrumpkinCrs.new(2 ** 16, undefined, log)]);
276
+ }
277
+ }
278
+
279
+ /**
280
+ * Downloads enough points to be able to prove every server-side circuit
281
+ * @param opts - Whether real proof are to be generated
282
+ * @param log - Logging function
283
+ */
284
+ export async function preloadCrsDataForServerSideProving(
285
+ { realProofs }: Pick<ProverConfig, 'realProofs'>,
286
+ log: LogFn,
287
+ ): Promise<void> {
288
+ if (realProofs) {
289
+ const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
290
+ await Promise.all([Crs.new(2 ** 25, undefined, log), GrumpkinCrs.new(2 ** 18, undefined, log)]);
291
+ }
292
+ }
293
+
294
+ export async function setupVersionChecker(
295
+ network: NetworkNames,
296
+ followsCanonicalRollup: boolean,
297
+ publicClient: ViemClient,
298
+ signalHandlers: Array<() => Promise<void>>,
299
+ cacheDir?: string,
300
+ ): Promise<void> {
301
+ const networkConfig = await getNetworkConfig(network, cacheDir);
302
+ if (!networkConfig) {
303
+ return;
304
+ }
305
+
306
+ const { VersionChecker } = await import('@aztec/stdlib/update-checker');
307
+
308
+ const logger = createLogger('version_check');
309
+ const registry = new RegistryContract(publicClient, networkConfig.registryAddress as Hex);
310
+
311
+ const checks: Array<VersionCheck> = [];
312
+ checks.push({
313
+ name: 'node',
314
+ currentVersion: getPackageVersion(),
315
+ getLatestVersion: async () => {
316
+ const cfg = await getNetworkConfig(network, cacheDir);
317
+ return cfg?.nodeVersion;
318
+ },
319
+ });
320
+
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
+ });
333
+ }
334
+ }
335
+
336
+ const checker = new VersionChecker(checks, 600_000, logger);
337
+ checker.on('newVersion', ({ name, latestVersion, currentVersion }) => {
338
+ if (isShuttingDown()) {
339
+ return;
340
+ }
341
+
342
+ logger.warn(`New ${name} version available`, { latestVersion, currentVersion });
343
+ });
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(' ');
352
+ }
@@ -1,13 +1,13 @@
1
1
  import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
2
- import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
2
+ import { protocolContractsHash } from '@aztec/protocol-contracts';
3
3
  import type { ChainConfig } from '@aztec/stdlib/config';
4
4
  import { type ComponentsVersions, getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
5
5
 
6
6
  export function getVersions(config?: ChainConfig): Partial<ComponentsVersions> {
7
7
  return config
8
- ? getComponentsVersionsFromConfig(config, protocolContractTreeRoot, getVKTreeRoot())
8
+ ? getComponentsVersionsFromConfig(config, protocolContractsHash, getVKTreeRoot())
9
9
  : {
10
10
  l2CircuitsVkTreeRoot: getVKTreeRoot().toString(),
11
- l2ProtocolContractsTreeRoot: protocolContractTreeRoot.toString(),
11
+ l2ProtocolContractsHash: protocolContractsHash.toString(),
12
12
  };
13
13
  }