@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.
Files changed (252) hide show
  1. package/README.md +2 -428
  2. package/dest/cmds/aztec_node/block_number.d.ts +3 -0
  3. package/dest/cmds/aztec_node/block_number.d.ts.map +1 -0
  4. package/dest/cmds/aztec_node/block_number.js +10 -0
  5. package/dest/cmds/aztec_node/get_block.d.ts +3 -0
  6. package/dest/cmds/aztec_node/get_block.d.ts.map +1 -0
  7. package/dest/cmds/aztec_node/get_block.js +10 -0
  8. package/dest/cmds/aztec_node/get_current_min_fee.d.ts +3 -0
  9. package/dest/cmds/aztec_node/get_current_min_fee.d.ts.map +1 -0
  10. package/dest/cmds/aztec_node/get_current_min_fee.js +7 -0
  11. package/dest/cmds/aztec_node/get_l1_to_l2_message_witness.d.ts +5 -0
  12. package/dest/cmds/aztec_node/get_l1_to_l2_message_witness.d.ts.map +1 -0
  13. package/dest/cmds/aztec_node/get_l1_to_l2_message_witness.js +12 -0
  14. package/dest/cmds/aztec_node/get_logs.d.ts +7 -0
  15. package/dest/cmds/aztec_node/get_logs.d.ts.map +1 -0
  16. package/dest/cmds/{pxe → aztec_node}/get_logs.js +4 -4
  17. package/dest/cmds/aztec_node/get_node_info.d.ts +3 -0
  18. package/dest/cmds/aztec_node/get_node_info.d.ts.map +1 -0
  19. package/dest/cmds/{pxe → aztec_node}/get_node_info.js +3 -8
  20. package/dest/cmds/aztec_node/index.d.ts +4 -0
  21. package/dest/cmds/aztec_node/index.d.ts.map +1 -0
  22. package/dest/cmds/aztec_node/index.js +28 -0
  23. package/dest/cmds/contracts/index.d.ts +1 -1
  24. package/dest/cmds/contracts/inspect_contract.d.ts +1 -1
  25. package/dest/cmds/contracts/inspect_contract.d.ts.map +1 -1
  26. package/dest/cmds/contracts/inspect_contract.js +4 -10
  27. package/dest/cmds/contracts/parse_parameter_struct.d.ts +1 -1
  28. package/dest/cmds/infrastructure/index.d.ts +3 -3
  29. package/dest/cmds/infrastructure/index.d.ts.map +1 -1
  30. package/dest/cmds/infrastructure/index.js +7 -9
  31. package/dest/cmds/infrastructure/sequencers.d.ts +3 -5
  32. package/dest/cmds/infrastructure/sequencers.d.ts.map +1 -1
  33. package/dest/cmds/infrastructure/sequencers.js +15 -7
  34. package/dest/cmds/infrastructure/setup_l2_contract.d.ts +2 -2
  35. package/dest/cmds/infrastructure/setup_l2_contract.d.ts.map +1 -1
  36. package/dest/cmds/infrastructure/setup_l2_contract.js +10 -25
  37. package/dest/cmds/l1/advance_epoch.d.ts +2 -2
  38. package/dest/cmds/l1/advance_epoch.d.ts.map +1 -1
  39. package/dest/cmds/l1/advance_epoch.js +6 -5
  40. package/dest/cmds/l1/assume_proven_through.d.ts +2 -2
  41. package/dest/cmds/l1/assume_proven_through.d.ts.map +1 -1
  42. package/dest/cmds/l1/assume_proven_through.js +8 -6
  43. package/dest/cmds/l1/bridge_erc20.d.ts +2 -2
  44. package/dest/cmds/l1/bridge_erc20.d.ts.map +1 -1
  45. package/dest/cmds/l1/bridge_erc20.js +3 -2
  46. package/dest/cmds/l1/create_l1_account.d.ts +1 -1
  47. package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts +4 -0
  48. package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts.map +1 -0
  49. package/dest/cmds/l1/{deploy_l1_contracts.js → deploy_l1_contracts_cmd.js} +42 -7
  50. package/dest/cmds/l1/deploy_new_rollup.d.ts +4 -4
  51. package/dest/cmds/l1/deploy_new_rollup.d.ts.map +1 -1
  52. package/dest/cmds/l1/deploy_new_rollup.js +5 -5
  53. package/dest/cmds/l1/get_l1_addresses.d.ts +2 -2
  54. package/dest/cmds/l1/get_l1_addresses.d.ts.map +1 -1
  55. package/dest/cmds/l1/get_l1_addresses.js +5 -2
  56. package/dest/cmds/l1/get_l1_balance.d.ts +1 -1
  57. package/dest/cmds/l1/get_l1_balance.js +4 -2
  58. package/dest/cmds/l1/governance_utils.d.ts +5 -5
  59. package/dest/cmds/l1/governance_utils.d.ts.map +1 -1
  60. package/dest/cmds/l1/governance_utils.js +3 -1
  61. package/dest/cmds/l1/index.d.ts +1 -2
  62. package/dest/cmds/l1/index.d.ts.map +1 -1
  63. package/dest/cmds/l1/index.js +22 -36
  64. package/dest/cmds/l1/prover_stats.d.ts +1 -1
  65. package/dest/cmds/l1/prover_stats.d.ts.map +1 -1
  66. package/dest/cmds/l1/prover_stats.js +32 -30
  67. package/dest/cmds/l1/trigger_seed_snapshot.d.ts +2 -2
  68. package/dest/cmds/l1/trigger_seed_snapshot.d.ts.map +1 -1
  69. package/dest/cmds/l1/trigger_seed_snapshot.js +2 -1
  70. package/dest/cmds/l1/update_l1_validators.d.ts +10 -5
  71. package/dest/cmds/l1/update_l1_validators.d.ts.map +1 -1
  72. package/dest/cmds/l1/update_l1_validators.js +74 -9
  73. package/dest/cmds/misc/compute_selector.d.ts +1 -1
  74. package/dest/cmds/misc/example_contracts.d.ts +1 -1
  75. package/dest/cmds/misc/generate_bootnode_enr.d.ts +1 -1
  76. package/dest/cmds/misc/generate_p2p_private_key.d.ts +1 -1
  77. package/dest/cmds/misc/generate_secret_and_hash.d.ts +1 -1
  78. package/dest/cmds/misc/generate_secret_and_hash.js +2 -2
  79. package/dest/cmds/misc/generate_secret_key.d.ts +2 -2
  80. package/dest/cmds/misc/generate_secret_key.d.ts.map +1 -1
  81. package/dest/cmds/misc/generate_secret_key.js +1 -1
  82. package/dest/cmds/misc/get_canonical_sponsored_fpc_address.d.ts +1 -1
  83. package/dest/cmds/misc/index.d.ts +1 -1
  84. package/dest/cmds/misc/index.d.ts.map +1 -1
  85. package/dest/cmds/misc/index.js +1 -1
  86. package/dest/cmds/misc/update/common.d.ts +1 -1
  87. package/dest/cmds/misc/update/github.d.ts +1 -1
  88. package/dest/cmds/misc/update/noir.d.ts +1 -1
  89. package/dest/cmds/misc/update/npm.d.ts +1 -1
  90. package/dest/cmds/misc/update/npm.js +1 -1
  91. package/dest/cmds/misc/update/utils.d.ts +1 -1
  92. package/dest/cmds/misc/update.d.ts +1 -1
  93. package/dest/cmds/validator_keys/add.d.ts +5 -0
  94. package/dest/cmds/validator_keys/add.d.ts.map +1 -0
  95. package/dest/cmds/validator_keys/add.js +83 -0
  96. package/dest/cmds/validator_keys/generate_bls_keypair.d.ts +12 -0
  97. package/dest/cmds/validator_keys/generate_bls_keypair.d.ts.map +1 -0
  98. package/dest/cmds/validator_keys/generate_bls_keypair.js +27 -0
  99. package/dest/cmds/validator_keys/index.d.ts +4 -0
  100. package/dest/cmds/validator_keys/index.d.ts.map +1 -0
  101. package/dest/cmds/validator_keys/index.js +32 -0
  102. package/dest/cmds/validator_keys/new.d.ts +29 -0
  103. package/dest/cmds/validator_keys/new.d.ts.map +1 -0
  104. package/dest/cmds/validator_keys/new.js +134 -0
  105. package/dest/cmds/validator_keys/shared.d.ts +68 -0
  106. package/dest/cmds/validator_keys/shared.d.ts.map +1 -0
  107. package/dest/cmds/validator_keys/shared.js +274 -0
  108. package/dest/cmds/validator_keys/staker.d.ts +38 -0
  109. package/dest/cmds/validator_keys/staker.d.ts.map +1 -0
  110. package/dest/cmds/validator_keys/staker.js +210 -0
  111. package/dest/cmds/validator_keys/utils.d.ts +25 -0
  112. package/dest/cmds/validator_keys/utils.d.ts.map +1 -0
  113. package/dest/cmds/validator_keys/utils.js +52 -0
  114. package/dest/config/cached_fetch.d.ts +18 -0
  115. package/dest/config/cached_fetch.d.ts.map +1 -0
  116. package/dest/config/cached_fetch.js +54 -0
  117. package/dest/config/chain_l2_config.d.ts +41 -0
  118. package/dest/config/chain_l2_config.d.ts.map +1 -0
  119. package/dest/config/chain_l2_config.js +524 -0
  120. package/dest/config/enrich_env.d.ts +4 -0
  121. package/dest/config/enrich_env.d.ts.map +1 -0
  122. package/dest/config/enrich_env.js +12 -0
  123. package/dest/config/get_l1_config.d.ts +9 -0
  124. package/dest/config/get_l1_config.d.ts.map +1 -0
  125. package/dest/config/get_l1_config.js +24 -0
  126. package/dest/config/index.d.ts +5 -0
  127. package/dest/config/index.d.ts.map +1 -0
  128. package/dest/config/index.js +4 -0
  129. package/dest/config/network_config.d.ts +22 -0
  130. package/dest/config/network_config.d.ts.map +1 -0
  131. package/dest/config/network_config.js +115 -0
  132. package/dest/utils/aztec.d.ts +8 -20
  133. package/dest/utils/aztec.d.ts.map +1 -1
  134. package/dest/utils/aztec.js +22 -67
  135. package/dest/utils/commands.d.ts +21 -12
  136. package/dest/utils/commands.d.ts.map +1 -1
  137. package/dest/utils/commands.js +38 -11
  138. package/dest/utils/encoding.d.ts +1 -1
  139. package/dest/utils/encoding.js +1 -1
  140. package/dest/utils/github.d.ts +1 -1
  141. package/dest/utils/index.d.ts +1 -1
  142. package/dest/utils/inspect.d.ts +5 -11
  143. package/dest/utils/inspect.d.ts.map +1 -1
  144. package/dest/utils/inspect.js +13 -95
  145. package/dest/utils/setup_contracts.d.ts +2 -4
  146. package/dest/utils/setup_contracts.d.ts.map +1 -1
  147. package/dest/utils/setup_contracts.js +2 -22
  148. package/package.json +43 -28
  149. package/public_include_metric_prefixes.json +1 -0
  150. package/src/cmds/aztec_node/block_number.ts +9 -0
  151. package/src/cmds/aztec_node/get_block.ts +11 -0
  152. package/src/cmds/aztec_node/get_current_min_fee.ts +9 -0
  153. package/src/cmds/aztec_node/get_l1_to_l2_message_witness.ts +27 -0
  154. package/src/cmds/{pxe → aztec_node}/get_logs.ts +11 -9
  155. package/src/cmds/{pxe → aztec_node}/get_node_info.ts +5 -16
  156. package/src/cmds/aztec_node/index.ts +87 -0
  157. package/src/cmds/contracts/inspect_contract.ts +4 -11
  158. package/src/cmds/infrastructure/index.ts +7 -18
  159. package/src/cmds/infrastructure/sequencers.ts +13 -11
  160. package/src/cmds/infrastructure/setup_l2_contract.ts +13 -30
  161. package/src/cmds/l1/advance_epoch.ts +6 -5
  162. package/src/cmds/l1/assume_proven_through.ts +10 -6
  163. package/src/cmds/l1/bridge_erc20.ts +5 -2
  164. package/src/cmds/l1/{deploy_l1_contracts.ts → deploy_l1_contracts_cmd.ts} +44 -24
  165. package/src/cmds/l1/deploy_new_rollup.ts +6 -9
  166. package/src/cmds/l1/get_l1_addresses.ts +5 -3
  167. package/src/cmds/l1/get_l1_balance.ts +2 -2
  168. package/src/cmds/l1/governance_utils.ts +3 -8
  169. package/src/cmds/l1/index.ts +28 -66
  170. package/src/cmds/l1/prover_stats.ts +42 -31
  171. package/src/cmds/l1/trigger_seed_snapshot.ts +2 -1
  172. package/src/cmds/l1/update_l1_validators.ts +88 -18
  173. package/src/cmds/misc/generate_secret_and_hash.ts +2 -2
  174. package/src/cmds/misc/generate_secret_key.ts +1 -1
  175. package/src/cmds/misc/index.ts +1 -1
  176. package/src/cmds/misc/update/npm.ts +1 -1
  177. package/src/cmds/validator_keys/add.ts +123 -0
  178. package/src/cmds/validator_keys/generate_bls_keypair.ts +34 -0
  179. package/src/cmds/validator_keys/index.ts +142 -0
  180. package/src/cmds/validator_keys/new.ts +207 -0
  181. package/src/cmds/validator_keys/shared.ts +326 -0
  182. package/src/cmds/validator_keys/staker.ts +301 -0
  183. package/src/cmds/validator_keys/utils.ts +81 -0
  184. package/src/config/cached_fetch.ts +67 -0
  185. package/src/config/chain_l2_config.ts +694 -0
  186. package/src/config/enrich_env.ts +15 -0
  187. package/src/config/get_l1_config.ts +31 -0
  188. package/src/config/index.ts +4 -0
  189. package/src/config/network_config.ts +147 -0
  190. package/src/utils/aztec.ts +27 -118
  191. package/src/utils/commands.ts +52 -15
  192. package/src/utils/encoding.ts +1 -1
  193. package/src/utils/inspect.ts +19 -111
  194. package/src/utils/setup_contracts.ts +4 -43
  195. package/dest/cmds/devnet/bootstrap_network.d.ts +0 -3
  196. package/dest/cmds/devnet/bootstrap_network.d.ts.map +0 -1
  197. package/dest/cmds/devnet/bootstrap_network.js +0 -216
  198. package/dest/cmds/devnet/faucet.d.ts +0 -4
  199. package/dest/cmds/devnet/faucet.d.ts.map +0 -1
  200. package/dest/cmds/devnet/faucet.js +0 -26
  201. package/dest/cmds/devnet/index.d.ts +0 -4
  202. package/dest/cmds/devnet/index.d.ts.map +0 -1
  203. package/dest/cmds/devnet/index.js +0 -14
  204. package/dest/cmds/l1/deploy_l1_contracts.d.ts +0 -4
  205. package/dest/cmds/l1/deploy_l1_contracts.d.ts.map +0 -1
  206. package/dest/cmds/pxe/add_contract.d.ts +0 -5
  207. package/dest/cmds/pxe/add_contract.d.ts.map +0 -1
  208. package/dest/cmds/pxe/add_contract.js +0 -29
  209. package/dest/cmds/pxe/block_number.d.ts +0 -3
  210. package/dest/cmds/pxe/block_number.d.ts.map +0 -1
  211. package/dest/cmds/pxe/block_number.js +0 -10
  212. package/dest/cmds/pxe/get_account.d.ts +0 -4
  213. package/dest/cmds/pxe/get_account.d.ts.map +0 -1
  214. package/dest/cmds/pxe/get_account.js +0 -10
  215. package/dest/cmds/pxe/get_accounts.d.ts +0 -3
  216. package/dest/cmds/pxe/get_accounts.d.ts.map +0 -1
  217. package/dest/cmds/pxe/get_accounts.js +0 -25
  218. package/dest/cmds/pxe/get_block.d.ts +0 -3
  219. package/dest/cmds/pxe/get_block.d.ts.map +0 -1
  220. package/dest/cmds/pxe/get_block.js +0 -9
  221. package/dest/cmds/pxe/get_contract_data.d.ts +0 -4
  222. package/dest/cmds/pxe/get_contract_data.d.ts.map +0 -1
  223. package/dest/cmds/pxe/get_contract_data.js +0 -31
  224. package/dest/cmds/pxe/get_current_base_fee.d.ts +0 -3
  225. package/dest/cmds/pxe/get_current_base_fee.d.ts.map +0 -1
  226. package/dest/cmds/pxe/get_current_base_fee.js +0 -7
  227. package/dest/cmds/pxe/get_l1_to_l2_message_witness.d.ts +0 -4
  228. package/dest/cmds/pxe/get_l1_to_l2_message_witness.d.ts.map +0 -1
  229. package/dest/cmds/pxe/get_l1_to_l2_message_witness.js +0 -11
  230. package/dest/cmds/pxe/get_logs.d.ts +0 -4
  231. package/dest/cmds/pxe/get_logs.d.ts.map +0 -1
  232. package/dest/cmds/pxe/get_node_info.d.ts +0 -3
  233. package/dest/cmds/pxe/get_node_info.d.ts.map +0 -1
  234. package/dest/cmds/pxe/get_pxe_info.d.ts +0 -3
  235. package/dest/cmds/pxe/get_pxe_info.d.ts.map +0 -1
  236. package/dest/cmds/pxe/get_pxe_info.js +0 -11
  237. package/dest/cmds/pxe/index.d.ts +0 -4
  238. package/dest/cmds/pxe/index.d.ts.map +0 -1
  239. package/dest/cmds/pxe/index.js +0 -55
  240. package/src/cmds/devnet/bootstrap_network.ts +0 -321
  241. package/src/cmds/devnet/faucet.ts +0 -33
  242. package/src/cmds/devnet/index.ts +0 -60
  243. package/src/cmds/pxe/add_contract.ts +0 -41
  244. package/src/cmds/pxe/block_number.ts +0 -9
  245. package/src/cmds/pxe/get_account.ts +0 -16
  246. package/src/cmds/pxe/get_accounts.ts +0 -35
  247. package/src/cmds/pxe/get_block.ts +0 -10
  248. package/src/cmds/pxe/get_contract_data.ts +0 -51
  249. package/src/cmds/pxe/get_current_base_fee.ts +0 -9
  250. package/src/cmds/pxe/get_l1_to_l2_message_witness.ts +0 -25
  251. package/src/cmds/pxe/get_pxe_info.ts +0 -13
  252. package/src/cmds/pxe/index.ts +0 -170
