@aztec/cli 0.0.1-commit.96bb3f7 → 0.0.1-commit.993d240

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 (71) hide show
  1. package/dest/cmds/aztec_node/block_number.js +1 -1
  2. package/dest/cmds/aztec_node/get_logs.d.ts +30 -4
  3. package/dest/cmds/aztec_node/get_logs.d.ts.map +1 -1
  4. package/dest/cmds/aztec_node/get_logs.js +39 -29
  5. package/dest/cmds/aztec_node/get_node_info.d.ts +1 -1
  6. package/dest/cmds/aztec_node/get_node_info.d.ts.map +1 -1
  7. package/dest/cmds/aztec_node/get_node_info.js +0 -2
  8. package/dest/cmds/aztec_node/index.d.ts +1 -1
  9. package/dest/cmds/aztec_node/index.d.ts.map +1 -1
  10. package/dest/cmds/aztec_node/index.js +13 -3
  11. package/dest/cmds/infrastructure/setup_l2_contract.d.ts +1 -1
  12. package/dest/cmds/infrastructure/setup_l2_contract.d.ts.map +1 -1
  13. package/dest/cmds/infrastructure/setup_l2_contract.js +4 -3
  14. package/dest/cmds/l1/assume_proven_through.d.ts +3 -2
  15. package/dest/cmds/l1/assume_proven_through.d.ts.map +1 -1
  16. package/dest/cmds/l1/assume_proven_through.js +3 -5
  17. package/dest/cmds/l1/compute_genesis_values.d.ts +4 -0
  18. package/dest/cmds/l1/compute_genesis_values.d.ts.map +1 -0
  19. package/dest/cmds/l1/compute_genesis_values.js +17 -0
  20. package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts +1 -1
  21. package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts.map +1 -1
  22. package/dest/cmds/l1/deploy_l1_contracts_cmd.js +0 -1
  23. package/dest/cmds/l1/deploy_new_rollup.d.ts +1 -1
  24. package/dest/cmds/l1/deploy_new_rollup.d.ts.map +1 -1
  25. package/dest/cmds/l1/deploy_new_rollup.js +2 -4
  26. package/dest/cmds/l1/index.d.ts +1 -1
  27. package/dest/cmds/l1/index.d.ts.map +1 -1
  28. package/dest/cmds/l1/index.js +7 -2
  29. package/dest/cmds/l1/update_l1_validators.d.ts +3 -3
  30. package/dest/cmds/l1/update_l1_validators.d.ts.map +1 -1
  31. package/dest/cmds/l1/update_l1_validators.js +52 -18
  32. package/dest/config/cached_fetch.d.ts +19 -10
  33. package/dest/config/cached_fetch.d.ts.map +1 -1
  34. package/dest/config/cached_fetch.js +110 -32
  35. package/dest/config/chain_l2_config.d.ts +12 -39
  36. package/dest/config/chain_l2_config.d.ts.map +1 -1
  37. package/dest/config/chain_l2_config.js +35 -512
  38. package/dest/config/generated/networks.d.ts +221 -0
  39. package/dest/config/generated/networks.d.ts.map +1 -0
  40. package/dest/config/generated/networks.js +222 -0
  41. package/dest/config/network_config.d.ts +2 -2
  42. package/dest/config/network_config.d.ts.map +1 -1
  43. package/dest/config/network_config.js +7 -3
  44. package/dest/utils/aztec.d.ts +1 -2
  45. package/dest/utils/aztec.d.ts.map +1 -1
  46. package/dest/utils/aztec.js +2 -3
  47. package/dest/utils/commands.d.ts +14 -6
  48. package/dest/utils/commands.d.ts.map +1 -1
  49. package/dest/utils/commands.js +19 -9
  50. package/dest/utils/inspect.d.ts +1 -1
  51. package/dest/utils/inspect.d.ts.map +1 -1
  52. package/dest/utils/inspect.js +10 -6
  53. package/package.json +35 -30
  54. package/src/cmds/aztec_node/block_number.ts +1 -1
  55. package/src/cmds/aztec_node/get_logs.ts +70 -38
  56. package/src/cmds/aztec_node/get_node_info.ts +0 -2
  57. package/src/cmds/aztec_node/index.ts +13 -8
  58. package/src/cmds/infrastructure/setup_l2_contract.ts +5 -4
  59. package/src/cmds/l1/assume_proven_through.ts +4 -7
  60. package/src/cmds/l1/compute_genesis_values.ts +29 -0
  61. package/src/cmds/l1/deploy_l1_contracts_cmd.ts +0 -1
  62. package/src/cmds/l1/deploy_new_rollup.ts +1 -3
  63. package/src/cmds/l1/index.ts +23 -4
  64. package/src/cmds/l1/update_l1_validators.ts +46 -21
  65. package/src/config/cached_fetch.ts +119 -31
  66. package/src/config/chain_l2_config.ts +35 -670
  67. package/src/config/generated/networks.ts +226 -0
  68. package/src/config/network_config.ts +7 -3
  69. package/src/utils/aztec.ts +12 -18
  70. package/src/utils/commands.ts +22 -9
  71. package/src/utils/inspect.ts +8 -6
