@aztec/cli 0.0.1-commit.b655e406 → 0.0.1-commit.b9865e97

package/dest/cmds/validator_keys/new.js

@@ -1,38 +1,57 @@
+import { prettyPrintJSON } from '@aztec/cli/utils';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { GSEContract } from '@aztec/ethereum/contracts';
 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 { buildValidatorEntries, logValidatorSummaries, maybePrintJson, resolveKeystoreOutputPath, writeBlsBn254ToFile, writeEthJsonV3ToFile, writeKeystoreFile } from './shared.js';
+import { processAttesterAccounts } from './staker.js';
+import { validateBlsPathOptions, validatePublisherOptions, validateRemoteSignerOptions, validateStakerOutputOptions } from './utils.js';
 export async function newValidatorKeystore(options, log) {
-    const { dataDir, file, count, publisherCount = 0, json, coinbase, accountIndex = 0, addressIndex = 0, feeRecipient, remoteSigner, fundingAccount, blsOnly, blsPath, ikm, mnemonic: _mnemonic, password, outDir } = options;
-    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.');
-    }
+    // validate bls-path inputs before proceeding with key generation
+    validateBlsPathOptions(options);
+    // validate staker output options before proceeding with key generation
+    validateStakerOutputOptions(options);
+    // validate publisher options
+    validatePublisherOptions(options);
+    // validate remote signer options
+    validateRemoteSignerOptions(options);
+    const { dataDir, file, count, publisherCount = 0, publishers, json, coinbase, accountIndex = 0, addressIndex = 0, feeRecipient, remoteSigner, blsPath, ikm, mnemonic: _mnemonic, password, encryptedKeystoreDir, stakerOutput, gseAddress, l1RpcUrls, l1ChainId } = options;
     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 keystoreOutDir = dirname(outputPath);
     const { validators, summaries } = await buildValidatorEntries({
         validatorCount,
         publisherCount,
+        publishers,
         accountIndex,
         baseAddressIndex: addressIndex,
         mnemonic,
         ikm,
         blsPath,
-        blsOnly,
         feeRecipient,
         coinbase,
-        remoteSigner,
-        fundingAccount
+        remoteSigner
     });
     // If password provided, write ETH JSON V3 and BLS BN254 keystores and replace plaintext
     if (password !== undefined) {
-        const keystoreOutDir = outDir && outDir.length > 0 ? outDir : dirname(outputPath);
+        const encryptedKeystoreOutDir = encryptedKeystoreDir && encryptedKeystoreDir.length > 0 ? encryptedKeystoreDir : keystoreOutDir;
         await writeEthJsonV3ToFile(validators, {
-            outDir: keystoreOutDir,
+            outDir: encryptedKeystoreOutDir,
             password
         });
         await writeBlsBn254ToFile(validators, {
-            outDir: keystoreOutDir,
+            outDir: encryptedKeystoreOutDir,
             password
         });
     }
@@ -41,13 +60,63 @@ export async function newValidatorKeystore(options, log) {
         validators
     };
     await writeKeystoreFile(outputPath, keystore);
-    maybePrintJson(log, json, keystore);
-    if (!json) {
+    // Generate staker outputs if requested
+    const allStakerOutputs = [];
+    if (stakerOutput && gseAddress && l1RpcUrls && l1ChainId !== undefined) {
+        const chain = createEthereumChain(l1RpcUrls, l1ChainId);
+        const publicClient = createPublicClient({
+            chain: chain.chainInfo,
+            transport: fallback(l1RpcUrls.map((url)=>http(url, {
+                    batch: false
+                })))
+        });
+        const gse = new GSEContract(publicClient, gseAddress);
+        // 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);
+            // Collect all staker outputs
+            for(let j = 0; j < outputs.length; j++){
+                allStakerOutputs.push(outputs[j]);
+            }
+        }
+        // Write a single JSON file with all staker outputs
+        if (allStakerOutputs.length > 0) {
+            const stakerOutputPath = join(keystoreOutDir, `${keystoreBaseName}_staker_output.json`);
+            await writeFile(stakerOutputPath, prettyPrintJSON(allStakerOutputs), 'utf-8');
+        }
+    }
+    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);
+        } else {
+            maybePrintJson(log, json, outputData);
+        }
+    } else {
         log(`Wrote validator keystore to ${outputPath}`);
+        if (stakerOutput && allStakerOutputs.length > 0) {
+            const keystoreBaseName = basename(outputPath, '.json');
+            const stakerOutputPath = join(keystoreOutDir, `${keystoreBaseName}_staker_output.json`);
+            log(`Wrote staker output for ${allStakerOutputs.length} validator(s) to ${stakerOutputPath}`);
+            log('');
+        }
     }
