@aztec/cli 2.1.0-rc.14 → 2.1.0-rc.16

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 (5) hide show
  1. package/dest/config/chain_l2_config.d.ts +2 -3
  2. package/dest/config/chain_l2_config.d.ts.map +1 -1
  3. package/dest/config/chain_l2_config.js +4 -23
  4. package/package.json +23 -23
  5. package/src/config/chain_l2_config.ts +5 -30
package/dest/config/chain_l2_config.d.ts CHANGED
@@ -30,7 +30,6 @@ export declare const stagingIgnitionL2ChainConfig: L2ChainConfig;
30
30
  export declare const stagingPublicL2ChainConfig: L2ChainConfig;
31
31
  export declare const testnetL2ChainConfig: L2ChainConfig;
32
32
  export declare const ignitionL2ChainConfig: L2ChainConfig;
33
- export declare function getBootnodes(networkName: NetworkNames, cacheDir?: string): Promise<any>;
34
- export declare function getL2ChainConfig(networkName: NetworkNames, cacheDir?: string): Promise<L2ChainConfig | undefined>;
35
- export declare function enrichEnvironmentWithChainConfig(networkName: NetworkNames): Promise<void>;
33
+ export declare function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | undefined;
34
+ export declare function enrichEnvironmentWithChainConfig(networkName: NetworkNames): void;
36
35
  //# sourceMappingURL=chain_l2_config.d.ts.map
package/dest/config/chain_l2_config.d.ts.map CHANGED
@@ -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,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAarE,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAC3C,IAAI,CAAC,SAAS,EAAE,2BAA2B,CAAC,GAC5C,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,CAAC,GAAG;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,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,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IAIpC,WAAW,EAAE,MAAM,CAAC;IACpB,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;CAC1B,CAAC;AA+CJ,eAAO,MAAM,4BAA4B,EAAE,aA+E1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAmDxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAsDlC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,aA+EnC,CAAC;AAIF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,MAAM,gBAQ9E;AAED,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAoBpC;AAMD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBA4F/E"}
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,iBAAiB,CAAC;AACnF,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,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAYrE,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAC3C,IAAI,CAAC,SAAS,EAAE,2BAA2B,CAAC,GAC5C,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,CAAC,GAAG;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,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,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IAIpC,WAAW,EAAE,MAAM,CAAC;IACpB,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;CAC1B,CAAC;AA+CJ,eAAO,MAAM,4BAA4B,EAAE,aA+E1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAmDxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAsDlC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,aA+EnC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,SAAS,CAYrF;AAMD,wBAAgB,gCAAgC,CAAC,WAAW,EAAE,YAAY,QA2FzE"}
package/dest/config/chain_l2_config.js CHANGED
@@ -1,10 +1,9 @@
1
1
  import { DefaultL1ContractsConfig } from '@aztec/ethereum';
2
2
  import { EthAddress } from '@aztec/foundation/eth-address';
3
- import path, { join } from 'path';
3
+ import path from 'path';
4
4
  import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with {
5
5
  type: 'json'
6
6
  };
7
- import { cachedFetch } from './cached_fetch.js';
8
7
  import { enrichEthAddressVar, enrichVar } from './enrich_env.js';
9
8
  const SNAPSHOTS_URL = 'https://aztec-labs-snapshots.com';
10
9
  const defaultDBMapSizeKb = 128 * 1_024 * 1_024; // 128 GB
@@ -257,16 +256,7 @@ export const ignitionL2ChainConfig = {
257
256
  slashExecuteRoundsLookBack: 4,
258
257
  ...DefaultNetworkDBMapSizeConfig
259
258
  };
