@aztec/cli 2.1.2-rc.1 → 2.1.2-rc.3

package/dest/cmds/validator_keys/new.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator_keys/new.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAgBhE,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,UAAU,CAAC;CAC7B,CAAC;AAEF,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,EAAE,GAAG,EAAE,KAAK,iBA+E1F"}
+{"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator_keys/new.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAgBhE,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,UAAU,CAAC;CAC7B,CAAC;AAEF,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,EAAE,GAAG,EAAE,KAAK,iBAyF1F"}

package/dest/cmds/validator_keys/new.js

@@ -8,6 +8,13 @@ export async function newValidatorKeystore(options, log) {
         throw new Error('Using --remote-signer requires a deterministic key source. Provide --mnemonic to derive keys, or omit --remote-signer to write new private keys to keystore.');
     }
     const mnemonic = _mnemonic ?? generateMnemonic(wordlist);
+    if (!_mnemonic && !json) {
+        log('No mnemonic provided, generating new one...');
+        log(`Using new mnemonic:`);
+        log('');
+        log(mnemonic);
+        log('');
+    }
     const validatorCount = typeof count === 'number' && Number.isFinite(count) && count > 0 ? Math.floor(count) : 1;
     const { outputPath } = await resolveKeystoreOutputPath(dataDir, file);
     const { validators, summaries } = await buildValidatorEntries({
@@ -41,7 +48,11 @@ export async function newValidatorKeystore(options, log) {
         validators
     };
     await writeKeystoreFile(outputPath, keystore);
-    maybePrintJson(log, json, keystore);
+    const outputData = !_mnemonic ? {
+        ...keystore,
+        generatedMnemonic: mnemonic
+    } : keystore;
+    maybePrintJson(log, json, outputData);
     if (!json) {
         log(`Wrote validator keystore to ${outputPath}`);
     }

package/dest/config/chain_l2_config.d.ts

@@ -16,6 +16,7 @@ export type L2ChainConfig = L1ContractsConfig & Pick<P2PConfig, 'txPoolDeleteTxs
     autoUpdate: SharedNodeConfig['autoUpdate'];
     autoUpdateUrl?: string;
     maxTxPoolSize: number;
+    publicMetricsOptOut: boolean;
     publicIncludeMetrics?: string[];
     publicMetricsCollectorUrl?: string;
     publicMetricsCollectFrom?: string[];
@@ -31,8 +32,10 @@ export type L2ChainConfig = L1ContractsConfig & Pick<P2PConfig, 'txPoolDeleteTxs
 };
 export declare const stagingIgnitionL2ChainConfig: L2ChainConfig;
 export declare const stagingPublicL2ChainConfig: L2ChainConfig;
+export declare const nextNetL2ChainConfig: L2ChainConfig;
 export declare const testnetL2ChainConfig: L2ChainConfig;
 export declare const mainnetL2ChainConfig: L2ChainConfig;
+export declare const devnetL2ChainConfig: L2ChainConfig;
 export declare function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | undefined;
 export declare function enrichEnvironmentWithChainConfig(networkName: NetworkNames): void;
 //# sourceMappingURL=chain_l2_config.d.ts.map

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

@@ -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,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;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAIhC,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;IACzB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AA+CJ,eAAO,MAAM,4BAA4B,EAAE,aAgF1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAoDxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAsFlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAoFlC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,SAAS,CAYrF;AAMD,wBAAgB,gCAAgC,CAAC,WAAW,EAAE,YAAY,QAoGzE"}
+{"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,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,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;IACzB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AA+CJ,eAAO,MAAM,4BAA4B,EAAE,aAiF1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAqDxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAqDlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAuFlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAsFlC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,aAqDjC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,SAAS,CAYrF;AAMD,wBAAgB,gCAAgC,CAAC,WAAW,EAAE,YAAY,QAsGzE"}

package/dest/config/chain_l2_config.js

@@ -58,7 +58,8 @@ export const stagingIgnitionL2ChainConfig = {
     ],
     autoUpdate: 'config-and-version',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-ignition.json',
-    maxTxPoolSize: 100_000_000,
+    maxTxPoolSize: 0,
+    publicMetricsOptOut: false,
     publicIncludeMetrics,
     publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
     publicMetricsCollectFrom: [
@@ -125,6 +126,7 @@ export const stagingPublicL2ChainConfig = {
     ],
     autoUpdate: 'config-and-version',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-public.json',
+    publicMetricsOptOut: false,
     publicIncludeMetrics,
     publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
     publicMetricsCollectFrom: [
@@ -150,6 +152,45 @@ export const stagingPublicL2ChainConfig = {
     ...DefaultSlashConfig,
     ...DefaultNetworkDBMapSizeConfig
 };
+export const nextNetL2ChainConfig = {
+    l1ChainId: 11155111,
+    testAccounts: true,
+    sponsoredFPC: true,
+    p2pEnabled: true,
+    disableTransactions: false,
+    p2pBootstrapNodes: [],
+    seqMinTxsPerBlock: 0,
+    seqMaxTxsPerBlock: 8,
+    realProofs: true,
+    snapshotsUrls: [],
+    autoUpdate: 'config-and-version',
+    autoUpdateUrl: '',
+    publicMetricsOptOut: true,
+    publicIncludeMetrics,
+    publicMetricsCollectorUrl: '',
+    publicMetricsCollectFrom: [
+        ''
+    ],
+    maxTxPoolSize: 100_000_000,
+    txPoolDeleteTxsAfterReorg: false,
+    // Deployment stuff
+    /** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
+    /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 36,
+    /** How many L2 slots an epoch lasts. */ aztecEpochDuration: 32,
+    /** The target validator committee size. */ aztecTargetCommitteeSize: 48,
+    /** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochs: DefaultL1ContractsConfig.lagInEpochs,
+    /** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */ localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
+    /** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
+    /** The deposit amount for a validator */ activationThreshold: DefaultL1ContractsConfig.activationThreshold,
+    /** The minimum stake for a validator. */ ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
+    /** The slashing round size */ slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
+    /** Governance proposing round size */ governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
+    /** The mana target for the rollup */ manaTarget: DefaultL1ContractsConfig.manaTarget,
+    /** The proving cost per mana */ provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
+    /** Exit delay for stakers */ exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
+    ...DefaultSlashConfig,
+    ...DefaultNetworkDBMapSizeConfig
+};
 export const testnetL2ChainConfig = {
     l1ChainId: 11155111,
     testAccounts: false,
@@ -166,6 +207,7 @@ export const testnetL2ChainConfig = {
     autoUpdate: 'config-and-version',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/testnet.json',
     maxTxPoolSize: 100_000_000,
+    publicMetricsOptOut: false,
     publicIncludeMetrics,
     publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
     publicMetricsCollectFrom: [
@@ -235,12 +277,14 @@ export const mainnetL2ChainConfig = {
     ],
     autoUpdate: 'notify',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-mainnet/auto-update/mainnet.json',
-    maxTxPoolSize: 100_000_000,
+    maxTxPoolSize: 0,
+    publicMetricsOptOut: true,
     publicIncludeMetrics,
     publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
     publicMetricsCollectFrom: [
         'sequencer'
     ],
+    blobAllowEmptySources: true,
     /** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
     /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 72,
     /** How many L2 slots an epoch lasts. */ aztecEpochDuration: 32,
@@ -252,7 +296,7 @@ export const mainnetL2ChainConfig = {
     slashingRoundSizeInEpochs: 4,
     slashingExecutionDelayInRounds: 28,
     slashingLifetimeInRounds: 34,
-    slashingVetoer: EthAddress.ZERO,
+    slashingVetoer: EthAddress.fromString('0xBbB4aF368d02827945748b28CD4b2D42e4A37480'),
     slashingOffsetInRounds: 2,
     slashingDisableDuration: 259_200,
     slasherFlavor: 'tally',
@@ -285,6 +329,45 @@ export const mainnetL2ChainConfig = {
     sentinelEnabled: true,
     ...DefaultNetworkDBMapSizeConfig
 };
+export const devnetL2ChainConfig = {
+    l1ChainId: 11155111,
+    testAccounts: true,
+    sponsoredFPC: true,
+    p2pEnabled: true,
+    disableTransactions: false,
+    p2pBootstrapNodes: [],
+    seqMinTxsPerBlock: 0,
+    seqMaxTxsPerBlock: 8,
+    realProofs: false,
+    snapshotsUrls: [],
+    autoUpdate: 'config-and-version',
+    autoUpdateUrl: '',
+    publicMetricsOptOut: true,
+    publicIncludeMetrics,
+    publicMetricsCollectorUrl: '',
+    publicMetricsCollectFrom: [
+        ''
+    ],
+    maxTxPoolSize: 100_000_000,
+    txPoolDeleteTxsAfterReorg: true,
+    // Deployment stuff
+    /** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
+    /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 36,
+    /** How many L2 slots an epoch lasts. */ aztecEpochDuration: 8,
+    /** The target validator committee size. */ aztecTargetCommitteeSize: 1,
+    /** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochs: 1,
+    /** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */ localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
+    /** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
+    /** The deposit amount for a validator */ activationThreshold: DefaultL1ContractsConfig.activationThreshold,
+    /** The minimum stake for a validator. */ ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
+    /** The slashing round size */ slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
+    /** Governance proposing round size */ governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
+    /** The mana target for the rollup */ manaTarget: DefaultL1ContractsConfig.manaTarget,
+    /** The proving cost per mana */ provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
+    /** Exit delay for stakers */ exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
+    ...DefaultSlashConfig,
+    ...DefaultNetworkDBMapSizeConfig
+};
 export function getL2ChainConfig(networkName) {
     let config;
     if (networkName === 'staging-public') {
@@ -355,6 +438,7 @@ export function enrichEnvironmentWithChainConfig(networkName) {
     if (config.publicMetricsCollectFrom) {
         enrichVar('PUBLIC_OTEL_COLLECT_FROM', config.publicMetricsCollectFrom.join(','));
     }
+    enrichVar('PUBLIC_OTEL_OPT_OUT', config.publicMetricsOptOut.toString());
     // Deployment stuff
     enrichVar('ETHEREUM_SLOT_DURATION', config.ethereumSlotDuration.toString());
     enrichVar('AZTEC_SLOT_DURATION', config.aztecSlotDuration.toString());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "2.1.2-rc.1",
+  "version": "2.1.2-rc.3",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -71,18 +71,18 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "2.1.2-rc.1",
-    "@aztec/aztec.js": "2.1.2-rc.1",
-    "@aztec/constants": "2.1.2-rc.1",
-    "@aztec/entrypoints": "2.1.2-rc.1",
-    "@aztec/ethereum": "2.1.2-rc.1",
-    "@aztec/foundation": "2.1.2-rc.1",
-    "@aztec/l1-artifacts": "2.1.2-rc.1",
-    "@aztec/node-keystore": "2.1.2-rc.1",
-    "@aztec/node-lib": "2.1.2-rc.1",
-    "@aztec/p2p": "2.1.2-rc.1",
-    "@aztec/stdlib": "2.1.2-rc.1",
-    "@aztec/world-state": "2.1.2-rc.1",
+    "@aztec/archiver": "2.1.2-rc.3",
+    "@aztec/aztec.js": "2.1.2-rc.3",
+    "@aztec/constants": "2.1.2-rc.3",
+    "@aztec/entrypoints": "2.1.2-rc.3",
+    "@aztec/ethereum": "2.1.2-rc.3",
+    "@aztec/foundation": "2.1.2-rc.3",
+    "@aztec/l1-artifacts": "2.1.2-rc.3",
+    "@aztec/node-keystore": "2.1.2-rc.3",
+    "@aztec/node-lib": "2.1.2-rc.3",
+    "@aztec/p2p": "2.1.2-rc.3",
+    "@aztec/stdlib": "2.1.2-rc.3",
+    "@aztec/world-state": "2.1.2-rc.3",
     "@ethersproject/wallet": "^5.8.0",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
@@ -96,8 +96,8 @@
     "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
   },
   "devDependencies": {
-    "@aztec/accounts": "2.1.2-rc.1",
-    "@aztec/protocol-contracts": "2.1.2-rc.1",
+    "@aztec/accounts": "2.1.2-rc.3",
+    "@aztec/protocol-contracts": "2.1.2-rc.3",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.chunk": "^4.2.9",
@@ -113,15 +113,15 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@aztec/accounts": "2.1.2-rc.1",
-    "@aztec/bb-prover": "2.1.2-rc.1",
-    "@aztec/ethereum": "2.1.2-rc.1",
-    "@aztec/l1-artifacts": "2.1.2-rc.1",
-    "@aztec/noir-contracts.js": "2.1.2-rc.1",
-    "@aztec/noir-protocol-circuits-types": "2.1.2-rc.1",
-    "@aztec/noir-test-contracts.js": "2.1.2-rc.1",
-    "@aztec/protocol-contracts": "2.1.2-rc.1",
-    "@aztec/stdlib": "2.1.2-rc.1"
+    "@aztec/accounts": "2.1.2-rc.3",
+    "@aztec/bb-prover": "2.1.2-rc.3",
+    "@aztec/ethereum": "2.1.2-rc.3",
+    "@aztec/l1-artifacts": "2.1.2-rc.3",
+    "@aztec/noir-contracts.js": "2.1.2-rc.3",
+    "@aztec/noir-protocol-circuits-types": "2.1.2-rc.3",
+    "@aztec/noir-test-contracts.js": "2.1.2-rc.3",
+    "@aztec/protocol-contracts": "2.1.2-rc.3",
+    "@aztec/stdlib": "2.1.2-rc.3"
   },
   "files": [
     "dest",

package/src/cmds/validator_keys/new.ts

@@ -67,6 +67,14 @@ export async function newValidatorKeystore(options: NewValidatorKeystoreOptions,
 
   const mnemonic = _mnemonic ?? generateMnemonic(wordlist);
 
+  if (!_mnemonic && !json) {
+    log('No mnemonic provided, generating new one...');
+    log(`Using new mnemonic:`);
+    log('');
+    log(mnemonic);
+    log('');
+  }
+
   const validatorCount = typeof count === 'number' && Number.isFinite(count) && count > 0 ? Math.floor(count) : 1;
   const { outputPath } = await resolveKeystoreOutputPath(dataDir, file);
 
@@ -99,7 +107,9 @@ export async function newValidatorKeystore(options: NewValidatorKeystoreOptions,
 
   await writeKeystoreFile(outputPath, keystore);
 
-  maybePrintJson(log, json, keystore as unknown as Record<string, any>);
+  const outputData = !_mnemonic ? { ...keystore, generatedMnemonic: mnemonic } : keystore;
+
+  maybePrintJson(log, json, outputData as unknown as Record<string, any>);
   if (!json) {
     log(`Wrote validator keystore to ${outputPath}`);
   }

package/src/config/chain_l2_config.ts

@@ -30,6 +30,7 @@ export type L2ChainConfig = L1ContractsConfig &
     autoUpdate: SharedNodeConfig['autoUpdate'];
     autoUpdateUrl?: string;
     maxTxPoolSize: number;
+    publicMetricsOptOut: boolean;
     publicIncludeMetrics?: string[];
     publicMetricsCollectorUrl?: string;
     publicMetricsCollectFrom?: string[];
@@ -107,7 +108,8 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   snapshotsUrls: [`${SNAPSHOTS_URL}/staging-ignition/`],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-ignition.json',
-  maxTxPoolSize: 100_000_000, // 100MB
+  maxTxPoolSize: 0,
+  publicMetricsOptOut: false,
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
   publicMetricsCollectFrom: ['sequencer'],
@@ -138,7 +140,7 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   slashAmountLarge: 50_000n * 10n ** 18n,
   slashingOffsetInRounds: 2,
   slasherFlavor: 'tally',
-  slashingVetoer: EthAddress.ZERO, // TODO TMNT-329
+  slashingVetoer: EthAddress.ZERO,
 
   /** The mana target for the rollup */
   manaTarget: 0n,
@@ -189,6 +191,7 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   snapshotsUrls: [`${SNAPSHOTS_URL}/staging-public/`],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-public.json',
+  publicMetricsOptOut: false,
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
   publicMetricsCollectFrom: ['sequencer'],
@@ -230,6 +233,61 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   ...DefaultNetworkDBMapSizeConfig,
 };
 
+export const nextNetL2ChainConfig: L2ChainConfig = {
+  l1ChainId: 11155111,
+  testAccounts: true,
+  sponsoredFPC: true,
+  p2pEnabled: true,
+  disableTransactions: false,
+  p2pBootstrapNodes: [],
+  seqMinTxsPerBlock: 0,
+  seqMaxTxsPerBlock: 8,
+  realProofs: true,
+  snapshotsUrls: [],
+  autoUpdate: 'config-and-version',
+  autoUpdateUrl: '',
+  publicMetricsOptOut: true,
+  publicIncludeMetrics,
+  publicMetricsCollectorUrl: '',
+  publicMetricsCollectFrom: [''],
+  maxTxPoolSize: 100_000_000, // 100MB
+  txPoolDeleteTxsAfterReorg: false,
+
+  // Deployment stuff
+  /** How many seconds an L1 slot lasts. */
+  ethereumSlotDuration: 12,
+  /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */
+  aztecSlotDuration: 36,
+  /** How many L2 slots an epoch lasts. */
+  aztecEpochDuration: 32,
+  /** The target validator committee size. */
+  aztecTargetCommitteeSize: 48,
+  /** The number of epochs to lag behind the current epoch for validator selection. */
+  lagInEpochs: DefaultL1ContractsConfig.lagInEpochs,
+  /** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */
+  localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
+  /** The number of epochs after an epoch ends that proofs are still accepted. */
+  aztecProofSubmissionEpochs: 1,
+  /** The deposit amount for a validator */
+  activationThreshold: DefaultL1ContractsConfig.activationThreshold,
+  /** The minimum stake for a validator. */
+  ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
+  /** The slashing round size */
+  slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
+  /** Governance proposing round size */
+  governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
+  /** The mana target for the rollup */
+  manaTarget: DefaultL1ContractsConfig.manaTarget,
+  /** The proving cost per mana */
+  provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
+  /** Exit delay for stakers */
+  exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
+
+  ...DefaultSlashConfig,
+
+  ...DefaultNetworkDBMapSizeConfig,
+};
+
 export const testnetL2ChainConfig: L2ChainConfig = {
   l1ChainId: 11155111,
   testAccounts: false,
@@ -244,6 +302,7 @@ export const testnetL2ChainConfig: L2ChainConfig = {
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/testnet.json',
   maxTxPoolSize: 100_000_000, // 100MB
+  publicMetricsOptOut: false,
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
   publicMetricsCollectFrom: ['sequencer'],
@@ -333,10 +392,12 @@ export const mainnetL2ChainConfig: L2ChainConfig = {
   snapshotsUrls: [`${SNAPSHOTS_URL}/mainnet/`],
   autoUpdate: 'notify',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-mainnet/auto-update/mainnet.json',
-  maxTxPoolSize: 100_000_000, // 100MB
+  maxTxPoolSize: 0,
+  publicMetricsOptOut: true,
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
   publicMetricsCollectFrom: ['sequencer'],
+  blobAllowEmptySources: true,
 
   /** How many seconds an L1 slot lasts. */
   ethereumSlotDuration: 12,
@@ -357,7 +418,7 @@ export const mainnetL2ChainConfig: L2ChainConfig = {
   slashingRoundSizeInEpochs: 4,
   slashingExecutionDelayInRounds: 28,
   slashingLifetimeInRounds: 34,
-  slashingVetoer: EthAddress.ZERO, // TODO TMNT-329
+  slashingVetoer: EthAddress.fromString('0xBbB4aF368d02827945748b28CD4b2D42e4A37480'),
   slashingOffsetInRounds: 2,
 
   slashingDisableDuration: 259_200, // 3 days
@@ -404,6 +465,61 @@ export const mainnetL2ChainConfig: L2ChainConfig = {
   ...DefaultNetworkDBMapSizeConfig,
 };
 
+export const devnetL2ChainConfig: L2ChainConfig = {
+  l1ChainId: 11155111,
+  testAccounts: true,
+  sponsoredFPC: true,
+  p2pEnabled: true,
+  disableTransactions: false,
+  p2pBootstrapNodes: [],
+  seqMinTxsPerBlock: 0,
+  seqMaxTxsPerBlock: 8,
+  realProofs: false,
+  snapshotsUrls: [],
+  autoUpdate: 'config-and-version',
+  autoUpdateUrl: '',
+  publicMetricsOptOut: true,
+  publicIncludeMetrics,
+  publicMetricsCollectorUrl: '',
+  publicMetricsCollectFrom: [''],
+  maxTxPoolSize: 100_000_000, // 100MB
+  txPoolDeleteTxsAfterReorg: true,
+
+  // Deployment stuff
+  /** How many seconds an L1 slot lasts. */
+  ethereumSlotDuration: 12,
+  /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */
+  aztecSlotDuration: 36,
+  /** How many L2 slots an epoch lasts. */
+  aztecEpochDuration: 8,
+  /** The target validator committee size. */
+  aztecTargetCommitteeSize: 1,
+  /** The number of epochs to lag behind the current epoch for validator selection. */
+  lagInEpochs: 1,
+  /** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */
+  localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
+  /** The number of epochs after an epoch ends that proofs are still accepted. */
+  aztecProofSubmissionEpochs: 1,
+  /** The deposit amount for a validator */
+  activationThreshold: DefaultL1ContractsConfig.activationThreshold,
+  /** The minimum stake for a validator. */
+  ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
+  /** The slashing round size */
+  slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
+  /** Governance proposing round size */
+  governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
+  /** The mana target for the rollup */
+  manaTarget: DefaultL1ContractsConfig.manaTarget,
+  /** The proving cost per mana */
+  provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
+  /** Exit delay for stakers */
+  exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
+
+  ...DefaultSlashConfig,
+
+  ...DefaultNetworkDBMapSizeConfig,
+};
+
 export function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | undefined {
   let config: L2ChainConfig | undefined;
   if (networkName === 'staging-public') {
@@ -480,6 +596,8 @@ export function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
     enrichVar('PUBLIC_OTEL_COLLECT_FROM', config.publicMetricsCollectFrom.join(','));
   }
 
+  enrichVar('PUBLIC_OTEL_OPT_OUT', config.publicMetricsOptOut.toString());
+
   // Deployment stuff
   enrichVar('ETHEREUM_SLOT_DURATION', config.ethereumSlotDuration.toString());
   enrichVar('AZTEC_SLOT_DURATION', config.aztecSlotDuration.toString());