@aztec/aztec 1.1.2 → 1.2.0

package/dest/cli/aztec_start_options.d.ts

@@ -5,6 +5,7 @@ export interface AztecStartOption {
     defaultValue: any;
     printDefault?: (val: any) => string;
     envVar: EnvVar | undefined;
+    fallback?: EnvVar[];
     parseVal?: (val: string) => any;
 }
 export declare const getOptions: (namespace: string, configMappings: Record<string, ConfigMapping>) => AztecStartOption[];

package/dest/cli/aztec_start_options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aztec_start_options.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_options.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,MAAM,EAKZ,MAAM,0BAA0B,CAAC;AAelC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC;IACpC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;CACjC;AAED,eAAO,MAAM,UAAU,GAAI,WAAW,MAAM,EAAE,gBAAgB,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,uBAiB1F,CAAC;AAGF,eAAO,MAAM,gBAAgB,UAU5B,CAAC;AAEF,eAAO,MAAM,YAAY,YAAY,CAAC;AAGtC,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAsXlE,CAAC"}
+{"version":3,"file":"aztec_start_options.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_options.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,MAAM,EAKZ,MAAM,0BAA0B,CAAC;AAelC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC;IACpC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;CACjC;AAED,eAAO,MAAM,UAAU,GAAI,WAAW,MAAM,EAAE,gBAAgB,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,uBAoB1F,CAAC;AAGF,eAAO,MAAM,gBAAgB,UAU5B,CAAC;AAEF,eAAO,MAAM,YAAY,YAAY,CAAC;AAGtC,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAsXlE,CAAC"}

package/dest/cli/aztec_start_options.js

