@aztec/cli 0.0.0-test.1 → 0.0.1-fake-ceab37513c

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 (146) hide show
  1. package/dest/cmds/contracts/inspect_contract.d.ts.map +1 -1
  2. package/dest/cmds/contracts/inspect_contract.js +9 -5
  3. package/dest/cmds/infrastructure/index.d.ts.map +1 -1
  4. package/dest/cmds/infrastructure/index.js +3 -3
  5. package/dest/cmds/infrastructure/sequencers.d.ts +2 -1
  6. package/dest/cmds/infrastructure/sequencers.d.ts.map +1 -1
  7. package/dest/cmds/infrastructure/sequencers.js +27 -15
  8. package/dest/cmds/infrastructure/setup_l2_contract.d.ts +1 -1
  9. package/dest/cmds/infrastructure/setup_l2_contract.d.ts.map +1 -1
  10. package/dest/cmds/infrastructure/setup_l2_contract.js +14 -12
  11. package/dest/cmds/l1/advance_epoch.d.ts.map +1 -1
  12. package/dest/cmds/l1/advance_epoch.js +3 -2
  13. package/dest/cmds/l1/assume_proven_through.d.ts.map +1 -1
  14. package/dest/cmds/l1/assume_proven_through.js +3 -3
  15. package/dest/cmds/l1/bridge_erc20.d.ts +1 -1
  16. package/dest/cmds/l1/bridge_erc20.d.ts.map +1 -1
  17. package/dest/cmds/l1/bridge_erc20.js +4 -4
  18. package/dest/cmds/l1/deploy_l1_contracts.d.ts +2 -2
  19. package/dest/cmds/l1/deploy_l1_contracts.d.ts.map +1 -1
  20. package/dest/cmds/l1/deploy_l1_contracts.js +22 -5
  21. package/dest/cmds/l1/deploy_new_rollup.d.ts +2 -1
  22. package/dest/cmds/l1/deploy_new_rollup.d.ts.map +1 -1
  23. package/dest/cmds/l1/deploy_new_rollup.js +16 -7
  24. package/dest/cmds/l1/governance_utils.d.ts.map +1 -1
  25. package/dest/cmds/l1/governance_utils.js +17 -17
  26. package/dest/cmds/l1/index.d.ts +1 -0
  27. package/dest/cmds/l1/index.d.ts.map +1 -1
  28. package/dest/cmds/l1/index.js +29 -39
  29. package/dest/cmds/l1/trigger_seed_snapshot.d.ts +6 -0
  30. package/dest/cmds/l1/trigger_seed_snapshot.d.ts.map +1 -0
  31. package/dest/cmds/l1/trigger_seed_snapshot.js +19 -0
  32. package/dest/cmds/l1/update_l1_validators.d.ts +17 -2
  33. package/dest/cmds/l1/update_l1_validators.d.ts.map +1 -1
  34. package/dest/cmds/l1/update_l1_validators.js +156 -101
  35. package/dest/cmds/misc/generate_bootnode_enr.d.ts +1 -1
  36. package/dest/cmds/misc/generate_bootnode_enr.d.ts.map +1 -1
  37. package/dest/cmds/misc/generate_bootnode_enr.js +2 -2
  38. package/dest/cmds/misc/generate_secret_and_hash.d.ts +1 -1
  39. package/dest/cmds/misc/generate_secret_and_hash.d.ts.map +1 -1
  40. package/dest/cmds/misc/generate_secret_and_hash.js +2 -2
  41. package/dest/cmds/misc/get_canonical_sponsored_fpc_address.d.ts +3 -0
  42. package/dest/cmds/misc/get_canonical_sponsored_fpc_address.d.ts.map +1 -0
  43. package/dest/cmds/misc/get_canonical_sponsored_fpc_address.js +4 -0
  44. package/dest/cmds/misc/index.d.ts.map +1 -1
  45. package/dest/cmds/misc/index.js +7 -3
  46. package/dest/cmds/misc/update/github.d.ts +0 -1
  47. package/dest/cmds/misc/update/github.d.ts.map +1 -1
  48. package/dest/cmds/misc/update/github.js +0 -1
  49. package/dest/cmds/misc/update.d.ts.map +1 -1
  50. package/dest/cmds/misc/update.js +2 -3
  51. package/dest/cmds/pxe/get_contract_data.js +1 -1
  52. package/dest/cmds/pxe/get_node_info.d.ts.map +1 -1
  53. package/dest/cmds/pxe/get_node_info.js +11 -7
  54. package/dest/cmds/pxe/get_pxe_info.js +2 -2
  55. package/dest/config/cached_fetch.d.ts +18 -0
  56. package/dest/config/cached_fetch.d.ts.map +1 -0
  57. package/dest/config/cached_fetch.js +54 -0
  58. package/dest/config/chain_l2_config.d.ts +38 -0
  59. package/dest/config/chain_l2_config.d.ts.map +1 -0
  60. package/dest/config/chain_l2_config.js +376 -0
  61. package/dest/config/enrich_env.d.ts +4 -0
  62. package/dest/config/enrich_env.d.ts.map +1 -0
  63. package/dest/config/enrich_env.js +12 -0
  64. package/dest/config/get_l1_config.d.ts +8 -0
  65. package/dest/config/get_l1_config.d.ts.map +1 -0
  66. package/dest/config/get_l1_config.js +22 -0
  67. package/dest/config/index.d.ts +5 -0
  68. package/dest/config/index.d.ts.map +1 -0
  69. package/dest/config/index.js +4 -0
  70. package/dest/config/network_config.d.ts +19 -0
  71. package/dest/config/network_config.d.ts.map +1 -0
  72. package/dest/config/network_config.js +79 -0
  73. package/dest/utils/aztec.d.ts +12 -11
  74. package/dest/utils/aztec.d.ts.map +1 -1
  75. package/dest/utils/aztec.js +52 -22
  76. package/dest/utils/commands.d.ts +1 -1
  77. package/dest/utils/commands.d.ts.map +1 -1
  78. package/dest/utils/commands.js +5 -5
  79. package/dest/utils/encoding.js +1 -1
  80. package/dest/utils/github.d.ts +0 -1
  81. package/dest/utils/github.d.ts.map +1 -1
  82. package/dest/utils/github.js +0 -1
  83. package/dest/utils/index.d.ts +1 -0
  84. package/dest/utils/index.d.ts.map +1 -1
  85. package/dest/utils/index.js +1 -0
  86. package/dest/utils/inspect.d.ts.map +1 -1
  87. package/dest/utils/inspect.js +18 -26
  88. package/dest/utils/setup_contracts.d.ts +5 -0
  89. package/dest/utils/setup_contracts.d.ts.map +1 -0
  90. package/dest/utils/setup_contracts.js +36 -0
  91. package/package.json +38 -32
  92. package/src/cmds/contracts/inspect_contract.ts +16 -6
  93. package/src/cmds/infrastructure/index.ts +10 -2
  94. package/src/cmds/infrastructure/sequencers.ts +32 -15
  95. package/src/cmds/infrastructure/setup_l2_contract.ts +16 -11
  96. package/src/cmds/l1/advance_epoch.ts +3 -2
  97. package/src/cmds/l1/assume_proven_through.ts +3 -3
  98. package/src/cmds/l1/bridge_erc20.ts +4 -3
  99. package/src/cmds/l1/deploy_l1_contracts.ts +30 -6
  100. package/src/cmds/l1/deploy_new_rollup.ts +22 -8
  101. package/src/cmds/l1/governance_utils.ts +18 -17
  102. package/src/cmds/l1/index.ts +69 -96
  103. package/src/cmds/l1/trigger_seed_snapshot.ts +31 -0
  104. package/src/cmds/l1/update_l1_validators.ts +191 -92
  105. package/src/cmds/misc/generate_bootnode_enr.ts +3 -2
  106. package/src/cmds/misc/generate_secret_and_hash.ts +2 -2
  107. package/src/cmds/misc/get_canonical_sponsored_fpc_address.ts +7 -0
  108. package/src/cmds/misc/index.ts +13 -4
  109. package/src/cmds/misc/update/github.ts +0 -1
  110. package/src/cmds/misc/update.ts +1 -7
  111. package/src/cmds/pxe/get_contract_data.ts +1 -1
  112. package/src/cmds/pxe/get_node_info.ts +10 -7
  113. package/src/cmds/pxe/get_pxe_info.ts +2 -2
  114. package/src/config/cached_fetch.ts +67 -0
  115. package/src/config/chain_l2_config.ts +493 -0
  116. package/src/config/enrich_env.ts +15 -0
  117. package/src/config/get_l1_config.ts +28 -0
  118. package/src/config/index.ts +4 -0
  119. package/src/config/network_config.ts +102 -0
  120. package/src/utils/aztec.ts +76 -27
  121. package/src/utils/commands.ts +5 -5
  122. package/src/utils/encoding.ts +1 -1
  123. package/src/utils/github.ts +0 -1
  124. package/src/utils/index.ts +1 -0
  125. package/src/utils/inspect.ts +18 -25
  126. package/src/utils/setup_contracts.ts +58 -0
  127. package/dest/cmds/devnet/bootstrap_network.d.ts +0 -3
  128. package/dest/cmds/devnet/bootstrap_network.d.ts.map +0 -1
  129. package/dest/cmds/devnet/bootstrap_network.js +0 -196
  130. package/dest/cmds/devnet/faucet.d.ts +0 -4
  131. package/dest/cmds/devnet/faucet.d.ts.map +0 -1
  132. package/dest/cmds/devnet/faucet.js +0 -26
  133. package/dest/cmds/devnet/index.d.ts +0 -4
  134. package/dest/cmds/devnet/index.d.ts.map +0 -1
  135. package/dest/cmds/devnet/index.js +0 -14
  136. package/dest/cmds/l1/deploy_l1_verifier.d.ts +0 -5
  137. package/dest/cmds/l1/deploy_l1_verifier.d.ts.map +0 -1
  138. package/dest/cmds/l1/deploy_l1_verifier.js +0 -54
  139. package/dest/cmds/misc/setup_contracts.d.ts +0 -7
  140. package/dest/cmds/misc/setup_contracts.d.ts.map +0 -1
  141. package/dest/cmds/misc/setup_contracts.js +0 -27
  142. package/src/cmds/devnet/bootstrap_network.ts +0 -318
  143. package/src/cmds/devnet/faucet.ts +0 -33
  144. package/src/cmds/devnet/index.ts +0 -60
  145. package/src/cmds/l1/deploy_l1_verifier.ts +0 -105
  146. package/src/cmds/misc/setup_contracts.ts +0 -40
