@aztec/cli 2.1.2 → 2.1.3-rc.2

package/dest/config/chain_l2_config.js

@@ -37,7 +37,7 @@ const DefaultSlashConfig = {
     slashExecuteRoundsLookBack: 4
 };
 const DefaultNetworkDBMapSizeConfig = {
-    dbMapSizeKb: defaultDBMapSizeKb,
+    dataStoreMapSizeKb: defaultDBMapSizeKb,
     archiverStoreMapSizeKb: tbMapSizeKb,
     noteHashTreeMapSizeKb: tbMapSizeKb,
     nullifierTreeMapSizeKb: tbMapSizeKb,
@@ -49,16 +49,17 @@ export const stagingIgnitionL2ChainConfig = {
     sponsoredFPC: false,
     disableTransactions: true,
     p2pEnabled: true,
-    p2pBootstrapNodes: [],
-    seqMinTxsPerBlock: 0,
-    seqMaxTxsPerBlock: 0,
+    bootstrapNodes: [],
+    minTxsPerBlock: 0,
+    maxTxsPerBlock: 0,
     realProofs: true,
     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,
+    maxTxPoolSize: 0,
+    publicMetricsOptOut: false,
     publicIncludeMetrics,
     publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
     publicMetricsCollectFrom: [
@@ -116,15 +117,16 @@ export const stagingPublicL2ChainConfig = {
     sponsoredFPC: true,
     disableTransactions: false,
     p2pEnabled: true,
-    p2pBootstrapNodes: [],
-    seqMinTxsPerBlock: 0,
-    seqMaxTxsPerBlock: 20,
+    bootstrapNodes: [],
+    minTxsPerBlock: 0,
+    maxTxsPerBlock: 20,
     realProofs: true,
     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: [
@@ -150,15 +152,54 @@ export const stagingPublicL2ChainConfig = {
     ...DefaultSlashConfig,
     ...DefaultNetworkDBMapSizeConfig
 };
+export const nextNetL2ChainConfig = {
+    l1ChainId: 11155111,
+    testAccounts: true,
+    sponsoredFPC: true,
+    p2pEnabled: true,
+    disableTransactions: false,
+    bootstrapNodes: [],
+    minTxsPerBlock: 0,
+    maxTxsPerBlock: 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,
     sponsoredFPC: true,
     p2pEnabled: true,
     disableTransactions: true,
-    p2pBootstrapNodes: [],
-    seqMinTxsPerBlock: 0,
-    seqMaxTxsPerBlock: 0,
+    bootstrapNodes: [],
+    minTxsPerBlock: 0,
+    maxTxsPerBlock: 0,
     realProofs: true,
     snapshotsUrls: [
         `${SNAPSHOTS_URL}/testnet/`
@@ -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: [
@@ -226,21 +268,23 @@ export const mainnetL2ChainConfig = {
     testAccounts: false,
     sponsoredFPC: false,
     p2pEnabled: true,
-    p2pBootstrapNodes: [],
-    seqMinTxsPerBlock: 0,
-    seqMaxTxsPerBlock: 0,
+    bootstrapNodes: [],
+    minTxsPerBlock: 0,
+    maxTxsPerBlock: 0,
     realProofs: true,
     snapshotsUrls: [
         `${SNAPSHOTS_URL}/mainnet/`
     ],
     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,
+    bootstrapNodes: [],
+    minTxsPerBlock: 0,
+    maxTxsPerBlock: 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') {
@@ -309,7 +392,7 @@ export function getL2ChainConfig(networkName) {
 function getDefaultDataDir(networkName) {
     return path.join(process.env.HOME || '~', '.aztec', networkName, 'data');
 }
-export function enrichEnvironmentWithChainConfig(networkName) {
+export function enrichEnvironmentWithChainName(networkName) {
     if (networkName === 'local') {
         return;
     }
@@ -318,18 +401,22 @@ export function enrichEnvironmentWithChainConfig(networkName) {
     if (!config) {
         throw new Error(`Unknown network name: ${networkName}`);
     }
-    enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
+    enrichEnvironmentWithChainConfig(config);
+}
+export function enrichEnvironmentWithChainConfig(config) {
+    enrichVar('BOOTSTRAP_NODES', config.bootstrapNodes.join(','));
     enrichVar('TEST_ACCOUNTS', config.testAccounts.toString());
     enrichVar('SPONSORED_FPC', config.sponsoredFPC.toString());
     enrichVar('P2P_ENABLED', config.p2pEnabled.toString());
     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('SEQ_MIN_TX_PER_BLOCK', config.minTxsPerBlock.toString());
+    enrichVar('SEQ_MAX_TX_PER_BLOCK', config.maxTxsPerBlock.toString());
     enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
     enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
     enrichVar('SYNC_SNAPSHOTS_URLS', config.snapshotsUrls.join(','));
     enrichVar('P2P_MAX_TX_POOL_SIZE', config.maxTxPoolSize.toString());
-    enrichVar('DATA_STORE_MAP_SIZE_KB', config.dbMapSizeKb.toString());
+    enrichVar('P2P_TX_POOL_DELETE_TXS_AFTER_REORG', config.txPoolDeleteTxsAfterReorg.toString());
+    enrichVar('DATA_STORE_MAP_SIZE_KB', config.dataStoreMapSizeKb.toString());
     enrichVar('ARCHIVER_STORE_MAP_SIZE_KB', config.archiverStoreMapSizeKb.toString());
     enrichVar('NOTE_HASH_TREE_MAP_SIZE_KB', config.noteHashTreeMapSizeKb.toString());
     enrichVar('NULLIFIER_TREE_MAP_SIZE_KB', config.nullifierTreeMapSizeKb.toString());
@@ -355,11 +442,13 @@ 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());
     enrichVar('AZTEC_EPOCH_DURATION', config.aztecEpochDuration.toString());
     enrichVar('AZTEC_TARGET_COMMITTEE_SIZE', config.aztecTargetCommitteeSize.toString());
+    enrichVar('AZTEC_LAG_IN_EPOCHS', config.lagInEpochs.toString());
     enrichVar('AZTEC_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
     enrichVar('AZTEC_ACTIVATION_THRESHOLD', config.activationThreshold.toString());
     enrichVar('AZTEC_EJECTION_THRESHOLD', config.ejectionThreshold.toString());
@@ -377,6 +466,7 @@ export function enrichEnvironmentWithChainConfig(networkName) {
     enrichVar('AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS', config.slashingExecutionDelayInRounds.toString());
     enrichVar('AZTEC_SLASHING_OFFSET_IN_ROUNDS', config.slashingOffsetInRounds.toString());
     enrichVar('AZTEC_SLASHER_FLAVOR', config.slasherFlavor);
+    enrichVar('AZTEC_SLASHING_DISABLE_DURATION', config.slashingDisableDuration.toString());
     enrichVar('AZTEC_EXIT_DELAY_SECONDS', config.exitDelaySeconds.toString());
     enrichEthAddressVar('AZTEC_SLASHING_VETOER', config.slashingVetoer.toString());
     // Slashing
@@ -393,6 +483,8 @@ export function enrichEnvironmentWithChainConfig(networkName) {
     enrichVar('SLASH_INVALID_BLOCK_PENALTY', config.slashBroadcastedInvalidBlockPenalty.toString());
     enrichVar('SLASH_OFFENSE_EXPIRATION_ROUNDS', config.slashOffenseExpirationRounds.toString());
     enrichVar('SLASH_MAX_PAYLOAD_SIZE', config.slashMaxPayloadSize.toString());
+    enrichVar('SLASH_GRACE_PERIOD_L2_SLOTS', config.slashGracePeriodL2Slots.toString());
+    enrichVar('SLASH_EXECUTE_ROUNDS_LOOK_BACK', config.slashExecuteRoundsLookBack.toString());
     enrichVar('SENTINEL_ENABLED', config.sentinelEnabled.toString());
     enrichVar('TRANSACTIONS_DISABLED', config.disableTransactions.toString());
 }

package/package.json

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

package/src/cmds/validator_keys/add.ts

@@ -30,7 +30,6 @@ export async function addValidatorKeys(existing: string, options: AddValidatorKe
     addressIndex,
     ikm,
     blsPath,
-    blsOnly,
     json,
     feeRecipient: feeRecipientOpt,
     coinbase: coinbaseOpt,
@@ -75,7 +74,6 @@ export async function addValidatorKeys(existing: string, options: AddValidatorKe
     mnemonic: mnemonicToUse,
     ikm,
     blsPath,
-    blsOnly,
     feeRecipient,
     coinbase,
     remoteSigner,

package/src/cmds/validator_keys/index.ts

@@ -7,7 +7,7 @@ import { parseAztecAddress, parseEthereumAddress, parseHex, parseOptionalInteger
 export function injectCommands(program: Command, log: LogFn) {
   const group = program
     .command('validator-keys')
-    .aliases(['valKeys'])
+    .aliases(['valKeys', 'valkeys'])
     .description('Manage validator keystores for node operators');
 
   group
@@ -29,13 +29,23 @@ export function injectCommands(program: Command, log: LogFn) {
     .option('--remote-signer <url>', 'Default remote signer URL for accounts in this file')
     .option('--ikm <hex>', 'Initial keying material for BLS (alternative to mnemonic)', value => parseHex(value, 32))
     .option('--bls-path <path>', 'EIP-2334 path (default m/12381/3600/0/0/0)')
-    .option('--bls-only', 'Generate only BLS keys')
     .option(
       '--password <str>',
       'Password for writing keystore files (ETH JSON V3 and BLS EIP-2335). Empty string allowed',
     )
     .option('--out-dir <dir>', 'Output directory for generated keystore file(s)')
     .option('--json', 'Echo resulting JSON to stdout')
+    .option('--staker-output', 'Generate staker output JSON files for each attester')
+    .option('--gse-address <address>', 'GSE contract address (required with --staker-output)', parseEthereumAddress)
+    .option('--l1-rpc-urls <urls>', 'L1 RPC URLs (comma-separated, required with --staker-output)', value =>
+      value.split(','),
+    )
+    .option(
+      '-c, --l1-chain-id <number>',
+      'L1 chain ID (required with --staker-output)',
+      value => parseInt(value),
+      31337,
+    )
     .requiredOption('--fee-recipient <address>', 'Aztec address that will receive fees', parseAztecAddress)
     .action(async options => {
       const { newValidatorKeystore } = await import('./new.js');
@@ -62,7 +72,6 @@ export function injectCommands(program: Command, log: LogFn) {
     .option('--remote-signer <url>', 'Default remote signer URL for accounts in this file')
     .option('--ikm <hex>', 'Initial keying material for BLS (alternative to mnemonic)', value => parseHex(value, 32))
     .option('--bls-path <path>', 'EIP-2334 path (default m/12381/3600/0/0/0)')
-    .option('--bls-only', 'Generate only BLS keys')
     .option('--empty', 'Generate an empty skeleton without keys')
     .option(
       '--password <str>',
@@ -76,6 +85,25 @@ export function injectCommands(program: Command, log: LogFn) {
       await addValidatorKeys(existing, options, log);
     });
 
+  group
+    .command('staker')
+    .summary('Generate staking JSON from keystore')
+    .description(
+      'Reads a validator keystore and outputs staking data with BLS public keys for each attester (skips mnemonics)',
+    )
+    .requiredOption('--from <keystore>', 'Path to keystore JSON file')
+    .option('--password <password>', 'Password for decrypting encrypted keystores (if not specified in keystore file)')
+    .requiredOption('--gse-address <address>', 'GSE contract address', parseEthereumAddress)
+    .option('--l1-rpc-urls <urls>', 'L1 RPC URLs (comma-separated)', value => value.split(','), [
+      'http://localhost:8545',
+    ])
+    .option('-c, --l1-chain-id <number>', 'L1 chain ID', value => parseInt(value), 31337)
+    .option('--output <file>', 'Output file path (if not specified, JSON is written to stdout)')
+    .action(async options => {
+      const { generateStakerJson } = await import('./staker.js');
+      await generateStakerJson(options, log);
+    });
+
   // top-level convenience: aztec generate-bls-keypair
   program
     .command('generate-bls-keypair')

package/src/cmds/validator_keys/new.ts

@@ -1,9 +1,13 @@
+import { prettyPrintJSON } from '@aztec/cli/utils';
+import { GSEContract, createEthereumChain } from '@aztec/ethereum';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn } from '@aztec/foundation/log';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 
 import { wordlist } from '@scure/bip39/wordlists/english.js';
-import { dirname } from 'path';
+import { writeFile } from 'fs/promises';
+import { basename, dirname, join } from 'path';
+import { createPublicClient, fallback, http } from 'viem';
 import { generateMnemonic, mnemonicToAccount } from 'viem/accounts';
 
 import {
@@ -15,6 +19,7 @@ import {
   writeEthJsonV3ToFile,
   writeKeystoreFile,
 } from './shared.js';
+import { processAttesterAccounts } from './staker.js';
 
 export type NewValidatorKeystoreOptions = {
   dataDir?: string;
@@ -28,7 +33,6 @@ export type NewValidatorKeystoreOptions = {
   separatePublisher?: boolean;
   ikm?: string;
   blsPath?: string;
-  blsOnly?: boolean;
   password?: string;
   outDir?: string;
   json?: boolean;
@@ -36,6 +40,10 @@ export type NewValidatorKeystoreOptions = {
   coinbase?: EthAddress;
   remoteSigner?: string;
   fundingAccount?: EthAddress;
+  stakerOutput?: boolean;
+  gseAddress?: EthAddress;
+  l1RpcUrls?: string[];
+  l1ChainId?: number;
 };
 
 export async function newValidatorKeystore(options: NewValidatorKeystoreOptions, log: LogFn) {
@@ -51,14 +59,30 @@ export async function newValidatorKeystore(options: NewValidatorKeystoreOptions,
     feeRecipient,
     remoteSigner,
     fundingAccount,
-    blsOnly,
     blsPath,
     ikm,
     mnemonic: _mnemonic,
     password,
     outDir,
+    stakerOutput,
+    gseAddress,
+    l1RpcUrls,
+    l1ChainId,
   } = options;
 
+  // Validate staker output requirements
+  if (stakerOutput) {
+    if (!gseAddress) {
+      throw new Error('--gse-address is required when using --staker-output');
+    }
+    if (!l1RpcUrls || l1RpcUrls.length === 0) {
+      throw new Error('--l1-rpc-urls is required when using --staker-output');
+    }
+    if (l1ChainId === undefined) {
+      throw new Error('--l1-chain-id is required when using --staker-output');
+    }
+  }
+
   if (remoteSigner && !_mnemonic) {
     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.',
@@ -67,6 +91,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);
 
@@ -78,7 +110,6 @@ export async function newValidatorKeystore(options: NewValidatorKeystoreOptions,
     mnemonic,
     ikm,
     blsPath,
-    blsOnly,
     feeRecipient,
     coinbase,
     remoteSigner,
@@ -99,15 +130,66 @@ export async function newValidatorKeystore(options: NewValidatorKeystoreOptions,
 
   await writeKeystoreFile(outputPath, keystore);
 
-  maybePrintJson(log, json, keystore as unknown as Record<string, any>);
-  if (!json) {
+  // Generate staker outputs if requested
+  const allStakerOutputs: any[] = [];
+  if (stakerOutput && gseAddress && l1RpcUrls && l1ChainId !== undefined) {
+    const chain = createEthereumChain(l1RpcUrls, l1ChainId);
+    const publicClient = createPublicClient({
+      chain: chain.chainInfo,
+      transport: fallback(l1RpcUrls.map(url => http(url))),
+    });
+    const gse = new GSEContract(publicClient, gseAddress);
+
+    const keystoreOutDir = outDir && outDir.length > 0 ? outDir : dirname(outputPath);
+    // Extract keystore base name without extension for unique staker output filenames
+    const keystoreBaseName = basename(outputPath, '.json');
+
+    // Process each validator
+    for (let i = 0; i < validators.length; i++) {
+      const validator = validators[i];
+      const outputs = await processAttesterAccounts(validator.attester, gse, password);
+
+      // Save each attester's staker output
+      for (let j = 0; j < outputs.length; j++) {
+        const attesterIndex = i + 1;
+        const stakerOutputPath = join(
+          keystoreOutDir,
+          `${keystoreBaseName}_attester${attesterIndex}_staker_output.json`,
+        );
+        await writeFile(stakerOutputPath, prettyPrintJSON(outputs[j]), 'utf-8');
+        allStakerOutputs.push(outputs[j]);
+      }
+    }
+  }
+
+  const outputData = !_mnemonic ? { ...keystore, generatedMnemonic: mnemonic } : keystore;
+
+  // Handle JSON output
+  if (json) {
+    if (stakerOutput && allStakerOutputs.length > 0) {
+      const combinedOutput = {
+        keystore: outputData,
+        staker: allStakerOutputs,
+      };
+      maybePrintJson(log, json, combinedOutput as unknown as Record<string, any>);
+    } else {
+      maybePrintJson(log, json, outputData as unknown as Record<string, any>);
+    }
+  } else {
     log(`Wrote validator keystore to ${outputPath}`);
+    if (stakerOutput && allStakerOutputs.length > 0) {
+      const keystoreOutDir = outDir && outDir.length > 0 ? outDir : dirname(outputPath);
+      log(`Wrote ${allStakerOutputs.length} staker output file(s) to ${keystoreOutDir}`);
+      log('');
+    }
   }
 
-  // Always print a concise summary of public keys (addresses and BLS pubkeys)
-  logValidatorSummaries(log, summaries);
+  // print a concise summary of public keys (addresses and BLS pubkeys) if no --json options was selected
+  if (!json) {
+    logValidatorSummaries(log, summaries);
+  }
 
-  if (!blsOnly && mnemonic && remoteSigner) {
+  if (mnemonic && remoteSigner && !json) {
     for (let i = 0; i < validatorCount; i++) {
       const addrIdx = addressIndex + i;
       const acct = mnemonicToAccount(mnemonic, {
@@ -117,4 +199,10 @@ export async function newValidatorKeystore(options: NewValidatorKeystoreOptions,
       log(`attester address: ${acct.address} remoteSignerUrl: ${remoteSigner}`);
     }
   }
+
+  // Log staker outputs if not in JSON mode
+  if (!json && stakerOutput && allStakerOutputs.length > 0) {
+    log('\nStaker outputs:');
+    log(prettyPrintJSON(allStakerOutputs));
+  }
 }

package/src/cmds/validator_keys/shared.ts

@@ -23,7 +23,6 @@ export type BuildValidatorsInput = {
   mnemonic: string;
   ikm?: string;
   blsPath?: string;
-  blsOnly?: boolean;
   feeRecipient: AztecAddress;
   coinbase?: EthAddress;
   remoteSigner?: string;
@@ -69,7 +68,6 @@ export async function buildValidatorEntries(input: BuildValidatorsInput) {
     mnemonic,
     ikm,
     blsPath,
-    blsOnly,
     feeRecipient,
     coinbase,
     remoteSigner,
@@ -85,15 +83,9 @@ export async function buildValidatorEntries(input: BuildValidatorsInput) {
       const basePath = blsPath ?? defaultBlsPath;
       const perValidatorPath = withValidatorIndex(basePath, addressIndex);
 
-      const blsPrivKey = blsOnly || ikm || mnemonic ? deriveBlsPrivateKey(mnemonic, ikm, perValidatorPath) : undefined;
+      const blsPrivKey = ikm || mnemonic ? deriveBlsPrivateKey(mnemonic, ikm, perValidatorPath) : undefined;
       const blsPubCompressed = blsPrivKey ? await computeBlsPublicKeyCompressed(blsPrivKey) : undefined;
 
-      if (blsOnly) {
-        const attester = { bls: blsPrivKey! };
-        summaries.push({ attesterBls: blsPubCompressed });
-        return { attester, feeRecipient } as ValidatorKeyStore;
-      }
-
       const ethAttester = deriveEthAttester(mnemonic, accountIndex, addressIndex, remoteSigner);
       const attester = blsPrivKey ? { eth: ethAttester, bls: blsPrivKey } : ethAttester;