@aztec/cli 0.0.0-test.1 → 0.0.1-commit.24de95ac

package/dest/cmds/l1/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAsBjD,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAohB/E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAcjD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAa3D,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAof/E"}

package/dest/cmds/l1/index.js

@@ -1,20 +1,22 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Option } from 'commander';
-import { ETHEREUM_HOSTS, PRIVATE_KEY, l1ChainIdOption, makePxeOption, parseAztecAddress, parseBigint, parseEthereumAddress, pxeOption } from '../../utils/commands.js';
+import { getL1RollupAddressFromEnv } from '../../config/get_l1_config.js';
+import { ETHEREUM_HOSTS, MNEMONIC, PRIVATE_KEY, l1ChainIdOption, nodeOption, parseAztecAddress, parseBigint, parseEthereumAddress } from '../../utils/commands.js';
+export { addL1Validator } from './update_l1_validators.js';
 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([
     ETHEREUM_HOSTS
 ]).makeOptionMandatory(true).argParser((arg)=>arg.split(',').map((url)=>url.trim()));
+const networkOption = new Option('--network <string>', 'Network to execute against').env('NETWORK');
 export function injectCommands(program, log, debugLogger) {
-    const { BB_BINARY_PATH, BB_WORKING_DIRECTORY } = process.env;
-    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)=>{
+    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)=>{
         const { deployL1Contracts } = await import('./deploy_l1_contracts.js');
         const initialValidators = options.validators?.split(',').map((validator)=>EthAddress.fromString(validator)) || [];
-        await deployL1Contracts(options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.acceleratedTestDeployments, options.json, initialValidators, log, debugLogger);
+        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);
     });
-    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)=>{
+    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)=>{
         const { deployNewRollup } = await import('./deploy_new_rollup.js');
         const initialValidators = options.validators?.split(',').map((validator)=>EthAddress.fromString(validator)) || [];
-        await deployNewRollup(options.registryAddress, options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.json, initialValidators, log, debugLogger);
+        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);
     });
     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)=>{
         const { depositGovernanceTokens } = await import('./governance_utils.js');
@@ -94,16 +96,19 @@ export function injectCommands(program, log, debugLogger) {
         const account = generateL1Account();
         log(JSON.stringify(account, null, 2));
     });
-    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)=>{
-        const { addL1Validator } = await import('./update_l1_validators.js');
-        await addL1Validator({
+    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)=>{
+        const { addL1ValidatorViaRollup } = await import('./update_l1_validators.js');
+        const rollupAddress = options.rollup ?? await getL1RollupAddressFromEnv(options.l1RpcUrls, options.l1ChainId);
+        await addL1ValidatorViaRollup({
             rpcUrls: options.l1RpcUrls,
             chainId: options.l1ChainId,
             privateKey: options.privateKey,
             mnemonic: options.mnemonic,
-            validatorAddress: options.validator,
-            rollupAddress: options.rollup,
+            attesterAddress: options.attester,
+            blsSecretKey: options.blsSecretKey,
             withdrawerAddress: options.withdrawer,
+            rollupAddress,
+            moveWithLatestRollup: options.moveWithLatestRollup,
             log,
             debugLogger
         });
@@ -132,6 +137,17 @@ export function injectCommands(program, log, debugLogger) {
             debugLogger
         });
     });
+    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)=>{
+        const { triggerSeedSnapshot } = await import('./trigger_seed_snapshot.js');
+        await triggerSeedSnapshot({
+            rollupAddress: options.rollup,
+            rpcUrls: options.l1RpcUrls,
+            chainId: options.l1ChainId,
+            privateKey: options.privateKey,
+            mnemonic: options.mnemonic,
+            log
+        });
+    });
     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)=>{
         const { debugRollup } = await import('./update_l1_validators.js');
         await debugRollup({
@@ -156,17 +172,9 @@ export function injectCommands(program, log, debugLogger) {
             debugLogger
         });
     });