@@ -1,20 +1,22 @@
1
1
  import { EthAddress } from '@aztec/foundation/eth-address';
2
2
  import { Option } from 'commander';
3
- import { ETHEREUM_HOSTS, PRIVATE_KEY, l1ChainIdOption, makePxeOption, parseAztecAddress, parseBigint, parseEthereumAddress, pxeOption } from '../../utils/commands.js';
3
+ import { getL1RollupAddressFromEnv } from '../../config/get_l1_config.js';
4
+ import { ETHEREUM_HOSTS, MNEMONIC, PRIVATE_KEY, l1ChainIdOption, parseAztecAddress, parseBigint, parseEthereumAddress, pxeOption } from '../../utils/commands.js';
5
+ export { addL1Validator } from './update_l1_validators.js';
4
6
  const l1RpcUrlsOption = new Option('--l1-rpc-urls <string>', 'List of Ethereum host URLs. Chain identifiers localhost and testnet can be used (comma separated)').env('ETHEREUM_HOSTS').default([
5
7
  ETHEREUM_HOSTS
6
8
  ]).makeOptionMandatory(true).argParser((arg)=>arg.split(',').map((url)=>url.trim()));
9
+ const networkOption = new Option('--network <string>', 'Network to execute against').env('NETWORK');
7
10
  export function injectCommands(program, log, debugLogger) {
8
- const { BB_BINARY_PATH, BB_WORKING_DIRECTORY } = process.env;
9
- program.command('deploy-l1-contracts').description('Deploys all necessary Ethereum contracts for Aztec.').addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').option('--accelerated-test-deployments', 'Fire and forget deployment transactions, use in testing only', false).action(async (options)=>{
11
+ program.command('deploy-l1-contracts').description('Deploys all necessary Ethereum contracts for Aztec.').addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').option('--sponsored-fpc', 'Populate genesis state with a testing sponsored FPC contract').option('--accelerated-test-deployments', 'Fire and forget deployment transactions, use in testing only', false).option('--real-verifier', 'Deploy the real verifier', false).option('--existing-token <address>', 'Use an existing ERC20 for both fee and staking', parseEthereumAddress).option('--create-verification-json [path]', 'Create JSON file for etherscan contract verification', false).action(async (options)=>{
10
12
  const { deployL1Contracts } = await import('./deploy_l1_contracts.js');
11
13
  const initialValidators = options.validators?.split(',').map((validator)=>EthAddress.fromString(validator)) || [];
12
- await deployL1Contracts(options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.acceleratedTestDeployments, options.json, initialValidators, log, debugLogger);
14
+ await deployL1Contracts(options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.sponsoredFpc, options.acceleratedTestDeployments, options.json, options.createVerificationJson, initialValidators, options.realVerifier, options.existingToken, log, debugLogger);
13
15
  });