-    // Always print a concise summary of public keys (addresses and BLS pubkeys)
-    logValidatorSummaries(log, summaries);
-    if (!blsOnly && mnemonic && remoteSigner) {
+    // print a concise summary of public keys (addresses and BLS pubkeys) if no --json options was selected
+    if (!json) {
+        logValidatorSummaries(log, summaries);
+    }
+    if (mnemonic && remoteSigner && !json) {
         for(let i = 0; i < validatorCount; i++){
             const addrIdx = addressIndex + i;
             const acct = mnemonicToAccount(mnemonic, {
@@ -57,4 +126,9 @@ export async function newValidatorKeystore(options, log) {
             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/dest/cmds/validator_keys/shared.d.ts

@@ -10,18 +10,17 @@ export type ValidatorSummary = {
 export type BuildValidatorsInput = {
     validatorCount: number;
     publisherCount?: number;
+    publishers?: string[];
     accountIndex: number;
     baseAddressIndex: number;
     mnemonic: string;
     ikm?: string;
     blsPath?: string;
-    blsOnly?: boolean;
     feeRecipient: AztecAddress;
     coinbase?: EthAddress;
     remoteSigner?: string;
-    fundingAccount?: EthAddress;
 };
-export declare function withValidatorIndex(path: string, index: number): string;
+export declare function withValidatorIndex(path: string, accountIndex?: number, addressIndex?: number): string;
 /**
  * Compute a compressed BN254 G1 public key from a private key.
  * @param privateKeyHex - Private key as 0x-prefixed hex string
@@ -57,6 +56,7 @@ export declare function writeBn254BlsKeystore(outDir: string, fileNameBase: stri
 export declare function writeBlsBn254ToFile(validators: ValidatorKeyStore[], options: {
     outDir: string;
     password: string;
+    blsPath?: string;
 }): Promise<void>;
 /** Writes an Ethereum JSON V3 keystore using ethers, returns absolute path */
 export declare function writeEthJsonV3Keystore(outDir: string, fileNameBase: string, password: string, privateKeyHex: string): Promise<string>;
@@ -65,4 +65,4 @@ export declare function writeEthJsonV3ToFile(validators: ValidatorKeyStore[], op
     outDir: string;
     password: string;
 }): Promise<void>;
-//# sourceMappingURL=shared.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY21kcy92YWxpZGF0b3Jfa2V5cy9zaGFyZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLGFBQWEsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQy9GLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBV2hFLE1BQU0sTUFBTSxnQkFBZ0IsR0FBRztJQUFFLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLFlBQVksQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFBO0NBQUUsQ0FBQztBQUV2RyxNQUFNLE1BQU0sb0JBQW9CLEdBQUc7SUFDakMsY0FBYyxFQUFFLE1BQU0sQ0FBQztJQUN2QixjQUFjLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDeEIsVUFBVSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDdEIsWUFBWSxFQUFFLE1BQU0sQ0FBQztJQUNyQixnQkFBZ0IsRUFBRSxNQUFNLENBQUM7SUFDekIsUUFBUSxFQUFFLE1BQU0sQ0FBQztJQUNqQixHQUFHLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDYixPQUFPLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDakIsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixRQUFRLENBQUMsRUFBRSxVQUFVLENBQUM7SUFDdEIsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3ZCLENBQUM7QUFFRix3QkFBZ0Isa0JBQWtCLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxZQUFZLEdBQUUsTUFBVSxFQUFFLFlBQVksR0FBRSxNQUFVLFVBcUJsRztBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsNkJBQTZCLENBQUMsYUFBYSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBRTFGO0FBRUQsd0JBQWdCLGlCQUFpQixDQUMvQixRQUFRLEVBQUUsTUFBTSxFQUNoQixnQkFBZ0IsRUFBRSxNQUFNLEVBQ3hCLFlBQVksRUFBRSxNQUFNLEVBQ3BCLFlBQVksQ0FBQyxFQUFFLE1BQU0sR0FDcEIsVUFBVSxHQUFHLGFBQWEsQ0FLNUI7QUFFRCx3QkFBc0IscUJBQXFCLENBQUMsS0FBSyxFQUFFLG9CQUFvQjs7O0dBdUV0RTtBQUVELHdCQUFzQix5QkFBeUIsQ0FBQyxPQUFPLENBQUMsRUFBRSxNQUFNLEVBQUUsSUFBSSxDQUFDLEVBQUUsTUFBTTs7O0dBb0I5RTtBQUVELHdCQUFzQixpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxPQUFPLGlCQUd0RTtBQUVELHdCQUFnQixxQkFBcUIsQ0FBQyxHQUFHLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxnQkFBZ0IsRUFBRSxRQXNCOUU7QUFFRCx3QkFBZ0IsY0FBYyxDQUFDLEdBQUcsRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLE9BQU8sR0FBRyxTQUFTLEVBQUUsR0FBRyxFQUFFLE9BQU8sUUFJckY7QUFFRDs7Ozs7Ozs7Ozs7R0FXRztBQUNILHdCQUFzQixxQkFBcUIsQ0FDekMsTUFBTSxFQUFFLE1BQU0sRUFDZCxZQUFZLEVBQUUsTUFBTSxFQUNwQixRQUFRLEVBQUUsTUFBTSxFQUNoQixhQUFhLEVBQUUsTUFBTSxFQUNyQixTQUFTLEVBQUUsTUFBTSxFQUNqQixjQUFjLEVBQUUsTUFBTSxHQUNyQixPQUFPLENBQUMsTUFBTSxDQUFDLENBU2pCO0FBRUQseUdBQXlHO0FBQ3pHLHdCQUFzQixtQkFBbUIsQ0FDdkMsVUFBVSxFQUFFLGlCQUFpQixFQUFFLEVBQy9CLE9BQU8sRUFBRTtJQUFFLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFBQyxRQUFRLEVBQUUsTUFBTSxDQUFDO0lBQUMsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFBO0NBQUUsR0FDOUQsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXVCZjtBQUVELDhFQUE4RTtBQUM5RSx3QkFBc0Isc0JBQXNCLENBQzFDLE1BQU0sRUFBRSxNQUFNLEVBQ2QsWUFBWSxFQUFFLE1BQU0sRUFDcEIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsYUFBYSxFQUFFLE1BQU0sR0FDcEIsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQVFqQjtBQUVELGtHQUFrRztBQUNsRyx3QkFBc0Isb0JBQW9CLENBQ3hDLFVBQVUsRUFBRSxpQkFBaUIsRUFBRSxFQUMvQixPQUFPLEVBQUU7SUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQTtDQUFFLEdBQzVDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FzQ2YifQ==

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

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

package/dest/cmds/validator_keys/shared.js

@@ -1,16 +1,34 @@
 import { prettyPrintJSON } from '@aztec/cli/utils';
-import { computeBn254G1PublicKeyCompressed, deriveBlsPrivateKey } from '@aztec/foundation/crypto';
+import { deriveBlsPrivateKey } from '@aztec/foundation/crypto/bls';
 import { createBn254Keystore } from '@aztec/foundation/crypto/bls/bn254_keystore';
+import { computeBn254G1PublicKeyCompressed } from '@aztec/foundation/crypto/bn254';
 import { Wallet } from '@ethersproject/wallet';
 import { constants as fsConstants, mkdirSync } from 'fs';
 import { access, writeFile } from 'fs/promises';
 import { homedir } from 'os';
 import { dirname, isAbsolute, join } from 'path';
 import { mnemonicToAccount } from 'viem/accounts';
-export function withValidatorIndex(path, index) {
+import { defaultBlsPath } from './utils.js';
+export function withValidatorIndex(path, accountIndex = 0, addressIndex = 0) {
+    // NOTE: The legacy BLS CLI is to allow users who generated keys in 2.1.4 to be able to use the same command
+    // to re-generate their keys. In 2.1.5 we switched how we append addresses to the path so this is to maintain backwards compatibility.
+    const useLegacyBlsCli = [
+        'true',
+        '1',
+        'yes',
+        'y'
+    ].includes(process.env.LEGACY_BLS_CLI ?? '');
+    const defaultBlsPathParts = defaultBlsPath.split('/');
     const parts = path.split('/');
-    if (parts.length >= 4 && parts[0] === 'm' && parts[1] === '12381' && parts[2] === '3600') {
-        parts[3] = String(index);
+    if (parts.length == defaultBlsPathParts.length && parts.every((part, index)=>part === defaultBlsPathParts[index])) {
+        if (useLegacyBlsCli) {
+            // In 2.1.4, we were using address-index in parts[3] and did NOT use account-index, check lines 32 & 84
+            // https://github.com/AztecProtocol/aztec-packages/blob/v2.1.4/yarn-project/cli/src/cmds/validator_keys/shared.ts
+            parts[3] = String(addressIndex);
+        } else {
+            parts[3] = String(accountIndex);
+            parts[5] = String(addressIndex);
+        }
         return parts.join('/');
     }
     return path;
@@ -33,29 +51,16 @@ export function deriveEthAttester(mnemonic, baseAccountIndex, addressIndex, remo
     } : '0x' + Buffer.from(acct.getHdKey().privateKey).toString('hex');
 }
 export async function buildValidatorEntries(input) {
-    const { validatorCount, publisherCount = 0, accountIndex, baseAddressIndex, mnemonic, ikm, blsPath, blsOnly, feeRecipient, coinbase, remoteSigner, fundingAccount } = input;
-    const defaultBlsPath = 'm/12381/3600/0/0/0';
+    const { validatorCount, publisherCount = 0, publishers, accountIndex, baseAddressIndex, mnemonic, ikm, blsPath, feeRecipient, coinbase, remoteSigner } = input;
     const summaries = [];
     const validators = await Promise.all(Array.from({
         length: validatorCount
     }, async (_unused, i)=>{
         const addressIndex = baseAddressIndex + i;
         const basePath = blsPath ?? defaultBlsPath;
-        const perValidatorPath = withValidatorIndex(basePath, addressIndex);
-        const blsPrivKey = blsOnly || ikm || mnemonic ? deriveBlsPrivateKey(mnemonic, ikm, perValidatorPath) : undefined;
+        const perValidatorPath = withValidatorIndex(basePath, accountIndex, addressIndex);
+        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
-            };
-        }
         const ethAttester = deriveEthAttester(mnemonic, accountIndex, addressIndex, remoteSigner);
         const attester = blsPrivKey ? {
             eth: ethAttester,
@@ -63,7 +68,10 @@ export async function buildValidatorEntries(input) {
         } : ethAttester;
         let publisherField;
         const publisherAddresses = [];
-        if (publisherCount > 0) {
+        if (publishers && publishers.length > 0) {
+            publisherAddresses.push(...publishers);
+            publisherField = publishers.length === 1 ? publishers[0] : publishers;
+        } else if (publisherCount > 0) {
             const publishersBaseIndex = baseAddressIndex + validatorCount + i * publisherCount;
             const publisherAccounts = Array.from({
                 length: publisherCount
@@ -97,8 +105,7 @@ export async function buildValidatorEntries(input) {
                 publisher: publisherField
             } : {},
             feeRecipient,
-            coinbase,
-            fundingAccount
+            coinbase: coinbase ?? attesterEthAddress
         };
     }));
     return {
@@ -202,7 +209,7 @@ export function maybePrintJson(log, jsonFlag, obj) {
             continue;
         }
         const pub = await computeBlsPublicKeyCompressed(blsKey);
-        const path = 'm/12381/3600/0/0/0';
+        const path = options.blsPath ?? defaultBlsPath;
         const fileBase = `${String(i + 1)}_${pub.slice(2, 18)}`;
         const keystorePath = await writeBn254BlsKeystore(options.outDir, fileBase, options.password, blsKey, pub, path);
         if (typeof att === 'object') {
@@ -263,9 +270,5 @@ export function maybePrintJson(log, jsonFlag, obj) {
                 v.publisher = await maybeEncryptEth(pub, `publisher_${i + 1}`);
             }
         }
-        // Optional fundingAccount within validator
-        if ('fundingAccount' in v) {
-            v.fundingAccount = await maybeEncryptEth(v.fundingAccount, `funding_${i + 1}`);
-        }
     }
 }

package/dest/cmds/validator_keys/staker.d.ts

@@ -0,0 +1,38 @@
+import { GSEContract } from '@aztec/ethereum/contracts';
+import type { EthAddress } from '@aztec/foundation/eth-address';
+import type { LogFn } from '@aztec/foundation/log';
+import type { AttesterAccounts } from '@aztec/node-keystore/types';
+export type StakerOptions = {
+    from: string;
+    password?: string;
+    output?: string;
+    gseAddress: EthAddress;
+    l1RpcUrls: string[];
+    l1ChainId: number;
+};
+export type StakerOutput = {
+    attester: string;
+    publicKeyG1: {
+        x: string;
+        y: string;
+    };
+    publicKeyG2: {
+        x0: string;
+        x1: string;
+        y0: string;
+        y1: string;
+    };
+    proofOfPossession: {
+        x: string;
+        y: string;
+    };
+};
+/**
+ * Process AttesterAccounts (which can be a single attester, array, or mnemonic)
+ */
+export declare function processAttesterAccounts(attesterAccounts: AttesterAccounts, gse: GSEContract, password?: string): Promise<StakerOutput[]>;
+/**
+ * Main staker command function
+ */
+export declare function generateStakerJson(options: StakerOptions, log: LogFn): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3Rha2VyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY21kcy92YWxpZGF0b3Jfa2V5cy9zdGFrZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSXhELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRW5ELE9BQU8sS0FBSyxFQUVWLGdCQUFnQixFQUtqQixNQUFNLDRCQUE0QixDQUFDO0FBUXBDLE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUNiLFFBQVEsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNsQixNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDaEIsVUFBVSxFQUFFLFVBQVUsQ0FBQztJQUN2QixTQUFTLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDcEIsU0FBUyxFQUFFLE1BQU0sQ0FBQztDQUNuQixDQUFDO0FBRUYsTUFBTSxNQUFNLFlBQVksR0FBRztJQUN6QixRQUFRLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLFdBQVcsRUFBRTtRQUNYLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDVixDQUFDLEVBQUUsTUFBTSxDQUFDO0tBQ1gsQ0FBQztJQUNGLFdBQVcsRUFBRTtRQUNYLEVBQUUsRUFBRSxNQUFNLENBQUM7UUFDWCxFQUFFLEVBQUUsTUFBTSxDQUFDO1FBQ1gsRUFBRSxFQUFFLE1BQU0sQ0FBQztRQUNYLEVBQUUsRUFBRSxNQUFNLENBQUM7S0FDWixDQUFDO0lBQ0YsaUJBQWlCLEVBQUU7UUFDakIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUNWLENBQUMsRUFBRSxNQUFNLENBQUM7S0FDWCxDQUFDO0NBQ0gsQ0FBQztBQTJLRjs7R0FFRztBQUNILHdCQUFzQix1QkFBdUIsQ0FDM0MsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLEdBQUcsRUFBRSxXQUFXLEVBQ2hCLFFBQVEsQ0FBQyxFQUFFLE1BQU0sR0FDaEIsT0FBTyxDQUFDLFlBQVksRUFBRSxDQUFDLENBcUJ6QjtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLGtCQUFrQixDQUFDLE9BQU8sRUFBRSxhQUFhLEVBQUUsR0FBRyxFQUFFLEtBQUssR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBK0MxRiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"staker.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator_keys/staker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAIxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAEV,gBAAgB,EAKjB,MAAM,4BAA4B,CAAC;AAQpC,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE;QACX,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;IACF,WAAW,EAAE;QACX,EAAE,EAAE,MAAM,CAAC;QACX,EAAE,EAAE,MAAM,CAAC;QACX,EAAE,EAAE,MAAM,CAAC;QACX,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;IACF,iBAAiB,EAAE;QACjB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;CACH,CAAC;AA2KF;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,gBAAgB,EAClC,GAAG,EAAE,WAAW,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,EAAE,CAAC,CAqBzB;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CA+C1F"}

package/dest/cmds/validator_keys/staker.js

@@ -0,0 +1,210 @@
+import { prettyPrintJSON } from '@aztec/cli/utils';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { GSEContract } from '@aztec/ethereum/contracts';
+import { decryptBn254Keystore } from '@aztec/foundation/crypto/bls/bn254_keystore';
+import { computeBn254G1PublicKey, computeBn254G2PublicKey } from '@aztec/foundation/crypto/bn254';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { loadKeystoreFile } from '@aztec/node-keystore/loader';
+import { Wallet } from '@ethersproject/wallet';
+import { readFileSync, writeFileSync } from 'fs';
+import { basename, dirname, join } from 'path';
+import { createPublicClient, fallback, http } from 'viem';
+import { privateKeyToAddress } from 'viem/accounts';
+/**
+ * Check if an object is a MnemonicConfig
+ */ function isMnemonicConfig(obj) {
+    return typeof obj === 'object' && obj !== null && 'mnemonic' in obj;
+}
+/**
+ * Check if a value is an encrypted keystore file config
+ */ function isEncryptedKeyFileConfig(value) {
+    return typeof value === 'object' && value !== null && 'path' in value;
+}
+/**
+ * Check if a BLSAccount is a private key string (not an encrypted keystore file)
+ */ function isBlsPrivateKey(bls) {
+    return typeof bls === 'string' && bls.startsWith('0x');
+}
+/**
+ * Check if an EthAccount is a private key string (66 chars: 0x + 64 hex)
+ */ function isEthPrivateKey(eth) {
+    return typeof eth === 'string' && eth.startsWith('0x') && eth.length === 66;
+}
+/**
+ * Check if a string is an Ethereum address (42 chars: 0x + 40 hex)
+ */ function isEthAddress(value) {
+    return typeof value === 'string' && /^0x[0-9a-fA-F]{40}$/.test(value);
+}
+/**
+ * Decrypt a BLS private key from an encrypted keystore file
+ */ function decryptBlsKey(bls, password) {
+    if (isBlsPrivateKey(bls)) {
+        return bls;
+    }
+    if (isEncryptedKeyFileConfig(bls)) {
+        if (!password && !bls.password) {
+            return undefined; // Can't decrypt without password
+        }
+        const pwd = password ?? bls.password;
+        return decryptBn254Keystore(bls.path, pwd);
+    }
+    return undefined;
+}
+/**
+ * Decrypt an Ethereum private key from an encrypted keystore file
+ */ async function decryptEthKey(eth, password) {
+    if (isEthPrivateKey(eth)) {
+        return eth;
+    }
+    if (isEncryptedKeyFileConfig(eth)) {
+        if (!password && !eth.password) {
+            return undefined; // Can't decrypt without password
+        }
+        const pwd = password ?? eth.password;
+        const json = readFileSync(eth.path, 'utf-8');
+        const wallet = await Wallet.fromEncryptedJson(json, pwd);
+        return wallet.privateKey;
+    }
+    return undefined;
+}
+/**
+ * Extract Ethereum address from an EthAccount (or private key)
+ */ async function getEthAddress(eth, password) {
+    // Case 1: It's a private key string - derive the address
+    if (isEthPrivateKey(eth)) {
+        return privateKeyToAddress(eth);
+    }
+    // Case 2: It's just an address string directly (EthRemoteSignerAccount can be just EthAddress)
+    if (isEthAddress(eth)) {
+        return eth;
+    }
+    // Case 3: It's an object with an address property (remote signer config)
+    if (typeof eth === 'object' && eth !== null && 'address' in eth) {
+        return eth.address;
+    }
+    // Case 4: It's an encrypted keystore file - decrypt and derive address
+    if (isEncryptedKeyFileConfig(eth)) {
+        const privateKey = await decryptEthKey(eth, password);
+        if (privateKey) {
+            return privateKeyToAddress(privateKey);
+        }
+        return undefined;
+    }
+    return undefined;
+}
+/**
+ * Extract BLS private key and Ethereum address from an AttesterAccount
+ */ async function extractAttesterInfo(attester, password) {
+    // Case 1: attester is { eth: EthAccount, bls?: BLSAccount }
+    if (typeof attester === 'object' && attester !== null && 'eth' in attester) {
+        const ethAddress = await getEthAddress(attester.eth, password);
+        const blsPrivateKey = attester.bls ? decryptBlsKey(attester.bls, password) : undefined;
+        return {
+            blsPrivateKey,
+            ethAddress
+        };
+    }
+    // Case 2: attester is just an EthAccount directly (no BLS key)
+    return {
+        blsPrivateKey: undefined,
+        ethAddress: await getEthAddress(attester, password)
+    };
+}
+/**
+ * Process a single attester entry and output staking JSON
+ */ async function processAttester(attester, gse, password) {
+    const { blsPrivateKey, ethAddress } = await extractAttesterInfo(attester, password);
+    // Skip if no BLS private key or no Ethereum address
+    if (!blsPrivateKey || !ethAddress) {
+        return undefined;
+    }
+    // Derive G1 and G2 public keys
+    const g1PublicKey = await computeBn254G1PublicKey(blsPrivateKey);
+    const g2PublicKey = await computeBn254G2PublicKey(blsPrivateKey);
+    // Generate proof of possession
+    const bn254SecretKeyFieldElement = Fr.fromString(blsPrivateKey);
+    const registrationTuple = await gse.makeRegistrationTuple(bn254SecretKeyFieldElement.toBigInt());
+    return {
+        attester: String(ethAddress),
+        publicKeyG1: {
+            x: '0x' + g1PublicKey.x.toString(16).padStart(64, '0'),
+            y: '0x' + g1PublicKey.y.toString(16).padStart(64, '0')
+        },
+        publicKeyG2: {
+            x0: '0x' + g2PublicKey.x.c0.toString(16).padStart(64, '0'),
+            x1: '0x' + g2PublicKey.x.c1.toString(16).padStart(64, '0'),
+            y0: '0x' + g2PublicKey.y.c0.toString(16).padStart(64, '0'),
+            y1: '0x' + g2PublicKey.y.c1.toString(16).padStart(64, '0')
+        },
+        proofOfPossession: {
+            x: '0x' + registrationTuple.proofOfPossession.x.toString(16),
+            y: '0x' + registrationTuple.proofOfPossession.y.toString(16)
+        }
+    };
+}
+/**
+ * Process AttesterAccounts (which can be a single attester, array, or mnemonic)
+ */ export async function processAttesterAccounts(attesterAccounts, gse, password) {
+    // Skip mnemonic configs
+    if (isMnemonicConfig(attesterAccounts)) {
+        return [];
+    }
+    // Handle array of attesters
+    if (Array.isArray(attesterAccounts)) {
+        const results = [];
+        for (const attester of attesterAccounts){
+            const result = await processAttester(attester, gse, password);
+            if (result) {
+                results.push(result);
+            }
+        }
+        return results;
+    }
+    // Handle single attester
+    const result = await processAttester(attesterAccounts, gse, password);
+    return result ? [
+        result
+    ] : [];
+}
+/**
+ * Main staker command function
+ */ export async function generateStakerJson(options, log) {
+    const { from, password, gseAddress, l1RpcUrls, l1ChainId, output } = options;
+    // Load the keystore file
+    const keystore = loadKeystoreFile(from);
+    if (!gseAddress) {
+        throw new Error('GSE contract address is required');
+    }
+    log(`Calling GSE contract ${gseAddress} on chain ${l1ChainId}, using ${l1RpcUrls.join(', ')} to get staker outputs`);
+    if (!keystore.validators || keystore.validators.length === 0) {
+        log('No validators found in keystore');
+        return;
+    }
+    const allOutputs = [];
+    // L1 client for proof of possession
+    const chain = createEthereumChain(l1RpcUrls, l1ChainId);
+    const publicClient = createPublicClient({
+        chain: chain.chainInfo,
+        transport: fallback(l1RpcUrls.map((url)=>http(url, {
+                batch: false
+            })))
+    });
+    const gse = new GSEContract(publicClient, gseAddress);
+    const keystoreBaseName = basename(from, '.json');
+    const outputDir = output ? output : dirname(from);
+    for(let i = 0; i < keystore.validators.length; i++){
+        const validator = keystore.validators[i];
+        const outputs = await processAttesterAccounts(validator.attester, gse, password);
+        for(let j = 0; j < outputs.length; j++){
+            allOutputs.push(outputs[j]);
+        }
+    }
+    if (allOutputs.length === 0) {
+        log('No attesters with BLS keys found (skipping mnemonics and encrypted keystores without password)');
+        return;
+    }
+    // Write a single JSON file with all staker outputs
+    const stakerOutputPath = join(outputDir, `${keystoreBaseName}_staker_output.json`);
+    writeFileSync(stakerOutputPath, prettyPrintJSON(allOutputs), 'utf-8');
+    log(`Wrote staker output for ${allOutputs.length} validator(s) to ${stakerOutputPath}`);
+}

package/dest/cmds/validator_keys/utils.d.ts

@@ -0,0 +1,25 @@
+import type { EthAddress } from '@aztec/foundation/eth-address';
+export declare const defaultBlsPath = "m/12381/3600/0/0/0";
+export declare function validateBlsPathOptions(options: {
+    count?: number;
+    publisherCount?: number;
+    accountIndex?: number;
+    addressIndex?: number;
+    blsPath?: string;
+    ikm?: string;
+}): void;
+export declare function validateStakerOutputOptions(options: {
+    stakerOutput?: boolean;
+    gseAddress?: EthAddress;
+    l1RpcUrls?: string[];
+    l1ChainId?: number;
+}): void;
+export declare function validateRemoteSignerOptions(options: {
+    remoteSigner?: string;
+    mnemonic?: string;
+}): void;
+export declare function validatePublisherOptions(options: {
+    publishers?: string[];
+    publisherCount?: number;
+}): void;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL3ZhbGlkYXRvcl9rZXlzL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBSWhFLGVBQU8sTUFBTSxjQUFjLHVCQUF1QixDQUFDO0FBRW5ELHdCQUFnQixzQkFBc0IsQ0FBQyxPQUFPLEVBQUU7SUFDOUMsS0FBSyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2YsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3hCLFlBQVksQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN0QixZQUFZLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDdEIsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLEdBQUcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNkLFFBV0E7QUFFRCx3QkFBZ0IsMkJBQTJCLENBQUMsT0FBTyxFQUFFO0lBQ25ELFlBQVksQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUN2QixVQUFVLENBQUMsRUFBRSxVQUFVLENBQUM7SUFDeEIsU0FBUyxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDckIsU0FBUyxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3BCLFFBZUE7QUFFRCx3QkFBZ0IsMkJBQTJCLENBQUMsT0FBTyxFQUFFO0lBQUUsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQUMsUUFBUSxDQUFDLEVBQUUsTUFBTSxDQUFBO0NBQUUsUUFNaEc7QUFFRCx3QkFBZ0Isd0JBQXdCLENBQUMsT0FBTyxFQUFFO0lBQUUsVUFBVSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFBQyxjQUFjLENBQUMsRUFBRSxNQUFNLENBQUE7Q0FBRSxRQXdCbkcifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator_keys/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAIhE,eAAO,MAAM,cAAc,uBAAuB,CAAC;AAEnD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,QAWA;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE;IACnD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,QAeA;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,QAMhG;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,QAwBnG"}

package/dest/cmds/validator_keys/utils.js

@@ -0,0 +1,52 @@
+import { ethPrivateKeySchema } from '@aztec/node-keystore/schemas';
+export const defaultBlsPath = 'm/12381/3600/0/0/0';
+export function validateBlsPathOptions(options) {
+    if (options.blsPath && options.blsPath !== defaultBlsPath) {
+        if (options.count && options.count !== 1 || options.publisherCount && options.publisherCount > 0 || options.accountIndex && options.accountIndex !== 0 || options.addressIndex && options.addressIndex !== 0) {
+            throw new Error('--bls-path cannot be used with --count, --publisher-count, --account-index, or --address-index');
+        }
+    }
+}
+export function validateStakerOutputOptions(options) {
+    if (!options.stakerOutput) {
+        return;
+    }
+    // Required options for staker output
+    if (!options.gseAddress) {
+        throw new Error('--gse-address is required when using --staker-output');
+    }
+    if (!options.l1RpcUrls || options.l1RpcUrls.length === 0) {
+        throw new Error('--l1-rpc-urls is required when using --staker-output');
+    }
+    if (options.l1ChainId === undefined) {
+        throw new Error('--l1-chain-id is required when using --staker-output');
+    }
+}
+export function validateRemoteSignerOptions(options) {
+    if (options.remoteSigner && !options.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.');
+    }
+}
+export function validatePublisherOptions(options) {
+    if (options.publisherCount && options.publisherCount > 0 && options.publishers && options.publishers.length > 0) {
+        throw new Error('--publishers and --publisher-count cannot be used together');
+    }
+    if (options.publishers && options.publishers.length > 0) {
+        // Normalize each private key by adding 0x prefix if missing
+        const normalizedKeys = [];
+        for (const key of options.publishers){
+            let privateKey = key.trim();
+            if (!privateKey.startsWith('0x')) {
+                privateKey = '0x' + privateKey;
+            }
+            try {
+                ethPrivateKeySchema.parse(privateKey);
+                normalizedKeys.push(privateKey);
+            } catch (error) {
+                throw new Error(`Invalid publisher private key: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        }
+        // Update the options with the normalized keys
+        options.publishers = normalizedKeys;
+    }
+}