-    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)=>{
-        const { deployMockVerifier, deployUltraHonkVerifier } = await import('./deploy_l1_verifier.js');
-        if (options.verifier === 'mock') {
-            await deployMockVerifier(options.rollupAddress?.toString(), options.l1RpcUrls, options.l1ChainId, options.l1PrivateKey, options.mnemonic, options.rpcUrl, log, debugLogger);
-        } else {
-            await deployUltraHonkVerifier(options.rollupAddress?.toString(), options.l1RpcUrls, options.l1ChainId, options.l1PrivateKey, options.mnemonic, options.rpcUrl, options.bb, options.bbWorkingDir, log, debugLogger);
-        }
-    });
-    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)=>{
+    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)=>{
         const { bridgeERC20 } = await import('./bridge_erc20.js');
-        await bridgeERC20(amount, recipient, options.l1RpcUrls, options.l1ChainId, options.l1PrivateKey, options.mnemonic, options.token, options.portal, options.private, options.mint, options.json, log, debugLogger);
+        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);
     });
     program.command('create-l1-account').option('--json', 'Output the account in JSON format').action(async (options)=>{
         const { createL1Account } = await import('./create_l1_account.js');
@@ -178,31 +186,13 @@ export function injectCommands(program, log, debugLogger) {
     });
     program.command('set-proven-through', {
         hidden: true
-    }).description('Instructs the L1 rollup contract to assume all blocks until the given number are automatically proven.').argument('[blockNumber]', 'The target block number, defaults to the latest pending block number.', parseBigint).addOption(l1RpcUrlsOption).addOption(pxeOption).action(async (blockNumber, options)=>{
+    }).description('Instructs the L1 rollup contract to assume all blocks until the given number are automatically proven.').argument('[blockNumber]', 'The target block number, defaults to the latest pending block number.', parseBigint).addOption(l1RpcUrlsOption).addOption(nodeOption).action(async (blockNumber, options)=>{
         const { assumeProvenThrough } = await import('./assume_proven_through.js');
-        await assumeProvenThrough(blockNumber, options.l1RpcUrls, options.rpcUrl, log);
+        await assumeProvenThrough(blockNumber, options.l1RpcUrls, options.nodeUrl, log);
     });
-    program.command('advance-epoch').description('Use L1 cheat codes to warp time until the next epoch.').addOption(l1RpcUrlsOption).addOption(pxeOption).action(async (options)=>{
+    program.command('advance-epoch').description('Use L1 cheat codes to warp time until the next epoch.').addOption(l1RpcUrlsOption).addOption(nodeOption).action(async (options)=>{
         const { advanceEpoch } = await import('./advance_epoch.js');
-        await advanceEpoch(options.l1RpcUrls, options.rpcUrl, log);
-    });
-    program.command('prover-stats', {
-        hidden: true
-    }).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)=>{
-        const { proverStats } = await import('./prover_stats.js');
-        const { l1RpcUrls, chainId, l1RollupAddress, startBlock, endBlock, batchSize, nodeUrl, provingTimeout, rawLogs } = options;
-        await proverStats({
-            l1RpcUrls,
-            chainId,
-            l1RollupAddress,
-            startBlock,
-            endBlock,
-            batchSize,
-            nodeUrl,
-            provingTimeout,
-            rawLogs,
-            log
-        });
+        await advanceEpoch(options.l1RpcUrls, options.nodeUrl, log);
     });
     return program;
 }

package/dest/cmds/l1/trigger_seed_snapshot.d.ts

@@ -0,0 +1,6 @@
+import type { LogFn } from '@aztec/foundation/log';
+import type { RollupCommandArgs } from './update_l1_validators.js';
+export declare function triggerSeedSnapshot({ rpcUrls, chainId, privateKey, mnemonic, rollupAddress, log, }: RollupCommandArgs & {
+    log: LogFn;
+}): Promise<void>;
+//# sourceMappingURL=trigger_seed_snapshot.d.ts.map

package/dest/cmds/l1/trigger_seed_snapshot.d.ts.map

@@ -0,0 +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"}

package/dest/cmds/l1/trigger_seed_snapshot.js