14
- program.command('deploy-new-rollup').description('Deploys a new rollup contract and a payload to upgrade the registry with it.').requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress).addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').action(async (options)=>{
16
+ program.command('deploy-new-rollup').description('Deploys a new rollup contract and adds it to the registry (if you are the owner).').requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress).addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', MNEMONIC ?? 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').option('--sponsored-fpc', 'Populate genesis state with a testing sponsored FPC contract').option('--real-verifier', 'Deploy the real verifier', false).option('--create-verification-json [path]', 'Create JSON file for etherscan contract verification', false).action(async (options)=>{
15
17
  const { deployNewRollup } = await import('./deploy_new_rollup.js');
16
18
  const initialValidators = options.validators?.split(',').map((validator)=>EthAddress.fromString(validator)) || [];
17
- await deployNewRollup(options.registryAddress, options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.json, initialValidators, log, debugLogger);
19
+ await deployNewRollup(options.registryAddress, options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.sponsoredFpc, options.json, initialValidators, options.realVerifier, options.createVerificationJson, log, debugLogger);
18
20
  });
19
21
  program.command('deposit-governance-tokens').description('Deposits governance tokens to the governance contract.').requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress).requiredOption('--recipient <string>', 'The recipient of the tokens', parseEthereumAddress).requiredOption('-a, --amount <string>', 'The amount of tokens to deposit', parseBigint).option('--mint', 'Mint the tokens on L1', false).addOption(l1RpcUrlsOption).addOption(l1ChainIdOption).option('-p, --private-key <string>', 'The private key to use to deposit', PRIVATE_KEY).option('-m, --mnemonic <string>', 'The mnemonic to use to deposit', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use to deposit', (arg)=>parseInt(arg), 0).action(async (options)=>{
20
22
  const { depositGovernanceTokens } = await import('./governance_utils.js');
@@ -94,16 +96,19 @@ export function injectCommands(program, log, debugLogger) {
94
96
  const account = generateL1Account();
95
97
  log(JSON.stringify(account, null, 2));
96
98
  });