@@ -31,4 +31,4 @@ export declare function updateAztecDeps(projectPath: string, aztecVersion: SemVe
31
31
  * @param projectPath - Path to Nodejs project
32
32
  */
33
33
  export declare function updateLockfile(projectPath: string, log: LogFn): void;
34
- //# sourceMappingURL=npm.d.ts.map
34
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY21kcy9taXNjL3VwZGF0ZS9ucG0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFNbkQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFTLE1BQU0sUUFBUSxDQUFDO0FBRTVDLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBWXJEOzs7O0dBSUc7QUFDSCx3QkFBc0IsZUFBZSxDQUFDLFdBQVcsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDO0lBQ2xFLG1CQUFtQjtJQUNuQixZQUFZLENBQUMsRUFBRSxNQUFNLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ3RDLHNCQUFzQjtJQUN0QixlQUFlLENBQUMsRUFBRSxNQUFNLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0NBQzFDLENBQUMsQ0FLRDtBQUVEOzs7OztHQUtHO0FBQ0gsd0JBQXNCLGdCQUFnQixDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsT0FBTyxTQUFXLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQWMvRjtBQUVEOzs7OztHQUtHO0FBQ0gsd0JBQXNCLGVBQWUsQ0FDbkMsV0FBVyxFQUFFLE1BQU0sRUFDbkIsWUFBWSxFQUFFLE1BQU0sRUFDcEIsR0FBRyxFQUFFLEtBQUssR0FDVCxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0F1RDVCO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLGNBQWMsQ0FBQyxXQUFXLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxLQUFLLEdBQUcsSUFBSSxDQXVCcEUifQ==
@@ -6,7 +6,7 @@ import { parse } from 'semver';
6
6
  import { atomicUpdateFile } from './utils.js';
7
7
  const deprecatedNpmPackages = new Set([
8
8
  '@aztec/cli',
9
- '@aztec/aztec-sandbox'
9
+ '@aztec/aztec-local-network'
10
10
  ]);
11
11
  const npmDeprecationMessage = `
12
12
  The following packages have been deprecated and will no longer be updated on the npm registry:
@@ -11,4 +11,4 @@ export declare function atomicUpdateFile(filePath: string, contents: string): Pr
11
11
  * @returns The Nargo.toml contents as a string
12
12
  */
13
13
  export declare function prettyPrintNargoToml(config: NoirPackageConfig): string;
14
- //# sourceMappingURL=utils.d.ts.map
14
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9jbWRzL21pc2MvdXBkYXRlL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFNaEU7Ozs7R0FJRztBQUNILHdCQUFzQixnQkFBZ0IsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQXFCeEU7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQWdCLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxpQkFBaUIsR0FBRyxNQUFNLENBVXRFIn0=
@@ -1,3 +1,3 @@
1
1
  import type { LogFn } from '@aztec/foundation/log';
2
2
  export declare function updateProject(projectPath: string, contracts: string[], aztecVersion: string, log: LogFn): Promise<void>;
3
- //# sourceMappingURL=update.d.ts.map
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY21kcy9taXNjL3VwZGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQVluRCx3QkFBc0IsYUFBYSxDQUNqQyxXQUFXLEVBQUUsTUFBTSxFQUNuQixTQUFTLEVBQUUsTUFBTSxFQUFFLEVBQ25CLFlBQVksRUFBRSxNQUFNLEVBQ3BCLEdBQUcsRUFBRSxLQUFLLEdBQ1QsT0FBTyxDQUFDLElBQUksQ0FBQyxDQTJDZiJ9
@@ -0,0 +1,5 @@
1
+ import type { LogFn } from '@aztec/foundation/log';
2
+ import type { NewValidatorKeystoreOptions } from './new.js';
3
+ export type AddValidatorKeysOptions = NewValidatorKeystoreOptions;
4
+ export declare function addValidatorKeys(existing: string, options: AddValidatorKeysOptions, log: LogFn): Promise<void>;
5
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY21kcy92YWxpZGF0b3Jfa2V5cy9hZGQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFRbkQsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFXNUQsTUFBTSxNQUFNLHVCQUF1QixHQUFHLDJCQUEyQixDQUFDO0FBRWxFLHdCQUFzQixnQkFBZ0IsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxHQUFHLEVBQUUsS0FBSyxpQkFvR3BHIn0=
@@ -0,0 +1 @@
1
+ {"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator_keys/add.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAQnD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAW5D,MAAM,MAAM,uBAAuB,GAAG,2BAA2B,CAAC;AAElE,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,EAAE,GAAG,EAAE,KAAK,iBAoGpG"}
@@ -0,0 +1,83 @@
1
+ import { loadKeystoreFile } from '@aztec/node-keystore/loader';
2
+ import { wordlist } from '@scure/bip39/wordlists/english.js';
3
+ import { dirname, isAbsolute, join } from 'path';
4
+ import { generateMnemonic } from 'viem/accounts';
5
+ import { buildValidatorEntries, logValidatorSummaries, maybePrintJson, writeBlsBn254ToFile, writeEthJsonV3ToFile, writeKeystoreFile } from './shared.js';
6
+ import { validateBlsPathOptions, validatePublisherOptions, validateRemoteSignerOptions } from './utils.js';
7
+ export async function addValidatorKeys(existing, options, log) {
8
+ // validate bls-path inputs before proceeding with key generation
9
+ validateBlsPathOptions(options);
10
+ // validate publisher options
11
+ validatePublisherOptions(options);
12
+ // validate remote signer options
13
+ validateRemoteSignerOptions(options);
14
+ const { dataDir, file, count, publisherCount = 0, publishers, mnemonic, accountIndex = 0, addressIndex, ikm, blsPath, json, feeRecipient: feeRecipientOpt, coinbase: coinbaseOpt, remoteSigner: remoteSignerOpt, password, encryptedKeystoreDir } = options;
15
+ const validatorCount = typeof count === 'number' && Number.isFinite(count) && count > 0 ? Math.floor(count) : 1;
16
+ const baseAddressIndex = addressIndex ?? 0;
17
+ const keystore = loadKeystoreFile(existing);
18
+ if (!keystore.validators || !Array.isArray(keystore.validators)) {
19
+ throw new Error('Invalid keystore: missing validators array');
20
+ }
21
+ const first = keystore.validators[0] ?? {};
22
+ const feeRecipient = feeRecipientOpt ?? first.feeRecipient;
23
+ if (!feeRecipient) {
24
+ throw new Error('feeRecipient is required (either present in existing file or via --fee-recipient)');
25
+ }
26
+ const coinbase = coinbaseOpt ?? first.coinbase;
27
+ const derivedRemoteSigner = first.attester?.remoteSignerUrl || first.attester?.eth?.remoteSignerUrl;
28
+ const remoteSigner = remoteSignerOpt ?? derivedRemoteSigner;
29
+ // Ensure we always have a mnemonic for key derivation if none was provided
30
+ const mnemonicToUse = mnemonic ?? generateMnemonic(wordlist);
31
+ // If user explicitly provided --address-index, use it as-is. Otherwise, append after existing validators.
32
+ const effectiveBaseAddressIndex = addressIndex === undefined ? baseAddressIndex + keystore.validators.length : baseAddressIndex;
33
+ const { validators, summaries } = await buildValidatorEntries({
34
+ validatorCount,
35
+ publisherCount,
36
+ publishers,
37
+ accountIndex,
38
+ baseAddressIndex: effectiveBaseAddressIndex,
39
+ mnemonic: mnemonicToUse,
40
+ ikm,
41
+ blsPath,
42
+ feeRecipient,
43
+ coinbase,
44
+ remoteSigner
45
+ });
46
+ keystore.validators.push(...validators);
47
+ // If password provided, write ETH JSON V3 and BLS BN254 keystores and replace plaintext
48
+ if (password !== undefined) {
49
+ let targetDir;
50
+ if (encryptedKeystoreDir && encryptedKeystoreDir.length > 0) {
51
+ targetDir = encryptedKeystoreDir;
52
+ } else if (dataDir && dataDir.length > 0) {
53
+ targetDir = dataDir;
54
+ } else {
55
+ targetDir = dirname(existing);
56
+ }
57
+ await writeEthJsonV3ToFile(keystore.validators, {
58
+ outDir: targetDir,
59
+ password
60
+ });
61
+ await writeBlsBn254ToFile(keystore.validators, {
62
+ outDir: targetDir,
63
+ password,
64
+ blsPath
65
+ });
66
+ }
67
+ let outputPath = existing;
68
+ if (file && file.length > 0) {
69
+ if (isAbsolute(file)) {
70
+ outputPath = file;
71
+ } else if (dataDir && dataDir.length > 0) {
72
+ outputPath = join(dataDir, file);
73
+ } else {
74
+ outputPath = join(dirname(existing), file);
75
+ }
76
+ }
77
+ await writeKeystoreFile(outputPath, keystore);
78
+ if (!json) {
79
+ log(`Updated keystore ${outputPath} with ${validators.length} new validator(s)`);
80
+ logValidatorSummaries(log, summaries);
81
+ }
82
+ maybePrintJson(log, !!json, keystore);
83
+ }
@@ -0,0 +1,12 @@
1
+ import type { LogFn } from '@aztec/foundation/log';
2
+ export type GenerateBlsKeypairOptions = {
3
+ mnemonic?: string;
4
+ ikm?: string;
5
+ blsPath?: string;
6
+ g2?: boolean;
7
+ compressed?: boolean;
8
+ json?: boolean;
9
+ out?: string;
10
+ };
11
+ export declare function generateBlsKeypair(options: GenerateBlsKeypairOptions, log: LogFn): Promise<void>;
12
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGVfYmxzX2tleXBhaXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL3ZhbGlkYXRvcl9rZXlzL2dlbmVyYXRlX2Jsc19rZXlwYWlyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBT25ELE1BQU0sTUFBTSx5QkFBeUIsR0FBRztJQUN0QyxRQUFRLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbEIsR0FBRyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2IsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLEVBQUUsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUNiLFVBQVUsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUNyQixJQUFJLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDZixHQUFHLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDZCxDQUFDO0FBRUYsd0JBQXNCLGtCQUFrQixDQUFDLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxHQUFHLEVBQUUsS0FBSyxpQkFldEYifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"generate_bls_keypair.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator_keys/generate_bls_keypair.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAOnD,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,EAAE,GAAG,EAAE,KAAK,iBAetF"}
@@ -0,0 +1,27 @@
1
+ import { deriveBlsPrivateKey } from '@aztec/foundation/crypto/bls';
2
+ import { writeFile } from 'fs/promises';
3
+ import { computeBlsPublicKeyCompressed, withValidatorIndex } from './shared.js';
4
+ import { defaultBlsPath } from './utils.js';
5
+ export async function generateBlsKeypair(options, log) {
6
+ const { mnemonic, ikm, blsPath, compressed = true, json, out } = options;
7
+ const path = withValidatorIndex(blsPath ?? defaultBlsPath, 0);
8
+ const priv = deriveBlsPrivateKey(mnemonic, ikm, path);
9
+ const pub = await computeBlsPublicKeyCompressed(priv);
10
+ const result = {
11
+ path,
12
+ privateKey: priv,
13
+ publicKey: pub,
14
+ format: compressed ? 'compressed' : 'uncompressed'
15
+ };
16
+ if (out) {
17
+ await writeFile(out, JSON.stringify(result, null, 2), {
18
+ encoding: 'utf-8'
19
+ });
20
+ if (!json) {
21
+ log(`Wrote BLS keypair to ${out}`);
22
+ }
23
+ }
24
+ if (json || !out) {
25
+ log(JSON.stringify(result, null, 2));
26
+ }
27
+ }
@@ -0,0 +1,4 @@
1
+ import type { LogFn } from '@aztec/foundation/log';
2
+ import { Command } from 'commander';
3
+ export declare function injectCommands(program: Command, log: LogFn): Command;
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL3ZhbGlkYXRvcl9rZXlzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRW5ELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFLcEMsd0JBQWdCLGNBQWMsQ0FBQyxPQUFPLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxLQUFLLFdBc0kxRCJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator_keys/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,WAsI1D"}
@@ -0,0 +1,32 @@
1
+ import { parseAztecAddress, parseEthereumAddress, parseHex, parseOptionalInteger } from '../../utils/commands.js';
2
+ import { defaultBlsPath } from './utils.js';
3
+ export function injectCommands(program, log) {
4
+ const group = program.command('validator-keys').aliases([
5
+ 'valKeys',
6
+ 'valkeys'
7
+ ]).description('Manage validator keystores for node operators');
8
+ group.command('new').summary('Generate a new validator keystore JSON').description('Generates a new validator keystore with ETH secp256k1 accounts and optional BLS accounts').option('--data-dir <path>', 'Directory to store keystore(s). Defaults to ~/.aztec/keystore').option('--file <name>', 'Keystore file name. Defaults to key1.json (or keyN.json if key1.json exists)').option('--count <N>', 'Number of validators to generate', parseOptionalInteger).option('--publisher-count <N>', 'Number of publisher accounts per validator (default 0)', (value)=>parseOptionalInteger(value, 0)).option('--publishers <privateKeys>', 'Comma-separated list of publisher private keys for all validators.', (value)=>value.split(',').map((key)=>key.trim())).option('--mnemonic <mnemonic>', 'Mnemonic for ETH/BLS derivation').option('--passphrase <str>', 'Optional passphrase for mnemonic').option('--account-index <N>', 'Base account index for ETH/BLS derivation', parseOptionalInteger).option('--address-index <N>', 'Base address index for ETH/BLS derivation', parseOptionalInteger).option('--coinbase <address>', 'Coinbase ETH address to use when proposing. Defaults to attester address.', parseEthereumAddress)// TODO: add funding account back in when implemented
9
+ // .option('--funding-account <privateKey|address>', 'ETH private key (or address for remote signer setup) to fund publishers')
10
+ .option('--remote-signer <url>', 'Default remote signer URL for accounts in this file').option('--ikm <hex>', 'Initial keying material for BLS (alternative to mnemonic)', (value)=>parseHex(value, 32)).option('--bls-path <path>', `EIP-2334 path (default ${defaultBlsPath})`).option('--password <str>', 'Password for writing keystore files (ETH JSON V3 and BLS EIP-2335). Empty string allowed').option('--encrypted-keystore-dir <dir>', 'Output directory for encrypted keystore file(s)').option('--json', 'Echo resulting JSON to stdout').option('--staker-output', 'Generate a single staker output JSON file with an array of validator entries').option('--gse-address <address>', 'GSE contract address (required with --staker-output)', parseEthereumAddress).option('--l1-rpc-urls <urls>', 'L1 RPC URLs (comma-separated, required with --staker-output)', (value)=>value.split(',')).option('-c, --l1-chain-id <number>', 'L1 chain ID (required with --staker-output)', (value)=>parseInt(value), 31337).requiredOption('--fee-recipient <address>', 'Aztec address that will receive fees', parseAztecAddress).action(async (options)=>{
11
+ const { newValidatorKeystore } = await import('./new.js');
12
+ await newValidatorKeystore(options, log);
13
+ });
14
+ group.command('add').summary('Augment an existing validator keystore JSON').description('Adds attester/publisher/BLS entries to an existing keystore using the same flags as new').argument('<existing>', 'Path to existing keystore JSON').option('--data-dir <path>', 'Directory where keystore(s) live. (default: ~/.aztec/keystore)').option('--file <name>', 'Override output file name. (default: key<N>.json)').option('--count <N>', 'Number of validators to add. (default: 1)', parseOptionalInteger).option('--publisher-count <N>', 'Number of publisher accounts per validator (default 0)', (value)=>parseOptionalInteger(value, 0)).option('--publishers <privateKeys>', 'Comma-separated list of publisher private keys for all validators.', (value)=>value.split(',').map((key)=>key.trim())).option('--mnemonic <mnemonic>', 'Mnemonic for ETH/BLS derivation').option('--passphrase <str>', 'Optional passphrase for mnemonic').option('--account-index <N>', 'Base account index for ETH/BLS derivation', parseOptionalInteger).option('--address-index <N>', 'Base address index for ETH/BLS derivation', parseOptionalInteger).option('--coinbase <address>', 'Coinbase ETH address to use when proposing. Defaults to attester address.', parseEthereumAddress)// TODO: add funding account back in when implemented
15
+ // .option('--funding-account <privateKey|address>', 'ETH private key (or address for remote signer setup) to fund publishers')
16
+ .option('--remote-signer <url>', 'Default remote signer URL for accounts in this file').option('--ikm <hex>', 'Initial keying material for BLS (alternative to mnemonic)', (value)=>parseHex(value, 32)).option('--bls-path <path>', `EIP-2334 path (default ${defaultBlsPath})`).option('--empty', 'Generate an empty skeleton without keys').option('--password <str>', 'Password for writing keystore files (ETH JSON V3 and BLS EIP-2335). Empty string allowed').option('--encrypted-keystore-dir <dir>', 'Output directory for encrypted keystore file(s)').option('--json', 'Echo resulting JSON to stdout').requiredOption('--fee-recipient <address>', 'Aztec address that will receive fees', parseAztecAddress).action(async (existing, options)=>{
17
+ const { addValidatorKeys } = await import('./add.js');
18
+ await addValidatorKeys(existing, options, log);
19
+ });
20
+ group.command('staker').summary('Generate staking JSON from keystore').description('Reads a validator keystore and outputs staking data with BLS public keys for each attester (skips mnemonics)').requiredOption('--from <keystore>', 'Path to keystore JSON file').option('--password <password>', 'Password for decrypting encrypted keystores (if not specified in keystore file)').requiredOption('--gse-address <address>', 'GSE contract address', parseEthereumAddress).option('--l1-rpc-urls <urls>', 'L1 RPC URLs (comma-separated)', (value)=>value.split(','), [
21
+ 'http://localhost:8545'
22
+ ]).option('-c, --l1-chain-id <number>', 'L1 chain ID', (value)=>parseInt(value), 31337).option('--output <file>', 'Output file path (if not specified, JSON is written to stdout)').action(async (options)=>{
23
+ const { generateStakerJson } = await import('./staker.js');
24
+ await generateStakerJson(options, log);
25
+ });
26
+ // top-level convenience: aztec generate-bls-keypair
27
+ program.command('generate-bls-keypair').description('Generate a BLS keypair with convenience flags').option('--mnemonic <mnemonic>', 'Mnemonic for BLS derivation').option('--ikm <hex>', 'Initial keying material for BLS (alternative to mnemonic)', (value)=>parseHex(value, 32)).option('--bls-path <path>', `EIP-2334 path (default ${defaultBlsPath})`).option('--g2', 'Derive on G2 subgroup').option('--compressed', 'Output compressed public key').option('--json', 'Print JSON output to stdout').option('--out <file>', 'Write output to file').action(async (options)=>{
28
+ const { generateBlsKeypair } = await import('./generate_bls_keypair.js');
29
+ await generateBlsKeypair(options, log);
30
+ });
31
+ return program;
32
+ }
@@ -0,0 +1,29 @@
1
+ import type { EthAddress } from '@aztec/foundation/eth-address';
2
+ import type { LogFn } from '@aztec/foundation/log';
3
+ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
4
+ export type NewValidatorKeystoreOptions = {
5
+ dataDir?: string;
6
+ file?: string;
7
+ count?: number;
8
+ publisherCount?: number;
9
+ publishers?: string[];
10
+ mnemonic?: string;
11
+ passphrase?: string;
12
+ accountIndex?: number;
13
+ addressIndex?: number;
14
+ separatePublisher?: boolean;
15
+ ikm?: string;
16
+ blsPath?: string;
17
+ password?: string;
18
+ encryptedKeystoreDir?: string;
19
+ json?: boolean;
20
+ feeRecipient: AztecAddress;
21
+ coinbase?: EthAddress;
22
+ remoteSigner?: string;
23
+ stakerOutput?: boolean;
24
+ gseAddress?: EthAddress;
25
+ l1RpcUrls?: string[];
26
+ l1ChainId?: number;
27
+ };
28
+ export declare function newValidatorKeystore(options: NewValidatorKeystoreOptions, log: LogFn): Promise<void>;
29
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV3LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY21kcy92YWxpZGF0b3Jfa2V5cy9uZXcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUF5QmhFLE1BQU0sTUFBTSwyQkFBMkIsR0FBRztJQUN4QyxPQUFPLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDakIsSUFBSSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2QsS0FBSyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2YsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3hCLFVBQVUsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3RCLFFBQVEsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNsQixVQUFVLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDcEIsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLFlBQVksQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN0QixpQkFBaUIsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUM1QixHQUFHLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDYixPQUFPLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDakIsUUFBUSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLG9CQUFvQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQzlCLElBQUksQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUNmLFlBQVksRUFBRSxZQUFZLENBQUM7SUFDM0IsUUFBUSxDQUFDLEVBQUUsVUFBVSxDQUFDO0lBQ3RCLFlBQVksQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN0QixZQUFZLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDdkIsVUFBVSxDQUFDLEVBQUUsVUFBVSxDQUFDO0lBQ3hCLFNBQVMsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3JCLFNBQVMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNwQixDQUFDO0FBRUYsd0JBQXNCLG9CQUFvQixDQUFDLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxHQUFHLEVBQUUsS0FBSyxpQkF1SjFGIn0=
@@ -0,0 +1 @@
1
+ {"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator_keys/new.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAyBhE,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,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,CAAC;AAEF,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,EAAE,GAAG,EAAE,KAAK,iBAuJ1F"}
@@ -0,0 +1,134 @@
1
+ import { prettyPrintJSON } from '@aztec/cli/utils';
2
+ import { createEthereumChain } from '@aztec/ethereum/chain';
3
+ import { GSEContract } from '@aztec/ethereum/contracts';
4
+ import { wordlist } from '@scure/bip39/wordlists/english.js';
5
+ import { writeFile } from 'fs/promises';
6
+ import { basename, dirname, join } from 'path';
7
+ import { createPublicClient, fallback, http } from 'viem';
8
+ import { generateMnemonic, mnemonicToAccount } from 'viem/accounts';
9
+ import { buildValidatorEntries, logValidatorSummaries, maybePrintJson, resolveKeystoreOutputPath, writeBlsBn254ToFile, writeEthJsonV3ToFile, writeKeystoreFile } from './shared.js';
10
+ import { processAttesterAccounts } from './staker.js';
11
+ import { validateBlsPathOptions, validatePublisherOptions, validateRemoteSignerOptions, validateStakerOutputOptions } from './utils.js';
12
+ export async function newValidatorKeystore(options, log) {
13
+ // validate bls-path inputs before proceeding with key generation
14
+ validateBlsPathOptions(options);
15
+ // validate staker output options before proceeding with key generation
16
+ validateStakerOutputOptions(options);
17
+ // validate publisher options
18
+ validatePublisherOptions(options);
19
+ // validate remote signer options
20
+ validateRemoteSignerOptions(options);
21
+ 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;
22
+ const mnemonic = _mnemonic ?? generateMnemonic(wordlist);
23
+ if (!_mnemonic && !json) {
24
+ log('No mnemonic provided, generating new one...');
25
+ log(`Using new mnemonic:`);
26
+ log('');
27
+ log(mnemonic);
28
+ log('');
29
+ }
30
+ const validatorCount = typeof count === 'number' && Number.isFinite(count) && count > 0 ? Math.floor(count) : 1;
31
+ const { outputPath } = await resolveKeystoreOutputPath(dataDir, file);
32
+ const keystoreOutDir = dirname(outputPath);
33
+ const { validators, summaries } = await buildValidatorEntries({
34
+ validatorCount,
35
+ publisherCount,
36
+ publishers,
37
+ accountIndex,
38
+ baseAddressIndex: addressIndex,
39
+ mnemonic,
40
+ ikm,
41
+ blsPath,
42
+ feeRecipient,
43
+ coinbase,
44
+ remoteSigner
45
+ });
46
+ // If password provided, write ETH JSON V3 and BLS BN254 keystores and replace plaintext
47
+ if (password !== undefined) {
48
+ const encryptedKeystoreOutDir = encryptedKeystoreDir && encryptedKeystoreDir.length > 0 ? encryptedKeystoreDir : keystoreOutDir;
49
+ await writeEthJsonV3ToFile(validators, {
50
+ outDir: encryptedKeystoreOutDir,
51
+ password
52
+ });
53
+ await writeBlsBn254ToFile(validators, {
54
+ outDir: encryptedKeystoreOutDir,
55
+ password
56
+ });
57
+ }
58
+ const keystore = {
59
+ schemaVersion: 1,
60
+ validators
61
+ };
62
+ await writeKeystoreFile(outputPath, keystore);
63
+ // Generate staker outputs if requested
64
+ const allStakerOutputs = [];
65
+ if (stakerOutput && gseAddress && l1RpcUrls && l1ChainId !== undefined) {
66
+ const chain = createEthereumChain(l1RpcUrls, l1ChainId);
67
+ const publicClient = createPublicClient({
68
+ chain: chain.chainInfo,
69
+ transport: fallback(l1RpcUrls.map((url)=>http(url, {
70
+ batch: false
71
+ })))
72
+ });
73
+ const gse = new GSEContract(publicClient, gseAddress);
74
+ // Extract keystore base name without extension for unique staker output filenames
75
+ const keystoreBaseName = basename(outputPath, '.json');
76
+ // Process each validator
77
+ for(let i = 0; i < validators.length; i++){
78
+ const validator = validators[i];
79
+ const outputs = await processAttesterAccounts(validator.attester, gse, password);
80
+ // Collect all staker outputs
81
+ for(let j = 0; j < outputs.length; j++){
82
+ allStakerOutputs.push(outputs[j]);
83
+ }
84
+ }
85
+ // Write a single JSON file with all staker outputs
86
+ if (allStakerOutputs.length > 0) {
87
+ const stakerOutputPath = join(keystoreOutDir, `${keystoreBaseName}_staker_output.json`);
88
+ await writeFile(stakerOutputPath, prettyPrintJSON(allStakerOutputs), 'utf-8');
89
+ }
90
+ }
91
+ const outputData = !_mnemonic ? {
92
+ ...keystore,
93
+ generatedMnemonic: mnemonic
94
+ } : keystore;
95
+ // Handle JSON output
96
+ if (json) {
97
+ if (stakerOutput && allStakerOutputs.length > 0) {
98
+ const combinedOutput = {
99
+ keystore: outputData,
100
+ staker: allStakerOutputs
101
+ };
102
+ maybePrintJson(log, json, combinedOutput);
103
+ } else {
104
+ maybePrintJson(log, json, outputData);
105
+ }
106
+ } else {
107
+ log(`Wrote validator keystore to ${outputPath}`);
108
+ if (stakerOutput && allStakerOutputs.length > 0) {
109
+ const keystoreBaseName = basename(outputPath, '.json');
110
+ const stakerOutputPath = join(keystoreOutDir, `${keystoreBaseName}_staker_output.json`);
111
+ log(`Wrote staker output for ${allStakerOutputs.length} validator(s) to ${stakerOutputPath}`);
112
+ log('');
113
+ }
114
+ }
115
+ // print a concise summary of public keys (addresses and BLS pubkeys) if no --json options was selected
116
+ if (!json) {
117
+ logValidatorSummaries(log, summaries);
118
+ }
119
+ if (mnemonic && remoteSigner && !json) {
120
+ for(let i = 0; i < validatorCount; i++){
121
+ const addrIdx = addressIndex + i;
122
+ const acct = mnemonicToAccount(mnemonic, {
123
+ accountIndex,
124
+ addressIndex: addrIdx
125
+ });
126
+ log(`attester address: ${acct.address} remoteSignerUrl: ${remoteSigner}`);
127
+ }
128
+ }
129
+ // Log staker outputs if not in JSON mode
130
+ if (!json && stakerOutput && allStakerOutputs.length > 0) {
131
+ log('\nStaker outputs:');
132
+ log(prettyPrintJSON(allStakerOutputs));
133
+ }
134
+ }
@@ -0,0 +1,68 @@
1
+ import type { EthAddress } from '@aztec/foundation/eth-address';
2
+ import type { LogFn } from '@aztec/foundation/log';
3
+ import type { EthAccount, EthPrivateKey, ValidatorKeyStore } from '@aztec/node-keystore/types';
4
+ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
5
+ export type ValidatorSummary = {
6
+ attesterEth?: string;
7
+ attesterBls?: string;
8
+ publisherEth?: string[];
9
+ };
10
+ export type BuildValidatorsInput = {
11
+ validatorCount: number;
12
+ publisherCount?: number;
13
+ publishers?: string[];
14
+ accountIndex: number;
15
+ baseAddressIndex: number;
16
+ mnemonic: string;
17
+ ikm?: string;
18
+ blsPath?: string;
19
+ feeRecipient: AztecAddress;
20
+ coinbase?: EthAddress;
21
+ remoteSigner?: string;
22
+ };
23
+ export declare function withValidatorIndex(path: string, accountIndex?: number, addressIndex?: number): string;
24
+ /**
25
+ * Compute a compressed BN254 G1 public key from a private key.
26
+ * @param privateKeyHex - Private key as 0x-prefixed hex string
27
+ * @returns Compressed G1 point (32 bytes with sign bit in MSB)
28
+ */
29
+ export declare function computeBlsPublicKeyCompressed(privateKeyHex: string): Promise<string>;
30
+ export declare function deriveEthAttester(mnemonic: string, baseAccountIndex: number, addressIndex: number, remoteSigner?: string): EthAccount | EthPrivateKey;
31
+ export declare function buildValidatorEntries(input: BuildValidatorsInput): Promise<{
32
+ validators: ValidatorKeyStore[];
33
+ summaries: ValidatorSummary[];
34
+ }>;
35
+ export declare function resolveKeystoreOutputPath(dataDir?: string, file?: string): Promise<{
36
+ resolvedDir: string;
37
+ outputPath: string;
38
+ }>;
39
+ export declare function writeKeystoreFile(path: string, keystore: unknown): Promise<void>;
40
+ export declare function logValidatorSummaries(log: LogFn, summaries: ValidatorSummary[]): void;
41
+ export declare function maybePrintJson(log: LogFn, jsonFlag: boolean | undefined, obj: unknown): void;
42
+ /**
43
+ * Writes a BN254 keystore file for a BN254 BLS private key.
44
+ * Returns the absolute path to the written file.
45
+ *
46
+ * @param outDir - Directory to write the keystore file to
47
+ * @param fileNameBase - Base name for the keystore file (will be sanitized)
48
+ * @param password - Password for encrypting the private key
49
+ * @param privateKeyHex - Private key as 0x-prefixed hex string (32 bytes)
50
+ * @param pubkeyHex - Public key as hex string
51
+ * @param derivationPath - BIP-44 style derivation path
52
+ * @returns Absolute path to the written keystore file
53
+ */
54
+ export declare function writeBn254BlsKeystore(outDir: string, fileNameBase: string, password: string, privateKeyHex: string, pubkeyHex: string, derivationPath: string): Promise<string>;
55
+ /** Replace plaintext BLS keys in validators with { path, password } pointing to BN254 keystore files. */
56
+ export declare function writeBlsBn254ToFile(validators: ValidatorKeyStore[], options: {
57
+ outDir: string;
58
+ password: string;
59
+ blsPath?: string;
60
+ }): Promise<void>;
61
+ /** Writes an Ethereum JSON V3 keystore using ethers, returns absolute path */
62
+ export declare function writeEthJsonV3Keystore(outDir: string, fileNameBase: string, password: string, privateKeyHex: string): Promise<string>;
63
+ /** Replace plaintext ETH keys in validators with { path, password } pointing to JSON V3 files. */
64
+ export declare function writeEthJsonV3ToFile(validators: ValidatorKeyStore[], options: {
65
+ outDir: string;
66
+ password: string;
67
+ }): Promise<void>;
68
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY21kcy92YWxpZGF0b3Jfa2V5cy9zaGFyZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLGFBQWEsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQy9GLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBV2hFLE1BQU0sTUFBTSxnQkFBZ0IsR0FBRztJQUFFLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLFlBQVksQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFBO0NBQUUsQ0FBQztBQUV2RyxNQUFNLE1BQU0sb0JBQW9CLEdBQUc7SUFDakMsY0FBYyxFQUFFLE1BQU0sQ0FBQztJQUN2QixjQUFjLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDeEIsVUFBVSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDdEIsWUFBWSxFQUFFLE1BQU0sQ0FBQztJQUNyQixnQkFBZ0IsRUFBRSxNQUFNLENBQUM7SUFDekIsUUFBUSxFQUFFLE1BQU0sQ0FBQztJQUNqQixHQUFHLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDYixPQUFPLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDakIsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixRQUFRLENBQUMsRUFBRSxVQUFVLENBQUM7SUFDdEIsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3ZCLENBQUM7QUFFRix3QkFBZ0Isa0JBQWtCLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxZQUFZLEdBQUUsTUFBVSxFQUFFLFlBQVksR0FBRSxNQUFVLFVBcUJsRztBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsNkJBQTZCLENBQUMsYUFBYSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBRTFGO0FBRUQsd0JBQWdCLGlCQUFpQixDQUMvQixRQUFRLEVBQUUsTUFBTSxFQUNoQixnQkFBZ0IsRUFBRSxNQUFNLEVBQ3hCLFlBQVksRUFBRSxNQUFNLEVBQ3BCLFlBQVksQ0FBQyxFQUFFLE1BQU0sR0FDcEIsVUFBVSxHQUFHLGFBQWEsQ0FLNUI7QUFFRCx3QkFBc0IscUJBQXFCLENBQUMsS0FBSyxFQUFFLG9CQUFvQjs7O0dBdUV0RTtBQUVELHdCQUFzQix5QkFBeUIsQ0FBQyxPQUFPLENBQUMsRUFBRSxNQUFNLEVBQUUsSUFBSSxDQUFDLEVBQUUsTUFBTTs7O0dBb0I5RTtBQUVELHdCQUFzQixpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxPQUFPLGlCQUd0RTtBQUVELHdCQUFnQixxQkFBcUIsQ0FBQyxHQUFHLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxnQkFBZ0IsRUFBRSxRQXNCOUU7QUFFRCx3QkFBZ0IsY0FBYyxDQUFDLEdBQUcsRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLE9BQU8sR0FBRyxTQUFTLEVBQUUsR0FBRyxFQUFFLE9BQU8sUUFJckY7QUFFRDs7Ozs7Ozs7Ozs7R0FXRztBQUNILHdCQUFzQixxQkFBcUIsQ0FDekMsTUFBTSxFQUFFLE1BQU0sRUFDZCxZQUFZLEVBQUUsTUFBTSxFQUNwQixRQUFRLEVBQUUsTUFBTSxFQUNoQixhQUFhLEVBQUUsTUFBTSxFQUNyQixTQUFTLEVBQUUsTUFBTSxFQUNqQixjQUFjLEVBQUUsTUFBTSxHQUNyQixPQUFPLENBQUMsTUFBTSxDQUFDLENBU2pCO0FBRUQseUdBQXlHO0FBQ3pHLHdCQUFzQixtQkFBbUIsQ0FDdkMsVUFBVSxFQUFFLGlCQUFpQixFQUFFLEVBQy9CLE9BQU8sRUFBRTtJQUFFLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFBQyxRQUFRLEVBQUUsTUFBTSxDQUFDO0lBQUMsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFBO0NBQUUsR0FDOUQsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXVCZjtBQUVELDhFQUE4RTtBQUM5RSx3QkFBc0Isc0JBQXNCLENBQzFDLE1BQU0sRUFBRSxNQUFNLEVBQ2QsWUFBWSxFQUFFLE1BQU0sRUFDcEIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsYUFBYSxFQUFFLE1BQU0sR0FDcEIsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQVFqQjtBQUVELGtHQUFrRztBQUNsRyx3QkFBc0Isb0JBQW9CLENBQ3hDLFVBQVUsRUFBRSxpQkFBaUIsRUFBRSxFQUMvQixPQUFPLEVBQUU7SUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQTtDQUFFLEdBQzVDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FzQ2YifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator_keys/shared.ts"],"names":[],"mappings":"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"}