@@ -0,0 +1,19 @@
+import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
+import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
+import { getContract } from 'viem';
+export async function triggerSeedSnapshot({ rpcUrls, chainId, privateKey, mnemonic, rollupAddress, log }) {
+    const chain = createEthereumChain(rpcUrls, chainId);
+    const client = createExtendedL1Client(rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
+    const rollup = getContract({
+        address: rollupAddress.toString(),
+        abi: RollupAbi,
+        client
+    });
+    log('Triggering seed snapshot for next epoch');
+    const txHash = await rollup.write.checkpointRandao();
+    log(`Sent! | Seed snapshot setup for next epoch | tx hash: ${txHash}`);
+    const receipt = await client.waitForTransactionReceipt({
+        hash: txHash
+    });
+    log(`Done! | Seed snapshot setup for next epoch | tx hash: ${txHash} | status: ${receipt.status}`);
+}

package/dest/cmds/l1/update_l1_validators.d.ts

@@ -8,6 +8,13 @@ export interface RollupCommandArgs {
     rollupAddress: EthAddress;
     withdrawerAddress?: EthAddress;
 }
+export interface StakingAssetHandlerCommandArgs {
+    rpcUrls: string[];
+    chainId: number;
+    privateKey?: string;
+    mnemonic?: string;
+    stakingAssetHandlerAddress: EthAddress;
+}
 export interface LoggerArgs {
     log: LogFn;
     debugLogger: Logger;
@@ -16,8 +23,16 @@ export declare function generateL1Account(): {
     privateKey: `0x${string}`;
     address: `0x${string}`;
 };
-export declare function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, withdrawerAddress, log, debugLogger, }: RollupCommandArgs & LoggerArgs & {
-    validatorAddress: EthAddress;
+export declare function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, stakingAssetHandlerAddress, merkleProof, proofParams, blsSecretKey, log, debugLogger, }: StakingAssetHandlerCommandArgs & LoggerArgs & {
+    blsSecretKey: bigint;
+    attesterAddress: EthAddress;
+    proofParams: Buffer;
+    merkleProof: string[];
+}): Promise<void>;
+export declare function addL1ValidatorViaRollup({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, withdrawerAddress, blsSecretKey, moveWithLatestRollup, rollupAddress, log, debugLogger, }: RollupCommandArgs & LoggerArgs & {
+    blsSecretKey: bigint;
+    attesterAddress: EthAddress;
+    moveWithLatestRollup: boolean;
 }): Promise<void>;
 export declare function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, log, debugLogger, }: RollupCommandArgs & LoggerArgs & {
     validatorAddress: EthAddress;

package/dest/cmds/l1/update_l1_validators.d.ts.map

@@ -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"}
+{"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;AAU3D,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"}

package/dest/cmds/l1/update_l1_validators.js

@@ -1,7 +1,11 @@
-import { EthCheatCodes, createEthereumChain, getExpectedAddress, getL1ContractsConfigEnvVars, isAnvilTestChain } from '@aztec/ethereum';
-import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
-import { createPublicClient, createWalletClient, fallback, getContract, http } from 'viem';
+import { GSEContract, RollupContract, createEthereumChain, createExtendedL1Client, createL1TxUtilsFromViemWallet, getL1ContractsConfigEnvVars, getPublicClient, isAnvilTestChain } from '@aztec/ethereum';
+import { EthCheatCodes } from '@aztec/ethereum/test';
+import { DateProvider } from '@aztec/foundation/timer';
+import { RollupAbi, StakingAssetHandlerAbi } from '@aztec/l1-artifacts';
+import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
+import { encodeFunctionData, formatEther, getContract } from 'viem';
 import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
+import { addLeadingHex } from '../../utils/aztec.js';
 export function generateL1Account() {
     const privateKey = generatePrivateKey();
     const account = privateKeyToAccount(privateKey);
@@ -11,106 +15,171 @@ export function generateL1Account() {
         address: account.address
     };
 }
-export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, withdrawerAddress, log, debugLogger }) {
-    const config = getL1ContractsConfigEnvVars();
+export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, stakingAssetHandlerAddress, merkleProof, proofParams, blsSecretKey, log, debugLogger }) {
     const dualLog = makeDualLog(log, debugLogger);
-    const publicClient = getPublicClient(rpcUrls, chainId);
-    const walletClient = getWalletClient(rpcUrls, chainId, privateKey, mnemonic);
+    const account = getAccount(privateKey, mnemonic);
+    const chain = createEthereumChain(rpcUrls, chainId);
+    const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
+    const stakingAssetHandler = getContract({
+        address: stakingAssetHandlerAddress.toString(),
+        abi: StakingAssetHandlerAbi,
+        client: l1Client
+    });
+    const rollupAddress = await stakingAssetHandler.read.getRollup();
+    dualLog(`Adding validator ${attesterAddress} to rollup ${rollupAddress.toString()}`);
     const rollup = getContract({
-        address: rollupAddress.toString(),
+        address: rollupAddress,
         abi: RollupAbi,
-        client: walletClient
-    });
-    const stakingAsset = getContract({
-        address: await rollup.read.getStakingAsset(),
-        abi: TestERC20Abi,
-        client: walletClient
-    });
-    await Promise.all([
-        await stakingAsset.write.mint([
-            walletClient.account.address,
-            config.minimumStake
-        ], {}),
-        await stakingAsset.write.approve([
-            rollupAddress.toString(),
-            config.minimumStake
-        ], {})
-    ].map((txHash)=>publicClient.waitForTransactionReceipt({
-            hash: txHash
-        })));
-    dualLog(`Adding validator ${validatorAddress.toString()} to rollup ${rollupAddress.toString()}`);
-    const txHash = await rollup.write.deposit([
-        validatorAddress.toString(),
-        // TODO(#11451): custom forwarders
-        getExpectedAddress(ForwarderAbi, ForwarderBytecode, [
-            validatorAddress.toString()
-        ], validatorAddress.toString()).address,
-        withdrawerAddress?.toString() ?? validatorAddress.toString(),
-        config.minimumStake
-    ]);
-    dualLog(`Transaction hash: ${txHash}`);
-    await publicClient.waitForTransactionReceipt({
-        hash: txHash
+        client: l1Client
+    });
+    const gseAddress = await rollup.read.getGSE();
+    const gse = new GSEContract(l1Client, gseAddress);
+    const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+        logger: debugLogger
+    });
+    const proofParamsObj = ZkPassportProofParams.fromBuffer(proofParams);
+    const merkleProofArray = merkleProof.map((proof)=>addLeadingHex(proof));
+    const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
+        to: stakingAssetHandlerAddress.toString(),
+        data: encodeFunctionData({
+            abi: StakingAssetHandlerAbi,
+            functionName: 'addValidator',
+            args: [
+                attesterAddress.toString(),
+                merkleProofArray,
+                proofParamsObj.toViem(),
+                registrationTuple.publicKeyInG1,
+                registrationTuple.publicKeyInG2,
+                registrationTuple.proofOfPossession
+            ]
+        }),
+        abi: StakingAssetHandlerAbi
+    });
+    dualLog(`Transaction hash: ${receipt.transactionHash}`);
+    await l1Client.waitForTransactionReceipt({
+        hash: receipt.transactionHash
     });
     if (isAnvilTestChain(chainId)) {
         dualLog(`Funding validator on L1`);
-        const cheatCodes = new EthCheatCodes(rpcUrls, debugLogger);
-        await cheatCodes.setBalance(validatorAddress, 10n ** 20n);
+        const cheatCodes = new EthCheatCodes(rpcUrls, new DateProvider(), debugLogger);
+        await cheatCodes.setBalance(attesterAddress, 10n ** 20n);
     } else {
-        const balance = await publicClient.getBalance({
-            address: validatorAddress.toString()
+        const balance = await l1Client.getBalance({
+            address: attesterAddress.toString()
         });
-        const balanceInEth = Number(balance) / 10 ** 18;
-        dualLog(`Validator balance: ${balanceInEth.toFixed(6)} ETH`);
-        if (balanceInEth === 0) {
-            dualLog(`WARNING: Validator has no balance. Remember to fund it!`);
+        dualLog(`Validator balance: ${formatEther(balance)} ETH`);
+        if (balance === 0n) {
+            dualLog(`WARNING: Proposer has no balance. Remember to fund it!`);
         }
     }
 }
-export async function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, log, debugLogger }) {
+export async function addL1ValidatorViaRollup({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, withdrawerAddress, blsSecretKey, moveWithLatestRollup, rollupAddress, log, debugLogger }) {
     const dualLog = makeDualLog(log, debugLogger);
-    const publicClient = getPublicClient(rpcUrls, chainId);
-    const walletClient = getWalletClient(rpcUrls, chainId, privateKey, mnemonic);
+    const account = getAccount(privateKey, mnemonic);
+    const chain = createEthereumChain(rpcUrls, chainId);
+    const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
+    dualLog(`Adding validator ${attesterAddress} to rollup ${rollupAddress.toString()} via direct deposit`);
+    if (!withdrawerAddress) {
+        throw new Error(`Withdrawer address required`);
+    }
     const rollup = getContract({
         address: rollupAddress.toString(),
         abi: RollupAbi,
-        client: walletClient
+        client: l1Client
+    });
+    const gseAddress = await rollup.read.getGSE();
+    const gse = new GSEContract(l1Client, gseAddress);
+    const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+        logger: debugLogger
+    });
+    const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
+        to: rollupAddress.toString(),
+        data: encodeFunctionData({
+            abi: RollupAbi,
+            functionName: 'deposit',
+            args: [
+                attesterAddress.toString(),
+                withdrawerAddress.toString(),
+                registrationTuple.publicKeyInG1,
+                registrationTuple.publicKeyInG2,
+                registrationTuple.proofOfPossession,
+                moveWithLatestRollup
+            ]
+        }),
+        abi: StakingAssetHandlerAbi
+    });
+    dualLog(`Transaction hash: ${receipt.transactionHash}`);
+    await l1Client.waitForTransactionReceipt({
+        hash: receipt.transactionHash
+    });
+    if (isAnvilTestChain(chainId)) {
+        dualLog(`Funding validator on L1`);
+        const cheatCodes = new EthCheatCodes(rpcUrls, new DateProvider(), debugLogger);
+        await cheatCodes.setBalance(attesterAddress, 10n ** 20n);
+    } else {
+        const balance = await l1Client.getBalance({
+            address: attesterAddress.toString()
+        });
+        dualLog(`Validator balance: ${formatEther(balance)} ETH`);
+        if (balance === 0n) {
+            dualLog(`WARNING: Proposer has no balance. Remember to fund it!`);
+        }
+    }
+}
+export async function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, log, debugLogger }) {
+    const dualLog = makeDualLog(log, debugLogger);
+    const account = getAccount(privateKey, mnemonic);
+    const chain = createEthereumChain(rpcUrls, chainId);
+    const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+        logger: debugLogger
     });
     dualLog(`Removing validator ${validatorAddress.toString()} from rollup ${rollupAddress.toString()}`);