97
- program.command('add-l1-validator').description('Adds a validator to the L1 rollup contract.').addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').addOption(l1ChainIdOption).option('--validator <address>', 'ethereum address of the validator', parseEthereumAddress).option('--rollup <address>', 'ethereum address of the rollup contract', parseEthereumAddress).option('--withdrawer <address>', 'ethereum address of the withdrawer', parseEthereumAddress).action(async (options)=>{
98
- const { addL1Validator } = await import('./update_l1_validators.js');
99
- await addL1Validator({
99
+ program.command('add-l1-validator').description('Adds a validator to the L1 rollup contract via a direct deposit.').addOption(l1RpcUrlsOption).addOption(networkOption).option('-pk, --private-key <string>', 'The private key to use sending the transaction', PRIVATE_KEY).option('-m, --mnemonic <string>', 'The mnemonic to use sending the transaction', 'test test test test test test test test test test test junk').addOption(l1ChainIdOption).option('--attester <address>', 'ethereum address of the attester', parseEthereumAddress).option('--withdrawer <address>', 'ethereum address of the withdrawer', parseEthereumAddress).option('--bls-secret-key <string>', 'The BN254 scalar field element used as a secret key for BLS signatures. Will be associated with the attester address.', parseBigint).option('--move-with-latest-rollup', 'Whether to move with the latest rollup', true).option('--rollup <string>', 'Rollup contract address', parseEthereumAddress).action(async (options)=>{
100
+ const { addL1ValidatorViaRollup } = await import('./update_l1_validators.js');
101
+ const rollupAddress = options.rollup ?? await getL1RollupAddressFromEnv(options.l1RpcUrls, options.l1ChainId);
102
+ await addL1ValidatorViaRollup({
100
103
  rpcUrls: options.l1RpcUrls,
101
104
  chainId: options.l1ChainId,
102
105
  privateKey: options.privateKey,
103
106
  mnemonic: options.mnemonic,
104
- validatorAddress: options.validator,
105
- rollupAddress: options.rollup,
107
+ attesterAddress: options.attester,
108
+ blsSecretKey: options.blsSecretKey,
106
109
  withdrawerAddress: options.withdrawer,
110
+ rollupAddress,
111
+ moveWithLatestRollup: options.moveWithLatestRollup,
107
112
  log,
108
113
  debugLogger
109
114
  });
@@ -132,6 +137,17 @@ export function injectCommands(program, log, debugLogger) {
132
137
  debugLogger
133
138
  });
134
139
  });
140
+ program.command('trigger-seed-snapshot').description('Triggers a seed snapshot for the next epoch.').option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').option('--rollup <address>', 'ethereum address of the rollup contract', parseEthereumAddress).addOption(l1RpcUrlsOption).addOption(l1ChainIdOption).action(async (options)=>{
141
+ const { triggerSeedSnapshot } = await import('./trigger_seed_snapshot.js');
142
+ await triggerSeedSnapshot({
143
+ rollupAddress: options.rollup,
144
+ rpcUrls: options.l1RpcUrls,
145
+ chainId: options.l1ChainId,
146
+ privateKey: options.privateKey,
147
+ mnemonic: options.mnemonic,
148
+ log
149
+ });
150
+ });
135
151
  program.command('debug-rollup').description('Debugs the rollup contract.').addOption(l1RpcUrlsOption).addOption(l1ChainIdOption).option('--rollup <address>', 'ethereum address of the rollup contract', parseEthereumAddress).action(async (options)=>{
136
152
  const { debugRollup } = await import('./update_l1_validators.js');
137
153
  await debugRollup({
@@ -156,17 +172,9 @@ export function injectCommands(program, log, debugLogger) {
156
172
  debugLogger
157
173
  });
158
174
  });
159
- program.command('deploy-l1-verifier').description('Deploys the rollup verifier contract').addOption(l1RpcUrlsOption).addOption(l1ChainIdOption).addOption(makePxeOption(false).conflicts('rollup-address')).addOption(new Option('--rollup-address <string>', 'The address of the rollup contract').env('ROLLUP_CONTRACT_ADDRESS').argParser(parseEthereumAddress).conflicts('rpc-url')).option('--l1-private-key <string>', 'The L1 private key to use for deployment', PRIVATE_KEY).option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').requiredOption('--verifier <verifier>', 'Either mock or real', 'real').option('--bb <path>', 'Path to bb binary', BB_BINARY_PATH).option('--bb-working-dir <path>', 'Path to bb working directory', BB_WORKING_DIRECTORY).action(async (options)=>{
160
- const { deployMockVerifier, deployUltraHonkVerifier } = await import('./deploy_l1_verifier.js');
161
- if (options.verifier === 'mock') {
162
- await deployMockVerifier(options.rollupAddress?.toString(), options.l1RpcUrls, options.l1ChainId, options.l1PrivateKey, options.mnemonic, options.rpcUrl, log, debugLogger);
163
- } else {
164
- await deployUltraHonkVerifier(options.rollupAddress?.toString(), options.l1RpcUrls, options.l1ChainId, options.l1PrivateKey, options.mnemonic, options.rpcUrl, options.bb, options.bbWorkingDir, log, debugLogger);
165
- }
166
- });
167
- program.command('bridge-erc20').description('Bridges ERC20 tokens to L2.').argument('<amount>', 'The amount of Fee Juice to mint and bridge.', parseBigint).argument('<recipient>', 'Aztec address of the recipient.', parseAztecAddress).addOption(l1RpcUrlsOption).option('-m, --mnemonic <string>', 'The mnemonic to use for deriving the Ethereum address that will mint and bridge', 'test test test test test test test test test test test junk').option('--mint', 'Mint the tokens on L1', false).option('--private', 'If the bridge should use the private flow', false).addOption(l1ChainIdOption).requiredOption('-t, --token <string>', 'The address of the token to bridge', parseEthereumAddress).requiredOption('-p, --portal <string>', 'The address of the portal contract', parseEthereumAddress).option('--l1-private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--json', 'Output the claim in JSON format').action(async (amount, recipient, options)=>{
175
+ program.command('bridge-erc20').description('Bridges ERC20 tokens to L2.').argument('<amount>', 'The amount of Fee Juice to mint and bridge.', parseBigint).argument('<recipient>', 'Aztec address of the recipient.', parseAztecAddress).addOption(l1RpcUrlsOption).option('-m, --mnemonic <string>', 'The mnemonic to use for deriving the Ethereum address that will mint and bridge', 'test test test test test test test test test test test junk').option('--mint', 'Mint the tokens on L1', false).option('--private', 'If the bridge should use the private flow', false).addOption(l1ChainIdOption).requiredOption('-t, --token <string>', 'The address of the token to bridge', parseEthereumAddress).requiredOption('-p, --portal <string>', 'The address of the portal contract', parseEthereumAddress).option('-f, --faucet <string>', 'The address of the faucet contract (only used if minting)', parseEthereumAddress).option('--l1-private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--json', 'Output the claim in JSON format').action(async (amount, recipient, options)=>{
168
176
  const { bridgeERC20 } = await import('./bridge_erc20.js');
169
- await bridgeERC20(amount, recipient, options.l1RpcUrls, options.l1ChainId, options.l1PrivateKey, options.mnemonic, options.token, options.portal, options.private, options.mint, options.json, log, debugLogger);
177
+ await bridgeERC20(amount, recipient, options.l1RpcUrls, options.l1ChainId, options.l1PrivateKey, options.mnemonic, options.token, options.faucet, options.portal, options.private, options.mint, options.json, log, debugLogger);
170
178
  });
171
179
  program.command('create-l1-account').option('--json', 'Output the account in JSON format').action(async (options)=>{
172
180
  const { createL1Account } = await import('./create_l1_account.js');
@@ -186,23 +194,5 @@ export function injectCommands(program, log, debugLogger) {
186
194
  const { advanceEpoch } = await import('./advance_epoch.js');
187
195
  await advanceEpoch(options.l1RpcUrls, options.rpcUrl, log);
188
196
  });
189
- program.command('prover-stats', {
190
- hidden: true
191
- }).addOption(l1RpcUrlsOption).addOption(l1ChainIdOption).option('--start-block <number>', 'The L1 block number to start from', parseBigint, 1n).option('--end-block <number>', 'The last L1 block number to query', parseBigint).option('--batch-size <number>', 'The number of blocks to query in each batch', parseBigint, 100n).option('--proving-timeout <number>', 'Cutoff for proving time to consider a block', parseBigint).option('--l1-rollup-address <string>', 'Address of the rollup contract (required if node URL is not set)').option('--node-url <string>', 'JSON RPC URL of an Aztec node to retrieve the rollup contract address (required if L1 rollup address is not set)').option('--raw-logs', 'Output raw logs instead of aggregated stats').action(async (options)=>{
192
- const { proverStats } = await import('./prover_stats.js');
193
- const { l1RpcUrls, chainId, l1RollupAddress, startBlock, endBlock, batchSize, nodeUrl, provingTimeout, rawLogs } = options;
194
- await proverStats({
195
- l1RpcUrls,
196
- chainId,
197
- l1RollupAddress,
198
- startBlock,
199
- endBlock,
200
- batchSize,
201
- nodeUrl,
202
- provingTimeout,
203
- rawLogs,
204
- log
205
- });
206
- });
207
197
  return program;
208
198
  }
@@ -0,0 +1,6 @@
1
+ import type { LogFn } from '@aztec/foundation/log';
2
+ import type { RollupCommandArgs } from './update_l1_validators.js';
3
+ export declare function triggerSeedSnapshot({ rpcUrls, chainId, privateKey, mnemonic, rollupAddress, log, }: RollupCommandArgs & {
4
+ log: LogFn;
5
+ }): Promise<void>;
6
+ //# sourceMappingURL=trigger_seed_snapshot.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"trigger_seed_snapshot.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/trigger_seed_snapshot.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAKnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,wBAAsB,mBAAmB,CAAC,EACxC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,GAAG,GACJ,EAAE,iBAAiB,GAAG;IAAE,GAAG,EAAE,KAAK,CAAA;CAAE,iBAepC"}
@@ -0,0 +1,19 @@
1
+ import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
2
+ import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
3
+ import { getContract } from 'viem';
4
+ export async function triggerSeedSnapshot({ rpcUrls, chainId, privateKey, mnemonic, rollupAddress, log }) {
5
+ const chain = createEthereumChain(rpcUrls, chainId);
6
+ const client = createExtendedL1Client(rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
7
+ const rollup = getContract({
8
+ address: rollupAddress.toString(),
9
+ abi: RollupAbi,
10
+ client
11
+ });
12
+ log('Triggering seed snapshot for next epoch');
13
+ const txHash = await rollup.write.checkpointRandao();
14
+ log(`Sent! | Seed snapshot setup for next epoch | tx hash: ${txHash}`);
15
+ const receipt = await client.waitForTransactionReceipt({
16
+ hash: txHash
17
+ });
18
+ log(`Done! | Seed snapshot setup for next epoch | tx hash: ${txHash} | status: ${receipt.status}`);
19
+ }
@@ -8,6 +8,13 @@ export interface RollupCommandArgs {
8
8
  rollupAddress: EthAddress;
9
9
  withdrawerAddress?: EthAddress;
10
10
  }
11
+ export interface StakingAssetHandlerCommandArgs {
12
+ rpcUrls: string[];
13
+ chainId: number;
14
+ privateKey?: string;
15
+ mnemonic?: string;
16
+ stakingAssetHandlerAddress: EthAddress;
17
+ }
11
18
  export interface LoggerArgs {
12
19
  log: LogFn;
13
20
  debugLogger: Logger;
@@ -16,8 +23,16 @@ export declare function generateL1Account(): {
16
23
  privateKey: `0x${string}`;
17
24
  address: `0x${string}`;
18
25
  };
19
- export declare function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, withdrawerAddress, log, debugLogger, }: RollupCommandArgs & LoggerArgs & {
20
- validatorAddress: EthAddress;
26
+ export declare function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, stakingAssetHandlerAddress, merkleProof, proofParams, blsSecretKey, log, debugLogger, }: StakingAssetHandlerCommandArgs & LoggerArgs & {
27
+ blsSecretKey: bigint;
28
+ attesterAddress: EthAddress;
29
+ proofParams: Buffer;
30
+ merkleProof: string[];
31
+ }): Promise<void>;
32
+ export declare function addL1ValidatorViaRollup({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, withdrawerAddress, blsSecretKey, moveWithLatestRollup, rollupAddress, log, debugLogger, }: RollupCommandArgs & LoggerArgs & {
33
+ blsSecretKey: bigint;
34
+ attesterAddress: EthAddress;
35
+ moveWithLatestRollup: boolean;
21
36
  }): Promise<void>;
22
37
  export declare function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, log, debugLogger, }: RollupCommandArgs & LoggerArgs & {
23
38
  validatorAddress: EthAddress;
@@ -1 +1 @@
1
- {"version":3,"file":"update_l1_validators.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/update_l1_validators.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,UAAU,CAAC;IAC1B,iBAAiB,CAAC,EAAE,UAAU,CAAC;CAChC;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,KAAK,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,iBAAiB;;;EAQhC;AAED,wBAAsB,cAAc,CAAC,EACnC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,gBAAgB,EAAE,UAAU,CAAA;CAAE,iBA+CnE;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,gBAAgB,EAAE,UAAU,CAAA;CAAE,iBAcnE;AAED,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,iBAchC;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,OAAO,EACP,aAAa,EACb,SAAS,EACT,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAyBxD;AAED,wBAAsB,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,iBAAiB,GAAG,UAAU,iBA4BzG"}
1
+ {"version":3,"file":"update_l1_validators.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/update_l1_validators.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAS3D,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,UAAU,CAAC;IAC1B,iBAAiB,CAAC,EAAE,UAAU,CAAC;CAChC;AAED,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0BAA0B,EAAE,UAAU,CAAC;CACxC;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,KAAK,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,iBAAiB;;;EAQhC;AAED,wBAAsB,cAAc,CAAC,EACnC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,eAAe,EACf,0BAA0B,EAC1B,WAAW,EACX,WAAW,EACX,YAAY,EACZ,GAAG,EACH,WAAW,GACZ,EAAE,8BAA8B,GAC/B,UAAU,GAAG;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,UAAU,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,iBA4DF;AAED,wBAAsB,uBAAuB,CAAC,EAC5C,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,eAAe,EACf,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EACpB,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAClB,UAAU,GAAG;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,UAAU,CAAC;IAC5B,oBAAoB,EAAE,OAAO,CAAC;CAC/B,iBAuDF;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,gBAAgB,EAAE,UAAU,CAAA;CAAE,iBAiBnE;AAED,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,iBAgBhC;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,OAAO,EACP,aAAa,EACb,SAAS,EACT,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAyBxD;AAED,wBAAsB,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,iBAAiB,GAAG,UAAU,iBAwBzG"}
@@ -1,7 +1,10 @@
1
- import { EthCheatCodes, createEthereumChain, getExpectedAddress, getL1ContractsConfigEnvVars, isAnvilTestChain } from '@aztec/ethereum';
2
- import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
3
- import { createPublicClient, createWalletClient, fallback, getContract, http } from 'viem';
1
+ import { GSEContract, RollupContract, createEthereumChain, createExtendedL1Client, createL1TxUtilsFromViemWallet, getL1ContractsConfigEnvVars, getPublicClient, isAnvilTestChain } from '@aztec/ethereum';
2
+ import { EthCheatCodes } from '@aztec/ethereum/test';
3
+ import { RollupAbi, StakingAssetHandlerAbi } from '@aztec/l1-artifacts';
4
+ import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
5
+ import { encodeFunctionData, formatEther, getContract } from 'viem';
4
6
  import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
7
+ import { addLeadingHex } from '../../utils/aztec.js';
5
8
  export function generateL1Account() {
6
9
  const privateKey = generatePrivateKey();
7
10
  const account = privateKeyToAccount(privateKey);
@@ -11,100 +14,165 @@ export function generateL1Account() {
11
14
  address: account.address
12
15
  };
13
16
  }
14
- export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, withdrawerAddress, log, debugLogger }) {
15
- const config = getL1ContractsConfigEnvVars();
17
+ export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, stakingAssetHandlerAddress, merkleProof, proofParams, blsSecretKey, log, debugLogger }) {
16
18
  const dualLog = makeDualLog(log, debugLogger);
17
- const publicClient = getPublicClient(rpcUrls, chainId);
18
- const walletClient = getWalletClient(rpcUrls, chainId, privateKey, mnemonic);
19
+ const account = getAccount(privateKey, mnemonic);
20
+ const chain = createEthereumChain(rpcUrls, chainId);
21
+ const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
22
+ const stakingAssetHandler = getContract({
23
+ address: stakingAssetHandlerAddress.toString(),
24
+ abi: StakingAssetHandlerAbi,
25
+ client: l1Client
26
+ });
27
+ const rollupAddress = await stakingAssetHandler.read.getRollup();
28
+ dualLog(`Adding validator ${attesterAddress} to rollup ${rollupAddress.toString()}`);
19
29
  const rollup = getContract({
20
- address: rollupAddress.toString(),
30
+ address: rollupAddress,
21
31
  abi: RollupAbi,
22
- client: walletClient
23
- });
24
- const stakingAsset = getContract({
25
- address: await rollup.read.getStakingAsset(),
26
- abi: TestERC20Abi,
27
- client: walletClient
28
- });
29
- await Promise.all([
30
- await stakingAsset.write.mint([
31
- walletClient.account.address,
32
- config.minimumStake
33
- ], {}),
34
- await stakingAsset.write.approve([
35
- rollupAddress.toString(),
36
- config.minimumStake
37
- ], {})
38
- ].map((txHash)=>publicClient.waitForTransactionReceipt({
39
- hash: txHash
40
- })));
41
- dualLog(`Adding validator ${validatorAddress.toString()} to rollup ${rollupAddress.toString()}`);
42
- const txHash = await rollup.write.deposit([
43
- validatorAddress.toString(),
44
- // TODO(#11451): custom forwarders
45
- getExpectedAddress(ForwarderAbi, ForwarderBytecode, [
46
- validatorAddress.toString()
47
- ], validatorAddress.toString()).address,
48
- withdrawerAddress?.toString() ?? validatorAddress.toString(),
49
- config.minimumStake
50
- ]);
51
- dualLog(`Transaction hash: ${txHash}`);
52
- await publicClient.waitForTransactionReceipt({
53
- hash: txHash
32
+ client: l1Client
33
+ });
34
+ const gseAddress = await rollup.read.getGSE();
35
+ const gse = new GSEContract(l1Client, gseAddress);
36
+ const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
37
+ const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
38
+ logger: debugLogger
39
+ });
40
+ const proofParamsObj = ZkPassportProofParams.fromBuffer(proofParams);
41
+ const merkleProofArray = merkleProof.map((proof)=>addLeadingHex(proof));
42
+ const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
43
+ to: stakingAssetHandlerAddress.toString(),
44
+ data: encodeFunctionData({
45
+ abi: StakingAssetHandlerAbi,
46
+ functionName: 'addValidator',
47
+ args: [
48
+ attesterAddress.toString(),
49
+ merkleProofArray,
50
+ proofParamsObj.toViem(),
51
+ registrationTuple.publicKeyInG1,
52
+ registrationTuple.publicKeyInG2,
53
+ registrationTuple.proofOfPossession
54
+ ]
55
+ }),
56
+ abi: StakingAssetHandlerAbi
57
+ });
58
+ dualLog(`Transaction hash: ${receipt.transactionHash}`);
59
+ await l1Client.waitForTransactionReceipt({
60
+ hash: receipt.transactionHash
54
61
  });