260
- const BOOTNODE_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour;
261
- export async function getBootnodes(networkName, cacheDir) {
262
- const url = `http://static.aztec.network/${networkName}/bootnodes.json`;
263
- const data = await cachedFetch(url, {
264
- cacheDurationMs: BOOTNODE_CACHE_DURATION_MS,
265
- cacheFile: cacheDir ? join(cacheDir, networkName, 'bootnodes.json') : undefined
266
- });
267
- return data?.bootnodes;
268
- }
269
- export async function getL2ChainConfig(networkName, cacheDir) {
259
+ export function getL2ChainConfig(networkName) {
270
260
  let config;
271
261
  if (networkName === 'staging-public') {
272
262
  config = {
@@ -285,26 +275,17 @@ export async function getL2ChainConfig(networkName, cacheDir) {
285
275
  ...ignitionL2ChainConfig
286
276
  };
287
277
  }
288
- if (!config) {
289
- return undefined;
290
- }
291
- // If the bootnodes are not set, get them from the network
292
- const bootnodeKey = 'BOOTSTRAP_NODES';
293
- if (!process.env[bootnodeKey]) {
294
- config.p2pBootstrapNodes = await getBootnodes(networkName, cacheDir);
295
- }
296
278
  return config;
297
279
  }
298
280
  function getDefaultDataDir(networkName) {
299
281
  return path.join(process.env.HOME || '~', '.aztec', networkName, 'data');
300
282
  }
301
- export async function enrichEnvironmentWithChainConfig(networkName) {
283
+ export function enrichEnvironmentWithChainConfig(networkName) {
302
284
  if (networkName === 'local') {
303
285
  return;
304
286
  }
305
287
  enrichVar('DATA_DIRECTORY', getDefaultDataDir(networkName));
306
- const cacheDir = process.env.DATA_DIRECTORY ? join(process.env.DATA_DIRECTORY, 'cache') : undefined;
307
- const config = await getL2ChainConfig(networkName, cacheDir);
288
+ const config = getL2ChainConfig(networkName);
308
289
  if (!config) {
309
290
  throw new Error(`Unknown network name: ${networkName}`);
310
291
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/cli",
3
- "version": "2.1.0-rc.14",
3
+ "version": "2.1.0-rc.16",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  "./contracts": "./dest/cmds/contracts/index.js",
@@ -70,17 +70,17 @@
70
70
  ]
71
71
  },
72
72
  "dependencies": {
73
- "@aztec/archiver": "2.1.0-rc.14",
74
- "@aztec/aztec.js": "2.1.0-rc.14",
75
- "@aztec/constants": "2.1.0-rc.14",
76
- "@aztec/entrypoints": "2.1.0-rc.14",
77
- "@aztec/ethereum": "2.1.0-rc.14",
78
- "@aztec/foundation": "2.1.0-rc.14",
79
- "@aztec/l1-artifacts": "2.1.0-rc.14",
80
- "@aztec/node-lib": "2.1.0-rc.14",
81
- "@aztec/p2p": "2.1.0-rc.14",
82
- "@aztec/stdlib": "2.1.0-rc.14",
83
- "@aztec/world-state": "2.1.0-rc.14",
73
+ "@aztec/archiver": "2.1.0-rc.16",
74
+ "@aztec/aztec.js": "2.1.0-rc.16",
75
+ "@aztec/constants": "2.1.0-rc.16",
76
+ "@aztec/entrypoints": "2.1.0-rc.16",
77
+ "@aztec/ethereum": "2.1.0-rc.16",
78
+ "@aztec/foundation": "2.1.0-rc.16",
79
+ "@aztec/l1-artifacts": "2.1.0-rc.16",
80
+ "@aztec/node-lib": "2.1.0-rc.16",
81
+ "@aztec/p2p": "2.1.0-rc.16",
82
+ "@aztec/stdlib": "2.1.0-rc.16",
83
+ "@aztec/world-state": "2.1.0-rc.16",
84
84
  "@iarna/toml": "^2.2.5",
85
85
  "@libp2p/peer-id-factory": "^3.0.4",
86
86
  "commander": "^12.1.0",
@@ -92,8 +92,8 @@
92
92
  "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
93
93
  },
94
94
  "devDependencies": {
95
- "@aztec/accounts": "2.1.0-rc.14",
96
- "@aztec/protocol-contracts": "2.1.0-rc.14",
95
+ "@aztec/accounts": "2.1.0-rc.16",
96
+ "@aztec/protocol-contracts": "2.1.0-rc.16",
97
97
  "@jest/globals": "^30.0.0",
98
98
  "@types/jest": "^30.0.0",
99
99
  "@types/lodash.chunk": "^4.2.9",
@@ -109,15 +109,15 @@
109
109
  "typescript": "^5.3.3"
110
110
  },
111
111
  "peerDependencies": {
112
- "@aztec/accounts": "2.1.0-rc.14",
113
- "@aztec/bb-prover": "2.1.0-rc.14",
114
- "@aztec/ethereum": "2.1.0-rc.14",
115
- "@aztec/l1-artifacts": "2.1.0-rc.14",
116
- "@aztec/noir-contracts.js": "2.1.0-rc.14",
117
- "@aztec/noir-protocol-circuits-types": "2.1.0-rc.14",
118
- "@aztec/noir-test-contracts.js": "2.1.0-rc.14",
119
- "@aztec/protocol-contracts": "2.1.0-rc.14",
120
- "@aztec/stdlib": "2.1.0-rc.14"
112
+ "@aztec/accounts": "2.1.0-rc.16",
113
+ "@aztec/bb-prover": "2.1.0-rc.16",
114
+ "@aztec/ethereum": "2.1.0-rc.16",
115
+ "@aztec/l1-artifacts": "2.1.0-rc.16",
116
+ "@aztec/noir-contracts.js": "2.1.0-rc.16",
117
+ "@aztec/noir-protocol-circuits-types": "2.1.0-rc.16",
118
+ "@aztec/noir-test-contracts.js": "2.1.0-rc.16",
119
+ "@aztec/protocol-contracts": "2.1.0-rc.16",
120
+ "@aztec/stdlib": "2.1.0-rc.16"
121
121
  },
122
122
  "files": [
123
123
  "dest",
package/src/config/chain_l2_config.ts CHANGED
@@ -1,14 +1,13 @@
1
1
  import { DefaultL1ContractsConfig, type L1ContractsConfig } from '@aztec/ethereum';
2
- import type { EnvVar, NetworkNames } from '@aztec/foundation/config';
2
+ import type { NetworkNames } from '@aztec/foundation/config';
3
3
  import { EthAddress } from '@aztec/foundation/eth-address';
4
4
  import type { SharedNodeConfig } from '@aztec/node-lib/config';
5
5
  import type { P2PConfig } from '@aztec/p2p/config';
6
6
  import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
7
7
 
8
- import path, { join } from 'path';
8
+ import path from 'path';
9
9
 
10
10
  import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with { type: 'json' };
11
- import { cachedFetch } from './cached_fetch.js';
12
11
  import { enrichEthAddressVar, enrichVar } from './enrich_env.js';
13
12
 
14
13
  const SNAPSHOTS_URL = 'https://aztec-labs-snapshots.com';
@@ -363,22 +362,7 @@ export const ignitionL2ChainConfig: L2ChainConfig = {
363
362
  ...DefaultNetworkDBMapSizeConfig,
364
363
  };
365
364
 
366
- const BOOTNODE_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour;
367
-
368
- export async function getBootnodes(networkName: NetworkNames, cacheDir?: string) {
369
- const url = `http://static.aztec.network/${networkName}/bootnodes.json`;
370
- const data = await cachedFetch(url, {
371
- cacheDurationMs: BOOTNODE_CACHE_DURATION_MS,
372
- cacheFile: cacheDir ? join(cacheDir, networkName, 'bootnodes.json') : undefined,
373
- });
374
-
375
- return data?.bootnodes;
376
- }
377
-
378
- export async function getL2ChainConfig(
379
- networkName: NetworkNames,
380
- cacheDir?: string,
381
- ): Promise<L2ChainConfig | undefined> {
365
+ export function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | undefined {
382
366
  let config: L2ChainConfig | undefined;
383
367
  if (networkName === 'staging-public') {
384
368
  config = { ...stagingPublicL2ChainConfig };
@@ -389,14 +373,6 @@ export async function getL2ChainConfig(
389
373
  } else if (networkName === 'ignition') {
390
374
  config = { ...ignitionL2ChainConfig };
391
375
  }
392
- if (!config) {
393
- return undefined;
394
- }
395
- // If the bootnodes are not set, get them from the network
396
- const bootnodeKey: EnvVar = 'BOOTSTRAP_NODES';
397
- if (!process.env[bootnodeKey]) {
398
- config.p2pBootstrapNodes = await getBootnodes(networkName, cacheDir);
399
- }
400
376
  return config;
401
377
  }
402
378
 
@@ -404,14 +380,13 @@ function getDefaultDataDir(networkName: NetworkNames): string {
404
380
  return path.join(process.env.HOME || '~', '.aztec', networkName, 'data');
405
381
  }
406
382
 
407
- export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
383
+ export function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
408
384
  if (networkName === 'local') {
409
385
  return;
410
386
  }
411
387
 
412
388
  enrichVar('DATA_DIRECTORY', getDefaultDataDir(networkName));
413
- const cacheDir = process.env.DATA_DIRECTORY ? join(process.env.DATA_DIRECTORY, 'cache') : undefined;
414
- const config = await getL2ChainConfig(networkName, cacheDir);
389
+ const config = getL2ChainConfig(networkName);
415
390
 
416
391
  if (!config) {
417
392
  throw new Error(`Unknown network name: ${networkName}`);