@@ -2,24 +2,22 @@ import { createEthereumChain, isAnvilTestChain } from '@aztec/ethereum/chain';
2
2
  import { createExtendedL1Client, getPublicClient } from '@aztec/ethereum/client';
3
3
  import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
4
4
  import { GSEContract, RollupContract } from '@aztec/ethereum/contracts';
5
- import { createL1TxUtilsFromViemWallet } from '@aztec/ethereum/l1-tx-utils';
5
+ import { createL1TxUtils } from '@aztec/ethereum/l1-tx-utils';
6
6
  import { EthCheatCodes } from '@aztec/ethereum/test';
7
7
  import { DateProvider } from '@aztec/foundation/timer';
8
- import { RollupAbi, StakingAssetHandlerAbi } from '@aztec/l1-artifacts';
8
+ import { RollupAbi, StakingAssetHandlerAbi, TestERC20Abi } from '@aztec/l1-artifacts';
9
9
  import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
10
- import { encodeFunctionData, formatEther, getContract } from 'viem';
10
+ import { encodeFunctionData, formatEther, getContract, maxUint256 } from 'viem';
11
11
  import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
12
- import { addLeadingHex } from '../../utils/aztec.js';
13
12
  export function generateL1Account() {
14
13
  const privateKey = generatePrivateKey();
15
14
  const account = privateKeyToAccount(privateKey);
16
- account.address;
17
15
  return {
18
16
  privateKey,
19
17
  address: account.address
20
18
  };
21
19
  }