-    const txHash = await rollup.write.initiateWithdraw([
-        validatorAddress.toString(),
-        validatorAddress.toString()
-    ]);
-    dualLog(`Transaction hash: ${txHash}`);
-    await publicClient.waitForTransactionReceipt({
-        hash: txHash
+    const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
+        to: rollupAddress.toString(),
+        data: encodeFunctionData({
+            abi: RollupAbi,
+            functionName: 'initiateWithdraw',
+            args: [
+                validatorAddress.toString(),
+                validatorAddress.toString()
+            ]
+        })
     });
+    dualLog(`Transaction hash: ${receipt.transactionHash}`);
 }
 export async function pruneRollup({ rpcUrls, chainId, privateKey, mnemonic, rollupAddress, log, debugLogger }) {
     const dualLog = makeDualLog(log, debugLogger);
-    const publicClient = getPublicClient(rpcUrls, chainId);
-    const walletClient = getWalletClient(rpcUrls, chainId, privateKey, mnemonic);
-    const rollup = getContract({
-        address: rollupAddress.toString(),
-        abi: RollupAbi,
-        client: walletClient
+    const account = getAccount(privateKey, mnemonic);
+    const chain = createEthereumChain(rpcUrls, chainId);
+    const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+        logger: debugLogger
     });
     dualLog(`Trying prune`);
-    const txHash = await rollup.write.prune();
-    dualLog(`Transaction hash: ${txHash}`);
-    await publicClient.waitForTransactionReceipt({
-        hash: txHash
+    const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
+        to: rollupAddress.toString(),
+        data: encodeFunctionData({
+            abi: RollupAbi,
+            functionName: 'prune'
+        })
     });
+    dualLog(`Transaction hash: ${receipt.transactionHash}`);
 }
 export async function fastForwardEpochs({ rpcUrls, chainId, rollupAddress, numEpochs, log, debugLogger }) {
     const dualLog = makeDualLog(log, debugLogger);
-    const publicClient = getPublicClient(rpcUrls, chainId);
+    const publicClient = getPublicClient({
+        l1RpcUrls: rpcUrls,
+        l1ChainId: chainId
+    });
     const rollup = getContract({
         address: rollupAddress.toString(),
         abi: RollupAbi,
         client: publicClient
     });
-    const cheatCodes = new EthCheatCodes(rpcUrls, debugLogger);
+    const cheatCodes = new EthCheatCodes(rpcUrls, new DateProvider(), debugLogger);
     const currentSlot = await rollup.read.getCurrentSlot();
     const l2SlotsInEpoch = await rollup.read.getEpochDuration();
     const timestamp = await rollup.read.getTimestampForSlot([
@@ -118,7 +187,9 @@ export async function fastForwardEpochs({ rpcUrls, chainId, rollupAddress, numEp
     ]);
     dualLog(`Fast forwarding ${numEpochs} epochs to ${timestamp}`);
     try {
-        await cheatCodes.warp(Number(timestamp));
+        await cheatCodes.warp(Number(timestamp), {
+            resetBlockInterval: true
+        });
         dualLog(`Fast forwarded ${numEpochs} epochs to ${timestamp}`);
     } catch (error) {
         if (error instanceof Error && error.message.includes("is lower than or equal to previous block's timestamp")) {
@@ -131,32 +202,29 @@ export async function fastForwardEpochs({ rpcUrls, chainId, rollupAddress, numEp
 }
 export async function debugRollup({ rpcUrls, chainId, rollupAddress, log }) {
     const config = getL1ContractsConfigEnvVars();
-    const publicClient = getPublicClient(rpcUrls, chainId);
-    const rollup = getContract({
-        address: rollupAddress.toString(),
-        abi: RollupAbi,
-        client: publicClient
+    const publicClient = getPublicClient({
+        l1RpcUrls: rpcUrls,
+        l1ChainId: chainId
     });
-    const pendingNum = await rollup.read.getPendingBlockNumber();
+    const rollup = new RollupContract(publicClient, rollupAddress);
+    const pendingNum = await rollup.getBlockNumber();
     log(`Pending block num: ${pendingNum}`);
-    const provenNum = await rollup.read.getProvenBlockNumber();
+    const provenNum = await rollup.getProvenBlockNumber();
     log(`Proven block num: ${provenNum}`);
-    const validators = await rollup.read.getAttesters();
+    const validators = await rollup.getAttesters();
     log(`Validators: ${validators.map((v)=>v.toString()).join(', ')}`);
-    const committee = await rollup.read.getCurrentEpochCommittee();
-    log(`Committee: ${committee.map((v)=>v.toString()).join(', ')}`);
-    const archive = await rollup.read.archive();
+    const committee = await rollup.getCurrentEpochCommittee();
+    log(`Committee: ${committee?.map((v)=>v.toString()).join(', ')}`);
+    const archive = await rollup.archive();
     log(`Archive: ${archive}`);
-    const epochNum = await rollup.read.getCurrentEpoch();
+    const epochNum = await rollup.getCurrentEpochNumber();
     log(`Current epoch: ${epochNum}`);
-    const slot = await rollup.read.getCurrentSlot();
+    const slot = await rollup.getSlotNumber();
     log(`Current slot: ${slot}`);
-    const proposerDuringPrevL1Block = await rollup.read.getCurrentProposer();
+    const proposerDuringPrevL1Block = await rollup.getCurrentProposer();
     log(`Proposer during previous L1 block: ${proposerDuringPrevL1Block}`);
     const nextBlockTS = BigInt((await publicClient.getBlock()).timestamp + BigInt(config.ethereumSlotDuration));
-    const proposer = await rollup.read.getProposerAt([
-        nextBlockTS
-    ]);
+    const proposer = await rollup.getProposerAt(nextBlockTS);
     log(`Proposer NOW: ${proposer.toString()}`);
 }
 function makeDualLog(log, debugLogger) {
@@ -165,22 +233,10 @@ function makeDualLog(log, debugLogger) {
         debugLogger.info(msg);
     };
 }
-function getPublicClient(rpcUrls, chainId) {
-    const chain = createEthereumChain(rpcUrls, chainId);
-    return createPublicClient({
-        chain: chain.chainInfo,
-        transport: fallback(rpcUrls.map((url)=>http(url)))
-    });
-}
-function getWalletClient(rpcUrls, chainId, privateKey, mnemonic) {
+function getAccount(privateKey, mnemonic) {
     if (!privateKey && !mnemonic) {
         throw new Error('Either privateKey or mnemonic must be provided to create a wallet client');
     }
-    const chain = createEthereumChain(rpcUrls, chainId);
     const account = !privateKey ? mnemonicToAccount(mnemonic) : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}`);
-    return createWalletClient({
-        account,
-        chain: chain.chainInfo,
-        transport: fallback(rpcUrls.map((url)=>http(url)))
-    });
+    return account;
 }

package/dest/cmds/misc/generate_bootnode_enr.d.ts

@@ -1,3 +1,3 @@
 import type { LogFn } from '@aztec/foundation/log';
-export declare function generateEncodedBootnodeENR(privateKey: string, udpAnnounceAddress: string, l1ChainId: number, log: LogFn): Promise<void>;
+export declare function generateEncodedBootnodeENR(privateKey: string, p2pIp: string, p2pPort: number, l1ChainId: number, log: LogFn): Promise<void>;
 //# sourceMappingURL=generate_bootnode_enr.d.ts.map

package/dest/cmds/misc/generate_bootnode_enr.d.ts.map

@@ -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"}
+{"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"}

package/dest/cmds/misc/generate_bootnode_enr.js

@@ -1,5 +1,5 @@
 import { createBootnodeENRandPeerId } from '@aztec/p2p/enr';
-export async function generateEncodedBootnodeENR(privateKey, udpAnnounceAddress, l1ChainId, log) {
-    const { enr } = await createBootnodeENRandPeerId(privateKey, udpAnnounceAddress, l1ChainId);
+export async function generateEncodedBootnodeENR(privateKey, p2pIp, p2pPort, l1ChainId, log) {
+    const { enr } = await createBootnodeENRandPeerId(privateKey, p2pIp, p2pPort, l1ChainId);
     log(`ENR: ${enr.encodeTxt()}`);
 }

package/dest/cmds/misc/generate_secret_and_hash.d.ts

@@ -1,3 +1,3 @@
 import type { LogFn } from '@aztec/foundation/log';
-export declare function generateSecretAndHash(log: LogFn): void;
+export declare function generateSecretAndHash(log: LogFn): Promise<void>;
 //# sourceMappingURL=generate_secret_and_hash.d.ts.map

package/dest/cmds/misc/generate_secret_and_hash.d.ts.map

@@ -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"}
+{"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"}

package/dest/cmds/misc/generate_secret_and_hash.js

@@ -1,9 +1,9 @@
-import { computeSecretHash } from '@aztec/aztec.js';
+import { computeSecretHash } from '@aztec/aztec.js/crypto';
 import { Fr } from '@aztec/foundation/fields';
-export function generateSecretAndHash(log) {
+export async function generateSecretAndHash(log) {
     const secret = Fr.random();
     // We hash this the same way that aztec nr hash does.
-    const secretHash = computeSecretHash(secret);
+    const secretHash = await computeSecretHash(secret);
     log(`
     Secret: ${secret}
     Secret hash: ${secretHash}