55
62
  if (isAnvilTestChain(chainId)) {
56
63
  dualLog(`Funding validator on L1`);
57
64
  const cheatCodes = new EthCheatCodes(rpcUrls, debugLogger);
58
- await cheatCodes.setBalance(validatorAddress, 10n ** 20n);
65
+ await cheatCodes.setBalance(attesterAddress, 10n ** 20n);
59
66
  } else {
60
- const balance = await publicClient.getBalance({
61
- address: validatorAddress.toString()
67
+ const balance = await l1Client.getBalance({
68
+ address: attesterAddress.toString()
62
69
  });
63
- const balanceInEth = Number(balance) / 10 ** 18;
64
- dualLog(`Validator balance: ${balanceInEth.toFixed(6)} ETH`);
65
- if (balanceInEth === 0) {
66
- dualLog(`WARNING: Validator has no balance. Remember to fund it!`);
70
+ dualLog(`Validator balance: ${formatEther(balance)} ETH`);
71
+ if (balance === 0n) {
72
+ dualLog(`WARNING: Proposer has no balance. Remember to fund it!`);
67
73
  }
68
74
  }
69
75
  }
70
- export async function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, log, debugLogger }) {
76
+ export async function addL1ValidatorViaRollup({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, withdrawerAddress, blsSecretKey, moveWithLatestRollup, rollupAddress, log, debugLogger }) {
71
77
  const dualLog = makeDualLog(log, debugLogger);
72
- const publicClient = getPublicClient(rpcUrls, chainId);
73
- const walletClient = getWalletClient(rpcUrls, chainId, privateKey, mnemonic);
78
+ const account = getAccount(privateKey, mnemonic);
79
+ const chain = createEthereumChain(rpcUrls, chainId);
80
+ const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
81
+ dualLog(`Adding validator ${attesterAddress} to rollup ${rollupAddress.toString()} via direct deposit`);
82
+ if (!withdrawerAddress) {
83
+ throw new Error(`Withdrawer address required`);
84
+ }
74
85
  const rollup = getContract({
75
86
  address: rollupAddress.toString(),
76
87
  abi: RollupAbi,
77
- client: walletClient
88
+ client: l1Client
89
+ });
90
+ const gseAddress = await rollup.read.getGSE();
91
+ const gse = new GSEContract(l1Client, gseAddress);
92
+ const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
93
+ const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
94
+ logger: debugLogger
95
+ });
96
+ const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
97
+ to: rollupAddress.toString(),
98
+ data: encodeFunctionData({
99
+ abi: RollupAbi,
100
+ functionName: 'deposit',
101
+ args: [
102
+ attesterAddress.toString(),
103
+ withdrawerAddress.toString(),
104
+ registrationTuple.publicKeyInG1,
105
+ registrationTuple.publicKeyInG2,
106
+ registrationTuple.proofOfPossession,
107
+ moveWithLatestRollup
108
+ ]
109
+ }),
110
+ abi: StakingAssetHandlerAbi
111
+ });
112
+ dualLog(`Transaction hash: ${receipt.transactionHash}`);
113
+ await l1Client.waitForTransactionReceipt({
114
+ hash: receipt.transactionHash
115
+ });
116
+ if (isAnvilTestChain(chainId)) {
117
+ dualLog(`Funding validator on L1`);
118
+ const cheatCodes = new EthCheatCodes(rpcUrls, debugLogger);
119
+ await cheatCodes.setBalance(attesterAddress, 10n ** 20n);
120
+ } else {
121
+ const balance = await l1Client.getBalance({
122
+ address: attesterAddress.toString()
123
+ });
124
+ dualLog(`Validator balance: ${formatEther(balance)} ETH`);
125
+ if (balance === 0n) {
126
+ dualLog(`WARNING: Proposer has no balance. Remember to fund it!`);
127
+ }
128
+ }
129
+ }
130
+ export async function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, log, debugLogger }) {
131
+ const dualLog = makeDualLog(log, debugLogger);
132
+ const account = getAccount(privateKey, mnemonic);
133
+ const chain = createEthereumChain(rpcUrls, chainId);
134
+ const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
135
+ const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
136
+ logger: debugLogger
78
137
  });