22
- export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, stakingAssetHandlerAddress, merkleProof, proofParams, blsSecretKey, log, debugLogger }) {
20
+ export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, withdrawerAddress, stakingAssetHandlerAddress, proofParams, blsSecretKey, log, debugLogger }) {
23
21
  const dualLog = makeDualLog(log, debugLogger);
24
22
  const account = getAccount(privateKey, mnemonic);
25
23
  const chain = createEthereumChain(rpcUrls, chainId);
@@ -39,28 +37,64 @@ export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, a
39
37
  const gseAddress = await rollup.read.getGSE();
40
38
  const gse = new GSEContract(l1Client, gseAddress);
41
39
  const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
42
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
40
+ const l1TxUtils = createL1TxUtils(l1Client, {
43
41
  logger: debugLogger
44
42
  });
45
43
  const proofParamsObj = ZkPassportProofParams.fromBuffer(proofParams);
46
- const merkleProofArray = merkleProof.map((proof)=>addLeadingHex(proof));
47
- const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
44
+ // Step 1: Claim STK tokens from the faucet
45
+ dualLog(`Claiming STK tokens from faucet`);
46
+ const { receipt: claimReceipt } = await l1TxUtils.sendAndMonitorTransaction({
48
47
  to: stakingAssetHandlerAddress.toString(),
49
48
  data: encodeFunctionData({
50
49
  abi: StakingAssetHandlerAbi,
51
- functionName: 'addValidator',
50
+ functionName: 'claim',
51
+ args: [
52
+ proofParamsObj.toViem()
53
+ ]
54
+ }),
55
+ abi: StakingAssetHandlerAbi
56
+ });
57
+ dualLog(`Claim transaction hash: ${claimReceipt.transactionHash}`);
58
+ await l1Client.waitForTransactionReceipt({
59
+ hash: claimReceipt.transactionHash
60
+ });
61
+ // Step 2: Approve the rollup to spend STK tokens
62
+ const stakingAssetAddress = await stakingAssetHandler.read.STAKING_ASSET();
63
+ dualLog(`Approving rollup to spend STK tokens`);
64
+ const { receipt: approveReceipt } = await l1TxUtils.sendAndMonitorTransaction({
65
+ to: stakingAssetAddress,
66
+ data: encodeFunctionData({
67
+ abi: TestERC20Abi,
68
+ functionName: 'approve',
69
+ args: [
70
+ rollupAddress,
71
+ maxUint256
72
+ ]
73
+ }),
74
+ abi: TestERC20Abi
75
+ });
76
+ await l1Client.waitForTransactionReceipt({
77
+ hash: approveReceipt.transactionHash
78
+ });
79
+ // Step 3: Deposit into the rollup to register as a validator
80
+ dualLog(`Depositing into rollup to register validator`);
81
+ const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
82
+ to: rollupAddress,
83
+ data: encodeFunctionData({
84
+ abi: RollupAbi,
85
+ functionName: 'deposit',
52
86
  args: [
53
87
  attesterAddress.toString(),
54
- merkleProofArray,
55
- proofParamsObj.toViem(),
88
+ withdrawerAddress.toString(),
56
89
  registrationTuple.publicKeyInG1,
57
90
  registrationTuple.publicKeyInG2,
58
- registrationTuple.proofOfPossession
91
+ registrationTuple.proofOfPossession,
92
+ false
59
93
  ]
60
94
  }),
61
- abi: StakingAssetHandlerAbi
95
+ abi: RollupAbi
62
96
  });
63
- dualLog(`Transaction hash: ${receipt.transactionHash}`);
97
+ dualLog(`Deposit transaction hash: ${receipt.transactionHash}`);
64
98
  await l1Client.waitForTransactionReceipt({
65
99
  hash: receipt.transactionHash
66
100
  });
