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

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.
Files changed (120) hide show
  1. package/README.md +1 -1
  2. package/dest/cmds/aztec_node/block_number.d.ts +1 -1
  3. package/dest/cmds/aztec_node/get_block.d.ts +1 -1
  4. package/dest/cmds/aztec_node/get_block.d.ts.map +1 -1
  5. package/dest/cmds/aztec_node/get_block.js +2 -1
  6. package/dest/cmds/aztec_node/get_current_base_fee.d.ts +1 -1
  7. package/dest/cmds/aztec_node/get_l1_to_l2_message_witness.d.ts +1 -1
  8. package/dest/cmds/aztec_node/get_logs.d.ts +3 -2
  9. package/dest/cmds/aztec_node/get_logs.d.ts.map +1 -1
  10. package/dest/cmds/aztec_node/get_node_info.d.ts +1 -1
  11. package/dest/cmds/aztec_node/index.d.ts +1 -1
  12. package/dest/cmds/contracts/index.d.ts +1 -1
  13. package/dest/cmds/contracts/inspect_contract.d.ts +1 -1
  14. package/dest/cmds/contracts/inspect_contract.d.ts.map +1 -1
  15. package/dest/cmds/contracts/inspect_contract.js +3 -9
  16. package/dest/cmds/contracts/parse_parameter_struct.d.ts +1 -1
  17. package/dest/cmds/infrastructure/index.d.ts +1 -1
  18. package/dest/cmds/infrastructure/index.d.ts.map +1 -1
  19. package/dest/cmds/infrastructure/index.js +0 -1
  20. package/dest/cmds/infrastructure/sequencers.d.ts +1 -2
  21. package/dest/cmds/infrastructure/sequencers.d.ts.map +1 -1
  22. package/dest/cmds/infrastructure/setup_l2_contract.d.ts +1 -1
  23. package/dest/cmds/l1/advance_epoch.d.ts +1 -1
  24. package/dest/cmds/l1/assume_proven_through.d.ts +1 -1
  25. package/dest/cmds/l1/assume_proven_through.d.ts.map +1 -1
  26. package/dest/cmds/l1/assume_proven_through.js +2 -1
  27. package/dest/cmds/l1/bridge_erc20.d.ts +1 -1
  28. package/dest/cmds/l1/create_l1_account.d.ts +1 -1
  29. package/dest/cmds/l1/deploy_l1_contracts.d.ts +1 -1
  30. package/dest/cmds/l1/deploy_new_rollup.d.ts +1 -1
  31. package/dest/cmds/l1/get_l1_addresses.d.ts +1 -1
  32. package/dest/cmds/l1/get_l1_balance.d.ts +1 -1
  33. package/dest/cmds/l1/governance_utils.d.ts +5 -5
  34. package/dest/cmds/l1/governance_utils.d.ts.map +1 -1
  35. package/dest/cmds/l1/index.d.ts +1 -1
  36. package/dest/cmds/l1/prover_stats.d.ts +1 -1
  37. package/dest/cmds/l1/prover_stats.d.ts.map +1 -1
  38. package/dest/cmds/l1/prover_stats.js +28 -28
  39. package/dest/cmds/l1/trigger_seed_snapshot.d.ts +2 -2
  40. package/dest/cmds/l1/trigger_seed_snapshot.d.ts.map +1 -1
  41. package/dest/cmds/l1/update_l1_validators.d.ts +6 -6
  42. package/dest/cmds/l1/update_l1_validators.d.ts.map +1 -1
  43. package/dest/cmds/l1/update_l1_validators.js +2 -2
  44. package/dest/cmds/misc/compute_selector.d.ts +1 -1
  45. package/dest/cmds/misc/example_contracts.d.ts +1 -1
  46. package/dest/cmds/misc/generate_bootnode_enr.d.ts +1 -1
  47. package/dest/cmds/misc/generate_p2p_private_key.d.ts +1 -1
  48. package/dest/cmds/misc/generate_secret_and_hash.d.ts +1 -1
  49. package/dest/cmds/misc/generate_secret_key.d.ts +1 -1
  50. package/dest/cmds/misc/get_canonical_sponsored_fpc_address.d.ts +1 -1
  51. package/dest/cmds/misc/index.d.ts +1 -1
  52. package/dest/cmds/misc/update/common.d.ts +1 -1
  53. package/dest/cmds/misc/update/github.d.ts +1 -1
  54. package/dest/cmds/misc/update/noir.d.ts +1 -1
  55. package/dest/cmds/misc/update/npm.d.ts +1 -1
  56. package/dest/cmds/misc/update/npm.js +1 -1
  57. package/dest/cmds/misc/update/utils.d.ts +1 -1
  58. package/dest/cmds/misc/update.d.ts +1 -1
  59. package/dest/cmds/validator_keys/add.d.ts +1 -1
  60. package/dest/cmds/validator_keys/add.d.ts.map +1 -1
  61. package/dest/cmds/validator_keys/add.js +20 -7
  62. package/dest/cmds/validator_keys/generate_bls_keypair.d.ts +1 -1
  63. package/dest/cmds/validator_keys/generate_bls_keypair.d.ts.map +1 -1
  64. package/dest/cmds/validator_keys/generate_bls_keypair.js +2 -1
  65. package/dest/cmds/validator_keys/index.d.ts +1 -1
  66. package/dest/cmds/validator_keys/index.d.ts.map +1 -1
  67. package/dest/cmds/validator_keys/index.js +16 -4
  68. package/dest/cmds/validator_keys/new.d.ts +7 -4
  69. package/dest/cmds/validator_keys/new.d.ts.map +1 -1
  70. package/dest/cmds/validator_keys/new.js +87 -16
  71. package/dest/cmds/validator_keys/shared.d.ts +4 -4
  72. package/dest/cmds/validator_keys/shared.d.ts.map +1 -1
  73. package/dest/cmds/validator_keys/shared.js +29 -27
  74. package/dest/cmds/validator_keys/staker.d.ts +38 -0
  75. package/dest/cmds/validator_keys/staker.d.ts.map +1 -0
  76. package/dest/cmds/validator_keys/staker.js +207 -0
  77. package/dest/cmds/validator_keys/utils.d.ts +25 -0
  78. package/dest/cmds/validator_keys/utils.d.ts.map +1 -0
  79. package/dest/cmds/validator_keys/utils.js +52 -0
  80. package/dest/config/cached_fetch.d.ts +1 -1
  81. package/dest/config/chain_l2_config.d.ts +11 -10
  82. package/dest/config/chain_l2_config.d.ts.map +1 -1
  83. package/dest/config/chain_l2_config.js +64 -34
  84. package/dest/config/enrich_env.d.ts +1 -1
  85. package/dest/config/get_l1_config.d.ts +1 -1
  86. package/dest/config/index.d.ts +1 -1
  87. package/dest/config/network_config.d.ts +6 -3
  88. package/dest/config/network_config.d.ts.map +1 -1
  89. package/dest/config/network_config.js +58 -28
  90. package/dest/utils/aztec.d.ts +1 -1
  91. package/dest/utils/aztec.d.ts.map +1 -1
  92. package/dest/utils/commands.d.ts +2 -2
  93. package/dest/utils/commands.d.ts.map +1 -1
  94. package/dest/utils/encoding.d.ts +1 -1
  95. package/dest/utils/github.d.ts +1 -1
  96. package/dest/utils/index.d.ts +1 -1
  97. package/dest/utils/inspect.d.ts +3 -2
  98. package/dest/utils/inspect.d.ts.map +1 -1
  99. package/dest/utils/setup_contracts.d.ts +1 -1
  100. package/package.json +34 -29
  101. package/public_include_metric_prefixes.json +1 -0
  102. package/src/cmds/aztec_node/get_block.ts +2 -1
  103. package/src/cmds/aztec_node/get_logs.ts +3 -2
  104. package/src/cmds/contracts/inspect_contract.ts +3 -10
  105. package/src/cmds/infrastructure/index.ts +0 -1
  106. package/src/cmds/infrastructure/sequencers.ts +0 -1
  107. package/src/cmds/l1/assume_proven_through.ts +4 -1
  108. package/src/cmds/l1/prover_stats.ts +36 -29
  109. package/src/cmds/l1/update_l1_validators.ts +2 -2
  110. package/src/cmds/misc/update/npm.ts +1 -1
  111. package/src/cmds/validator_keys/add.ts +20 -10
  112. package/src/cmds/validator_keys/generate_bls_keypair.ts +2 -1
  113. package/src/cmds/validator_keys/index.ts +67 -21
  114. package/src/cmds/validator_keys/new.ts +109 -23
  115. package/src/cmds/validator_keys/shared.ts +30 -26
  116. package/src/cmds/validator_keys/staker.ts +300 -0
  117. package/src/cmds/validator_keys/utils.ts +80 -0
  118. package/src/config/chain_l2_config.ts +86 -45
  119. package/src/config/network_config.ts +67 -29
  120. package/src/utils/inspect.ts +2 -1
