@aztec/aztec 0.0.1-commit.e0f15ab9b → 0.0.1-commit.e304674f1

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 (33) hide show
  1. package/dest/cli/cmds/compile.d.ts +1 -1
  2. package/dest/cli/cmds/compile.d.ts.map +1 -1
  3. package/dest/cli/cmds/compile.js +2 -0
  4. package/dest/cli/cmds/standby.d.ts +1 -1
  5. package/dest/cli/cmds/standby.js +2 -2
  6. package/dest/cli/cmds/start_node.d.ts +1 -1
  7. package/dest/cli/cmds/start_node.d.ts.map +1 -1
  8. package/dest/cli/cmds/start_node.js +6 -20
  9. package/dest/cli/cmds/start_prover_agent.d.ts +1 -1
  10. package/dest/cli/cmds/start_prover_agent.d.ts.map +1 -1
  11. package/dest/cli/cmds/start_prover_agent.js +3 -15
  12. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts +21 -0
  13. package/dest/cli/cmds/utils/collect_crate_dirs.d.ts.map +1 -0
  14. package/dest/cli/cmds/utils/collect_crate_dirs.js +114 -0
  15. package/dest/cli/cmds/utils/needs_recompile.d.ts +1 -1
  16. package/dest/cli/cmds/utils/needs_recompile.d.ts.map +1 -1
  17. package/dest/cli/cmds/utils/needs_recompile.js +9 -53
  18. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts +4 -0
  19. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.d.ts.map +1 -0
  20. package/dest/cli/cmds/utils/warn_if_aztec_version_mismatch.js +41 -0
  21. package/dest/local-network/local-network.d.ts +3 -4
  22. package/dest/local-network/local-network.d.ts.map +1 -1
  23. package/dest/local-network/local-network.js +3 -3
  24. package/package.json +33 -33
  25. package/scripts/aztec.sh +1 -1
  26. package/src/cli/cmds/compile.ts +3 -0
  27. package/src/cli/cmds/standby.ts +2 -2
  28. package/src/cli/cmds/start_node.ts +9 -11
  29. package/src/cli/cmds/start_prover_agent.ts +3 -6
  30. package/src/cli/cmds/utils/collect_crate_dirs.ts +118 -0
  31. package/src/cli/cmds/utils/needs_recompile.ts +8 -61
  32. package/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts +54 -0
  33. package/src/local-network/local-network.ts +5 -5
@@ -1,4 +1,4 @@
1
1
  import type { LogFn } from '@aztec/foundation/log';
2
2
  import type { Command } from 'commander';
3
3
  export declare function injectCompileCommand(program: Command, log: LogFn): Command;
4
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGlsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL2NvbXBpbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHbkQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBb0t6Qyx3QkFBZ0Isb0JBQW9CLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxHQUFHLE9BQU8sQ0FzQjFFIn0=
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGlsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL2NvbXBpbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHbkQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBdUt6Qyx3QkFBZ0Isb0JBQW9CLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxHQUFHLE9BQU8sQ0FzQjFFIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/compile.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAoKzC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAsB1E"}
1
+ {"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/compile.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuKzC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAsB1E"}
@@ -5,6 +5,7 @@ import { join } from 'path';
5
5
  import { readArtifactFiles } from './utils/artifacts.js';
6
6
  import { needsRecompile } from './utils/needs_recompile.js';
7
7
  import { run } from './utils/spawn.js';
8
+ import { warnIfAztecVersionMismatch } from './utils/warn_if_aztec_version_mismatch.js';
8
9
  /** Returns paths to contract artifacts in the target directory. */ async function collectContractArtifacts() {
9
10
  let files;
10
11
  try {
@@ -118,6 +119,7 @@ import { run } from './utils/spawn.js';
118
119
  }
119
120
  }