@@ -95,7 +129,7 @@ export async function addL1ValidatorViaRollup({ rpcUrls, chainId, privateKey, mn
95
129
  const gseAddress = await rollup.read.getGSE();
96
130
  const gse = new GSEContract(l1Client, gseAddress);
97
131
  const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
98
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
132
+ const l1TxUtils = createL1TxUtils(l1Client, {
99
133
  logger: debugLogger
100
134
  });
101
135
  const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
@@ -137,7 +171,7 @@ export async function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic
137
171
  const account = getAccount(privateKey, mnemonic);
138
172
  const chain = createEthereumChain(rpcUrls, chainId);
139
173
  const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
140
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
174
+ const l1TxUtils = createL1TxUtils(l1Client, {
141
175
  logger: debugLogger
142
176
  });
143
177
  dualLog(`Removing validator ${validatorAddress.toString()} from rollup ${rollupAddress.toString()}`);
@@ -159,7 +193,7 @@ export async function pruneRollup({ rpcUrls, chainId, privateKey, mnemonic, roll
159
193
  const account = getAccount(privateKey, mnemonic);
160
194
  const chain = createEthereumChain(rpcUrls, chainId);
161
195
  const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
162
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
196
+ const l1TxUtils = createL1TxUtils(l1Client, {
163
197
  logger: debugLogger
164
198
  });
165
199
  dualLog(`Trying prune`);
@@ -1,18 +1,27 @@
1
1
  export interface CachedFetchOptions {
2
- /** Cache duration in milliseconds */
3
- cacheDurationMs: number;
4
- /** The cache file */
2
+ /** The cache file path for storing data. If not provided, no caching is performed. */
5
3
  cacheFile?: string;
4
+ /** Fallback max-age in milliseconds when server sends no Cache-Control header. Defaults to 5 minutes. */
5
+ defaultMaxAgeMs?: number;
6
6
  }
7
+ /** Extracts max-age value in milliseconds from a Response's Cache-Control header. Returns undefined if not present. */
8
+ export declare function parseMaxAge(response: {
9
+ headers: {
10
+ get(name: string): string | null;
11
+ };
12
+ }): number | undefined;
7
13
  /**
8
- * Fetches data from a URL with file-based caching support.
9
- * This utility can be used by both remote config and bootnodes fetching.
14
+ * Fetches data from a URL with file-based HTTP conditional caching.
15
+ *
16
+ * Data is stored as raw JSON in the cache file (same format as the server returns).
17
+ * Caching metadata (ETag, expiry) is stored in a separate sidecar `.meta` file.
18
+ * This keeps the data file human-readable and backward-compatible with older code.
10
19
  *
11
20
  * @param url - The URL to fetch from
12
- * @param networkName - Network name for cache directory structure
13
- * @param options - Caching and error handling options
14
- * @param cacheDir - Optional cache directory (defaults to no caching)
15
- * @returns The fetched and parsed JSON data, or undefined if fetch fails and throwOnError is false
21
+ * @param options - Caching options
22
+ * @param fetch - Fetch implementation (defaults to globalThis.fetch)
23
+ * @param log - Logger instance
24
+ * @returns The fetched and parsed JSON data, or undefined if fetch fails
16
25
  */
17
26
  export declare function cachedFetch<T = any>(url: string, options: CachedFetchOptions, fetch?: typeof globalThis.fetch, log?: import("@aztec/aztec.js/log").Logger): Promise<T | undefined>;
18
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGVkX2ZldGNoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NhY2hlZF9mZXRjaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxNQUFNLFdBQVcsa0JBQWtCO0lBQ2pDLHFDQUFxQztJQUNyQyxlQUFlLEVBQUUsTUFBTSxDQUFDO0lBQ3hCLHFCQUFxQjtJQUNyQixTQUFTLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDcEI7QUFFRDs7Ozs7Ozs7O0dBU0c7QUFDSCx3QkFBc0IsV0FBVyxDQUFDLENBQUMsR0FBRyxHQUFHLEVBQ3ZDLEdBQUcsRUFBRSxNQUFNLEVBQ1gsT0FBTyxFQUFFLGtCQUFrQixFQUMzQixLQUFLLDBCQUFtQixFQUN4QixHQUFHLHVDQUErQixHQUNqQyxPQUFPLENBQUMsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxDQXVDeEIifQ==
27
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGVkX2ZldGNoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NhY2hlZF9mZXRjaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxNQUFNLFdBQVcsa0JBQWtCO0lBQ2pDLHNGQUFzRjtJQUN0RixTQUFTLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbkIseUdBQXlHO0lBQ3pHLGVBQWUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUMxQjtBQVVELHVIQUF1SDtBQUN2SCx3QkFBZ0IsV0FBVyxDQUFDLFFBQVEsRUFBRTtJQUFFLE9BQU8sRUFBRTtRQUFFLEdBQUcsQ0FBQyxJQUFJLEVBQUUsTUFBTSxHQUFHLE1BQU0sR0FBRyxJQUFJLENBQUE7S0FBRSxDQUFBO0NBQUUsR0FBRyxNQUFNLEdBQUcsU0FBUyxDQVUzRztBQUVEOzs7Ozs7Ozs7Ozs7R0FZRztBQUNILHdCQUFzQixXQUFXLENBQUMsQ0FBQyxHQUFHLEdBQUcsRUFDdkMsR0FBRyxFQUFFLE1BQU0sRUFDWCxPQUFPLEVBQUUsa0JBQWtCLEVBQzNCLEtBQUssMEJBQW1CLEVBQ3hCLEdBQUcsdUNBQStCLEdBQ2pDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsU0FBUyxDQUFDLENBb0V4QiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"cached_fetch.d.ts","sourceRoot":"","sources":["../../src/config/cached_fetch.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,kBAAkB;IACjC,qCAAqC;IACrC,eAAe,EAAE,MAAM,CAAC;IACxB,qBAAqB;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;GASG;AACH,wBAAsB,WAAW,CAAC,CAAC,GAAG,GAAG,EACvC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,kBAAkB,EAC3B,KAAK,0BAAmB,EACxB,GAAG,uCAA+B,GACjC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAuCxB"}
1
+ {"version":3,"file":"cached_fetch.d.ts","sourceRoot":"","sources":["../../src/config/cached_fetch.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,kBAAkB;IACjC,sFAAsF;IACtF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,yGAAyG;IACzG,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAUD,uHAAuH;AACvH,wBAAgB,WAAW,CAAC,QAAQ,EAAE;IAAE,OAAO,EAAE;QAAE,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,GAAG,MAAM,GAAG,SAAS,CAU3G;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,WAAW,CAAC,CAAC,GAAG,GAAG,EACvC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,kBAAkB,EAC3B,KAAK,0BAAmB,EACxB,GAAG,uCAA+B,GACjC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAoExB"}
@@ -1,50 +1,105 @@
1
1
  import { createLogger } from '@aztec/aztec.js/log';
2
- import { mkdir, readFile, stat, writeFile } from 'fs/promises';
2
+ import { mkdir, readFile, writeFile } from 'fs/promises';
3
3
  import { dirname } from 'path';
4
+ const DEFAULT_MAX_AGE_MS = 5 * 60 * 1000; // 5 minutes
5
+ /** Extracts max-age value in milliseconds from a Response's Cache-Control header. Returns undefined if not present. */ export function parseMaxAge(response) {
6
+ const cacheControl = response.headers.get('cache-control');
7
+ if (!cacheControl) {
8
+ return undefined;
9
+ }
10
+ const match = cacheControl.match(/max-age=(\d+)/);
11
+ if (!match) {
12
+ return undefined;
13
+ }
14
+ return parseInt(match[1], 10) * 1000;
15
+ }
4
16
  /**
5
- * Fetches data from a URL with file-based caching support.
6
- * This utility can be used by both remote config and bootnodes fetching.
17
+ * Fetches data from a URL with file-based HTTP conditional caching.
18
+ *
19
+ * Data is stored as raw JSON in the cache file (same format as the server returns).
20
+ * Caching metadata (ETag, expiry) is stored in a separate sidecar `.meta` file.
21
+ * This keeps the data file human-readable and backward-compatible with older code.
7
22
  *
8
23
  * @param url - The URL to fetch from
9
- * @param networkName - Network name for cache directory structure
10
- * @param options - Caching and error handling options
11
- * @param cacheDir - Optional cache directory (defaults to no caching)
12
- * @returns The fetched and parsed JSON data, or undefined if fetch fails and throwOnError is false
24
+ * @param options - Caching options
25
+ * @param fetch - Fetch implementation (defaults to globalThis.fetch)
26
+ * @param log - Logger instance
27
+ * @returns The fetched and parsed JSON data, or undefined if fetch fails
13
28
  */ export async function cachedFetch(url, options, fetch = globalThis.fetch, log = createLogger('cached_fetch')) {
14
- const { cacheDurationMs, cacheFile } = options;
15
- // Try to read from cache first
29
+ const { cacheFile, defaultMaxAgeMs = DEFAULT_MAX_AGE_MS } = options;
30
+ // If no cacheFile, just fetch normally without caching
31
+ if (!cacheFile) {
32
+ return fetchAndParse(url, fetch, log);
33
+ }
34
+ const metaFile = cacheFile + '.meta';
35
+ // Try to read metadata
36
+ let meta;
16
37
  try {
17
- if (cacheFile) {
18
- const info = await stat(cacheFile);
19
- if (info.mtimeMs + cacheDurationMs > Date.now()) {
20
- const cachedData = JSON.parse(await readFile(cacheFile, 'utf-8'));
21
- return cachedData;
22
- }
23
- }
38
+ meta = JSON.parse(await readFile(metaFile, 'utf-8'));
24
39
  } catch {
25
- log.trace('Failed to read data from cache');
40
+ log.trace('No usable cache metadata found');
26
41
  }
42
+ // Try to read cached data
43
+ let cachedData;
27
44
  try {
28
- const response = await fetch(url);
45
+ cachedData = JSON.parse(await readFile(cacheFile, 'utf-8'));
46
+ } catch {
47
+ log.trace('No usable cached data found');
48
+ }
49
+ // If metadata and data exist and cache is fresh, return directly
50
+ if (meta && cachedData !== undefined && meta.expiresAt > Date.now()) {
51
+ return cachedData;
52
+ }
53
+ // Cache is stale or missing — make a (possibly conditional) request
54
+ try {
55
+ const headers = {};
56
+ if (meta?.etag && cachedData !== undefined) {
57
+ headers['If-None-Match'] = meta.etag;
58
+ }
59
+ const response = await fetch(url, {
60
+ headers
61
+ });
62
+ if (response.status === 304 && cachedData !== undefined) {
63
+ // Not modified — recompute expiry from new response headers and return cached data
64
+ const maxAgeMs = parseMaxAge(response) ?? defaultMaxAgeMs;
65
+ await writeMetaFile(metaFile, {
66
+ etag: meta?.etag,
67
+ expiresAt: Date.now() + maxAgeMs
68
+ }, log);
69
+ return cachedData;
70
+ }
29
71
  if (!response.ok) {
30
72
  log.warn(`Failed to fetch from ${url}: ${response.status} ${response.statusText}`);
31
- return undefined;
73
+ return cachedData;
32
74
  }
75
+ // 200 — parse new data and cache it
33
76
  const data = await response.json();
34
- try {
35
- if (cacheFile) {
36
- await mkdir(dirname(cacheFile), {
37
- recursive: true
38
- });
39
- await writeFile(cacheFile, JSON.stringify(data), 'utf-8');
40
- }
41
- } catch (err) {
42
- log.warn('Failed to cache data on disk: ' + cacheFile, {
43
- cacheFile,
44
- err
45
- });
46
- }
77
+ const maxAgeMs = parseMaxAge(response) ?? defaultMaxAgeMs;
78
+ const etag = response.headers.get('etag') ?? undefined;
79
+ await ensureDir(cacheFile, log);
80
+ await Promise.all([
81
+ writeFile(cacheFile, JSON.stringify(data), 'utf-8'),
82
+ writeFile(metaFile, JSON.stringify({
83
+ etag,
84
+ expiresAt: Date.now() + maxAgeMs
85
+ }), 'utf-8')
86
+ ]);
47
87
  return data;
88
+ } catch (err) {
89
+ log.warn(`Failed to fetch from ${url}`, {
90
+ err
91
+ });
92
+ return cachedData;
93
+ }
94
+ }
95
+ async function fetchAndParse(url, fetch, log) {
96
+ try {
97
+ const response = await fetch(url);
98
+ if (!response.ok) {
99
+ log.warn(`Failed to fetch from ${url}: ${response.status} ${response.statusText}`);
100
+ return undefined;
101
+ }
102
+ return await response.json();
48
103
  } catch (err) {
49
104
  log.warn(`Failed to fetch from ${url}`, {
50
105
  err
@@ -52,3 +107,26 @@ import { dirname } from 'path';
52
107
  return undefined;
53
108
  }
54
109
  }
110
+ async function ensureDir(filePath, log) {
111
+ try {
112
+ await mkdir(dirname(filePath), {
113
+ recursive: true
114
+ });
115
+ } catch (err) {
116
+ log.warn('Failed to create cache directory for: ' + filePath, {
117
+ err
118
+ });
119
+ }
120
+ }
121
+ async function writeMetaFile(metaFile, meta, log) {
122
+ try {
123
+ await mkdir(dirname(metaFile), {
124
+ recursive: true
125
+ });
126
+ await writeFile(metaFile, JSON.stringify(meta), 'utf-8');
127
+ } catch (err) {
128
+ log.warn('Failed to write cache metadata: ' + metaFile, {
129
+ err
130
+ });
131
+ }
132
+ }
@@ -1,41 +1,14 @@
1
- import { type L1ContractsConfig } from '@aztec/ethereum/config';
2
- import type { L1TxUtilsConfig } from '@aztec/ethereum/l1-tx-utils/config';
3
1
  import type { NetworkNames } from '@aztec/foundation/config';
4
- import type { SharedNodeConfig } from '@aztec/node-lib/config';
5
- import type { P2PConfig } from '@aztec/p2p/config';
6
- import type { SequencerConfig, SlasherConfig } from '@aztec/stdlib/interfaces/server';
7
- export type L2ChainConfig = Omit<L1ContractsConfig, keyof L1TxUtilsConfig> & Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways' | 'slashOverridePayload' | 'slashSelfAllowed'> & Pick<P2PConfig, 'bootstrapNodes' | 'p2pEnabled' | 'txPoolDeleteTxsAfterReorg'> & Pick<SequencerConfig, 'buildCheckpointIfEmpty' | 'minTxsPerBlock' | 'maxTxsPerBlock' | 'blockDurationMs'> & {
8
- l1ChainId: number;
9
- testAccounts: boolean;
10
- sponsoredFPC: boolean;
11
- minTxsPerBlock: number;
12
- maxTxsPerBlock: number;
13
- realProofs: boolean;
14
- snapshotsUrls: string[];
15
- autoUpdate: SharedNodeConfig['autoUpdate'];
16
- autoUpdateUrl?: string;
17
- maxPendingTxCount: number;
18
- publicMetricsOptOut: boolean;
19
- publicIncludeMetrics?: string[];
20
- publicMetricsCollectorUrl?: string;
21
- publicMetricsCollectFrom?: string[];
22
- skipArchiverInitialSync?: boolean;
23
- blobAllowEmptySources?: boolean;
24
- dataStoreMapSizeKb: number;
25
- archiverStoreMapSizeKb: number;
26
- noteHashTreeMapSizeKb: number;
27
- nullifierTreeMapSizeKb: number;
28
- publicDataTreeMapSizeKb: number;
29
- sentinelEnabled: boolean;
30
- disableTransactions: boolean;
31
- };
32
- export declare const stagingIgnitionL2ChainConfig: L2ChainConfig;
33
- export declare const stagingPublicL2ChainConfig: L2ChainConfig;
34
- export declare const nextNetL2ChainConfig: L2ChainConfig;
35
- export declare const testnetL2ChainConfig: L2ChainConfig;
36
- export declare const mainnetL2ChainConfig: L2ChainConfig;
37
- export declare const devnetL2ChainConfig: L2ChainConfig;
38
- export declare function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | undefined;
2
+ /**
3
+ * Sets up environment for the given network.
4
+ *
5
+ * For 'local' network: returns early, using hardcoded defaults from DefaultL1ContractsConfig
6
+ * and DefaultSlasherConfig (which match the 'defaults' section of defaults.yml).
7
+ *
8
+ * For deployed networks: applies network configuration from generated defaults.yml,
9
+ * merging base defaults with network-specific overrides.
10
+ *
11
+ * @param networkName - The network name
12
+ */
39
13
  export declare function enrichEnvironmentWithChainName(networkName: NetworkNames): void;
40
- export declare function enrichEnvironmentWithChainConfig(config: L2ChainConfig): void;
41
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW5fbDJfY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NoYWluX2wyX2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTRCLEtBQUssaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMxRixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUMxRSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU3RCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxhQUFhLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQVl0RixNQUFNLE1BQU0sYUFBYSxHQUFHLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxNQUFNLGVBQWUsQ0FBQyxHQUN4RSxJQUFJLENBQUMsYUFBYSxFQUFFLHNCQUFzQixHQUFHLHVCQUF1QixHQUFHLHNCQUFzQixHQUFHLGtCQUFrQixDQUFDLEdBQ25ILElBQUksQ0FBQyxTQUFTLEVBQUUsZ0JBQWdCLEdBQUcsWUFBWSxHQUFHLDJCQUEyQixDQUFDLEdBQzlFLElBQUksQ0FBQyxlQUFlLEVBQUUsd0JBQXdCLEdBQUcsZ0JBQWdCLEdBQUcsZ0JBQWdCLEdBQUcsaUJBQWlCLENBQUMsR0FBRztJQUMxRyxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLFlBQVksRUFBRSxPQUFPLENBQUM7SUFDdEIsWUFBWSxFQUFFLE9BQU8sQ0FBQztJQUN0QixjQUFjLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLGNBQWMsRUFBRSxNQUFNLENBQUM7SUFDdkIsVUFBVSxFQUFFLE9BQU8sQ0FBQztJQUNwQixhQUFhLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDeEIsVUFBVSxFQUFFLGdCQUFnQixDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQzNDLGFBQWEsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN2QixpQkFBaUIsRUFBRSxNQUFNLENBQUM7SUFDMUIsbUJBQW1CLEVBQUUsT0FBTyxDQUFDO0lBQzdCLG9CQUFvQixDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDaEMseUJBQXlCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbkMsd0JBQXdCLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNwQyx1QkFBdUIsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUNsQyxxQkFBcUIsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUloQyxrQkFBa0IsRUFBRSxNQUFNLENBQUM7SUFDM0Isc0JBQXNCLEVBQUUsTUFBTSxDQUFDO0lBQy9CLHFCQUFxQixFQUFFLE1BQU0sQ0FBQztJQUM5QixzQkFBc0IsRUFBRSxNQUFNLENBQUM7SUFDL0IsdUJBQXVCLEVBQUUsTUFBTSxDQUFDO0lBR2hDLGVBQWUsRUFBRSxPQUFPLENBQUM7SUFDekIsbUJBQW1CLEVBQUUsT0FBTyxDQUFDO0NBQzlCLENBQUM7QUErQ0osZUFBTyxNQUFNLDRCQUE0QixFQUFFLGFBc0YxQyxDQUFDO0FBRUYsZUFBTyxNQUFNLDBCQUEwQixFQUFFLGFBMER4QyxDQUFDO0FBRUYsZUFBTyxNQUFNLG9CQUFvQixFQUFFLGFBMERsQyxDQUFDO0FBRUYsZUFBTyxNQUFNLG9CQUFvQixFQUFFLGFBNEZsQyxDQUFDO0FBRUYsZUFBTyxNQUFNLG9CQUFvQixFQUFFLGFBMkZsQyxDQUFDO0FBRUYsZUFBTyxNQUFNLG1CQUFtQixFQUFFLGFBMERqQyxDQUFDO0FBRUYsd0JBQWdCLGdCQUFnQixDQUFDLFdBQVcsRUFBRSxZQUFZLEdBQUcsYUFBYSxHQUFHLFNBQVMsQ0FnQnJGO0FBTUQsd0JBQWdCLDhCQUE4QixDQUFDLFdBQVcsRUFBRSxZQUFZLFFBYXZFO0FBRUQsd0JBQWdCLGdDQUFnQyxDQUFDLE1BQU0sRUFBRSxhQUFhLFFBd0dyRSJ9
14
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW5fbDJfY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NoYWluX2wyX2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQTBCN0Q7Ozs7Ozs7Ozs7R0FVRztBQUNILHdCQUFnQiw4QkFBOEIsQ0FBQyxXQUFXLEVBQUUsWUFBWSxRQXFCdkUifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAYtF,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,EAAE,MAAM,eAAe,CAAC,GACxE,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,GAAG,sBAAsB,GAAG,kBAAkB,CAAC,GACnH,IAAI,CAAC,SAAS,EAAE,gBAAgB,GAAG,YAAY,GAAG,2BAA2B,CAAC,GAC9E,IAAI,CAAC,eAAe,EAAE,wBAAwB,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,iBAAiB,CAAC,GAAG;IAC1G,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAIhC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAGhC,eAAe,EAAE,OAAO,CAAC;IACzB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AA+CJ,eAAO,MAAM,4BAA4B,EAAE,aAsF1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aA0DxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aA0DlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aA4FlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aA2FlC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,aA0DjC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,SAAS,CAgBrF;AAMD,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,YAAY,QAavE;AAED,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,aAAa,QAwGrE"}
1
+ {"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AA0B7D;;;;;;;;;;GAUG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,YAAY,QAqBvE"}