@aztec/cli 4.0.0-nightly.20250907 → 4.0.0-nightly.20260108
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -428
- package/dest/cmds/aztec_node/block_number.d.ts +3 -0
- package/dest/cmds/aztec_node/block_number.d.ts.map +1 -0
- package/dest/cmds/aztec_node/block_number.js +10 -0
- package/dest/cmds/aztec_node/get_block.d.ts +3 -0
- package/dest/cmds/aztec_node/get_block.d.ts.map +1 -0
- package/dest/cmds/aztec_node/get_block.js +10 -0
- package/dest/cmds/aztec_node/get_current_min_fee.d.ts +3 -0
- package/dest/cmds/aztec_node/get_current_min_fee.d.ts.map +1 -0
- package/dest/cmds/aztec_node/get_current_min_fee.js +7 -0
- package/dest/cmds/aztec_node/get_l1_to_l2_message_witness.d.ts +5 -0
- package/dest/cmds/aztec_node/get_l1_to_l2_message_witness.d.ts.map +1 -0
- package/dest/cmds/aztec_node/get_l1_to_l2_message_witness.js +12 -0
- package/dest/cmds/aztec_node/get_logs.d.ts +7 -0
- package/dest/cmds/aztec_node/get_logs.d.ts.map +1 -0
- package/dest/cmds/{pxe → aztec_node}/get_logs.js +4 -4
- package/dest/cmds/aztec_node/get_node_info.d.ts +3 -0
- package/dest/cmds/aztec_node/get_node_info.d.ts.map +1 -0
- package/dest/cmds/{pxe → aztec_node}/get_node_info.js +3 -8
- package/dest/cmds/aztec_node/index.d.ts +4 -0
- package/dest/cmds/aztec_node/index.d.ts.map +1 -0
- package/dest/cmds/aztec_node/index.js +28 -0
- package/dest/cmds/contracts/index.d.ts +1 -1
- package/dest/cmds/contracts/inspect_contract.d.ts +1 -1
- package/dest/cmds/contracts/inspect_contract.d.ts.map +1 -1
- package/dest/cmds/contracts/inspect_contract.js +4 -10
- package/dest/cmds/contracts/parse_parameter_struct.d.ts +1 -1
- package/dest/cmds/infrastructure/index.d.ts +3 -3
- package/dest/cmds/infrastructure/index.d.ts.map +1 -1
- package/dest/cmds/infrastructure/index.js +7 -9
- package/dest/cmds/infrastructure/sequencers.d.ts +3 -5
- package/dest/cmds/infrastructure/sequencers.d.ts.map +1 -1
- package/dest/cmds/infrastructure/sequencers.js +15 -7
- package/dest/cmds/infrastructure/setup_l2_contract.d.ts +2 -2
- package/dest/cmds/infrastructure/setup_l2_contract.d.ts.map +1 -1
- package/dest/cmds/infrastructure/setup_l2_contract.js +10 -25
- package/dest/cmds/l1/advance_epoch.d.ts +2 -2
- package/dest/cmds/l1/advance_epoch.d.ts.map +1 -1
- package/dest/cmds/l1/advance_epoch.js +6 -5
- package/dest/cmds/l1/assume_proven_through.d.ts +2 -2
- package/dest/cmds/l1/assume_proven_through.d.ts.map +1 -1
- package/dest/cmds/l1/assume_proven_through.js +8 -6
- package/dest/cmds/l1/bridge_erc20.d.ts +2 -2
- package/dest/cmds/l1/bridge_erc20.d.ts.map +1 -1
- package/dest/cmds/l1/bridge_erc20.js +3 -2
- package/dest/cmds/l1/create_l1_account.d.ts +1 -1
- package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts +4 -0
- package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts.map +1 -0
- package/dest/cmds/l1/{deploy_l1_contracts.js → deploy_l1_contracts_cmd.js} +42 -7
- package/dest/cmds/l1/deploy_new_rollup.d.ts +4 -4
- package/dest/cmds/l1/deploy_new_rollup.d.ts.map +1 -1
- package/dest/cmds/l1/deploy_new_rollup.js +5 -5
- package/dest/cmds/l1/get_l1_addresses.d.ts +2 -2
- package/dest/cmds/l1/get_l1_addresses.d.ts.map +1 -1
- package/dest/cmds/l1/get_l1_addresses.js +5 -2
- package/dest/cmds/l1/get_l1_balance.d.ts +1 -1
- package/dest/cmds/l1/get_l1_balance.js +4 -2
- package/dest/cmds/l1/governance_utils.d.ts +5 -5
- package/dest/cmds/l1/governance_utils.d.ts.map +1 -1
- package/dest/cmds/l1/governance_utils.js +3 -1
- package/dest/cmds/l1/index.d.ts +1 -2
- package/dest/cmds/l1/index.d.ts.map +1 -1
- package/dest/cmds/l1/index.js +22 -36
- package/dest/cmds/l1/prover_stats.d.ts +1 -1
- package/dest/cmds/l1/prover_stats.d.ts.map +1 -1
- package/dest/cmds/l1/prover_stats.js +32 -30
- package/dest/cmds/l1/trigger_seed_snapshot.d.ts +2 -2
- package/dest/cmds/l1/trigger_seed_snapshot.d.ts.map +1 -1
- package/dest/cmds/l1/trigger_seed_snapshot.js +2 -1
- package/dest/cmds/l1/update_l1_validators.d.ts +10 -5
- package/dest/cmds/l1/update_l1_validators.d.ts.map +1 -1
- package/dest/cmds/l1/update_l1_validators.js +74 -9
- package/dest/cmds/misc/compute_selector.d.ts +1 -1
- package/dest/cmds/misc/example_contracts.d.ts +1 -1
- package/dest/cmds/misc/generate_bootnode_enr.d.ts +1 -1
- package/dest/cmds/misc/generate_p2p_private_key.d.ts +1 -1
- package/dest/cmds/misc/generate_secret_and_hash.d.ts +1 -1
- package/dest/cmds/misc/generate_secret_and_hash.js +2 -2
- package/dest/cmds/misc/generate_secret_key.d.ts +2 -2
- package/dest/cmds/misc/generate_secret_key.d.ts.map +1 -1
- package/dest/cmds/misc/generate_secret_key.js +1 -1
- package/dest/cmds/misc/get_canonical_sponsored_fpc_address.d.ts +1 -1
- package/dest/cmds/misc/index.d.ts +1 -1
- package/dest/cmds/misc/index.d.ts.map +1 -1
- package/dest/cmds/misc/index.js +1 -1
- package/dest/cmds/misc/update/common.d.ts +1 -1
- package/dest/cmds/misc/update/github.d.ts +1 -1
- package/dest/cmds/misc/update/noir.d.ts +1 -1
- package/dest/cmds/misc/update/npm.d.ts +1 -1
- package/dest/cmds/misc/update/npm.js +1 -1
- package/dest/cmds/misc/update/utils.d.ts +1 -1
- package/dest/cmds/misc/update.d.ts +1 -1
- package/dest/cmds/validator_keys/add.d.ts +5 -0
- package/dest/cmds/validator_keys/add.d.ts.map +1 -0
- package/dest/cmds/validator_keys/add.js +83 -0
- package/dest/cmds/validator_keys/generate_bls_keypair.d.ts +12 -0
- package/dest/cmds/validator_keys/generate_bls_keypair.d.ts.map +1 -0
- package/dest/cmds/validator_keys/generate_bls_keypair.js +27 -0
- package/dest/cmds/validator_keys/index.d.ts +4 -0
- package/dest/cmds/validator_keys/index.d.ts.map +1 -0
- package/dest/cmds/validator_keys/index.js +32 -0
- package/dest/cmds/validator_keys/new.d.ts +29 -0
- package/dest/cmds/validator_keys/new.d.ts.map +1 -0
- package/dest/cmds/validator_keys/new.js +134 -0
- package/dest/cmds/validator_keys/shared.d.ts +68 -0
- package/dest/cmds/validator_keys/shared.d.ts.map +1 -0
- package/dest/cmds/validator_keys/shared.js +274 -0
- package/dest/cmds/validator_keys/staker.d.ts +38 -0
- package/dest/cmds/validator_keys/staker.d.ts.map +1 -0
- package/dest/cmds/validator_keys/staker.js +210 -0
- package/dest/cmds/validator_keys/utils.d.ts +25 -0
- package/dest/cmds/validator_keys/utils.d.ts.map +1 -0
- package/dest/cmds/validator_keys/utils.js +52 -0
- package/dest/config/cached_fetch.d.ts +18 -0
- package/dest/config/cached_fetch.d.ts.map +1 -0
- package/dest/config/cached_fetch.js +54 -0
- package/dest/config/chain_l2_config.d.ts +41 -0
- package/dest/config/chain_l2_config.d.ts.map +1 -0
- package/dest/config/chain_l2_config.js +524 -0
- package/dest/config/enrich_env.d.ts +4 -0
- package/dest/config/enrich_env.d.ts.map +1 -0
- package/dest/config/enrich_env.js +12 -0
- package/dest/config/get_l1_config.d.ts +9 -0
- package/dest/config/get_l1_config.d.ts.map +1 -0
- package/dest/config/get_l1_config.js +24 -0
- package/dest/config/index.d.ts +5 -0
- package/dest/config/index.d.ts.map +1 -0
- package/dest/config/index.js +4 -0
- package/dest/config/network_config.d.ts +22 -0
- package/dest/config/network_config.d.ts.map +1 -0
- package/dest/config/network_config.js +115 -0
- package/dest/utils/aztec.d.ts +8 -20
- package/dest/utils/aztec.d.ts.map +1 -1
- package/dest/utils/aztec.js +22 -67
- package/dest/utils/commands.d.ts +21 -12
- package/dest/utils/commands.d.ts.map +1 -1
- package/dest/utils/commands.js +38 -11
- package/dest/utils/encoding.d.ts +1 -1
- package/dest/utils/encoding.js +1 -1
- package/dest/utils/github.d.ts +1 -1
- package/dest/utils/index.d.ts +1 -1
- package/dest/utils/inspect.d.ts +5 -11
- package/dest/utils/inspect.d.ts.map +1 -1
- package/dest/utils/inspect.js +13 -95
- package/dest/utils/setup_contracts.d.ts +2 -4
- package/dest/utils/setup_contracts.d.ts.map +1 -1
- package/dest/utils/setup_contracts.js +2 -22
- package/package.json +43 -28
- package/public_include_metric_prefixes.json +1 -0
- package/src/cmds/aztec_node/block_number.ts +9 -0
- package/src/cmds/aztec_node/get_block.ts +11 -0
- package/src/cmds/aztec_node/get_current_min_fee.ts +9 -0
- package/src/cmds/aztec_node/get_l1_to_l2_message_witness.ts +27 -0
- package/src/cmds/{pxe → aztec_node}/get_logs.ts +11 -9
- package/src/cmds/{pxe → aztec_node}/get_node_info.ts +5 -16
- package/src/cmds/aztec_node/index.ts +87 -0
- package/src/cmds/contracts/inspect_contract.ts +4 -11
- package/src/cmds/infrastructure/index.ts +7 -18
- package/src/cmds/infrastructure/sequencers.ts +13 -11
- package/src/cmds/infrastructure/setup_l2_contract.ts +13 -30
- package/src/cmds/l1/advance_epoch.ts +6 -5
- package/src/cmds/l1/assume_proven_through.ts +10 -6
- package/src/cmds/l1/bridge_erc20.ts +5 -2
- package/src/cmds/l1/{deploy_l1_contracts.ts → deploy_l1_contracts_cmd.ts} +44 -24
- package/src/cmds/l1/deploy_new_rollup.ts +6 -9
- package/src/cmds/l1/get_l1_addresses.ts +5 -3
- package/src/cmds/l1/get_l1_balance.ts +2 -2
- package/src/cmds/l1/governance_utils.ts +3 -8
- package/src/cmds/l1/index.ts +28 -66
- package/src/cmds/l1/prover_stats.ts +42 -31
- package/src/cmds/l1/trigger_seed_snapshot.ts +2 -1
- package/src/cmds/l1/update_l1_validators.ts +88 -18
- package/src/cmds/misc/generate_secret_and_hash.ts +2 -2
- package/src/cmds/misc/generate_secret_key.ts +1 -1
- package/src/cmds/misc/index.ts +1 -1
- package/src/cmds/misc/update/npm.ts +1 -1
- package/src/cmds/validator_keys/add.ts +123 -0
- package/src/cmds/validator_keys/generate_bls_keypair.ts +34 -0
- package/src/cmds/validator_keys/index.ts +142 -0
- package/src/cmds/validator_keys/new.ts +207 -0
- package/src/cmds/validator_keys/shared.ts +326 -0
- package/src/cmds/validator_keys/staker.ts +301 -0
- package/src/cmds/validator_keys/utils.ts +81 -0
- package/src/config/cached_fetch.ts +67 -0
- package/src/config/chain_l2_config.ts +694 -0
- package/src/config/enrich_env.ts +15 -0
- package/src/config/get_l1_config.ts +31 -0
- package/src/config/index.ts +4 -0
- package/src/config/network_config.ts +147 -0
- package/src/utils/aztec.ts +27 -118
- package/src/utils/commands.ts +52 -15
- package/src/utils/encoding.ts +1 -1
- package/src/utils/inspect.ts +19 -111
- package/src/utils/setup_contracts.ts +4 -43
- package/dest/cmds/devnet/bootstrap_network.d.ts +0 -3
- package/dest/cmds/devnet/bootstrap_network.d.ts.map +0 -1
- package/dest/cmds/devnet/bootstrap_network.js +0 -216
- package/dest/cmds/devnet/faucet.d.ts +0 -4
- package/dest/cmds/devnet/faucet.d.ts.map +0 -1
- package/dest/cmds/devnet/faucet.js +0 -26
- package/dest/cmds/devnet/index.d.ts +0 -4
- package/dest/cmds/devnet/index.d.ts.map +0 -1
- package/dest/cmds/devnet/index.js +0 -14
- package/dest/cmds/l1/deploy_l1_contracts.d.ts +0 -4
- package/dest/cmds/l1/deploy_l1_contracts.d.ts.map +0 -1
- package/dest/cmds/pxe/add_contract.d.ts +0 -5
- package/dest/cmds/pxe/add_contract.d.ts.map +0 -1
- package/dest/cmds/pxe/add_contract.js +0 -29
- package/dest/cmds/pxe/block_number.d.ts +0 -3
- package/dest/cmds/pxe/block_number.d.ts.map +0 -1
- package/dest/cmds/pxe/block_number.js +0 -10
- package/dest/cmds/pxe/get_account.d.ts +0 -4
- package/dest/cmds/pxe/get_account.d.ts.map +0 -1
- package/dest/cmds/pxe/get_account.js +0 -10
- package/dest/cmds/pxe/get_accounts.d.ts +0 -3
- package/dest/cmds/pxe/get_accounts.d.ts.map +0 -1
- package/dest/cmds/pxe/get_accounts.js +0 -25
- package/dest/cmds/pxe/get_block.d.ts +0 -3
- package/dest/cmds/pxe/get_block.d.ts.map +0 -1
- package/dest/cmds/pxe/get_block.js +0 -9
- package/dest/cmds/pxe/get_contract_data.d.ts +0 -4
- package/dest/cmds/pxe/get_contract_data.d.ts.map +0 -1
- package/dest/cmds/pxe/get_contract_data.js +0 -31
- package/dest/cmds/pxe/get_current_base_fee.d.ts +0 -3
- package/dest/cmds/pxe/get_current_base_fee.d.ts.map +0 -1
- package/dest/cmds/pxe/get_current_base_fee.js +0 -7
- package/dest/cmds/pxe/get_l1_to_l2_message_witness.d.ts +0 -4
- package/dest/cmds/pxe/get_l1_to_l2_message_witness.d.ts.map +0 -1
- package/dest/cmds/pxe/get_l1_to_l2_message_witness.js +0 -11
- package/dest/cmds/pxe/get_logs.d.ts +0 -4
- package/dest/cmds/pxe/get_logs.d.ts.map +0 -1
- package/dest/cmds/pxe/get_node_info.d.ts +0 -3
- package/dest/cmds/pxe/get_node_info.d.ts.map +0 -1
- package/dest/cmds/pxe/get_pxe_info.d.ts +0 -3
- package/dest/cmds/pxe/get_pxe_info.d.ts.map +0 -1
- package/dest/cmds/pxe/get_pxe_info.js +0 -11
- package/dest/cmds/pxe/index.d.ts +0 -4
- package/dest/cmds/pxe/index.d.ts.map +0 -1
- package/dest/cmds/pxe/index.js +0 -55
- package/src/cmds/devnet/bootstrap_network.ts +0 -321
- package/src/cmds/devnet/faucet.ts +0 -33
- package/src/cmds/devnet/index.ts +0 -60
- package/src/cmds/pxe/add_contract.ts +0 -41
- package/src/cmds/pxe/block_number.ts +0 -9
- package/src/cmds/pxe/get_account.ts +0 -16
- package/src/cmds/pxe/get_accounts.ts +0 -35
- package/src/cmds/pxe/get_block.ts +0 -10
- package/src/cmds/pxe/get_contract_data.ts +0 -51
- package/src/cmds/pxe/get_current_base_fee.ts +0 -9
- package/src/cmds/pxe/get_l1_to_l2_message_witness.ts +0 -25
- package/src/cmds/pxe/get_pxe_info.ts +0 -13
- package/src/cmds/pxe/index.ts +0 -170
|
@@ -0,0 +1,274 @@
|
|
|
1
|
+
import { prettyPrintJSON } from '@aztec/cli/utils';
|
|
2
|
+
import { deriveBlsPrivateKey } from '@aztec/foundation/crypto/bls';
|
|
3
|
+
import { createBn254Keystore } from '@aztec/foundation/crypto/bls/bn254_keystore';
|
|
4
|
+
import { computeBn254G1PublicKeyCompressed } from '@aztec/foundation/crypto/bn254';
|
|
5
|
+
import { Wallet } from '@ethersproject/wallet';
|
|
6
|
+
import { constants as fsConstants, mkdirSync } from 'fs';
|
|
7
|
+
import { access, writeFile } from 'fs/promises';
|
|
8
|
+
import { homedir } from 'os';
|
|
9
|
+
import { dirname, isAbsolute, join } from 'path';
|
|
10
|
+
import { mnemonicToAccount } from 'viem/accounts';
|
|
11
|
+
import { defaultBlsPath } from './utils.js';
|
|
12
|
+
export function withValidatorIndex(path, accountIndex = 0, addressIndex = 0) {
|
|
13
|
+
// NOTE: The legacy BLS CLI is to allow users who generated keys in 2.1.4 to be able to use the same command
|
|
14
|
+
// 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.
|
|
15
|
+
const useLegacyBlsCli = [
|
|
16
|
+
'true',
|
|
17
|
+
'1',
|
|
18
|
+
'yes',
|
|
19
|
+
'y'
|
|
20
|
+
].includes(process.env.LEGACY_BLS_CLI ?? '');
|
|
21
|
+
const defaultBlsPathParts = defaultBlsPath.split('/');
|
|
22
|
+
const parts = path.split('/');
|
|
23
|
+
if (parts.length == defaultBlsPathParts.length && parts.every((part, index)=>part === defaultBlsPathParts[index])) {
|
|
24
|
+
if (useLegacyBlsCli) {
|
|
25
|
+
// In 2.1.4, we were using address-index in parts[3] and did NOT use account-index, check lines 32 & 84
|
|
26
|
+
// https://github.com/AztecProtocol/aztec-packages/blob/v2.1.4/yarn-project/cli/src/cmds/validator_keys/shared.ts
|
|
27
|
+
parts[3] = String(addressIndex);
|
|
28
|
+
} else {
|
|
29
|
+
parts[3] = String(accountIndex);
|
|
30
|
+
parts[5] = String(addressIndex);
|
|
31
|
+
}
|
|
32
|
+
return parts.join('/');
|
|
33
|
+
}
|
|
34
|
+
return path;
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Compute a compressed BN254 G1 public key from a private key.
|
|
38
|
+
* @param privateKeyHex - Private key as 0x-prefixed hex string
|
|
39
|
+
* @returns Compressed G1 point (32 bytes with sign bit in MSB)
|
|
40
|
+
*/ export async function computeBlsPublicKeyCompressed(privateKeyHex) {
|
|
41
|
+
return await computeBn254G1PublicKeyCompressed(privateKeyHex);
|
|
42
|
+
}
|
|
43
|
+
export function deriveEthAttester(mnemonic, baseAccountIndex, addressIndex, remoteSigner) {
|
|
44
|
+
const acct = mnemonicToAccount(mnemonic, {
|
|
45
|
+
accountIndex: baseAccountIndex,
|
|
46
|
+
addressIndex
|
|
47
|
+
});
|
|
48
|
+
return remoteSigner ? {
|
|
49
|
+
address: acct.address,
|
|
50
|
+
remoteSignerUrl: remoteSigner
|
|
51
|
+
} : '0x' + Buffer.from(acct.getHdKey().privateKey).toString('hex');
|
|
52
|
+
}
|
|
53
|
+
export async function buildValidatorEntries(input) {
|
|
54
|
+
const { validatorCount, publisherCount = 0, publishers, accountIndex, baseAddressIndex, mnemonic, ikm, blsPath, feeRecipient, coinbase, remoteSigner } = input;
|
|
55
|
+
const summaries = [];
|
|
56
|
+
const validators = await Promise.all(Array.from({
|
|
57
|
+
length: validatorCount
|
|
58
|
+
}, async (_unused, i)=>{
|
|
59
|
+
const addressIndex = baseAddressIndex + i;
|
|
60
|
+
const basePath = blsPath ?? defaultBlsPath;
|
|
61
|
+
const perValidatorPath = withValidatorIndex(basePath, accountIndex, addressIndex);
|
|
62
|
+
const blsPrivKey = ikm || mnemonic ? deriveBlsPrivateKey(mnemonic, ikm, perValidatorPath) : undefined;
|
|
63
|
+
const blsPubCompressed = blsPrivKey ? await computeBlsPublicKeyCompressed(blsPrivKey) : undefined;
|
|
64
|
+
const ethAttester = deriveEthAttester(mnemonic, accountIndex, addressIndex, remoteSigner);
|
|
65
|
+
const attester = blsPrivKey ? {
|
|
66
|
+
eth: ethAttester,
|
|
67
|
+
bls: blsPrivKey
|
|
68
|
+
} : ethAttester;
|
|
69
|
+
let publisherField;
|
|
70
|
+
const publisherAddresses = [];
|
|
71
|
+
if (publishers && publishers.length > 0) {
|
|
72
|
+
publisherAddresses.push(...publishers);
|
|
73
|
+
publisherField = publishers.length === 1 ? publishers[0] : publishers;
|
|
74
|
+
} else if (publisherCount > 0) {
|
|
75
|
+
const publishersBaseIndex = baseAddressIndex + validatorCount + i * publisherCount;
|
|
76
|
+
const publisherAccounts = Array.from({
|
|
77
|
+
length: publisherCount
|
|
78
|
+
}, (_unused2, j)=>{
|
|
79
|
+
const publisherAddressIndex = publishersBaseIndex + j;
|
|
80
|
+
const pubAcct = mnemonicToAccount(mnemonic, {
|
|
81
|
+
accountIndex,
|
|
82
|
+
addressIndex: publisherAddressIndex
|
|
83
|
+
});
|
|
84
|
+
publisherAddresses.push(pubAcct.address);
|
|
85
|
+
return remoteSigner ? {
|
|
86
|
+
address: pubAcct.address,
|
|
87
|
+
remoteSignerUrl: remoteSigner
|
|
88
|
+
} : '0x' + Buffer.from(pubAcct.getHdKey().privateKey).toString('hex');
|
|
89
|
+
});
|
|
90
|
+
publisherField = publisherCount === 1 ? publisherAccounts[0] : publisherAccounts;
|
|
91
|
+
}
|
|
92
|
+
const acct = mnemonicToAccount(mnemonic, {
|
|
93
|
+
accountIndex,
|
|
94
|
+
addressIndex
|
|
95
|
+
});
|
|
96
|
+
const attesterEthAddress = acct.address;
|
|
97
|
+
summaries.push({
|
|
98
|
+
attesterEth: attesterEthAddress,
|
|
99
|
+
attesterBls: blsPubCompressed,
|
|
100
|
+
publisherEth: publisherAddresses.length > 0 ? publisherAddresses : undefined
|
|
101
|
+
});
|
|
102
|
+
return {
|
|
103
|
+
attester,
|
|
104
|
+
...publisherField !== undefined ? {
|
|
105
|
+
publisher: publisherField
|
|
106
|
+
} : {},
|
|
107
|
+
feeRecipient,
|
|
108
|
+
coinbase: coinbase ?? attesterEthAddress
|
|
109
|
+
};
|
|
110
|
+
}));
|
|
111
|
+
return {
|
|
112
|
+
validators,
|
|
113
|
+
summaries
|
|
114
|
+
};
|
|
115
|
+
}
|
|
116
|
+
export async function resolveKeystoreOutputPath(dataDir, file) {
|
|
117
|
+
const defaultDataDir = join(homedir(), '.aztec', 'keystore');
|
|
118
|
+
const resolvedDir = dataDir && dataDir.length > 0 ? dataDir : defaultDataDir;
|
|
119
|
+
let outputPath;
|
|
120
|
+
if (file && file.length > 0) {
|
|
121
|
+
outputPath = isAbsolute(file) ? file : join(resolvedDir, file);
|
|
122
|
+
} else {
|
|
123
|
+
let index = 1;
|
|
124
|
+
while(true){
|
|
125
|
+
const candidate = join(resolvedDir, `key${index}.json`);
|
|
126
|
+
try {
|
|
127
|
+
await access(candidate, fsConstants.F_OK);
|
|
128
|
+
index += 1;
|
|
129
|
+
} catch {
|
|
130
|
+
outputPath = candidate;
|
|
131
|
+
break;
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
return {
|
|
136
|
+
resolvedDir,
|
|
137
|
+
outputPath: outputPath
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
export async function writeKeystoreFile(path, keystore) {
|
|
141
|
+
mkdirSync(dirname(path), {
|
|
142
|
+
recursive: true
|
|
143
|
+
});
|
|
144
|
+
await writeFile(path, JSON.stringify(keystore, null, 2), {
|
|
145
|
+
encoding: 'utf-8'
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
export function logValidatorSummaries(log, summaries) {
|
|
149
|
+
const lines = [];
|
|
150
|
+
for(let i = 0; i < summaries.length; i++){
|
|
151
|
+
const v = summaries[i];
|
|
152
|
+
lines.push(`acc${i + 1}:`);
|
|
153
|
+
lines.push(` attester:`);
|
|
154
|
+
if (v.attesterEth) {
|
|
155
|
+
lines.push(` eth: ${v.attesterEth}`);
|
|
156
|
+
}
|
|
157
|
+
if (v.attesterBls) {
|
|
158
|
+
lines.push(` bls: ${v.attesterBls}`);
|
|
159
|
+
}
|
|
160
|
+
if (v.publisherEth && v.publisherEth.length > 0) {
|
|
161
|
+
lines.push(` publisher:`);
|
|
162
|
+
for (const addr of v.publisherEth){
|
|
163
|
+
lines.push(` - ${addr}`);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
if (lines.length > 0) {
|
|
168
|
+
log(lines.join('\n'));
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
export function maybePrintJson(log, jsonFlag, obj) {
|
|
172
|
+
if (jsonFlag) {
|
|
173
|
+
log(prettyPrintJSON(obj));
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
/**
|
|
177
|
+
* Writes a BN254 keystore file for a BN254 BLS private key.
|
|
178
|
+
* Returns the absolute path to the written file.
|
|
179
|
+
*
|
|
180
|
+
* @param outDir - Directory to write the keystore file to
|
|
181
|
+
* @param fileNameBase - Base name for the keystore file (will be sanitized)
|
|
182
|
+
* @param password - Password for encrypting the private key
|
|
183
|
+
* @param privateKeyHex - Private key as 0x-prefixed hex string (32 bytes)
|
|
184
|
+
* @param pubkeyHex - Public key as hex string
|
|
185
|
+
* @param derivationPath - BIP-44 style derivation path
|
|
186
|
+
* @returns Absolute path to the written keystore file
|
|
187
|
+
*/ export async function writeBn254BlsKeystore(outDir, fileNameBase, password, privateKeyHex, pubkeyHex, derivationPath) {
|
|
188
|
+
mkdirSync(outDir, {
|
|
189
|
+
recursive: true
|
|
190
|
+
});
|
|
191
|
+
const keystore = createBn254Keystore(password, privateKeyHex, pubkeyHex, derivationPath);
|
|
192
|
+
const safeBase = fileNameBase.replace(/[^a-zA-Z0-9_-]/g, '_');
|
|
193
|
+
const outPath = join(outDir, `keystore-${safeBase}.json`);
|
|
194
|
+
await writeFile(outPath, JSON.stringify(keystore, null, 2), {
|
|
195
|
+
encoding: 'utf-8'
|
|
196
|
+
});
|
|
197
|
+
return outPath;
|
|
198
|
+
}
|
|
199
|
+
/** Replace plaintext BLS keys in validators with { path, password } pointing to BN254 keystore files. */ export async function writeBlsBn254ToFile(validators, options) {
|
|
200
|
+
for(let i = 0; i < validators.length; i++){
|
|
201
|
+
const v = validators[i];
|
|
202
|
+
if (!v || typeof v !== 'object' || !('attester' in v)) {
|
|
203
|
+
continue;
|
|
204
|
+
}
|
|
205
|
+
const att = v.attester;
|
|
206
|
+
// Shapes: { bls: <hex> } or { eth: <ethAccount>, bls?: <hex> } or plain EthAccount
|
|
207
|
+
const blsKey = typeof att === 'object' && 'bls' in att ? att.bls : undefined;
|
|
208
|
+
if (!blsKey || typeof blsKey !== 'string') {
|
|
209
|
+
continue;
|
|
210
|
+
}
|
|
211
|
+
const pub = await computeBlsPublicKeyCompressed(blsKey);
|
|
212
|
+
const path = options.blsPath ?? defaultBlsPath;
|
|
213
|
+
const fileBase = `${String(i + 1)}_${pub.slice(2, 18)}`;
|
|
214
|
+
const keystorePath = await writeBn254BlsKeystore(options.outDir, fileBase, options.password, blsKey, pub, path);
|
|
215
|
+
if (typeof att === 'object') {
|
|
216
|
+
att.bls = {
|
|
217
|
+
path: keystorePath,
|
|
218
|
+
password: options.password
|
|
219
|
+
};
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
/** Writes an Ethereum JSON V3 keystore using ethers, returns absolute path */ export async function writeEthJsonV3Keystore(outDir, fileNameBase, password, privateKeyHex) {
|
|
224
|
+
const safeBase = fileNameBase.replace(/[^a-zA-Z0-9_-]/g, '_');
|
|
225
|
+
mkdirSync(outDir, {
|
|
226
|
+
recursive: true
|
|
227
|
+
});
|
|
228
|
+
const wallet = new Wallet(privateKeyHex);
|
|
229
|
+
const json = await wallet.encrypt(password);
|
|
230
|
+
const outPath = join(outDir, `keystore-eth-${safeBase}.json`);
|
|
231
|
+
await writeFile(outPath, json, {
|
|
232
|
+
encoding: 'utf-8'
|
|
233
|
+
});
|
|
234
|
+
return outPath;
|
|
235
|
+
}
|
|
236
|
+
/** Replace plaintext ETH keys in validators with { path, password } pointing to JSON V3 files. */ export async function writeEthJsonV3ToFile(validators, options) {
|
|
237
|
+
const maybeEncryptEth = async (account, label)=>{
|
|
238
|
+
if (typeof account === 'string' && account.startsWith('0x') && account.length === 66) {
|
|
239
|
+
const fileBase = `${label}_${account.slice(2, 10)}`;
|
|
240
|
+
const p = await writeEthJsonV3Keystore(options.outDir, fileBase, options.password, account);
|
|
241
|
+
return {
|
|
242
|
+
path: p,
|
|
243
|
+
password: options.password
|
|
244
|
+
};
|
|
245
|
+
}
|
|
246
|
+
return account;
|
|
247
|
+
};
|
|
248
|
+
for(let i = 0; i < validators.length; i++){
|
|
249
|
+
const v = validators[i];
|
|
250
|
+
if (!v || typeof v !== 'object') {
|
|
251
|
+
continue;
|
|
252
|
+
}
|
|
253
|
+
// attester may be string (eth), object with eth, or remote signer
|
|
254
|
+
const att = v.attester;
|
|
255
|
+
if (typeof att === 'string') {
|
|
256
|
+
v.attester = await maybeEncryptEth(att, `attester_${i + 1}`);
|
|
257
|
+
} else if (att && typeof att === 'object' && 'eth' in att) {
|
|
258
|
+
att.eth = await maybeEncryptEth(att.eth, `attester_${i + 1}`);
|
|
259
|
+
}
|
|
260
|
+
// publisher can be single or array
|
|
261
|
+
if ('publisher' in v) {
|
|
262
|
+
const pub = v.publisher;
|
|
263
|
+
if (Array.isArray(pub)) {
|
|
264
|
+
const out = [];
|
|
265
|
+
for(let j = 0; j < pub.length; j++){
|
|
266
|
+
out.push(await maybeEncryptEth(pub[j], `publisher_${i + 1}_${j + 1}`));
|
|
267
|
+
}
|
|
268
|
+
v.publisher = out;
|
|
269
|
+
} else if (pub !== undefined) {
|
|
270
|
+
v.publisher = await maybeEncryptEth(pub, `publisher_${i + 1}`);
|
|
271
|
+
}
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { GSEContract } from '@aztec/ethereum/contracts';
|
|
2
|
+
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
|
+
import type { LogFn } from '@aztec/foundation/log';
|
|
4
|
+
import type { AttesterAccounts } from '@aztec/node-keystore/types';
|
|
5
|
+
export type StakerOptions = {
|
|
6
|
+
from: string;
|
|
7
|
+
password?: string;
|
|
8
|
+
output?: string;
|
|
9
|
+
gseAddress: EthAddress;
|
|
10
|
+
l1RpcUrls: string[];
|
|
11
|
+
l1ChainId: number;
|
|
12
|
+
};
|
|
13
|
+
export type StakerOutput = {
|
|
14
|
+
attester: string;
|
|
15
|
+
publicKeyG1: {
|
|
16
|
+
x: string;
|
|
17
|
+
y: string;
|
|
18
|
+
};
|
|
19
|
+
publicKeyG2: {
|
|
20
|
+
x0: string;
|
|
21
|
+
x1: string;
|
|
22
|
+
y0: string;
|
|
23
|
+
y1: string;
|
|
24
|
+
};
|
|
25
|
+
proofOfPossession: {
|
|
26
|
+
x: string;
|
|
27
|
+
y: string;
|
|
28
|
+
};
|
|
29
|
+
};
|
|
30
|
+
/**
|
|
31
|
+
* Process AttesterAccounts (which can be a single attester, array, or mnemonic)
|
|
32
|
+
*/
|
|
33
|
+
export declare function processAttesterAccounts(attesterAccounts: AttesterAccounts, gse: GSEContract, password?: string): Promise<StakerOutput[]>;
|
|
34
|
+
/**
|
|
35
|
+
* Main staker command function
|
|
36
|
+
*/
|
|
37
|
+
export declare function generateStakerJson(options: StakerOptions, log: LogFn): Promise<void>;
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3Rha2VyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY21kcy92YWxpZGF0b3Jfa2V5cy9zdGFrZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSXhELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRW5ELE9BQU8sS0FBSyxFQUVWLGdCQUFnQixFQUtqQixNQUFNLDRCQUE0QixDQUFDO0FBUXBDLE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUNiLFFBQVEsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNsQixNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDaEIsVUFBVSxFQUFFLFVBQVUsQ0FBQztJQUN2QixTQUFTLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDcEIsU0FBUyxFQUFFLE1BQU0sQ0FBQztDQUNuQixDQUFDO0FBRUYsTUFBTSxNQUFNLFlBQVksR0FBRztJQUN6QixRQUFRLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLFdBQVcsRUFBRTtRQUNYLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDVixDQUFDLEVBQUUsTUFBTSxDQUFDO0tBQ1gsQ0FBQztJQUNGLFdBQVcsRUFBRTtRQUNYLEVBQUUsRUFBRSxNQUFNLENBQUM7UUFDWCxFQUFFLEVBQUUsTUFBTSxDQUFDO1FBQ1gsRUFBRSxFQUFFLE1BQU0sQ0FBQztRQUNYLEVBQUUsRUFBRSxNQUFNLENBQUM7S0FDWixDQUFDO0lBQ0YsaUJBQWlCLEVBQUU7UUFDakIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUNWLENBQUMsRUFBRSxNQUFNLENBQUM7S0FDWCxDQUFDO0NBQ0gsQ0FBQztBQTJLRjs7R0FFRztBQUNILHdCQUFzQix1QkFBdUIsQ0FDM0MsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLEdBQUcsRUFBRSxXQUFXLEVBQ2hCLFFBQVEsQ0FBQyxFQUFFLE1BQU0sR0FDaEIsT0FBTyxDQUFDLFlBQVksRUFBRSxDQUFDLENBcUJ6QjtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLGtCQUFrQixDQUFDLE9BQU8sRUFBRSxhQUFhLEVBQUUsR0FBRyxFQUFFLEtBQUssR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBK0MxRiJ9
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1,210 @@
|
|
|
1
|
+
import { prettyPrintJSON } from '@aztec/cli/utils';
|
|
2
|
+
import { createEthereumChain } from '@aztec/ethereum/chain';
|
|
3
|
+
import { GSEContract } from '@aztec/ethereum/contracts';
|
|
4
|
+
import { decryptBn254Keystore } from '@aztec/foundation/crypto/bls/bn254_keystore';
|
|
5
|
+
import { computeBn254G1PublicKey, computeBn254G2PublicKey } from '@aztec/foundation/crypto/bn254';
|
|
6
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
7
|
+
import { loadKeystoreFile } from '@aztec/node-keystore/loader';
|
|
8
|
+
import { Wallet } from '@ethersproject/wallet';
|
|
9
|
+
import { readFileSync, writeFileSync } from 'fs';
|
|
10
|
+
import { basename, dirname, join } from 'path';
|
|
11
|
+
import { createPublicClient, fallback, http } from 'viem';
|
|
12
|
+
import { privateKeyToAddress } from 'viem/accounts';
|
|
13
|
+
/**
|
|
14
|
+
* Check if an object is a MnemonicConfig
|
|
15
|
+
*/ function isMnemonicConfig(obj) {
|
|
16
|
+
return typeof obj === 'object' && obj !== null && 'mnemonic' in obj;
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Check if a value is an encrypted keystore file config
|
|
20
|
+
*/ function isEncryptedKeyFileConfig(value) {
|
|
21
|
+
return typeof value === 'object' && value !== null && 'path' in value;
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Check if a BLSAccount is a private key string (not an encrypted keystore file)
|
|
25
|
+
*/ function isBlsPrivateKey(bls) {
|
|
26
|
+
return typeof bls === 'string' && bls.startsWith('0x');
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Check if an EthAccount is a private key string (66 chars: 0x + 64 hex)
|
|
30
|
+
*/ function isEthPrivateKey(eth) {
|
|
31
|
+
return typeof eth === 'string' && eth.startsWith('0x') && eth.length === 66;
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Check if a string is an Ethereum address (42 chars: 0x + 40 hex)
|
|
35
|
+
*/ function isEthAddress(value) {
|
|
36
|
+
return typeof value === 'string' && /^0x[0-9a-fA-F]{40}$/.test(value);
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Decrypt a BLS private key from an encrypted keystore file
|
|
40
|
+
*/ function decryptBlsKey(bls, password) {
|
|
41
|
+
if (isBlsPrivateKey(bls)) {
|
|
42
|
+
return bls;
|
|
43
|
+
}
|
|
44
|
+
if (isEncryptedKeyFileConfig(bls)) {
|
|
45
|
+
if (!password && !bls.password) {
|
|
46
|
+
return undefined; // Can't decrypt without password
|
|
47
|
+
}
|
|
48
|
+
const pwd = password ?? bls.password;
|
|
49
|
+
return decryptBn254Keystore(bls.path, pwd);
|
|
50
|
+
}
|
|
51
|
+
return undefined;
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* Decrypt an Ethereum private key from an encrypted keystore file
|
|
55
|
+
*/ async function decryptEthKey(eth, password) {
|
|
56
|
+
if (isEthPrivateKey(eth)) {
|
|
57
|
+
return eth;
|
|
58
|
+
}
|
|
59
|
+
if (isEncryptedKeyFileConfig(eth)) {
|
|
60
|
+
if (!password && !eth.password) {
|
|
61
|
+
return undefined; // Can't decrypt without password
|
|
62
|
+
}
|
|
63
|
+
const pwd = password ?? eth.password;
|
|
64
|
+
const json = readFileSync(eth.path, 'utf-8');
|
|
65
|
+
const wallet = await Wallet.fromEncryptedJson(json, pwd);
|
|
66
|
+
return wallet.privateKey;
|
|
67
|
+
}
|
|
68
|
+
return undefined;
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* Extract Ethereum address from an EthAccount (or private key)
|
|
72
|
+
*/ async function getEthAddress(eth, password) {
|
|
73
|
+
// Case 1: It's a private key string - derive the address
|
|
74
|
+
if (isEthPrivateKey(eth)) {
|
|
75
|
+
return privateKeyToAddress(eth);
|
|
76
|
+
}
|
|
77
|
+
// Case 2: It's just an address string directly (EthRemoteSignerAccount can be just EthAddress)
|
|
78
|
+
if (isEthAddress(eth)) {
|
|
79
|
+
return eth;
|
|
80
|
+
}
|
|
81
|
+
// Case 3: It's an object with an address property (remote signer config)
|
|
82
|
+
if (typeof eth === 'object' && eth !== null && 'address' in eth) {
|
|
83
|
+
return eth.address;
|
|
84
|
+
}
|
|
85
|
+
// Case 4: It's an encrypted keystore file - decrypt and derive address
|
|
86
|
+
if (isEncryptedKeyFileConfig(eth)) {
|
|
87
|
+
const privateKey = await decryptEthKey(eth, password);
|
|
88
|
+
if (privateKey) {
|
|
89
|
+
return privateKeyToAddress(privateKey);
|
|
90
|
+
}
|
|
91
|
+
return undefined;
|
|
92
|
+
}
|
|
93
|
+
return undefined;
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* Extract BLS private key and Ethereum address from an AttesterAccount
|
|
97
|
+
*/ async function extractAttesterInfo(attester, password) {
|
|
98
|
+
// Case 1: attester is { eth: EthAccount, bls?: BLSAccount }
|
|
99
|
+
if (typeof attester === 'object' && attester !== null && 'eth' in attester) {
|
|
100
|
+
const ethAddress = await getEthAddress(attester.eth, password);
|
|
101
|
+
const blsPrivateKey = attester.bls ? decryptBlsKey(attester.bls, password) : undefined;
|
|
102
|
+
return {
|
|
103
|
+
blsPrivateKey,
|
|
104
|
+
ethAddress
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
// Case 2: attester is just an EthAccount directly (no BLS key)
|
|
108
|
+
return {
|
|
109
|
+
blsPrivateKey: undefined,
|
|
110
|
+
ethAddress: await getEthAddress(attester, password)
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* Process a single attester entry and output staking JSON
|
|
115
|
+
*/ async function processAttester(attester, gse, password) {
|
|
116
|
+
const { blsPrivateKey, ethAddress } = await extractAttesterInfo(attester, password);
|
|
117
|
+
// Skip if no BLS private key or no Ethereum address
|
|
118
|
+
if (!blsPrivateKey || !ethAddress) {
|
|
119
|
+
return undefined;
|
|
120
|
+
}
|
|
121
|
+
// Derive G1 and G2 public keys
|
|
122
|
+
const g1PublicKey = await computeBn254G1PublicKey(blsPrivateKey);
|
|
123
|
+
const g2PublicKey = await computeBn254G2PublicKey(blsPrivateKey);
|
|
124
|
+
// Generate proof of possession
|
|
125
|
+
const bn254SecretKeyFieldElement = Fr.fromString(blsPrivateKey);
|
|
126
|
+
const registrationTuple = await gse.makeRegistrationTuple(bn254SecretKeyFieldElement.toBigInt());
|
|
127
|
+
return {
|
|
128
|
+
attester: String(ethAddress),
|
|
129
|
+
publicKeyG1: {
|
|
130
|
+
x: '0x' + g1PublicKey.x.toString(16).padStart(64, '0'),
|
|
131
|
+
y: '0x' + g1PublicKey.y.toString(16).padStart(64, '0')
|
|
132
|
+
},
|
|
133
|
+
publicKeyG2: {
|
|
134
|
+
x0: '0x' + g2PublicKey.x.c0.toString(16).padStart(64, '0'),
|
|
135
|
+
x1: '0x' + g2PublicKey.x.c1.toString(16).padStart(64, '0'),
|
|
136
|
+
y0: '0x' + g2PublicKey.y.c0.toString(16).padStart(64, '0'),
|
|
137
|
+
y1: '0x' + g2PublicKey.y.c1.toString(16).padStart(64, '0')
|
|
138
|
+
},
|
|
139
|
+
proofOfPossession: {
|
|
140
|
+
x: '0x' + registrationTuple.proofOfPossession.x.toString(16),
|
|
141
|
+
y: '0x' + registrationTuple.proofOfPossession.y.toString(16)
|
|
142
|
+
}
|
|
143
|
+
};
|
|
144
|
+
}
|
|
145
|
+
/**
|
|
146
|
+
* Process AttesterAccounts (which can be a single attester, array, or mnemonic)
|
|
147
|
+
*/ export async function processAttesterAccounts(attesterAccounts, gse, password) {
|
|
148
|
+
// Skip mnemonic configs
|
|
149
|
+
if (isMnemonicConfig(attesterAccounts)) {
|
|
150
|
+
return [];
|
|
151
|
+
}
|
|
152
|
+
// Handle array of attesters
|
|
153
|
+
if (Array.isArray(attesterAccounts)) {
|
|
154
|
+
const results = [];
|
|
155
|
+
for (const attester of attesterAccounts){
|
|
156
|
+
const result = await processAttester(attester, gse, password);
|
|
157
|
+
if (result) {
|
|
158
|
+
results.push(result);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
return results;
|
|
162
|
+
}
|
|
163
|
+
// Handle single attester
|
|
164
|
+
const result = await processAttester(attesterAccounts, gse, password);
|
|
165
|
+
return result ? [
|
|
166
|
+
result
|
|
167
|
+
] : [];
|
|
168
|
+
}
|
|
169
|
+
/**
|
|
170
|
+
* Main staker command function
|
|
171
|
+
*/ export async function generateStakerJson(options, log) {
|
|
172
|
+
const { from, password, gseAddress, l1RpcUrls, l1ChainId, output } = options;
|
|
173
|
+
// Load the keystore file
|
|
174
|
+
const keystore = loadKeystoreFile(from);
|
|
175
|
+
if (!gseAddress) {
|
|
176
|
+
throw new Error('GSE contract address is required');
|
|
177
|
+
}
|
|
178
|
+
log(`Calling GSE contract ${gseAddress} on chain ${l1ChainId}, using ${l1RpcUrls.join(', ')} to get staker outputs`);
|
|
179
|
+
if (!keystore.validators || keystore.validators.length === 0) {
|
|
180
|
+
log('No validators found in keystore');
|
|
181
|
+
return;
|
|
182
|
+
}
|
|
183
|
+
const allOutputs = [];
|
|
184
|
+
// L1 client for proof of possession
|
|
185
|
+
const chain = createEthereumChain(l1RpcUrls, l1ChainId);
|
|
186
|
+
const publicClient = createPublicClient({
|
|
187
|
+
chain: chain.chainInfo,
|
|
188
|
+
transport: fallback(l1RpcUrls.map((url)=>http(url, {
|
|
189
|
+
batch: false
|
|
190
|
+
})))
|
|
191
|
+
});
|
|
192
|
+
const gse = new GSEContract(publicClient, gseAddress);
|
|
193
|
+
const keystoreBaseName = basename(from, '.json');
|
|
194
|
+
const outputDir = output ? output : dirname(from);
|
|
195
|
+
for(let i = 0; i < keystore.validators.length; i++){
|
|
196
|
+
const validator = keystore.validators[i];
|
|
197
|
+
const outputs = await processAttesterAccounts(validator.attester, gse, password);
|
|
198
|
+
for(let j = 0; j < outputs.length; j++){
|
|
199
|
+
allOutputs.push(outputs[j]);
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
if (allOutputs.length === 0) {
|
|
203
|
+
log('No attesters with BLS keys found (skipping mnemonics and encrypted keystores without password)');
|
|
204
|
+
return;
|
|
205
|
+
}
|
|
206
|
+
// Write a single JSON file with all staker outputs
|
|
207
|
+
const stakerOutputPath = join(outputDir, `${keystoreBaseName}_staker_output.json`);
|
|
208
|
+
writeFileSync(stakerOutputPath, prettyPrintJSON(allOutputs), 'utf-8');
|
|
209
|
+
log(`Wrote staker output for ${allOutputs.length} validator(s) to ${stakerOutputPath}`);
|
|
210
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
2
|
+
export declare const defaultBlsPath = "m/12381/3600/0/0/0";
|
|
3
|
+
export declare function validateBlsPathOptions(options: {
|
|
4
|
+
count?: number;
|
|
5
|
+
publisherCount?: number;
|
|
6
|
+
accountIndex?: number;
|
|
7
|
+
addressIndex?: number;
|
|
8
|
+
blsPath?: string;
|
|
9
|
+
ikm?: string;
|
|
10
|
+
}): void;
|
|
11
|
+
export declare function validateStakerOutputOptions(options: {
|
|
12
|
+
stakerOutput?: boolean;
|
|
13
|
+
gseAddress?: EthAddress;
|
|
14
|
+
l1RpcUrls?: string[];
|
|
15
|
+
l1ChainId?: number;
|
|
16
|
+
}): void;
|
|
17
|
+
export declare function validateRemoteSignerOptions(options: {
|
|
18
|
+
remoteSigner?: string;
|
|
19
|
+
mnemonic?: string;
|
|
20
|
+
}): void;
|
|
21
|
+
export declare function validatePublisherOptions(options: {
|
|
22
|
+
publishers?: string[];
|
|
23
|
+
publisherCount?: number;
|
|
24
|
+
}): void;
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL3ZhbGlkYXRvcl9rZXlzL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBSWhFLGVBQU8sTUFBTSxjQUFjLHVCQUF1QixDQUFDO0FBRW5ELHdCQUFnQixzQkFBc0IsQ0FBQyxPQUFPLEVBQUU7SUFDOUMsS0FBSyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2YsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3hCLFlBQVksQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN0QixZQUFZLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDdEIsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLEdBQUcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNkLFFBV0E7QUFFRCx3QkFBZ0IsMkJBQTJCLENBQUMsT0FBTyxFQUFFO0lBQ25ELFlBQVksQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUN2QixVQUFVLENBQUMsRUFBRSxVQUFVLENBQUM7SUFDeEIsU0FBUyxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDckIsU0FBUyxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3BCLFFBZUE7QUFFRCx3QkFBZ0IsMkJBQTJCLENBQUMsT0FBTyxFQUFFO0lBQUUsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQUMsUUFBUSxDQUFDLEVBQUUsTUFBTSxDQUFBO0NBQUUsUUFNaEc7QUFFRCx3QkFBZ0Isd0JBQXdCLENBQUMsT0FBTyxFQUFFO0lBQUUsVUFBVSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFBQyxjQUFjLENBQUMsRUFBRSxNQUFNLENBQUE7Q0FBRSxRQXdCbkcifQ==
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { ethPrivateKeySchema } from '@aztec/node-keystore/schemas';
|
|
2
|
+
export const defaultBlsPath = 'm/12381/3600/0/0/0';
|
|
3
|
+
export function validateBlsPathOptions(options) {
|
|
4
|
+
if (options.blsPath && options.blsPath !== defaultBlsPath) {
|
|
5
|
+
if (options.count && options.count !== 1 || options.publisherCount && options.publisherCount > 0 || options.accountIndex && options.accountIndex !== 0 || options.addressIndex && options.addressIndex !== 0) {
|
|
6
|
+
throw new Error('--bls-path cannot be used with --count, --publisher-count, --account-index, or --address-index');
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
export function validateStakerOutputOptions(options) {
|
|
11
|
+
if (!options.stakerOutput) {
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
// Required options for staker output
|
|
15
|
+
if (!options.gseAddress) {
|
|
16
|
+
throw new Error('--gse-address is required when using --staker-output');
|
|
17
|
+
}
|
|
18
|
+
if (!options.l1RpcUrls || options.l1RpcUrls.length === 0) {
|
|
19
|
+
throw new Error('--l1-rpc-urls is required when using --staker-output');
|
|
20
|
+
}
|
|
21
|
+
if (options.l1ChainId === undefined) {
|
|
22
|
+
throw new Error('--l1-chain-id is required when using --staker-output');
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
export function validateRemoteSignerOptions(options) {
|
|
26
|
+
if (options.remoteSigner && !options.mnemonic) {
|
|
27
|
+
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.');
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
export function validatePublisherOptions(options) {
|
|
31
|
+
if (options.publisherCount && options.publisherCount > 0 && options.publishers && options.publishers.length > 0) {
|
|
32
|
+
throw new Error('--publishers and --publisher-count cannot be used together');
|
|
33
|
+
}
|
|
34
|
+
if (options.publishers && options.publishers.length > 0) {
|
|
35
|
+
// Normalize each private key by adding 0x prefix if missing
|
|
36
|
+
const normalizedKeys = [];
|
|
37
|
+
for (const key of options.publishers){
|
|
38
|
+
let privateKey = key.trim();
|
|
39
|
+
if (!privateKey.startsWith('0x')) {
|
|
40
|
+
privateKey = '0x' + privateKey;
|
|
41
|
+
}
|
|
42
|
+
try {
|
|
43
|
+
ethPrivateKeySchema.parse(privateKey);
|
|
44
|
+
normalizedKeys.push(privateKey);
|
|
45
|
+
} catch (error) {
|
|
46
|
+
throw new Error(`Invalid publisher private key: ${error instanceof Error ? error.message : String(error)}`);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
// Update the options with the normalized keys
|
|
50
|
+
options.publishers = normalizedKeys;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
export interface CachedFetchOptions {
|
|
2
|
+
/** Cache duration in milliseconds */
|
|
3
|
+
cacheDurationMs: number;
|
|
4
|
+
/** The cache file */
|
|
5
|
+
cacheFile?: string;
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* Fetches data from a URL with file-based caching support.
|
|
9
|
+
* This utility can be used by both remote config and bootnodes fetching.
|
|
10
|
+
*
|
|
11
|
+
* @param url - The URL to fetch from
|
|
12
|
+
* @param networkName - Network name for cache directory structure
|
|
13
|
+
* @param options - Caching and error handling options
|
|
14
|
+
* @param cacheDir - Optional cache directory (defaults to no caching)
|
|
15
|
+
* @returns The fetched and parsed JSON data, or undefined if fetch fails and throwOnError is false
|
|
16
|
+
*/
|
|
17
|
+
export declare function cachedFetch<T = any>(url: string, options: CachedFetchOptions, fetch?: typeof globalThis.fetch, log?: import("@aztec/aztec.js/log").Logger): Promise<T | undefined>;
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGVkX2ZldGNoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NhY2hlZF9mZXRjaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxNQUFNLFdBQVcsa0JBQWtCO0lBQ2pDLHFDQUFxQztJQUNyQyxlQUFlLEVBQUUsTUFBTSxDQUFDO0lBQ3hCLHFCQUFxQjtJQUNyQixTQUFTLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDcEI7QUFFRDs7Ozs7Ozs7O0dBU0c7QUFDSCx3QkFBc0IsV0FBVyxDQUFDLENBQUMsR0FBRyxHQUFHLEVBQ3ZDLEdBQUcsRUFBRSxNQUFNLEVBQ1gsT0FBTyxFQUFFLGtCQUFrQixFQUMzQixLQUFLLDBCQUFtQixFQUN4QixHQUFHLHVDQUErQixHQUNqQyxPQUFPLENBQUMsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxDQXVDeEIifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cached_fetch.d.ts","sourceRoot":"","sources":["../../src/config/cached_fetch.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,kBAAkB;IACjC,qCAAqC;IACrC,eAAe,EAAE,MAAM,CAAC;IACxB,qBAAqB;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;GASG;AACH,wBAAsB,WAAW,CAAC,CAAC,GAAG,GAAG,EACvC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,kBAAkB,EAC3B,KAAK,0BAAmB,EACxB,GAAG,uCAA+B,GACjC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAuCxB"}
|