@@ -0,0 +1,38 @@
1
+ import { GSEContract } from '@aztec/ethereum';
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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3Rha2VyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY21kcy92YWxpZGF0b3Jfa2V5cy9zdGFrZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFdBQVcsRUFBdUIsTUFBTSxpQkFBaUIsQ0FBQztBQUduRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVuRCxPQUFPLEtBQUssRUFFVixnQkFBZ0IsRUFLakIsTUFBTSw0QkFBNEIsQ0FBQztBQVFwQyxNQUFNLE1BQU0sYUFBYSxHQUFHO0lBQzFCLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixRQUFRLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbEIsTUFBTSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLFVBQVUsRUFBRSxVQUFVLENBQUM7SUFDdkIsU0FBUyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3BCLFNBQVMsRUFBRSxNQUFNLENBQUM7Q0FDbkIsQ0FBQztBQUVGLE1BQU0sTUFBTSxZQUFZLEdBQUc7SUFDekIsUUFBUSxFQUFFLE1BQU0sQ0FBQztJQUNqQixXQUFXLEVBQUU7UUFDWCxDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQ1YsQ0FBQyxFQUFFLE1BQU0sQ0FBQztLQUNYLENBQUM7SUFDRixXQUFXLEVBQUU7UUFDWCxFQUFFLEVBQUUsTUFBTSxDQUFDO1FBQ1gsRUFBRSxFQUFFLE1BQU0sQ0FBQztRQUNYLEVBQUUsRUFBRSxNQUFNLENBQUM7UUFDWCxFQUFFLEVBQUUsTUFBTSxDQUFDO0tBQ1osQ0FBQztJQUNGLGlCQUFpQixFQUFFO1FBQ2pCLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDVixDQUFDLEVBQUUsTUFBTSxDQUFDO0tBQ1gsQ0FBQztDQUNILENBQUM7QUEyS0Y7O0dBRUc7QUFDSCx3QkFBc0IsdUJBQXVCLENBQzNDLGdCQUFnQixFQUFFLGdCQUFnQixFQUNsQyxHQUFHLEVBQUUsV0FBVyxFQUNoQixRQUFRLENBQUMsRUFBRSxNQUFNLEdBQ2hCLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQXFCekI7QUFFRDs7R0FFRztBQUNILHdCQUFzQixrQkFBa0IsQ0FBQyxPQUFPLEVBQUUsYUFBYSxFQUFFLEdBQUcsRUFBRSxLQUFLLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQStDMUYifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"staker.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator_keys/staker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAuB,MAAM,iBAAiB,CAAC;AAGnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,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,207 @@
1
+ import { prettyPrintJSON } from '@aztec/cli/utils';
2
+ import { GSEContract, createEthereumChain } from '@aztec/ethereum';
3
+ import { computeBn254G1PublicKey, computeBn254G2PublicKey } from '@aztec/foundation/crypto';
4
+ import { decryptBn254Keystore } from '@aztec/foundation/crypto/bls/bn254_keystore';
5
+ import { Fr } from '@aztec/foundation/fields';
6
+ import { loadKeystoreFile } from '@aztec/node-keystore/loader';
7
+ import { Wallet } from '@ethersproject/wallet';
8
+ import { readFileSync, writeFileSync } from 'fs';
9
+ import { basename, dirname, join } from 'path';
10
+ import { createPublicClient, fallback, http } from 'viem';
11
+ import { privateKeyToAddress } from 'viem/accounts';
12
+ /**
13
+ * Check if an object is a MnemonicConfig
14
+ */ function isMnemonicConfig(obj) {
15
+ return typeof obj === 'object' && obj !== null && 'mnemonic' in obj;
16
+ }
17
+ /**
18
+ * Check if a value is an encrypted keystore file config
19
+ */ function isEncryptedKeyFileConfig(value) {
20
+ return typeof value === 'object' && value !== null && 'path' in value;
21
+ }
22
+ /**
23
+ * Check if a BLSAccount is a private key string (not an encrypted keystore file)
24
+ */ function isBlsPrivateKey(bls) {
25
+ return typeof bls === 'string' && bls.startsWith('0x');
26
+ }
27
+ /**
28
+ * Check if an EthAccount is a private key string (66 chars: 0x + 64 hex)
29
+ */ function isEthPrivateKey(eth) {
30
+ return typeof eth === 'string' && eth.startsWith('0x') && eth.length === 66;
31
+ }
32
+ /**
33
+ * Check if a string is an Ethereum address (42 chars: 0x + 40 hex)
34
+ */ function isEthAddress(value) {
35
+ return typeof value === 'string' && /^0x[0-9a-fA-F]{40}$/.test(value);
36
+ }
37
+ /**
38
+ * Decrypt a BLS private key from an encrypted keystore file
39
+ */ function decryptBlsKey(bls, password) {
40
+ if (isBlsPrivateKey(bls)) {
41
+ return bls;
42
+ }
43
+ if (isEncryptedKeyFileConfig(bls)) {
44
+ if (!password && !bls.password) {
45
+ return undefined; // Can't decrypt without password
46
+ }
47
+ const pwd = password ?? bls.password;
48
+ return decryptBn254Keystore(bls.path, pwd);
49
+ }
50
+ return undefined;
51
+ }
52
+ /**
53
+ * Decrypt an Ethereum private key from an encrypted keystore file
54
+ */ async function decryptEthKey(eth, password) {
55
+ if (isEthPrivateKey(eth)) {
56
+ return eth;
57
+ }
58
+ if (isEncryptedKeyFileConfig(eth)) {
59
+ if (!password && !eth.password) {
60
+ return undefined; // Can't decrypt without password
61
+ }
62
+ const pwd = password ?? eth.password;
63
+ const json = readFileSync(eth.path, 'utf-8');
64
+ const wallet = await Wallet.fromEncryptedJson(json, pwd);
65
+ return wallet.privateKey;
66
+ }
67
+ return undefined;
68
+ }
69
+ /**
70
+ * Extract Ethereum address from an EthAccount (or private key)
71
+ */ async function getEthAddress(eth, password) {
72
+ // Case 1: It's a private key string - derive the address
73
+ if (isEthPrivateKey(eth)) {
74
+ return privateKeyToAddress(eth);
75
+ }
76
+ // Case 2: It's just an address string directly (EthRemoteSignerAccount can be just EthAddress)
77
+ if (isEthAddress(eth)) {
78
+ return eth;
79
+ }
80
+ // Case 3: It's an object with an address property (remote signer config)
81
+ if (typeof eth === 'object' && eth !== null && 'address' in eth) {
82
+ return eth.address;
83
+ }
84
+ // Case 4: It's an encrypted keystore file - decrypt and derive address
85
+ if (isEncryptedKeyFileConfig(eth)) {
86
+ const privateKey = await decryptEthKey(eth, password);
87
+ if (privateKey) {
88
+ return privateKeyToAddress(privateKey);
89
+ }
90
+ return undefined;
91
+ }
92
+ return undefined;
93
+ }
94
+ /**
95
+ * Extract BLS private key and Ethereum address from an AttesterAccount
96
+ */ async function extractAttesterInfo(attester, password) {
97
+ // Case 1: attester is { eth: EthAccount, bls?: BLSAccount }
98
+ if (typeof attester === 'object' && attester !== null && 'eth' in attester) {
99
+ const ethAddress = await getEthAddress(attester.eth, password);
100
+ const blsPrivateKey = attester.bls ? decryptBlsKey(attester.bls, password) : undefined;
101
+ return {
102
+ blsPrivateKey,
103
+ ethAddress
104
+ };
105
+ }
106
+ // Case 2: attester is just an EthAccount directly (no BLS key)
107
+ return {
108
+ blsPrivateKey: undefined,
109
+ ethAddress: await getEthAddress(attester, password)
110
+ };
111
+ }
112
+ /**
113
+ * Process a single attester entry and output staking JSON
114
+ */ async function processAttester(attester, gse, password) {
115
+ const { blsPrivateKey, ethAddress } = await extractAttesterInfo(attester, password);
116
+ // Skip if no BLS private key or no Ethereum address
117
+ if (!blsPrivateKey || !ethAddress) {
118
+ return undefined;
119
+ }
120
+ // Derive G1 and G2 public keys
121
+ const g1PublicKey = await computeBn254G1PublicKey(blsPrivateKey);
122
+ const g2PublicKey = await computeBn254G2PublicKey(blsPrivateKey);
123
+ // Generate proof of possession
124
+ const bn254SecretKeyFieldElement = Fr.fromString(blsPrivateKey);
125
+ const registrationTuple = await gse.makeRegistrationTuple(bn254SecretKeyFieldElement.toBigInt());
126
+ return {
127
+ attester: String(ethAddress),
128
+ publicKeyG1: {
129
+ x: '0x' + g1PublicKey.x.toString(16).padStart(64, '0'),
130
+ y: '0x' + g1PublicKey.y.toString(16).padStart(64, '0')
131
+ },
132
+ publicKeyG2: {
133
+ x0: '0x' + g2PublicKey.x.c0.toString(16).padStart(64, '0'),
134
+ x1: '0x' + g2PublicKey.x.c1.toString(16).padStart(64, '0'),
135
+ y0: '0x' + g2PublicKey.y.c0.toString(16).padStart(64, '0'),
136
+ y1: '0x' + g2PublicKey.y.c1.toString(16).padStart(64, '0')
137
+ },
138
+ proofOfPossession: {
139
+ x: '0x' + registrationTuple.proofOfPossession.x.toString(16),
140
+ y: '0x' + registrationTuple.proofOfPossession.y.toString(16)
141
+ }
142
+ };
143
+ }
144
+ /**
145
+ * Process AttesterAccounts (which can be a single attester, array, or mnemonic)
146
+ */ export async function processAttesterAccounts(attesterAccounts, gse, password) {
147
+ // Skip mnemonic configs
148
+ if (isMnemonicConfig(attesterAccounts)) {
149
+ return [];
150
+ }
151
+ // Handle array of attesters
152
+ if (Array.isArray(attesterAccounts)) {
153
+ const results = [];
154
+ for (const attester of attesterAccounts){
155
+ const result = await processAttester(attester, gse, password);
156
+ if (result) {
157
+ results.push(result);
158
+ }
159
+ }
160
+ return results;
161
+ }
162
+ // Handle single attester
163
+ const result = await processAttester(attesterAccounts, gse, password);
164
+ return result ? [
165
+ result
166
+ ] : [];
167
+ }
168
+ /**
169
+ * Main staker command function
170
+ */ export async function generateStakerJson(options, log) {
171
+ const { from, password, gseAddress, l1RpcUrls, l1ChainId, output } = options;
172
+ // Load the keystore file
173
+ const keystore = loadKeystoreFile(from);
174
+ if (!gseAddress) {
175
+ throw new Error('GSE contract address is required');
176
+ }
177
+ log(`Calling GSE contract ${gseAddress} on chain ${l1ChainId}, using ${l1RpcUrls.join(', ')} to get staker outputs`);
178
+ if (!keystore.validators || keystore.validators.length === 0) {
179
+ log('No validators found in keystore');
180
+ return;
181
+ }
182
+ const allOutputs = [];
183
+ // L1 client for proof of possession
184
+ const chain = createEthereumChain(l1RpcUrls, l1ChainId);
185
+ const publicClient = createPublicClient({
186
+ chain: chain.chainInfo,
187
+ transport: fallback(l1RpcUrls.map((url)=>http(url)))
188
+ });
189
+ const gse = new GSEContract(publicClient, gseAddress);
190
+ const keystoreBaseName = basename(from, '.json');
191
+ const outputDir = output ? output : dirname(from);
192
+ for(let i = 0; i < keystore.validators.length; i++){
193
+ const validator = keystore.validators[i];
194
+ const outputs = await processAttesterAccounts(validator.attester, gse, password);
195
+ for(let j = 0; j < outputs.length; j++){
196
+ allOutputs.push(outputs[j]);
197
+ }
198
+ }
199
+ if (allOutputs.length === 0) {
200
+ log('No attesters with BLS keys found (skipping mnemonics and encrypted keystores without password)');
201
+ return;
202
+ }
203
+ // Write a single JSON file with all staker outputs
204
+ const stakerOutputPath = join(outputDir, `${keystoreBaseName}_staker_output.json`);
205
+ writeFileSync(stakerOutputPath, prettyPrintJSON(allOutputs), 'utf-8');
206
+ log(`Wrote staker output for ${allOutputs.length} validator(s) to ${stakerOutputPath}`);
207
+ }
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL3ZhbGlkYXRvcl9rZXlzL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBR2hFLGVBQU8sTUFBTSxjQUFjLHVCQUF1QixDQUFDO0FBRW5ELHdCQUFnQixzQkFBc0IsQ0FBQyxPQUFPLEVBQUU7SUFDOUMsS0FBSyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2YsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3hCLFlBQVksQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN0QixZQUFZLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDdEIsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLEdBQUcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNkLFFBV0E7QUFFRCx3QkFBZ0IsMkJBQTJCLENBQUMsT0FBTyxFQUFFO0lBQ25ELFlBQVksQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUN2QixVQUFVLENBQUMsRUFBRSxVQUFVLENBQUM7SUFDeEIsU0FBUyxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDckIsU0FBUyxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3BCLFFBZUE7QUFFRCx3QkFBZ0IsMkJBQTJCLENBQUMsT0FBTyxFQUFFO0lBQUUsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQUMsUUFBUSxDQUFDLEVBQUUsTUFBTSxDQUFBO0NBQUUsUUFNaEc7QUFFRCx3QkFBZ0Isd0JBQXdCLENBQUMsT0FBTyxFQUFFO0lBQUUsVUFBVSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFBQyxjQUFjLENBQUMsRUFBRSxNQUFNLENBQUE7Q0FBRSxRQXdCbkcifQ==
@@ -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;AAGhE,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';
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
+ }
@@ -15,4 +15,4 @@ export interface CachedFetchOptions {
15
15
  * @returns The fetched and parsed JSON data, or undefined if fetch fails and throwOnError is false
16
16
  */
17
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=cached_fetch.d.ts.map
18
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGVkX2ZldGNoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NhY2hlZF9mZXRjaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxNQUFNLFdBQVcsa0JBQWtCO0lBQ2pDLHFDQUFxQztJQUNyQyxlQUFlLEVBQUUsTUFBTSxDQUFDO0lBQ3hCLHFCQUFxQjtJQUNyQixTQUFTLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDcEI7QUFFRDs7Ozs7Ozs7O0dBU0c7QUFDSCx3QkFBc0IsV0FBVyxDQUFDLENBQUMsR0FBRyxHQUFHLEVBQ3ZDLEdBQUcsRUFBRSxNQUFNLEVBQ1gsT0FBTyxFQUFFLGtCQUFrQixFQUMzQixLQUFLLDBCQUFtQixFQUN4QixHQUFHLHVDQUErQixHQUNqQyxPQUFPLENBQUMsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxDQXVDeEIifQ==
@@ -1,26 +1,26 @@
1
- import { type L1ContractsConfig } from '@aztec/ethereum';
1
+ import { type L1ContractsConfig, type L1TxUtilsConfig } from '@aztec/ethereum';
2
2
  import type { NetworkNames } from '@aztec/foundation/config';
3
3
  import type { SharedNodeConfig } from '@aztec/node-lib/config';
4
- import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
5
- export type L2ChainConfig = L1ContractsConfig & Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways'> & {
4
+ import type { P2PConfig } from '@aztec/p2p';
5
+ import type { SequencerConfig, SlasherConfig } from '@aztec/stdlib/interfaces/server';
6
+ export type L2ChainConfig = Omit<L1ContractsConfig, keyof L1TxUtilsConfig> & Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways' | 'slashOverridePayload' | 'slashSelfAllowed'> & Pick<P2PConfig, 'bootstrapNodes' | 'p2pEnabled' | 'txPoolDeleteTxsAfterReorg'> & Pick<SequencerConfig, 'minTxsPerBlock' | 'maxTxsPerBlock'> & {
6
7
  l1ChainId: number;
7
8
  testAccounts: boolean;
8
9
  sponsoredFPC: boolean;
9
- p2pEnabled: boolean;
10
- p2pBootstrapNodes: string[];
11
- seqMinTxsPerBlock: number;
12
- seqMaxTxsPerBlock: number;
10
+ minTxsPerBlock: number;
11
+ maxTxsPerBlock: number;
13
12
  realProofs: boolean;
14
13
  snapshotsUrls: string[];
15
14
  autoUpdate: SharedNodeConfig['autoUpdate'];
16
15
  autoUpdateUrl?: string;
17
16
  maxTxPoolSize: number;
17
+ publicMetricsOptOut: boolean;
18
18
  publicIncludeMetrics?: string[];
19
19
  publicMetricsCollectorUrl?: string;
20
20
  publicMetricsCollectFrom?: string[];
21
21
  skipArchiverInitialSync?: boolean;
22
22
  blobAllowEmptySources?: boolean;
23
- dbMapSizeKb: number;
23
+ dataStoreMapSizeKb: number;
24
24
  archiverStoreMapSizeKb: number;
25
25
  noteHashTreeMapSizeKb: number;
26
26
  nullifierTreeMapSizeKb: number;
@@ -35,5 +35,6 @@ export declare const testnetL2ChainConfig: L2ChainConfig;
35
35
  export declare const mainnetL2ChainConfig: L2ChainConfig;
36
36
  export declare const devnetL2ChainConfig: L2ChainConfig;
37
37
  export declare function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | undefined;
38
- export declare function enrichEnvironmentWithChainConfig(networkName: NetworkNames): void;
39
- //# sourceMappingURL=chain_l2_config.d.ts.map
38
+ export declare function enrichEnvironmentWithChainName(networkName: NetworkNames): void;
39
+ export declare function enrichEnvironmentWithChainConfig(config: L2ChainConfig): void;
40
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW5fbDJfY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NoYWluX2wyX2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTRCLEtBQUssaUJBQWlCLEVBQUUsS0FBSyxlQUFlLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6RyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU3RCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUM1QyxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsYUFBYSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFZdEYsTUFBTSxNQUFNLGFBQWEsR0FBRyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsTUFBTSxlQUFlLENBQUMsR0FDeEUsSUFBSSxDQUFDLGFBQWEsRUFBRSxzQkFBc0IsR0FBRyx1QkFBdUIsR0FBRyxzQkFBc0IsR0FBRyxrQkFBa0IsQ0FBQyxHQUNuSCxJQUFJLENBQUMsU0FBUyxFQUFFLGdCQUFnQixHQUFHLFlBQVksR0FBRywyQkFBMkIsQ0FBQyxHQUM5RSxJQUFJLENBQUMsZUFBZSxFQUFFLGdCQUFnQixHQUFHLGdCQUFnQixDQUFDLEdBQUc7SUFDM0QsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLFlBQVksRUFBRSxPQUFPLENBQUM7SUFDdEIsY0FBYyxFQUFFLE1BQU0sQ0FBQztJQUN2QixjQUFjLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLFVBQVUsRUFBRSxPQUFPLENBQUM7SUFDcEIsYUFBYSxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3hCLFVBQVUsRUFBRSxnQkFBZ0IsQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUMzQyxhQUFhLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDdkIsYUFBYSxFQUFFLE1BQU0sQ0FBQztJQUN0QixtQkFBbUIsRUFBRSxPQUFPLENBQUM7SUFDN0Isb0JBQW9CLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNoQyx5QkFBeUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNuQyx3QkFBd0IsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3BDLHVCQUF1QixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQ2xDLHFCQUFxQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBSWhDLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztJQUMzQixzQkFBc0IsRUFBRSxNQUFNLENBQUM7SUFDL0IscUJBQXFCLEVBQUUsTUFBTSxDQUFDO0lBQzlCLHNCQUFzQixFQUFFLE1BQU0sQ0FBQztJQUMvQix1QkFBdUIsRUFBRSxNQUFNLENBQUM7SUFHaEMsZUFBZSxFQUFFLE9BQU8sQ0FBQztJQUN6QixtQkFBbUIsRUFBRSxPQUFPLENBQUM7Q0FDOUIsQ0FBQztBQStDSixlQUFPLE1BQU0sNEJBQTRCLEVBQUUsYUFtRjFDLENBQUM7QUFFRixlQUFPLE1BQU0sMEJBQTBCLEVBQUUsYUF1RHhDLENBQUM7QUFFRixlQUFPLE1BQU0sb0JBQW9CLEVBQUUsYUF1RGxDLENBQUM7QUFFRixlQUFPLE1BQU0sb0JBQW9CLEVBQUUsYUF5RmxDLENBQUM7QUFFRixlQUFPLE1BQU0sb0JBQW9CLEVBQUUsYUF3RmxDLENBQUM7QUFFRixlQUFPLE1BQU0sbUJBQW1CLEVBQUUsYUF1RGpDLENBQUM7QUFFRix3QkFBZ0IsZ0JBQWdCLENBQUMsV0FBVyxFQUFFLFlBQVksR0FBRyxhQUFhLEdBQUcsU0FBUyxDQWdCckY7QUFNRCx3QkFBZ0IsOEJBQThCLENBQUMsV0FBVyxFQUFFLFlBQVksUUFhdkU7QUFFRCx3QkFBZ0IsZ0NBQWdDLENBQUMsTUFBTSxFQUFFLGFBQWEsUUFpR3JFIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAYrE,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAC3C,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,CAAC,GAAG;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAIhC,WAAW,EAAE,MAAM,CAAC;IACpB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAGhC,eAAe,EAAE,OAAO,CAAC;IACzB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AA+CJ,eAAO,MAAM,4BAA4B,EAAE,aA8E1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAmDxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAmDlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAqFlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAkFlC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,aAmDjC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,SAAS,CAgBrF;AAMD,wBAAgB,gCAAgC,CAAC,WAAW,EAAE,YAAY,QAoGzE"}
1
+ {"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACzG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAYtF,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,EAAE,MAAM,eAAe,CAAC,GACxE,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,GAAG,sBAAsB,GAAG,kBAAkB,CAAC,GACnH,IAAI,CAAC,SAAS,EAAE,gBAAgB,GAAG,YAAY,GAAG,2BAA2B,CAAC,GAC9E,IAAI,CAAC,eAAe,EAAE,gBAAgB,GAAG,gBAAgB,CAAC,GAAG;IAC3D,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAIhC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAGhC,eAAe,EAAE,OAAO,CAAC;IACzB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AA+CJ,eAAO,MAAM,4BAA4B,EAAE,aAmF1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAuDxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAuDlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAyFlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAwFlC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,aAuDjC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,SAAS,CAgBrF;AAMD,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,YAAY,QAavE;AAED,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,aAAa,QAiGrE"}