120
121
  /** Compiles Aztec Noir contracts and postprocesses artifacts. */ async function compileAztecContract(nargoArgs, log) {
122
+ await warnIfAztecVersionMismatch(log);
121
123
  if (!await needsRecompile()) {
122
124
  log('No source changes detected, skipping compilation.');
123
125
  return;
@@ -9,7 +9,7 @@ import type { LogFn } from '@aztec/foundation/log';
9
9
  */
10
10
  export declare function computeExpectedGenesisRoot(config: GenesisStateConfig, userLog: LogFn): Promise<{
11
11
  genesisArchiveRoot: Fr;
12
- prefilledPublicData: import("@aztec/stdlib/trees").PublicDataTreeLeaf[];
12
+ genesis: import("@aztec/stdlib/world-state").GenesisData;
13
13
  }>;
14
14
  /**
15
15
  * Waits until the canonical rollup's genesis archive root, VK tree root, and protocol contracts hash
@@ -20,11 +20,11 @@ const ROLLUP_POLL_INTERVAL_S = 60;
20
20
  const prefundAddresses = (config.prefundAddresses ?? []).map((a)=>AztecAddress.fromString(a));
21
21
  const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts).concat(prefundAddresses);
22
22
  userLog(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
23
- const { genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
23
+ const { genesisArchiveRoot, genesis } = await getGenesisValues(initialFundedAccounts);
24
24
  userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
25
25
  return {
26
26
  genesisArchiveRoot,
27
- prefilledPublicData
27
+ genesis
28
28
  };
29
29
  }
30
30
  async function checkRollupCompatibility(rollup, expected) {
@@ -5,4 +5,4 @@ import type { LogFn } from '@aztec/foundation/log';
5
5
  export declare function startNode(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, adminServices: NamespacedApiHandlers, userLog: LogFn, networkName: NetworkNames): Promise<{
6
6
  config: AztecNodeConfig;
7
7
  }>;
8
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfbm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUE2QyxNQUFNLG1CQUFtQixDQUFDO0FBS3BHLE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBZSxNQUFNLDBCQUEwQixDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFL0UsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUEwQm5ELHdCQUFzQixTQUFTLENBQzdCLE9BQU8sRUFBRSxHQUFHLEVBQ1osY0FBYyxFQUFFLENBQUMsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxFQUN2QyxRQUFRLEVBQUUscUJBQXFCLEVBQy9CLGFBQWEsRUFBRSxxQkFBcUIsRUFDcEMsT0FBTyxFQUFFLEtBQUssRUFDZCxXQUFXLEVBQUUsWUFBWSxHQUN4QixPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsZUFBZSxDQUFBO0NBQUUsQ0FBQyxDQW9LdEMifQ==
8
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfbm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUE2QyxNQUFNLG1CQUFtQixDQUFDO0FBS3BHLE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBZSxNQUFNLDBCQUEwQixDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFL0UsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUE4Qm5ELHdCQUFzQixTQUFTLENBQzdCLE9BQU8sRUFBRSxHQUFHLEVBQ1osY0FBYyxFQUFFLENBQUMsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxFQUN2QyxRQUFRLEVBQUUscUJBQXFCLEVBQy9CLGFBQWEsRUFBRSxxQkFBcUIsRUFDcEMsT0FBTyxFQUFFLEtBQUssRUFDZCxXQUFXLEVBQUUsWUFBWSxHQUN4QixPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsZUFBZSxDQUFBO0NBQUUsQ0FBQyxDQThKdEMifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"start_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAA6C,MAAM,mBAAmB,CAAC;AAKpG,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,0BAA0B,CAAC;AAC1E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AA0BnD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB,EACpC,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,YAAY,GACxB,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CAoKtC"}
1
+ {"version":3,"file":"start_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAA6C,MAAM,mBAAmB,CAAC;AAKpG,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,0BAA0B,CAAC;AAC1E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AA8BnD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB,EACpC,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,YAAY,GACxB,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CA8JtC"}
@@ -7,7 +7,7 @@ import { SecretValue } from '@aztec/foundation/config';
7
7
  import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
8
8
  import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
9
9
  import { protocolContractsHash } from '@aztec/protocol-contracts';
10
- import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker';
10
+ import { ProvingJobConsumerSchema, createProvingJobBrokerClient, proverBrokerBackoff } from '@aztec/prover-client/broker';
11
11
  import { allPxeConfigMappings } from '@aztec/pxe/config';
12
12
  import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
13
13
  import { P2PApiSchema, ProverNodeApiSchema } from '@aztec/stdlib/interfaces/server';
@@ -39,20 +39,8 @@ export async function startNode(options, signalHandlers, services, adminServices
39
39
  if (nodeConfig.proverBrokerUrl) {
40
40
  // at 1TPS we'd enqueue ~1k chonk verifier proofs and ~1k AVM proofs immediately
41
41
  // set a lower connection limit such that we don't overload the server
42
- // Keep retrying up to 30s
43
- const fetch = makeTracedFetch([
44
- 1,
45
- 2,
46
- 3,
47
- 3,
48
- 3,
49
- 3,
50
- 3,
51
- 3,
52
- 3,
53
- 3,
54
- 3
55
- ], false, makeUndiciFetch(new Agent({
42
+ // Retry indefinitely until the epoch proving times out and the chain reorgs
43
+ const fetch = makeTracedFetch(proverBrokerBackoff, false, makeUndiciFetch(new Agent({
56
44
  connections: 100
57
45
  })));
58
46
  broker = createProvingJobBrokerClient(nodeConfig.proverBrokerUrl, getVersions(nodeConfig), fetch);
@@ -65,7 +53,7 @@ export async function startNode(options, signalHandlers, services, adminServices
65
53
  }
66
54
  await preloadCrsDataForVerifying(nodeConfig, userLog);
67
55
  const genesisConfig = getGenesisStateConfigEnvVars();
68
- const { genesisArchiveRoot, prefilledPublicData } = await computeExpectedGenesisRoot(genesisConfig, userLog);
56
+ const { genesisArchiveRoot, genesis } = await computeExpectedGenesisRoot(genesisConfig, userLog);
69
57
  const followsCanonicalRollup = typeof nodeConfig.rollupVersion !== 'number' || nodeConfig.rollupVersion === 'canonical';
70
58
  if (!nodeConfig.l1Contracts.registryAddress || nodeConfig.l1Contracts.registryAddress.isZero()) {
71
59
  throw new Error('L1 registry address is required to start Aztec Node');
@@ -82,12 +70,10 @@ export async function startNode(options, signalHandlers, services, adminServices
82
70
  if (!Fr.fromHexString(config.genesisArchiveTreeRoot).equals(genesisArchiveRoot)) {
83
71
  throw new Error(`The computed genesis archive tree root ${genesisArchiveRoot} does not match the expected genesis archive tree root ${config.genesisArchiveTreeRoot} for the rollup deployed at ${addresses.rollupAddress}`);
84
72
  }
85
- // TODO(#12272): will clean this up.
86
73
  nodeConfig = {
87
74
  ...nodeConfig,
88
75
  l1Contracts: {
89
- ...addresses,
90
- slashFactoryAddress: nodeConfig.l1Contracts.slashFactoryAddress
76
+ ...addresses
91
77
  },
92
78
  ...config
93
79
  };
@@ -121,7 +107,7 @@ export async function startNode(options, signalHandlers, services, adminServices
121
107
  telemetry,
122
108
  proverBroker: broker
123
109
  }, {
124
- prefilledPublicData
110
+ genesis
125
111
  });
126
112
  // Add node and p2p to services list
127
113
  services.node = [
@@ -1,4 +1,4 @@
1
1
  import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
2
2
  import type { LogFn } from '@aztec/foundation/log';
3
3
  export declare function startProverAgent(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, userLog: LogFn): Promise<void>;
4
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfcHJvdmVyX2FnZW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2NtZHMvc3RhcnRfcHJvdmVyX2FnZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFL0UsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFnQm5ELHdCQUFzQixnQkFBZ0IsQ0FDcEMsT0FBTyxFQUFFLEdBQUcsRUFDWixjQUFjLEVBQUUsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQ3ZDLFFBQVEsRUFBRSxxQkFBcUIsRUFDL0IsT0FBTyxFQUFFLEtBQUssaUJBd0RmIn0=
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfcHJvdmVyX2FnZW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2NtZHMvc3RhcnRfcHJvdmVyX2FnZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFL0UsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFpQm5ELHdCQUFzQixnQkFBZ0IsQ0FDcEMsT0FBTyxFQUFFLEdBQUcsRUFDWixjQUFjLEVBQUUsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQ3ZDLFFBQVEsRUFBRSxxQkFBcUIsRUFDL0IsT0FBTyxFQUFFLEtBQUssaUJBb0RmIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"start_prover_agent.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_agent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAgBnD,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,iBAwDf"}
1
+ {"version":3,"file":"start_prover_agent.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_agent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAiBnD,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,iBAoDf"}
@@ -1,7 +1,7 @@
1
1
  import { times } from '@aztec/foundation/collection';
2
2
  import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
3
3
  import { buildServerCircuitProver } from '@aztec/prover-client';
4
- import { ProvingAgent, createProofStore, createProvingJobBrokerClient, proverAgentConfigMappings } from '@aztec/prover-client/broker';
4
+ import { ProvingAgent, createProofStore, createProvingJobBrokerClient, proverAgentConfigMappings, proverBrokerBackoff } from '@aztec/prover-client/broker';
5
5
  import { getProverNodeAgentConfigFromEnv } from '@aztec/prover-node';
6
6
  import { ProverAgentApiSchema } from '@aztec/stdlib/interfaces/server';
7
7
  import { initTelemetryClient, makeTracedFetch, telemetryClientConfigMappings } from '@aztec/telemetry-client';
@@ -25,20 +25,8 @@ export async function startProverAgent(options, signalHandlers, services, userLo
25
25
  process.exit(1);
26
26
  }
27
27
  await preloadCrsDataForServerSideProving(config, userLog);
28
- const fetch = makeTracedFetch(// retry connections every 3s, up to 30s before giving up
29
- [
30
- 1,
31
- 2,
32
- 3,
33
- 3,
34
- 3,
35
- 3,
36
- 3,
37
- 3,
38
- 3,
39
- 3,
40
- 3
41
- ], false, makeUndiciFetch(new Agent({
28
+ // Retry indefinitely until the epoch proving times out and the chain reorgs
29
+ const fetch = makeTracedFetch(proverBrokerBackoff, false, makeUndiciFetch(new Agent({
42
30
  connections: 10
43
31
  })));
44
32
  const broker = createProvingJobBrokerClient(config.proverBrokerUrl, getVersions(), fetch);
@@ -0,0 +1,21 @@
1
+ /**
2
+ * Recursively collects crate directories starting from startCrateDir by following dependencies declared in Nargo.toml
3
+ * files.
4
+ *
5
+ * When `skipGitDeps` is false (default), git-based deps are followed and fetched into the nargo cache
6
+ * (`$HOME/nargo/<domain>/<repo-path>/<tag>`) if not already present.
7
+ *
8
+ * When `skipGitDeps` is true, git-based deps are ignored entirely.
9
+ */
10
+ export declare function collectCrateDirs(startCrateDir: string, opts?: {
11
+ skipGitDeps?: boolean;
12
+ }): Promise<string[]>;
13
+ /**
14
+ * Computes the local nargo cache path for a git dependency, mirroring nargo's own `git_dep_location` function.
15
+ * Path format: `$HOME/nargo/<domain>/<repo-path>/<tag>`
16
+ * e.g. `~/nargo/github.com/AztecProtocol/aztec-packages/v0.82.0`
17
+ *
18
+ * Source: noir/noir-repo/tooling/nargo_toml/src/git.rs
19
+ */
20
+ export declare function nargoGitDepPath(gitUrl: string, tag: string): string;
21
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdF9jcmF0ZV9kaXJzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY2xpL2NtZHMvdXRpbHMvY29sbGVjdF9jcmF0ZV9kaXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVFBOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLGdCQUFnQixDQUFDLGFBQWEsRUFBRSxNQUFNLEVBQUUsSUFBSSxDQUFDLEVBQUU7SUFBRSxXQUFXLENBQUMsRUFBRSxPQUFPLENBQUE7Q0FBRSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQWlFakg7QUFFRDs7Ozs7O0dBTUc7QUFDSCx3QkFBZ0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLE1BQU0sR0FBRyxNQUFNLENBS25FIn0=
@@ -0,0 +1 @@
1
+ {"version":3,"file":"collect_crate_dirs.d.ts","sourceRoot":"","sources":["../../../../src/cli/cmds/utils/collect_crate_dirs.ts"],"names":[],"mappings":"AAQA;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAiEjH;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAKnE"}
@@ -0,0 +1,114 @@
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
+ import { run } from './spawn.js';
7
+ /**
8
+ * Recursively collects crate directories starting from startCrateDir by following dependencies declared in Nargo.toml
9
+ * files.
10
+ *
11
+ * When `skipGitDeps` is false (default), git-based deps are followed and fetched into the nargo cache
12
+ * (`$HOME/nargo/<domain>/<repo-path>/<tag>`) if not already present.
13
+ *
14
+ * When `skipGitDeps` is true, git-based deps are ignored entirely.
15
+ */ export async function collectCrateDirs(startCrateDir, opts) {
16
+ const { skipGitDeps = false } = opts ?? {};
17
+ const visited = new Set();
18
+ async function visit(crateDir) {
19
+ const absDir = resolve(crateDir);
20
+ if (visited.has(absDir)) {
21
+ return;
22
+ }
23
+ visited.add(absDir);
24
+ const tomlPath = join(absDir, 'Nargo.toml');
25
+ const content = await readFile(tomlPath, 'utf-8').catch(()=>{
26
+ throw new Error(`Incorrectly defined dependency. Nargo.toml not found in ${absDir}`);
27
+ });
28
+ const parsed = TOML.parse(content);
29
+ const members = parsed.workspace?.members;
30
+ // A Nargo.toml is either a workspace root (has workspace.members) or a single crate (has dependencies).
31
+ if (Array.isArray(members)) {
32
+ // The crate is a workspace root and has members defined so we visit the members
33
+ for (const member of members){
34
+ await visit(resolve(absDir, member));
35
+ }
36
+ } else {
37
+ // Single crate — follow its deps
38
+ const deps = parsed.dependencies ?? {};
39
+ for (const dep of Object.values(deps)){
40
+ if (!dep || typeof dep !== 'object') {
41
+ continue;
42
+ }
43
+ if (typeof dep.path === 'string') {
44
+ // Dependency contains "path" hence it's a local dependency. We just check it's a real directory and then we
45
+ // recursively search through it
46
+ const depPath = resolve(absDir, dep.path);
47
+ const s = await stat(depPath);
48
+ if (!s.isDirectory()) {
49
+ throw new Error(`Dependency path "${dep.path}" in ${tomlPath} resolves to ${depPath} which is not a directory`);
50
+ }
51
+ await visit(depPath);
52
+ } else if (!skipGitDeps && typeof dep.git === 'string' && typeof dep.tag === 'string') {
53
+ // Dependency contains "git" hence it's a git dependency. We ensure it has been fetched and fetch it if
54
+ // it's not the case and then we recursively search through it.
55
+ await fetchAndVisit(dep.git, dep.tag, dep.directory);
56
+ }
57
+ }
58
+ }
59
+ }
60
+ async function fetchAndVisit(gitUrl, tag, directory) {
61
+ // `directory` is set when the dep lives in a subdirectory of a repository, e.g.:
62
+ // aztec = { git = "https://github.com/AztecProtocol/aztec-packages", tag = "v0.82.0",
63
+ // directory = "noir-projects/aztec-nr/aztec" }
64
+ // In that case nargo clones the whole repo and the crate root is <cachePath>/<directory>.
65
+ const cachePath = nargoGitDepPath(gitUrl, tag);
66
+ const crateDir = directory ? join(cachePath, directory) : cachePath;
67
+ await ensureGitDepCached(gitUrl, tag, cachePath);
68
+ await visit(crateDir);
69
+ }
70
+ await visit(startCrateDir);
71
+ return [
72
+ ...visited
73
+ ];
74
+ }
75
+ /**
76
+ * Computes the local nargo cache path for a git dependency, mirroring nargo's own `git_dep_location` function.
77
+ * Path format: `$HOME/nargo/<domain>/<repo-path>/<tag>`
78
+ * e.g. `~/nargo/github.com/AztecProtocol/aztec-packages/v0.82.0`
79
+ *
80
+ * Source: noir/noir-repo/tooling/nargo_toml/src/git.rs
81
+ */ export function nargoGitDepPath(gitUrl, tag) {
82
+ const url = new URL(gitUrl);
83
+ const domain = url.hostname;
84
+ const repoPath = url.pathname.replace(/^\//, '');
85
+ return join(process.env.HOME ?? homedir(), 'nargo', domain, repoPath, tag);
86
+ }
87
+ /**
88
+ * Ensures a git dep is present in the nargo cache, cloning it if it isn't. Mirrors nargo's `clone_git_repo`.
89
+ * If cloning fails (e.g. no network), throws with a message suggesting `nargo check` to prime the cache.
90
+ *
91
+ * Source: noir/noir-repo/tooling/nargo_toml/src/git.rs
92
+ */ async function ensureGitDepCached(gitUrl, tag, cachePath) {
93
+ if (existsSync(cachePath)) {
94
+ return;
95
+ }
96
+ await mkdir(dirname(cachePath), {
97
+ recursive: true
98
+ });
99
+ try {
100
+ await run('git', [
101
+ '-c',
102
+ 'advice.detachedHead=false',
103
+ 'clone',
104
+ '--depth',
105
+ '1',
106
+ '--branch',
107
+ tag,
108
+ gitUrl,
109
+ cachePath
110
+ ]);
111
+ } catch (err) {
112
+ throw new Error(`Failed to fetch git dependency ${gitUrl}@${tag}: ${err?.message ?? err}.\n` + `Try running \`nargo check\` first to prime the dependency cache.`);
113
+ }
114
+ }
@@ -7,4 +7,4 @@
7
7
  * Note: The above implies that if there is a random json file in the target dir we would be always recompiling.
8
8
  */
9
9
  export declare function needsRecompile(): Promise<boolean>;
10
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmVlZHNfcmVjb21waWxlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY2xpL2NtZHMvdXRpbHMvbmVlZHNfcmVjb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBOzs7Ozs7O0dBT0c7QUFDSCx3QkFBc0IsY0FBYyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FRdkQifQ==
10
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmVlZHNfcmVjb21waWxlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY2xpL2NtZHMvdXRpbHMvbmVlZHNfcmVjb21waWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBOzs7Ozs7O0dBT0c7QUFDSCx3QkFBc0IsY0FBYyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FXdkQifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"needs_recompile.d.ts","sourceRoot":"","sources":["../../../../src/cli/cmds/utils/needs_recompile.ts"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAQvD"}
1
+ {"version":3,"file":"needs_recompile.d.ts","sourceRoot":"","sources":["../../../../src/cli/cmds/utils/needs_recompile.ts"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAWvD"}
@@ -1,6 +1,6 @@
1
- import TOML from '@iarna/toml';
2
- import { readFile, readdir, stat } from 'fs/promises';
3
- import { join, resolve } from 'path';
1
+ import { readdir, stat } from 'fs/promises';
2
+ import { join } from 'path';
3
+ import { collectCrateDirs } from './collect_crate_dirs.js';
4
4
  /**
5
5
  * Returns true if recompilation is needed: either no artifacts exist in target/ or any .nr or Nargo.toml source file
6
6
  * (including path-based dependencies) is newer than the oldest artifact. We compare against the oldest artifact so
@@ -13,7 +13,12 @@ import { join, resolve } from 'path';
13
13
  if (oldestArtifactMs === undefined) {
14
14
  return true;
15
15
  }
16
- const crateDirs = await collectCrateDirs('.');
16
+ // Git deps are pinned to a specific tag in Nargo.toml and nargo always fetches an exact tag, so their contents never
17
+ // change without Nargo.toml itself changing — and Nargo.toml is already tracked as a source file. Hence we can
18
+ // safely ignore checking source files of git deps.
19
+ const crateDirs = await collectCrateDirs('.', {
20
+ skipGitDeps: true
21
+ });
17
22
  return hasNewerSourceFile(crateDirs, oldestArtifactMs);
18
23
  }
19
24
  /**
@@ -41,55 +46,6 @@ import { join, resolve } from 'path';
41
46
  }
42
47
  return oldest;
43
48
  }
44
- /**
45
- * Recursively collects crate directories starting from startCrateDir by following path-based dependencies declared in
46
- * Nargo.toml files. Git-based deps are ignored (they only change when Nargo.toml itself is modified since the deps are
47
- * tagged).
48
- */ async function collectCrateDirs(startCrateDir) {
49
- // We have a set of visited dirs we check against when entering a new dir because we could stumble upon a directory
50
- // multiple times in case multiple deps shared a dep (e.g. dep A and dep B both sharing dep C).
51
- const visited = new Set();
52
- async function visit(crateDir) {
53
- const absDir = resolve(crateDir);
54
- if (visited.has(absDir)) {
55
- return;
56
- }
57
- visited.add(absDir);
58
- // Every dep is its own crate and every crate needs to have Nargo.toml defined in the root so we try to load it and
59
- // error out if it's not the case.
60
- const tomlPath = join(absDir, 'Nargo.toml');
61
- const content = await readFile(tomlPath, 'utf-8').catch(()=>{
62
- throw new Error(`Incorrectly defined dependency. Nargo.toml not found in ${absDir}`);
63
- });
64
- const parsed = TOML.parse(content);
65
- const members = parsed.workspace?.members;
66
- // A Nargo.toml is either a workspace root (has workspace.members) or a single crate (has dependencies).
67
- if (Array.isArray(members)) {
68
- // The crate is a workspace root and has members defined so we visit the members
69
- for (const member of members){
70
- const memberPath = resolve(absDir, member);
71
- await visit(memberPath);
72
- }
73
- } else {
74
- // The crate is not a workspace root so we check for dependencies
75
- const deps = parsed.dependencies ?? {};
76
- for (const dep of Object.values(deps)){
77
- if (dep && typeof dep === 'object' && typeof dep.path === 'string') {
78
- const depPath = resolve(absDir, dep.path);
79
- const s = await stat(depPath);
80
- if (!s.isDirectory()) {
81
- throw new Error(`Dependency path "${dep.path}" in ${tomlPath} resolves to ${depPath} which is not a directory`);
82
- }
83
- await visit(depPath);
84
- }
85
- }
86
- }
87
- }
88
- await visit(startCrateDir);
89
- return [
90
- ...visited
91
- ];
92
- }
93
49
  /**
94
50
  * Walks crate dirs looking for .nr and Nargo.toml files newer than thresholdMs. Short-circuits on the first match.
95
51
  */ async function hasNewerSourceFile(crateDirs, thresholdMs) {
@@ -0,0 +1,4 @@
1
+ import type { LogFn } from '@aztec/foundation/log';
2
+ /** Warns if the `aztec` dependency tag in any crate's Nargo.toml doesn't match the CLI version. */
3
+ export declare function warnIfAztecVersionMismatch(log: LogFn, cliVersion?: string): Promise<void>;
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2Fybl9pZl9henRlY192ZXJzaW9uX21pc21hdGNoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY2xpL2NtZHMvdXRpbHMvd2Fybl9pZl9henRlY192ZXJzaW9uX21pc21hdGNoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBU25ELG1HQUFtRztBQUNuRyx3QkFBc0IsMEJBQTBCLENBQUMsR0FBRyxFQUFFLEtBQUssRUFBRSxVQUFVLENBQUMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQTJDL0YifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"warn_if_aztec_version_mismatch.d.ts","sourceRoot":"","sources":["../../../../src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AASnD,mGAAmG;AACnG,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA2C/F"}
@@ -0,0 +1,41 @@
1
+ import { getPackageVersion } from '@aztec/stdlib/update-checker';
2
+ import TOML from '@iarna/toml';
3
+ import { readFile } from 'fs/promises';
4
+ import { join } from 'path';
5
+ import { collectCrateDirs } from './collect_crate_dirs.js';
6
+ /** Warns if the `aztec` dependency tag in any crate's Nargo.toml doesn't match the CLI version. */ export async function warnIfAztecVersionMismatch(log, cliVersion) {
7
+ const version = cliVersion ?? getPackageVersion();
8
+ if (!version) {
9
+ log(`WARNING: aztec CLI version not found. Skipping dependency compatibility check.`);
10
+ return;
11
+ }
12
+ const expectedTag = `v${version}`;
13
+ const mismatches = [];
14
+ const crateDirs = await collectCrateDirs('.', {
15
+ skipGitDeps: true
16
+ });
17
+ for (const dir of crateDirs){
18
+ const tomlPath = join(dir, 'Nargo.toml');
19
+ let content;
20
+ try {
21
+ content = await readFile(tomlPath, 'utf-8');
22
+ } catch {
23
+ continue;
24
+ }
25
+ const parsed = TOML.parse(content);
26
+ const aztecDep = parsed.dependencies?.aztec;
27
+ if (!aztecDep || typeof aztecDep !== 'object' || typeof aztecDep.tag !== 'string') {
28
+ continue;
29
+ }
30
+ if (aztecDep.tag !== expectedTag) {
31
+ mismatches.push({
32
+ file: tomlPath,
33
+ tag: aztecDep.tag
34
+ });
35
+ }
36
+ }
37
+ if (mismatches.length > 0) {
38
+ const details = mismatches.map((m)=>` ${m.file} (${m.tag})`).join('\n');
39
+ log(`WARNING: Aztec dependency version mismatch detected.\n` + `The following crates have an aztec dependency that does not match the CLI version (${expectedTag}):\n` + `${details}\n\n` + `See https://docs.aztec.network/errors/9 for how to update your dependencies.`);
40
+ }
41
+ }
@@ -7,7 +7,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
7
7
  import type { LogFn } from '@aztec/foundation/log';
8
8
  import { DateProvider } from '@aztec/foundation/timer';
9
9
  import type { ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
10
- import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
10
+ import type { GenesisData } from '@aztec/stdlib/world-state';
11
11
  import { type TelemetryClient } from '@aztec/telemetry-client';
12
12
  import { type Hex } from 'viem';
13
13
  /**
@@ -31,7 +31,6 @@ export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, pr
31
31
  rollupAddress: EthAddress;
32
32
  stakingAssetAddress: EthAddress;
33
33
  } & {
34
- slashFactoryAddress?: EthAddress | undefined;
35
34
  feeAssetHandlerAddress?: EthAddress | undefined;
36
35
  stakingAssetHandlerAddress?: EthAddress | undefined;
37
36
  zkPassportVerifierAddress?: EthAddress | undefined;
@@ -68,6 +67,6 @@ export declare function createAztecNode(config?: Partial<AztecNodeConfig>, deps?
68
67
  dateProvider?: DateProvider;
69
68
  proverBroker?: ProvingJobBroker;
70
69
  }, options?: {
71
- prefilledPublicData?: PublicDataTreeLeaf[];
70
+ genesis?: GenesisData;
72
71
  }): Promise<AztecNodeService>;
73
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFvQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBb0IsTUFBTSwyQkFBMkIsQ0FBQztBQVN2RixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFlBQVksRUFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUt6RSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDOUQsT0FBTyxFQUNMLEtBQUssZUFBZSxFQUdyQixNQUFNLHlCQUF5QixDQUFDO0FBS2pDLE9BQU8sRUFBRSxLQUFLLEdBQUcsRUFBMkQsTUFBTSxNQUFNLENBQUM7QUFnQnpGOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQ3ZDLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLFVBQVUsRUFBRSxHQUFHLEVBQ2YsSUFBSSxHQUFFO0lBQ0osa0JBQWtCLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDeEIsNEJBQTRCLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDbEM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JQO0FBRUQsOEJBQThCO0FBQzlCLE1BQU0sTUFBTSxrQkFBa0IsR0FBRyxlQUFlLEdBQUc7SUFDakQsMERBQTBEO0lBQzFELFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsNkRBQTZEO0lBQzdELFlBQVksRUFBRSxPQUFPLENBQUM7Q0FDdkIsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCx3QkFBc0Isa0JBQWtCLENBQUMsTUFBTSx5Q0FBa0MsRUFBRSxPQUFPLEVBQUUsS0FBSzs7O0dBd0poRztBQUVEOzs7R0FHRztBQUNILHdCQUFzQixlQUFlLENBQ25DLE1BQU0sR0FBRSxPQUFPLENBQUMsZUFBZSxDQUFNLEVBQ3JDLElBQUksR0FBRTtJQUNKLFNBQVMsQ0FBQyxFQUFFLGVBQWUsQ0FBQztJQUM1QixVQUFVLENBQUMsRUFBRSxtQkFBbUIsQ0FBQztJQUNqQyxZQUFZLENBQUMsRUFBRSxZQUFZLENBQUM7SUFDNUIsWUFBWSxDQUFDLEVBQUUsZ0JBQWdCLENBQUM7Q0FDNUIsRUFDTixPQUFPLEdBQUU7SUFBRSxtQkFBbUIsQ0FBQyxFQUFFLGtCQUFrQixFQUFFLENBQUE7Q0FBTyw2QkFlN0QifQ==
72
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFvQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBb0IsTUFBTSwyQkFBMkIsQ0FBQztBQVN2RixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFlBQVksRUFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUt6RSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzdELE9BQU8sRUFDTCxLQUFLLGVBQWUsRUFHckIsTUFBTSx5QkFBeUIsQ0FBQztBQUtqQyxPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQTJELE1BQU0sTUFBTSxDQUFDO0FBZ0J6Rjs7OztHQUlHO0FBQ0gsd0JBQXNCLG1CQUFtQixDQUN2QyxlQUFlLEVBQUUsZUFBZSxFQUNoQyxVQUFVLEVBQUUsR0FBRyxFQUNmLElBQUksR0FBRTtJQUNKLGtCQUFrQixDQUFDLEVBQUUsRUFBRSxDQUFDO0lBQ3hCLDRCQUE0QixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ2xDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JQO0FBRUQsOEJBQThCO0FBQzlCLE1BQU0sTUFBTSxrQkFBa0IsR0FBRyxlQUFlLEdBQUc7SUFDakQsMERBQTBEO0lBQzFELFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsNkRBQTZEO0lBQzdELFlBQVksRUFBRSxPQUFPLENBQUM7Q0FDdkIsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCx3QkFBc0Isa0JBQWtCLENBQUMsTUFBTSx5Q0FBa0MsRUFBRSxPQUFPLEVBQUUsS0FBSzs7O0dBd0poRztBQUVEOzs7R0FHRztBQUNILHdCQUFzQixlQUFlLENBQ25DLE1BQU0sR0FBRSxPQUFPLENBQUMsZUFBZSxDQUFNLEVBQ3JDLElBQUksR0FBRTtJQUNKLFNBQVMsQ0FBQyxFQUFFLGVBQWUsQ0FBQztJQUM1QixVQUFVLENBQUMsRUFBRSxtQkFBbUIsQ0FBQztJQUNqQyxZQUFZLENBQUMsRUFBRSxZQUFZLENBQUM7SUFDNUIsWUFBWSxDQUFDLEVBQUUsZ0JBQWdCLENBQUM7Q0FDNUIsRUFDTixPQUFPLEdBQUU7SUFBRSxPQUFPLENBQUMsRUFBRSxXQUFXLENBQUE7Q0FBTyw2QkFleEMifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,2BAA2B,CAAC;AASvF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAKzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EAAE,KAAK,GAAG,EAA2D,MAAM,MAAM,CAAC;AAgBzF;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,GAAG,EACf,IAAI,GAAE;IACJ,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;;GAoBP;AAED,8BAA8B;AAC9B,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG;IACjD,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,6DAA6D;IAC7D,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,yCAAkC,EAAE,OAAO,EAAE,KAAK;;;GAwJhG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IACJ,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,YAAY,CAAC,EAAE,gBAAgB,CAAC;CAC5B,EACN,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAe7D"}
1
+ {"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,2BAA2B,CAAC;AASvF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAKzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EAAE,KAAK,GAAG,EAA2D,MAAM,MAAM,CAAC;AAgBzF;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,GAAG,EACf,IAAI,GAAE;IACJ,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;GAoBP;AAED,8BAA8B;AAC9B,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG;IACjD,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,6DAA6D;IAC7D,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,yCAAkC,EAAE,OAAO,EAAE,KAAK;;;GAwJhG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IACJ,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,YAAY,CAAC,EAAE,gBAAgB,CAAC;CAC5B,EACN,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,WAAW,CAAA;CAAO,6BAexC"}
@@ -49,7 +49,7 @@ const localAnvil = foundry;
49
49
  genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
50
50
  feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
51
51
  aztecTargetCommitteeSize: 0,
52
- slasherFlavor: 'none',
52
+ slasherEnabled: false,
53
53
  realVerifier: false
54
54
  });
55
55
  aztecNodeConfig.l1Contracts = l1Contracts.l1ContractAddresses;
@@ -116,7 +116,7 @@ const localAnvil = foundry;
116
116
  ] : [],
117
117
  ...prefundAddresses
118
118
  ];
119
- const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(fundedAddresses);
119
+ const { genesisArchiveRoot, genesis, fundingNeeded } = await getGenesisValues(fundedAddresses);
120
120
  const dateProvider = new TestDateProvider();
121
121
  let cheatcodes;
122
122
  let rollupAddress;
@@ -153,7 +153,7 @@ const localAnvil = foundry;
153
153
  blobClient,
154
154
  dateProvider
155
155
  }, {
156
- prefilledPublicData
156
+ genesis
157
157
  });
158
158
  // Now that the node is up, let the watcher check for pending txs so it can skip unfilled slots faster when
159
159
  // transactions are waiting in the mempool. Also let it check if the sequencer is actively building, to avoid
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/aztec",
3
- "version": "0.0.1-commit.e0f15ab9b",
3
+ "version": "0.0.1-commit.e304674f1",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -28,38 +28,38 @@
28
28
  "../package.common.json"
29
29
  ],
30
30
  "dependencies": {
31
- "@aztec/accounts": "0.0.1-commit.e0f15ab9b",
32
- "@aztec/archiver": "0.0.1-commit.e0f15ab9b",
33
- "@aztec/aztec-node": "0.0.1-commit.e0f15ab9b",
34
- "@aztec/aztec.js": "0.0.1-commit.e0f15ab9b",
35
- "@aztec/bb-prover": "0.0.1-commit.e0f15ab9b",
36
- "@aztec/bb.js": "0.0.1-commit.e0f15ab9b",
37
- "@aztec/blob-client": "0.0.1-commit.e0f15ab9b",
38
- "@aztec/bot": "0.0.1-commit.e0f15ab9b",
39
- "@aztec/builder": "0.0.1-commit.e0f15ab9b",
40
- "@aztec/cli": "0.0.1-commit.e0f15ab9b",
41
- "@aztec/constants": "0.0.1-commit.e0f15ab9b",
42
- "@aztec/entrypoints": "0.0.1-commit.e0f15ab9b",
43
- "@aztec/ethereum": "0.0.1-commit.e0f15ab9b",
44
- "@aztec/foundation": "0.0.1-commit.e0f15ab9b",
45
- "@aztec/kv-store": "0.0.1-commit.e0f15ab9b",
46
- "@aztec/l1-artifacts": "0.0.1-commit.e0f15ab9b",
47
- "@aztec/node-lib": "0.0.1-commit.e0f15ab9b",
48
- "@aztec/noir-contracts.js": "0.0.1-commit.e0f15ab9b",
49
- "@aztec/noir-protocol-circuits-types": "0.0.1-commit.e0f15ab9b",
50
- "@aztec/p2p": "0.0.1-commit.e0f15ab9b",
51
- "@aztec/p2p-bootstrap": "0.0.1-commit.e0f15ab9b",
52
- "@aztec/protocol-contracts": "0.0.1-commit.e0f15ab9b",
53
- "@aztec/prover-client": "0.0.1-commit.e0f15ab9b",
54
- "@aztec/prover-node": "0.0.1-commit.e0f15ab9b",
55
- "@aztec/pxe": "0.0.1-commit.e0f15ab9b",
56
- "@aztec/sequencer-client": "0.0.1-commit.e0f15ab9b",
57
- "@aztec/stdlib": "0.0.1-commit.e0f15ab9b",
58
- "@aztec/telemetry-client": "0.0.1-commit.e0f15ab9b",
59
- "@aztec/txe": "0.0.1-commit.e0f15ab9b",
60
- "@aztec/validator-ha-signer": "0.0.1-commit.e0f15ab9b",
61
- "@aztec/wallets": "0.0.1-commit.e0f15ab9b",
62
- "@aztec/world-state": "0.0.1-commit.e0f15ab9b",
31
+ "@aztec/accounts": "0.0.1-commit.e304674f1",
32
+ "@aztec/archiver": "0.0.1-commit.e304674f1",
33
+ "@aztec/aztec-node": "0.0.1-commit.e304674f1",
34
+ "@aztec/aztec.js": "0.0.1-commit.e304674f1",
35
+ "@aztec/bb-prover": "0.0.1-commit.e304674f1",
36
+ "@aztec/bb.js": "0.0.1-commit.e304674f1",
37
+ "@aztec/blob-client": "0.0.1-commit.e304674f1",
38
+ "@aztec/bot": "0.0.1-commit.e304674f1",
39
+ "@aztec/builder": "0.0.1-commit.e304674f1",
40
+ "@aztec/cli": "0.0.1-commit.e304674f1",
41
+ "@aztec/constants": "0.0.1-commit.e304674f1",
42
+ "@aztec/entrypoints": "0.0.1-commit.e304674f1",
43
+ "@aztec/ethereum": "0.0.1-commit.e304674f1",
44
+ "@aztec/foundation": "0.0.1-commit.e304674f1",
45
+ "@aztec/kv-store": "0.0.1-commit.e304674f1",
46
+ "@aztec/l1-artifacts": "0.0.1-commit.e304674f1",
47
+ "@aztec/node-lib": "0.0.1-commit.e304674f1",
48
+ "@aztec/noir-contracts.js": "0.0.1-commit.e304674f1",
49
+ "@aztec/noir-protocol-circuits-types": "0.0.1-commit.e304674f1",
50
+ "@aztec/p2p": "0.0.1-commit.e304674f1",
51
+ "@aztec/p2p-bootstrap": "0.0.1-commit.e304674f1",
52
+ "@aztec/protocol-contracts": "0.0.1-commit.e304674f1",
53
+ "@aztec/prover-client": "0.0.1-commit.e304674f1",
54
+ "@aztec/prover-node": "0.0.1-commit.e304674f1",
55
+ "@aztec/pxe": "0.0.1-commit.e304674f1",
56
+ "@aztec/sequencer-client": "0.0.1-commit.e304674f1",
57
+ "@aztec/stdlib": "0.0.1-commit.e304674f1",
58
+ "@aztec/telemetry-client": "0.0.1-commit.e304674f1",
59
+ "@aztec/txe": "0.0.1-commit.e304674f1",
60
+ "@aztec/validator-ha-signer": "0.0.1-commit.e304674f1",
61
+ "@aztec/wallets": "0.0.1-commit.e304674f1",
62
+ "@aztec/world-state": "0.0.1-commit.e304674f1",
63
63
  "@iarna/toml": "^2.2.5",
64
64
  "@types/chalk": "^2.2.0",
65
65
  "abitype": "^0.8.11",
package/scripts/aztec.sh CHANGED
@@ -23,7 +23,7 @@ case $cmd in
23
23
  # Attempt to compile, no-op if there are no changes
24
24
  node --no-warnings "$script_dir/../dest/bin/index.js" compile
25
25
 
26
- export LOG_LEVEL="${LOG_LEVEL:-"error;trace:contract_log"}"
26
+ export LOG_LEVEL="${LOG_LEVEL:-"error;trace:contract"}"
27
27
  aztec start --txe --port 8081 &
28
28
  server_pid=$!
29
29
  trap 'kill $server_pid &>/dev/null || true' EXIT
@@ -9,6 +9,7 @@ import { join } from 'path';
9
9
  import { readArtifactFiles } from './utils/artifacts.js';
10
10
  import { needsRecompile } from './utils/needs_recompile.js';
11
11
  import { run } from './utils/spawn.js';
12
+ import { warnIfAztecVersionMismatch } from './utils/warn_if_aztec_version_mismatch.js';
12
13
 
13
14
  /** Returns paths to contract artifacts in the target directory. */
14
15
  async function collectContractArtifacts(): Promise<string[]> {
@@ -139,6 +140,8 @@ async function checkNoTestsInContracts(nargo: string, log: LogFn): Promise<void>
139
140
 
140
141
  /** Compiles Aztec Noir contracts and postprocesses artifacts. */
141
142
  async function compileAztecContract(nargoArgs: string[], log: LogFn): Promise<void> {
143
+ await warnIfAztecVersionMismatch(log);
144
+
142
145
  if (!(await needsRecompile())) {
143
146
  log('No source changes detected, skipping compilation.');
144
147
  return;
@@ -28,11 +28,11 @@ export async function computeExpectedGenesisRoot(config: GenesisStateConfig, use
28
28
 
29
29
  userLog(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
30
30
 
31
- const { genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
31
+ const { genesisArchiveRoot, genesis } = await getGenesisValues(initialFundedAccounts);
32
32
 
33
33
  userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
34
34
 
35
- return { genesisArchiveRoot, prefilledPublicData };
35
+ return { genesisArchiveRoot, genesis };
36
36
  }
37
37
 
38
38
  async function checkRollupCompatibility(
@@ -9,7 +9,11 @@ import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
9
9
  import type { LogFn } from '@aztec/foundation/log';
10
10
  import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
11
11
  import { protocolContractsHash } from '@aztec/protocol-contracts';
12
- import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker';
12
+ import {
13
+ ProvingJobConsumerSchema,
14
+ createProvingJobBrokerClient,
15
+ proverBrokerBackoff,
16
+ } from '@aztec/prover-client/broker';
13
17
  import { type CliPXEOptions, type PXEConfig, allPxeConfigMappings } from '@aztec/pxe/config';
14
18
  import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
15
19
  import { P2PApiSchema, ProverNodeApiSchema, type ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
@@ -65,12 +69,8 @@ export async function startNode(
65
69
  if (nodeConfig.proverBrokerUrl) {
66
70
  // at 1TPS we'd enqueue ~1k chonk verifier proofs and ~1k AVM proofs immediately
67
71
  // set a lower connection limit such that we don't overload the server
68
- // Keep retrying up to 30s
69
- const fetch = makeTracedFetch(
70
- [1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3],
71
- false,
72
- makeUndiciFetch(new Agent({ connections: 100 })),
73
- );
72
+ // Retry indefinitely until the epoch proving times out and the chain reorgs
73
+ const fetch = makeTracedFetch(proverBrokerBackoff, false, makeUndiciFetch(new Agent({ connections: 100 })));
74
74
  broker = createProvingJobBrokerClient(nodeConfig.proverBrokerUrl, getVersions(nodeConfig), fetch);
75
75
  } else if (options.proverBroker) {
76
76
  ({ broker } = await startProverBroker(options, signalHandlers, services, userLog));
@@ -83,7 +83,7 @@ export async function startNode(
83
83
  await preloadCrsDataForVerifying(nodeConfig, userLog);
84
84
 
85
85
  const genesisConfig = getGenesisStateConfigEnvVars();
86
- const { genesisArchiveRoot, prefilledPublicData } = await computeExpectedGenesisRoot(genesisConfig, userLog);
86
+ const { genesisArchiveRoot, genesis } = await computeExpectedGenesisRoot(genesisConfig, userLog);
87
87
 
88
88
  const followsCanonicalRollup =
89
89
  typeof nodeConfig.rollupVersion !== 'number' || (nodeConfig.rollupVersion as unknown as string) === 'canonical';
@@ -116,12 +116,10 @@ export async function startNode(
116
116
  );
117
117
  }
118
118
 
119
- // TODO(#12272): will clean this up.
120
119
  nodeConfig = {
121
120
  ...nodeConfig,
122
121
  l1Contracts: {
123
122
  ...addresses,
124
- slashFactoryAddress: nodeConfig.l1Contracts.slashFactoryAddress,
125
123
  },
126
124
  ...config,
127
125
  };
@@ -158,7 +156,7 @@ export async function startNode(
158
156
  const telemetry = await initTelemetryClient(telemetryConfig);
159
157
 
160
158
  // Create and start Aztec Node
161
- const node = await createAztecNode(nodeConfig, { telemetry, proverBroker: broker }, { prefilledPublicData });
159
+ const node = await createAztecNode(nodeConfig, { telemetry, proverBroker: broker }, { genesis });
162
160
 
163
161
  // Add node and p2p to services list
164
162
  services.node = [node, AztecNodeApiSchema];
@@ -9,6 +9,7 @@ import {
9
9
  createProofStore,
10
10
  createProvingJobBrokerClient,
11
11
  proverAgentConfigMappings,
12
+ proverBrokerBackoff,
12
13
  } from '@aztec/prover-client/broker';
13
14
  import { getProverNodeAgentConfigFromEnv } from '@aztec/prover-node';
14
15
  import { ProverAgentApiSchema } from '@aztec/stdlib/interfaces/server';
@@ -45,12 +46,8 @@ export async function startProverAgent(
45
46
 
46
47
  await preloadCrsDataForServerSideProving(config, userLog);
47
48
 
48
- const fetch = makeTracedFetch(
49
- // retry connections every 3s, up to 30s before giving up
50
- [1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3],
51
- false,
52
- makeUndiciFetch(new Agent({ connections: 10 })),
53
- );
49
+ // Retry indefinitely until the epoch proving times out and the chain reorgs
50
+ const fetch = makeTracedFetch(proverBrokerBackoff, false, makeUndiciFetch(new Agent({ connections: 10 })));
54
51
  const broker = createProvingJobBrokerClient(config.proverBrokerUrl, getVersions(), fetch);
55
52
 
56
53
  const telemetry = await initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
@@ -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
+ }
@@ -1,6 +1,7 @@
1
- import TOML from '@iarna/toml';
2
- import { readFile, readdir, stat } from 'fs/promises';
3
- import { join, resolve } from 'path';
1
+ import { readdir, stat } from 'fs/promises';
2
+ import { join } from 'path';
3
+
4
+ import { collectCrateDirs } from './collect_crate_dirs.js';
4
5
 
5
6
  /**
6
7
  * Returns true if recompilation is needed: either no artifacts exist in target/ or any .nr or Nargo.toml source file
@@ -16,7 +17,10 @@ export async function needsRecompile(): Promise<boolean> {
16
17
  return true;
17
18
  }
18
19
 
19
- const crateDirs = await collectCrateDirs('.');
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 });
20
24
  return hasNewerSourceFile(crateDirs, oldestArtifactMs);
21
25
  }
22
26
 
@@ -49,63 +53,6 @@ async function getOldestArtifactModificationTime(targetDir: string): Promise<num
49
53
  return oldest;
50
54
  }
51
55
 
52
- /**
53
- * Recursively collects crate directories starting from startCrateDir by following path-based dependencies declared in
54
- * Nargo.toml files. Git-based deps are ignored (they only change when Nargo.toml itself is modified since the deps are
55
- * tagged).
56
- */
57
- async function collectCrateDirs(startCrateDir: string): Promise<string[]> {
58
- // We have a set of visited dirs we check against when entering a new dir because we could stumble upon a directory
59
- // multiple times in case multiple deps shared a dep (e.g. dep A and dep B both sharing dep C).
60
- const visited = new Set<string>();
61
-
62
- async function visit(crateDir: string): Promise<void> {
63
- const absDir = resolve(crateDir);
64
- if (visited.has(absDir)) {
65
- return;
66
- }
67
- visited.add(absDir);
68
-
69
- // Every dep is its own crate and every crate needs to have Nargo.toml defined in the root so we try to load it and
70
- // error out if it's not the case.
71
- const tomlPath = join(absDir, 'Nargo.toml');
72
- const content = await readFile(tomlPath, 'utf-8').catch(() => {
73
- throw new Error(`Incorrectly defined dependency. Nargo.toml not found in ${absDir}`);
74
- });
75
-
76
- const parsed = TOML.parse(content) as Record<string, any>;
77
-
78
- const members = (parsed.workspace as Record<string, any>)?.members as string[] | undefined;
79
-
80
- // A Nargo.toml is either a workspace root (has workspace.members) or a single crate (has dependencies).
81
- if (Array.isArray(members)) {
82
- // The crate is a workspace root and has members defined so we visit the members
83
- for (const member of members) {
84
- const memberPath = resolve(absDir, member);
85
- await visit(memberPath);
86
- }
87
- } else {
88
- // The crate is not a workspace root so we check for dependencies
89
- const deps = (parsed.dependencies as Record<string, any>) ?? {};
90
- for (const dep of Object.values(deps)) {
91
- if (dep && typeof dep === 'object' && typeof dep.path === 'string') {
92
- const depPath = resolve(absDir, dep.path);
93
- const s = await stat(depPath);
94
- if (!s.isDirectory()) {
95
- throw new Error(
96
- `Dependency path "${dep.path}" in ${tomlPath} resolves to ${depPath} which is not a directory`,
97
- );
98
- }
99
- await visit(depPath);
100
- }
101
- }
102
- }
103
- }
104
-
105
- await visit(startCrateDir);
106
- return [...visited];
107
- }
108
-
109
56
  /**
110
57
  * Walks crate dirs looking for .nr and Nargo.toml files newer than thresholdMs. Short-circuits on the first match.
111
58
  */
@@ -0,0 +1,54 @@
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
+ /** Warns if the `aztec` dependency tag in any crate's Nargo.toml doesn't match the CLI version. */
11
+ export async function warnIfAztecVersionMismatch(log: LogFn, cliVersion?: string): Promise<void> {
12
+ const version = cliVersion ?? getPackageVersion();
13
+ if (!version) {
14
+ log(`WARNING: aztec CLI version not found. Skipping dependency compatibility check.`);
15
+ return;
16
+ }
17
+
18
+ const expectedTag = `v${version}`;
19
+ const mismatches: { file: string; tag: string }[] = [];
20
+
21
+ const crateDirs = await collectCrateDirs('.', { skipGitDeps: true });
22
+
23
+ for (const dir of crateDirs) {
24
+ const tomlPath = join(dir, 'Nargo.toml');
25
+ let content: string;
26
+ try {
27
+ content = await readFile(tomlPath, 'utf-8');
28
+ } catch {
29
+ continue;
30
+ }
31
+
32
+ const parsed = TOML.parse(content) as Record<string, any>;
33
+ const aztecDep = (parsed.dependencies as Record<string, any>)?.aztec;
34
+ if (!aztecDep || typeof aztecDep !== 'object' || typeof aztecDep.tag !== 'string') {
35
+ // If a dep called "aztec" doesn't exist or it does not get parsed to an object or it doesn't have a tag defined
36
+ // we skip the check.
37
+ continue;
38
+ }
39
+
40
+ if (aztecDep.tag !== expectedTag) {
41
+ mismatches.push({ file: tomlPath, tag: aztecDep.tag });
42
+ }
43
+ }
44
+
45
+ if (mismatches.length > 0) {
46
+ const details = mismatches.map(m => ` ${m.file} (${m.tag})`).join('\n');
47
+ log(
48
+ `WARNING: Aztec dependency version mismatch detected.\n` +
49
+ `The following crates have an aztec dependency that does not match the CLI version (${expectedTag}):\n` +
50
+ `${details}\n\n` +
51
+ `See https://docs.aztec.network/errors/9 for how to update your dependencies.`,
52
+ );
53
+ }
54
+ }
@@ -21,7 +21,7 @@ import { protocolContractsHash } from '@aztec/protocol-contracts';
21
21
  import { SequencerState } from '@aztec/sequencer-client';
22
22
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
23
23
  import type { ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
24
- import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
24
+ import type { GenesisData } from '@aztec/stdlib/world-state';
25
25
  import {
26
26
  type TelemetryClient,
27
27
  getConfigEnvVars as getTelemetryClientConfig,
@@ -70,7 +70,7 @@ export async function deployContractsToL1(
70
70
  genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
71
71
  feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
72
72
  aztecTargetCommitteeSize: 0, // no committee in local network
73
- slasherFlavor: 'none', // no slashing in local network
73
+ slasherEnabled: false, // no slashing in local network
74
74
  realVerifier: false,
75
75
  });
76
76
 
@@ -151,7 +151,7 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
151
151
  ...(initialAccounts.length ? [bananaFPC, sponsoredFPC] : []),
152
152
  ...prefundAddresses,
153
153
  ];
154
- const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(fundedAddresses);
154
+ const { genesisArchiveRoot, genesis, fundingNeeded } = await getGenesisValues(fundedAddresses);
155
155
 
156
156
  const dateProvider = new TestDateProvider();
157
157
 
@@ -190,7 +190,7 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
190
190
  const telemetry = await initTelemetryClient(getTelemetryClientConfig());
191
191
  // Create a local blob client client inside the local network, no http connectivity
192
192
  const blobClient = createBlobClient();
193
- const node = await createAztecNode(aztecNodeConfig, { telemetry, blobClient, dateProvider }, { prefilledPublicData });
193
+ const node = await createAztecNode(aztecNodeConfig, { telemetry, blobClient, dateProvider }, { genesis });
194
194
 
195
195
  // Now that the node is up, let the watcher check for pending txs so it can skip unfilled slots faster when
196
196
  // transactions are waiting in the mempool. Also let it check if the sequencer is actively building, to avoid
@@ -259,7 +259,7 @@ export async function createAztecNode(
259
259
  dateProvider?: DateProvider;
260
260
  proverBroker?: ProvingJobBroker;
261
261
  } = {},
262
- options: { prefilledPublicData?: PublicDataTreeLeaf[] } = {},
262
+ options: { genesis?: GenesisData } = {},
263
263
  ) {
264
264
  // TODO(#12272): will clean this up. This is criminal.
265
265
  const { l1Contracts, ...rest } = getConfigEnvVars();