@@ -12,7 +12,7 @@ import { telemetryClientConfigMappings } from '@aztec/telemetry-client';
 import { DefaultMnemonic } from '../mnemonic.js';
 export const getOptions = (namespace, configMappings)=>{
     const options = [];
-    for (const [key, { env, defaultValue: def, parseEnv, description, printDefault }] of Object.entries(configMappings)){
+    for (const [key, { env, defaultValue: def, parseEnv, description, printDefault, fallback }] of Object.entries(configMappings)){
         if (universalOptions.includes(key)) {
             continue;
         }
@@ -23,6 +23,7 @@ export const getOptions = (namespace, configMappings)=>{
             defaultValue: def,
             printDefault,
             envVar: env,
+            fallback,
             parseVal: parseEnv
         });
     }

package/dest/cli/chain_l2_config.d.ts

@@ -57,13 +57,11 @@ export type L2ChainConfig = {
     slashInvalidBlockEnabled: boolean;
     slashInvalidBlockPenalty: bigint;
     slashInvalidBlockMaxPenalty: bigint;
+    sentinelEnabled: boolean;
 };
 export declare const testnetIgnitionL2ChainConfig: L2ChainConfig;
 export declare const alphaTestnetL2ChainConfig: L2ChainConfig;
-export declare function getBootnodes(networkName: NetworkNames): Promise<any>;
-export declare function getL2ChainConfig(networkName: NetworkNames): Promise<{
-    config: L2ChainConfig;
-    networkName: string;
-} | undefined>;
+export declare function getBootnodes(networkName: NetworkNames, cacheDir?: string): Promise<any>;
+export declare function getL2ChainConfig(networkName: NetworkNames, cacheDir?: string): Promise<L2ChainConfig | undefined>;
 export declare function enrichEnvironmentWithChainConfig(networkName: NetworkNames): Promise<void>;
 //# sourceMappingURL=chain_l2_config.d.ts.map

package/dest/cli/chain_l2_config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/cli/chain_l2_config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAM/D,MAAM,MAAM,aAAa,GAAG;IAC1B,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,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,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,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,+EAA+E;IAC/E,0BAA0B,EAAE,MAAM,CAAC;IACnC,yCAAyC;IACzC,aAAa,EAAE,MAAM,CAAC;IACtB,yCAAyC;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,0BAA0B;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,8BAA8B;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kCAAkC;IAClC,wBAAwB,EAAE,MAAM,CAAC;IACjC,sCAAsC;IACtC,2BAA2B,EAAE,MAAM,CAAC;IACpC,qCAAqC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAG3B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,sBAAsB,EAAE,OAAO,CAAC;IAChC,qCAAqC,EAAE,MAAM,CAAC;IAC9C,qCAAqC,EAAE,MAAM,CAAC;IAC9C,4BAA4B,EAAE,MAAM,CAAC;IACrC,yBAAyB,EAAE,MAAM,CAAC;IAClC,wBAAwB,EAAE,OAAO,CAAC;IAClC,wBAAwB,EAAE,MAAM,CAAC;IACjC,2BAA2B,EAAE,MAAM,CAAC;CACrC,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,aA0D1C,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,aA6DvC,CAAC;AAEF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,gBAW3D;AAED,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,GACxB,OAAO,CAAC;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CAWrE;AAmBD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBA2E/E"}
+{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/cli/chain_l2_config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAO/D,MAAM,MAAM,aAAa,GAAG;IAC1B,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,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,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,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,+EAA+E;IAC/E,0BAA0B,EAAE,MAAM,CAAC;IACnC,yCAAyC;IACzC,aAAa,EAAE,MAAM,CAAC;IACtB,yCAAyC;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,0BAA0B;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,8BAA8B;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kCAAkC;IAClC,wBAAwB,EAAE,MAAM,CAAC;IACjC,sCAAsC;IACtC,2BAA2B,EAAE,MAAM,CAAC;IACpC,qCAAqC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAG3B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,sBAAsB,EAAE,OAAO,CAAC;IAChC,qCAAqC,EAAE,MAAM,CAAC;IAC9C,qCAAqC,EAAE,MAAM,CAAC;IAC9C,4BAA4B,EAAE,MAAM,CAAC;IACrC,yBAAyB,EAAE,MAAM,CAAC;IAClC,wBAAwB,EAAE,OAAO,CAAC;IAClC,wBAAwB,EAAE,MAAM,CAAC;IACjC,2BAA2B,EAAE,MAAM,CAAC;IAEpC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,aA2D1C,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,aA8DvC,CAAC;AAIF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,MAAM,gBAgC9E;AAED,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAWpC;AAgCD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBA8E/E"}

package/dest/cli/chain_l2_config.js

@@ -1,6 +1,7 @@
 import { EthAddress } from '@aztec/aztec.js';
 import { DefaultL1ContractsConfig } from '@aztec/ethereum';
-import path from 'path';
+import { mkdir, readFile, stat, writeFile } from 'fs/promises';
+import path, { dirname, join } from 'path';
 import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with {
     type: 'json'
 };
@@ -46,7 +47,8 @@ export const testnetIgnitionL2ChainConfig = {
     slashPrunePenalty: 0n,
     slashPruneMaxPenalty: 0n,
     slashInvalidBlockPenalty: 0n,
-    slashInvalidBlockMaxPenalty: 0n
+    slashInvalidBlockMaxPenalty: 0n,
+    sentinelEnabled: false
 };
 export const alphaTestnetL2ChainConfig = {
     l1ChainId: 11155111,
@@ -65,7 +67,7 @@ export const alphaTestnetL2ChainConfig = {
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/alpha-testnet.json',
     maxTxPoolSize: 100_000_000,
     publicIncludeMetrics,
-    publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec.network',
+    publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec.network/v1/metrics',
     publicMetricsCollectFrom: [
         'sequencer'
     ],
@@ -95,36 +97,53 @@ export const alphaTestnetL2ChainConfig = {
     slashInactivityMaxPenalty: 17n * (DefaultL1ContractsConfig.depositAmount / 100n),
     slashInvalidBlockEnabled: true,
     slashInvalidBlockPenalty: DefaultL1ContractsConfig.depositAmount,
-    slashInvalidBlockMaxPenalty: DefaultL1ContractsConfig.depositAmount
+    slashInvalidBlockMaxPenalty: DefaultL1ContractsConfig.depositAmount,
+    sentinelEnabled: true
 };
-export async function getBootnodes(networkName) {
+const BOOTNODE_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour;
+export async function getBootnodes(networkName, cacheDir) {
+    const cacheFile = cacheDir ? join(cacheDir, networkName, 'bootnodes.json') : undefined;
+    try {
+        if (cacheFile) {
+            const info = await stat(cacheFile);
+            if (info.mtimeMs + BOOTNODE_CACHE_DURATION_MS > Date.now()) {
+                return JSON.parse(await readFile(cacheFile, 'utf-8'))['bootnodes'];
+            }
+        }
+    } catch  {
+    // no-op. Get the remote-file
+    }
     const url = `http://static.aztec.network/${networkName}/bootnodes.json`;
     const response = await fetch(url);
     if (!response.ok) {
         throw new Error(`Failed to fetch basic contract addresses from ${url}. Check you are using a correct network name.`);
     }
     const json = await response.json();
+    try {
+        if (cacheFile) {
+            await mkdir(dirname(cacheFile), {
+                recursive: true
+            });
+            await writeFile(cacheFile, JSON.stringify(json), 'utf-8');
+        }
+    } catch  {
+    // no-op
+    }
     return json['bootnodes'];
 }
-export async function getL2ChainConfig(networkName) {
+export async function getL2ChainConfig(networkName, cacheDir) {
     if (networkName === 'testnet-ignition') {
         const config = {
             ...testnetIgnitionL2ChainConfig
         };
-        config.p2pBootstrapNodes = await getBootnodes(networkName);
-        return {
-            config,
-            networkName
-        };
+        config.p2pBootstrapNodes = await getBootnodes(networkName, cacheDir);
+        return config;
     } else if (networkName === 'alpha-testnet' || networkName === 'testnet') {
         const config = {
             ...alphaTestnetL2ChainConfig
         };
-        config.p2pBootstrapNodes = await getBootnodes('alpha-testnet');
-        return {
-            config,
-            networkName: 'alpha-testnet'
-        };
+        config.p2pBootstrapNodes = await getBootnodes('alpha-testnet', cacheDir);
+        return config;
     }
     return undefined;
 }
@@ -143,15 +162,27 @@ function enrichEthAddressVar(envVar, value) {
     }
     enrichVar(envVar, value);
 }
+function getDefaultDataDir(networkName) {
+    let prefix;
+    if (networkName === 'testnet-ignition') {
+        prefix = 'testnet-ignition';
+    } else if (networkName === 'alpha-testnet' || networkName === 'testnet') {
+        prefix = 'alpha-testnet';
+    } else {
+        prefix = networkName;
+    }
+    return path.join(process.env.HOME || '~', '.aztec', prefix, 'data');
+}
 export async function enrichEnvironmentWithChainConfig(networkName) {
     if (networkName === 'local') {
         return;
     }
-    const result = await getL2ChainConfig(networkName);
-    if (!result) {
+    enrichVar('DATA_DIRECTORY', getDefaultDataDir(networkName));
+    const cacheDir = process.env.DATA_DIRECTORY ? join(process.env.DATA_DIRECTORY, 'cache') : undefined;
+    const config = await getL2ChainConfig(networkName, cacheDir);
+    if (!config) {
         throw new Error(`Unknown network name: ${networkName}`);
     }
-    const { config, networkName: name } = result;
     enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
     enrichVar('TEST_ACCOUNTS', config.testAccounts.toString());
     enrichVar('SPONSORED_FPC', config.sponsoredFPC.toString());
@@ -159,7 +190,6 @@ export async function enrichEnvironmentWithChainConfig(networkName) {
     enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
     enrichVar('SEQ_MIN_TX_PER_BLOCK', config.seqMinTxsPerBlock.toString());
     enrichVar('SEQ_MAX_TX_PER_BLOCK', config.seqMaxTxsPerBlock.toString());
-    enrichVar('DATA_DIRECTORY', path.join(process.env.HOME || '~', '.aztec', name, 'data'));
     enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
     enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
     enrichVar('SYNC_SNAPSHOTS_URL', config.snapshotsUrl);
@@ -209,4 +239,5 @@ export async function enrichEnvironmentWithChainConfig(networkName) {
     enrichVar('SLASH_INVALID_BLOCK_ENABLED', config.slashInvalidBlockEnabled.toString());
     enrichVar('SLASH_INVALID_BLOCK_PENALTY', config.slashInvalidBlockPenalty.toString());
     enrichVar('SLASH_INVALID_BLOCK_MAX_PENALTY', config.slashInvalidBlockMaxPenalty.toString());
+    enrichVar('SENTINEL_ENABLED', config.sentinelEnabled.toString());
 }

package/dest/cli/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/cli/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/cli/util.ts"],"names":[],"mappings":"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"}

package/dest/cli/util.js

@@ -111,17 +111,29 @@ export function formatHelpLine(option, defaultValue, envVar, maxOptionLength, ma
 }
 const getDefaultOrEnvValue = (opt)=>{
     let val;
-    // if the option is set in the environment, use that & parse it
-    if (opt.envVar && process.env[opt.envVar]) {
+    // if the option is set in the environment, use that
+    if (opt.envVar) {
         val = process.env[opt.envVar];
-        if (val && opt.parseVal) {
+    }
+    // if we have fallback env vars, check those
+    if (!val && opt.fallback && opt.fallback.length > 0) {
+        for (const fallback of opt.fallback){
+            val = process.env[fallback];
+            if (val) {
+                break;
+            }
+        }
+    }
+    // if we have a value, optionally parse it and return
+    if (val) {
+        if (opt.parseVal) {
             return opt.parseVal(val);
         }
-    // if no env variable, use the default value
+        return val;
     } else if (opt.defaultValue) {
-        val = opt.defaultValue;
+        return opt.defaultValue;
     }
-    return val;
+    return undefined;
 };
 // Function to add options dynamically
 export const addOptions = (cmd, options)=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js"
@@ -27,35 +27,35 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "1.1.2",
-    "@aztec/archiver": "1.1.2",
-    "@aztec/aztec-faucet": "1.1.2",
-    "@aztec/aztec-node": "1.1.2",
-    "@aztec/aztec.js": "1.1.2",
-    "@aztec/bb-prover": "1.1.2",
-    "@aztec/bb.js": "1.1.2",
-    "@aztec/blob-sink": "1.1.2",
-    "@aztec/bot": "1.1.2",
-    "@aztec/builder": "1.1.2",
-    "@aztec/cli": "1.1.2",
-    "@aztec/cli-wallet": "1.1.2",
-    "@aztec/constants": "1.1.2",
-    "@aztec/entrypoints": "1.1.2",
-    "@aztec/ethereum": "1.1.2",
-    "@aztec/foundation": "1.1.2",
-    "@aztec/kv-store": "1.1.2",
-    "@aztec/noir-contracts.js": "1.1.2",
-    "@aztec/noir-protocol-circuits-types": "1.1.2",
-    "@aztec/p2p": "1.1.2",
-    "@aztec/p2p-bootstrap": "1.1.2",
-    "@aztec/protocol-contracts": "1.1.2",
-    "@aztec/prover-client": "1.1.2",
-    "@aztec/prover-node": "1.1.2",
-    "@aztec/pxe": "1.1.2",
-    "@aztec/stdlib": "1.1.2",
-    "@aztec/telemetry-client": "1.1.2",
-    "@aztec/txe": "1.1.2",
-    "@aztec/world-state": "1.1.2",
+    "@aztec/accounts": "1.2.0",
+    "@aztec/archiver": "1.2.0",
+    "@aztec/aztec-faucet": "1.2.0",
+    "@aztec/aztec-node": "1.2.0",
+    "@aztec/aztec.js": "1.2.0",
+    "@aztec/bb-prover": "1.2.0",
+    "@aztec/bb.js": "1.2.0",
+    "@aztec/blob-sink": "1.2.0",
+    "@aztec/bot": "1.2.0",
+    "@aztec/builder": "1.2.0",
+    "@aztec/cli": "1.2.0",
+    "@aztec/cli-wallet": "1.2.0",
+    "@aztec/constants": "1.2.0",
+    "@aztec/entrypoints": "1.2.0",
+    "@aztec/ethereum": "1.2.0",
+    "@aztec/foundation": "1.2.0",
+    "@aztec/kv-store": "1.2.0",
+    "@aztec/noir-contracts.js": "1.2.0",
+    "@aztec/noir-protocol-circuits-types": "1.2.0",
+    "@aztec/p2p": "1.2.0",
+    "@aztec/p2p-bootstrap": "1.2.0",
+    "@aztec/protocol-contracts": "1.2.0",
+    "@aztec/prover-client": "1.2.0",
+    "@aztec/prover-node": "1.2.0",
+    "@aztec/pxe": "1.2.0",
+    "@aztec/stdlib": "1.2.0",
+    "@aztec/telemetry-client": "1.2.0",
+    "@aztec/txe": "1.2.0",
+    "@aztec/world-state": "1.2.0",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",

package/src/cli/aztec_start_options.ts

@@ -31,12 +31,15 @@ export interface AztecStartOption {
   defaultValue: any;
   printDefault?: (val: any) => string;
   envVar: EnvVar | undefined;
+  fallback?: EnvVar[];
   parseVal?: (val: string) => any;
 }
 
 export const getOptions = (namespace: string, configMappings: Record<string, ConfigMapping>) => {
   const options: AztecStartOption[] = [];
-  for (const [key, { env, defaultValue: def, parseEnv, description, printDefault }] of Object.entries(configMappings)) {
+  for (const [key, { env, defaultValue: def, parseEnv, description, printDefault, fallback }] of Object.entries(
+    configMappings,
+  )) {
     if (universalOptions.includes(key)) {
       continue;
     }
@@ -47,6 +50,7 @@ export const getOptions = (namespace: string, configMappings: Record<string, Con
       defaultValue: def,
       printDefault,
       envVar: env,
+      fallback,
       parseVal: parseEnv,
     });
   }

package/src/cli/chain_l2_config.ts

@@ -3,7 +3,8 @@ import { DefaultL1ContractsConfig } from '@aztec/ethereum';
 import type { EnvVar, NetworkNames } from '@aztec/foundation/config';
 import type { SharedNodeConfig } from '@aztec/node-lib/config';
 
-import path from 'path';
+import { mkdir, readFile, stat, writeFile } from 'fs/promises';
+import path, { dirname, join } from 'path';
 
 import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with { type: 'json' };
 
@@ -69,6 +70,8 @@ export type L2ChainConfig = {
   slashInvalidBlockEnabled: boolean;
   slashInvalidBlockPenalty: bigint;
   slashInvalidBlockMaxPenalty: bigint;
+  // control whether sentinel is enabled or not. Needed for slashing
+  sentinelEnabled: boolean;
 };
 
 export const testnetIgnitionL2ChainConfig: L2ChainConfig = {
@@ -129,6 +132,7 @@ export const testnetIgnitionL2ChainConfig: L2ChainConfig = {
   slashPruneMaxPenalty: 0n,
   slashInvalidBlockPenalty: 0n,
   slashInvalidBlockMaxPenalty: 0n,
+  sentinelEnabled: false,
 };
 
 export const alphaTestnetL2ChainConfig: L2ChainConfig = {
@@ -148,7 +152,7 @@ export const alphaTestnetL2ChainConfig: L2ChainConfig = {
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/alpha-testnet.json',
   maxTxPoolSize: 100_000_000, // 100MB
   publicIncludeMetrics,
-  publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec.network',
+  publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec.network/v1/metrics',
   publicMetricsCollectFrom: ['sequencer'],
 
   // Deployment stuff
@@ -192,9 +196,24 @@ export const alphaTestnetL2ChainConfig: L2ChainConfig = {
   slashInvalidBlockEnabled: true,
   slashInvalidBlockPenalty: DefaultL1ContractsConfig.depositAmount,
   slashInvalidBlockMaxPenalty: DefaultL1ContractsConfig.depositAmount,
+  sentinelEnabled: true,
 };
 
-export async function getBootnodes(networkName: NetworkNames) {
+const BOOTNODE_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour;
+
+export async function getBootnodes(networkName: NetworkNames, cacheDir?: string) {
+  const cacheFile = cacheDir ? join(cacheDir, networkName, 'bootnodes.json') : undefined;
+  try {
+    if (cacheFile) {
+      const info = await stat(cacheFile);
+      if (info.mtimeMs + BOOTNODE_CACHE_DURATION_MS > Date.now()) {
+        return JSON.parse(await readFile(cacheFile, 'utf-8'))['bootnodes'];
+      }
+    }
+  } catch {
+    // no-op. Get the remote-file
+  }
+
   const url = `http://static.aztec.network/${networkName}/bootnodes.json`;
   const response = await fetch(url);
   if (!response.ok) {
@@ -204,20 +223,30 @@ export async function getBootnodes(networkName: NetworkNames) {
   }
   const json = await response.json();
 
+  try {
+    if (cacheFile) {
+      await mkdir(dirname(cacheFile), { recursive: true });
+      await writeFile(cacheFile, JSON.stringify(json), 'utf-8');
+    }
+  } catch {
+    // no-op
+  }
+
   return json['bootnodes'];
 }
 
 export async function getL2ChainConfig(
   networkName: NetworkNames,
-): Promise<{ config: L2ChainConfig; networkName: string } | undefined> {
+  cacheDir?: string,
+): Promise<L2ChainConfig | undefined> {
   if (networkName === 'testnet-ignition') {
     const config = { ...testnetIgnitionL2ChainConfig };
-    config.p2pBootstrapNodes = await getBootnodes(networkName);
-    return { config, networkName };
+    config.p2pBootstrapNodes = await getBootnodes(networkName, cacheDir);
+    return config;
   } else if (networkName === 'alpha-testnet' || networkName === 'testnet') {
     const config = { ...alphaTestnetL2ChainConfig };
-    config.p2pBootstrapNodes = await getBootnodes('alpha-testnet');
-    return { config, networkName: 'alpha-testnet' };
+    config.p2pBootstrapNodes = await getBootnodes('alpha-testnet', cacheDir);
+    return config;
   }
   return undefined;
 }
@@ -239,16 +268,32 @@ function enrichEthAddressVar(envVar: EnvVar, value: string) {
   enrichVar(envVar, value);
 }
 
+function getDefaultDataDir(networkName: NetworkNames): string {
+  let prefix: string;
+  if (networkName === 'testnet-ignition') {
+    prefix = 'testnet-ignition';
+  } else if (networkName === 'alpha-testnet' || networkName === 'testnet') {
+    prefix = 'alpha-testnet';
+  } else {
+    prefix = networkName;
+  }
+
+  return path.join(process.env.HOME || '~', '.aztec', prefix, 'data');
+}
+
 export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
   if (networkName === 'local') {
     return;
   }
 
-  const result = await getL2ChainConfig(networkName);
-  if (!result) {
+  enrichVar('DATA_DIRECTORY', getDefaultDataDir(networkName));
+  const cacheDir = process.env.DATA_DIRECTORY ? join(process.env.DATA_DIRECTORY, 'cache') : undefined;
+  const config = await getL2ChainConfig(networkName, cacheDir);
+
+  if (!config) {
     throw new Error(`Unknown network name: ${networkName}`);
   }
-  const { config, networkName: name } = result;
+
   enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
   enrichVar('TEST_ACCOUNTS', config.testAccounts.toString());
   enrichVar('SPONSORED_FPC', config.sponsoredFPC.toString());
@@ -256,7 +301,6 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames
   enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
   enrichVar('SEQ_MIN_TX_PER_BLOCK', config.seqMinTxsPerBlock.toString());
   enrichVar('SEQ_MAX_TX_PER_BLOCK', config.seqMaxTxsPerBlock.toString());
-  enrichVar('DATA_DIRECTORY', path.join(process.env.HOME || '~', '.aztec', name, 'data'));
   enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
   enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
   enrichVar('SYNC_SNAPSHOTS_URL', config.snapshotsUrl);
@@ -314,4 +358,5 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames
   enrichVar('SLASH_INVALID_BLOCK_ENABLED', config.slashInvalidBlockEnabled.toString());
   enrichVar('SLASH_INVALID_BLOCK_PENALTY', config.slashInvalidBlockPenalty.toString());
   enrichVar('SLASH_INVALID_BLOCK_MAX_PENALTY', config.slashInvalidBlockMaxPenalty.toString());
+  enrichVar('SENTINEL_ENABLED', config.sentinelEnabled.toString());
 }

package/src/cli/util.ts

@@ -142,18 +142,32 @@ export function formatHelpLine(
 
 const getDefaultOrEnvValue = (opt: AztecStartOption) => {
   let val;
-  // if the option is set in the environment, use that & parse it
-  if (opt.envVar && process.env[opt.envVar]) {
+
+  // if the option is set in the environment, use that
+  if (opt.envVar) {
     val = process.env[opt.envVar];
-    if (val && opt.parseVal) {
+  }
+
+  // if we have fallback env vars, check those
+  if (!val && opt.fallback && opt.fallback.length > 0) {
+    for (const fallback of opt.fallback) {
+      val = process.env[fallback];
+      if (val) {
+        break;
+      }
+    }
+  }
+
+  // if we have a value, optionally parse it and return
+  if (val) {
+    if (opt.parseVal) {
       return opt.parseVal(val);
     }
-    // if no env variable, use the default value
+    return val;
   } else if (opt.defaultValue) {
-    val = opt.defaultValue;
+    return opt.defaultValue;
   }
-
-  return val;
+  return undefined;
 };
 
 // Function to add options dynamically