79
138
  dualLog(`Removing validator ${validatorAddress.toString()} from rollup ${rollupAddress.toString()}`);
80
- const txHash = await rollup.write.initiateWithdraw([
81
- validatorAddress.toString(),
82
- validatorAddress.toString()
83
- ]);
84
- dualLog(`Transaction hash: ${txHash}`);
85
- await publicClient.waitForTransactionReceipt({
86
- hash: txHash
139
+ const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
140
+ to: rollupAddress.toString(),
141
+ data: encodeFunctionData({
142
+ abi: RollupAbi,
143
+ functionName: 'initiateWithdraw',
144
+ args: [
145
+ validatorAddress.toString(),
146
+ validatorAddress.toString()
147
+ ]
148
+ })
87
149
  });
150
+ dualLog(`Transaction hash: ${receipt.transactionHash}`);
88
151
  }
89
152
  export async function pruneRollup({ rpcUrls, chainId, privateKey, mnemonic, rollupAddress, log, debugLogger }) {
90
153
  const dualLog = makeDualLog(log, debugLogger);
91
- const publicClient = getPublicClient(rpcUrls, chainId);
92
- const walletClient = getWalletClient(rpcUrls, chainId, privateKey, mnemonic);
93
- const rollup = getContract({
94
- address: rollupAddress.toString(),
95
- abi: RollupAbi,
96
- client: walletClient
154
+ const account = getAccount(privateKey, mnemonic);
155
+ const chain = createEthereumChain(rpcUrls, chainId);
156
+ const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
157
+ const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
158
+ logger: debugLogger
97
159
  });
98
160
  dualLog(`Trying prune`);
99
- const txHash = await rollup.write.prune();
100
- dualLog(`Transaction hash: ${txHash}`);
101
- await publicClient.waitForTransactionReceipt({
102
- hash: txHash
161
+ const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
162
+ to: rollupAddress.toString(),
163
+ data: encodeFunctionData({
164
+ abi: RollupAbi,
165
+ functionName: 'prune'
166
+ })
103
167
  });
168
+ dualLog(`Transaction hash: ${receipt.transactionHash}`);
104
169
  }
105
170
  export async function fastForwardEpochs({ rpcUrls, chainId, rollupAddress, numEpochs, log, debugLogger }) {
106
171
  const dualLog = makeDualLog(log, debugLogger);
107
- const publicClient = getPublicClient(rpcUrls, chainId);
172
+ const publicClient = getPublicClient({
173
+ l1RpcUrls: rpcUrls,
174
+ l1ChainId: chainId
175
+ });
108
176
  const rollup = getContract({
109
177
  address: rollupAddress.toString(),
110
178
  abi: RollupAbi,
@@ -118,7 +186,9 @@ export async function fastForwardEpochs({ rpcUrls, chainId, rollupAddress, numEp
118
186
  ]);
119
187
  dualLog(`Fast forwarding ${numEpochs} epochs to ${timestamp}`);
120
188
  try {
121
- await cheatCodes.warp(Number(timestamp));
189
+ await cheatCodes.warp(Number(timestamp), {
190
+ resetBlockInterval: true
191
+ });
122
192
  dualLog(`Fast forwarded ${numEpochs} epochs to ${timestamp}`);
123
193
  } catch (error) {
124
194
  if (error instanceof Error && error.message.includes("is lower than or equal to previous block's timestamp")) {
@@ -131,32 +201,29 @@ export async function fastForwardEpochs({ rpcUrls, chainId, rollupAddress, numEp
131
201
  }
132
202
  export async function debugRollup({ rpcUrls, chainId, rollupAddress, log }) {
133
203
  const config = getL1ContractsConfigEnvVars();
134
- const publicClient = getPublicClient(rpcUrls, chainId);
135
- const rollup = getContract({
136
- address: rollupAddress.toString(),
137
- abi: RollupAbi,
138
- client: publicClient
204
+ const publicClient = getPublicClient({
205
+ l1RpcUrls: rpcUrls,
206
+ l1ChainId: chainId
139
207
  });
140
- const pendingNum = await rollup.read.getPendingBlockNumber();
208
+ const rollup = new RollupContract(publicClient, rollupAddress);
209
+ const pendingNum = await rollup.getBlockNumber();
141
210
  log(`Pending block num: ${pendingNum}`);
142
- const provenNum = await rollup.read.getProvenBlockNumber();
211
+ const provenNum = await rollup.getProvenBlockNumber();
143
212
  log(`Proven block num: ${provenNum}`);
144
- const validators = await rollup.read.getAttesters();
213
+ const validators = await rollup.getAttesters();
145
214
  log(`Validators: ${validators.map((v)=>v.toString()).join(', ')}`);
146
- const committee = await rollup.read.getCurrentEpochCommittee();
147
- log(`Committee: ${committee.map((v)=>v.toString()).join(', ')}`);
148
- const archive = await rollup.read.archive();
215
+ const committee = await rollup.getCurrentEpochCommittee();
216
+ log(`Committee: ${committee?.map((v)=>v.toString()).join(', ')}`);
217
+ const archive = await rollup.archive();
149
218
  log(`Archive: ${archive}`);
150
- const epochNum = await rollup.read.getCurrentEpoch();
219
+ const epochNum = await rollup.getCurrentEpochNumber();
151
220
  log(`Current epoch: ${epochNum}`);
152
- const slot = await rollup.read.getCurrentSlot();
221
+ const slot = await rollup.getSlotNumber();
153
222
  log(`Current slot: ${slot}`);
154
- const proposerDuringPrevL1Block = await rollup.read.getCurrentProposer();
223
+ const proposerDuringPrevL1Block = await rollup.getCurrentProposer();
155
224
  log(`Proposer during previous L1 block: ${proposerDuringPrevL1Block}`);
156
225
  const nextBlockTS = BigInt((await publicClient.getBlock()).timestamp + BigInt(config.ethereumSlotDuration));
157
- const proposer = await rollup.read.getProposerAt([
158
- nextBlockTS
159
- ]);
226
+ const proposer = await rollup.getProposerAt(nextBlockTS);
160
227
  log(`Proposer NOW: ${proposer.toString()}`);
161
228
  }
162
229
  function makeDualLog(log, debugLogger) {
@@ -165,22 +232,10 @@ function makeDualLog(log, debugLogger) {
165
232
  debugLogger.info(msg);
166
233
  };
167
234
  }
168
- function getPublicClient(rpcUrls, chainId) {
169
- const chain = createEthereumChain(rpcUrls, chainId);
170
- return createPublicClient({
171
- chain: chain.chainInfo,
172
- transport: fallback(rpcUrls.map((url)=>http(url)))
173
- });
174
- }
175
- function getWalletClient(rpcUrls, chainId, privateKey, mnemonic) {
235
+ function getAccount(privateKey, mnemonic) {
176
236
  if (!privateKey && !mnemonic) {
177
237
  throw new Error('Either privateKey or mnemonic must be provided to create a wallet client');
178
238
  }
179
- const chain = createEthereumChain(rpcUrls, chainId);
180
239
  const account = !privateKey ? mnemonicToAccount(mnemonic) : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}`);
181
- return createWalletClient({
182
- account,
183
- chain: chain.chainInfo,
184
- transport: fallback(rpcUrls.map((url)=>http(url)))
185
- });
240
+ return account;
186
241
  }
@@ -1,3 +1,3 @@
1
1
  import type { LogFn } from '@aztec/foundation/log';
2
- export declare function generateEncodedBootnodeENR(privateKey: string, udpAnnounceAddress: string, l1ChainId: number, log: LogFn): Promise<void>;
2
+ export declare function generateEncodedBootnodeENR(privateKey: string, p2pIp: string, p2pPort: number, l1ChainId: number, log: LogFn): Promise<void>;
3
3
  //# sourceMappingURL=generate_bootnode_enr.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"generate_bootnode_enr.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/generate_bootnode_enr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,MAAM,EAClB,kBAAkB,EAAE,MAAM,EAC1B,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,KAAK,iBAIX"}
1
+ {"version":3,"file":"generate_bootnode_enr.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/generate_bootnode_enr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,KAAK,iBAIX"}
@@ -1,5 +1,5 @@
1
1
  import { createBootnodeENRandPeerId } from '@aztec/p2p/enr';
2
- export async function generateEncodedBootnodeENR(privateKey, udpAnnounceAddress, l1ChainId, log) {
3
- const { enr } = await createBootnodeENRandPeerId(privateKey, udpAnnounceAddress, l1ChainId);
2
+ export async function generateEncodedBootnodeENR(privateKey, p2pIp, p2pPort, l1ChainId, log) {
3
+ const { enr } = await createBootnodeENRandPeerId(privateKey, p2pIp, p2pPort, l1ChainId);
4
4
  log(`ENR: ${enr.encodeTxt()}`);
5
5
  }
@@ -1,3 +1,3 @@
1
1
  import type { LogFn } from '@aztec/foundation/log';
2
- export declare function generateSecretAndHash(log: LogFn): void;
2
+ export declare function generateSecretAndHash(log: LogFn): Promise<void>;
3
3
  //# sourceMappingURL=generate_secret_and_hash.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"generate_secret_and_hash.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/generate_secret_and_hash.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,KAAK,QAU/C"}
1
+ {"version":3,"file":"generate_secret_and_hash.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/generate_secret_and_hash.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,KAAK,iBAUrD"}
@@ -1,9 +1,9 @@
1
1
  import { computeSecretHash } from '@aztec/aztec.js';
2
2
  import { Fr } from '@aztec/foundation/fields';
3
- export function generateSecretAndHash(log) {
3
+ export async function generateSecretAndHash(log) {
4
4
  const secret = Fr.random();
5
5
  // We hash this the same way that aztec nr hash does.
6
- const secretHash = computeSecretHash(secret);
6
+ const secretHash = await computeSecretHash(secret);
7
7
  log(`
8
8
  Secret: ${secret}
9
9
  Secret hash: ${secretHash}
@@ -0,0 +1,3 @@
1
+ import type { LogFn } from '@aztec/foundation/log';
2
+ export declare function getCanonicalSponsoredFPCAddress(log: LogFn): Promise<void>;
3
+ //# sourceMappingURL=get_canonical_sponsored_fpc_address.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"get_canonical_sponsored_fpc_address.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/get_canonical_sponsored_fpc_address.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,wBAAsB,+BAA+B,CAAC,GAAG,EAAE,KAAK,iBAE/D"}
@@ -0,0 +1,4 @@
1
+ import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
2
+ export async function getCanonicalSponsoredFPCAddress(log) {
3
+ log(`Canonical SponsoredFPC Address: ${(await getSponsoredFPCAddress()).toString()}`);
4
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,WAoF1D"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,WA6F1D"}