@aztec/cli 0.0.0-test.1 → 0.0.1-commit.21caa21

package/src/cmds/aztec_node/index.ts

@@ -0,0 +1,87 @@
+import type { LogFn, Logger } from '@aztec/foundation/log';
+
+import type { Command } from 'commander';
+
+import {
+  logJson,
+  nodeOption,
+  parseAztecAddress,
+  parseField,
+  parseOptionalAztecAddress,
+  parseOptionalInteger,
+  parseOptionalLogId,
+  parseOptionalTxHash,
+} from '../../utils/commands.js';
+
+export function injectCommands(program: Command, log: LogFn, debugLogger: Logger) {
+  program
+    .command('get-block')
+    .description('Gets info for a given block or latest.')
+    .argument('[blockNumber]', 'Block height', parseOptionalInteger)
+    .addOption(nodeOption)
+    .action(async (blockNumber, options) => {
+      const { getBlock } = await import('./get_block.js');
+      await getBlock(options.nodeUrl, blockNumber, log);
+    });
+
+  program
+    .command('get-current-base-fee')
+    .description('Gets the current base fee.')
+    .addOption(nodeOption)
+    .action(async options => {
+      const { getCurrentBaseFee } = await import('./get_current_base_fee.js');
+      await getCurrentBaseFee(options.rpcUrl, debugLogger, log);
+    });
+
+  program
+    .command('get-l1-to-l2-message-witness')
+    .description('Gets a L1 to L2 message witness.')
+    .requiredOption('-ca, --contract-address <address>', 'Aztec address of the contract.', parseAztecAddress)
+    .requiredOption('--message-hash <messageHash>', 'The L1 to L2 message hash.', parseField)
+    .requiredOption('--secret <secret>', 'The secret used to claim the L1 to L2 message', parseField)
+    .addOption(nodeOption)
+    .action(async ({ contractAddress, messageHash, secret, nodeUrl }) => {
+      const { getL1ToL2MessageWitness } = await import('./get_l1_to_l2_message_witness.js');
+      await getL1ToL2MessageWitness(nodeUrl, contractAddress, messageHash, secret, log);
+    });
+
+  program
+    .command('get-logs')
+    .description('Gets all the public logs from an intersection of all the filter params.')
+    .option('-tx, --tx-hash <txHash>', 'A transaction hash to get the receipt for.', parseOptionalTxHash)
+    .option(
+      '-fb, --from-block <blockNum>',
+      'Initial block number for getting logs (defaults to 1).',
+      parseOptionalInteger,
+    )
+    .option('-tb, --to-block <blockNum>', 'Up to which block to fetch logs (defaults to latest).', parseOptionalInteger)
+    .option('-al --after-log <logId>', 'ID of a log after which to fetch the logs.', parseOptionalLogId)
+    .option('-ca, --contract-address <address>', 'Contract address to filter logs by.', parseOptionalAztecAddress)
+    .addOption(nodeOption)
+    .option('--follow', 'If set, will keep polling for new logs until interrupted.')
+    .action(async ({ txHash, fromBlock, toBlock, afterLog, contractAddress, aztecNodeRpcUrl: nodeUrl, follow }) => {
+      const { getLogs } = await import('./get_logs.js');
+      await getLogs(txHash, fromBlock, toBlock, afterLog, contractAddress, nodeUrl, follow, log);
+    });
+
+  program
+    .command('block-number')
+    .description('Gets the current Aztec L2 block number.')
+    .addOption(nodeOption)
+    .action(async (options: any) => {
+      const { blockNumber } = await import('./block_number.js');
+      await blockNumber(options.nodeUrl, log);
+    });
+
+  program
+    .command('get-node-info')
+    .description('Gets the information of an Aztec node from a PXE or directly from an Aztec node.')
+    .option('--json', 'Emit output as json')
+    .addOption(nodeOption)
+    .action(async options => {
+      const { getNodeInfo } = await import('./get_node_info.js');
+      await getNodeInfo(options.nodeUrl, options.json, log, logJson(log));
+    });
+
+  return program;
+}

package/src/cmds/contracts/inspect_contract.ts

@@ -5,6 +5,7 @@ import {
   FunctionSelector,
   decodeFunctionSignature,
   decodeFunctionSignatureWithParameterNames,
+  retainBytecode,
 } from '@aztec/stdlib/abi';
 import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
 
@@ -12,7 +13,9 @@ import { getContractArtifact } from '../../utils/aztec.js';
 
 export async function inspectContract(contractArtifactFile: string, debugLogger: Logger, log: LogFn) {
   const contractArtifact = await getContractArtifact(contractArtifactFile, log);
-  const contractFns = contractArtifact.functions;
+  const contractFns = contractArtifact.functions.concat(
+    contractArtifact.nonDispatchPublicFunctions.map(f => f as FunctionArtifact),
+  );
   if (contractFns.length === 0) {
     log(`No functions found for contract ${contractArtifact.name}`);
   }
@@ -26,16 +29,9 @@ export async function inspectContract(contractArtifactFile: string, debugLogger:
   log(`\tpublic bytecode commitment: ${contractClass.publicBytecodeCommitment.toString()}`);
   log(`\tpublic bytecode length: ${contractClass.packedBytecode.length} bytes (${bytecodeLengthInFields} fields)`);
 
-  const externalFunctions = contractFns.filter(f => !f.isInternal);
-  if (externalFunctions.length > 0) {
-    log(`\nExternal functions:`);
-    await Promise.all(externalFunctions.map(f => logFunction(f, log)));
-  }
-
-  const internalFunctions = contractFns.filter(f => f.isInternal);
-  if (internalFunctions.length > 0) {
-    log(`\nInternal functions:`);
-    await Promise.all(internalFunctions.map(f => logFunction(f, log)));
+  if (contractFns.length > 0) {
+    log(`\nExternal contract functions:`);
+    await Promise.all(contractFns.map(f => logFunction(f, log)));
   }
 }
 
@@ -43,9 +39,16 @@ async function logFunction(fn: FunctionArtifact, log: LogFn) {
   const signatureWithParameterNames = decodeFunctionSignatureWithParameterNames(fn.name, fn.parameters);
   const signature = decodeFunctionSignature(fn.name, fn.parameters);
   const selector = await FunctionSelector.fromSignature(signature);
-  const bytecodeSize = fn.bytecode.length;
-  const bytecodeHash = sha256(fn.bytecode).toString('hex');
-  log(
-    `${fn.functionType} ${signatureWithParameterNames} \n\tfunction signature: ${signature}\n\tselector: ${selector}\n\tbytecode: ${bytecodeSize} bytes (sha256 ${bytecodeHash})`,
-  );
+
+  if (retainBytecode(fn)) {
+    const bytecodeSize = fn.bytecode.length;
+    const bytecodeHash = sha256(fn.bytecode).toString('hex');
+    log(
+      `${fn.functionType} ${signatureWithParameterNames} \n\tfunction signature: ${signature}\n\tselector: ${selector}\n\tbytecode: ${bytecodeSize} bytes (sha256 ${bytecodeHash})`,
+    );
+  } else {
+    log(
+      `${fn.functionType} ${signatureWithParameterNames} \n\tfunction signature: ${signature}\n\tselector: ${selector}`,
+    );
+  }
 }

package/src/cmds/infrastructure/index.ts

@@ -1,20 +1,19 @@
-import type { LogFn, Logger } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
 
 import type { Command } from 'commander';
 
-import { ETHEREUM_HOSTS, l1ChainIdOption, parseOptionalInteger, pxeOption } from '../../utils/commands.js';
+import { ETHEREUM_HOSTS, l1ChainIdOption, nodeOption, parseOptionalInteger } from '../../utils/commands.js';
 
-export function injectCommands(program: Command, log: LogFn, debugLogger: Logger) {
+export function injectCommands(program: Command, log: LogFn) {
   program
     .command('setup-protocol-contracts')
     .description('Bootstrap the blockchain by initializing all the protocol contracts')
-    .addOption(pxeOption)
+    .addOption(nodeOption)
     .option('--testAccounts', 'Deploy funded test accounts.')
     .option('--json', 'Output the contract addresses in JSON format')
-    .option('--skipProofWait', "Don't wait for proofs to land.")
     .action(async options => {
       const { setupL2Contracts } = await import('./setup_l2_contract.js');
-      await setupL2Contracts(options.rpcUrl, options.testAccounts, options.json, options.skipProofWait, log);
+      await setupL2Contracts(options.nodeUrl, options.testAccounts, options.json, log);
     });
 
   program
@@ -34,7 +33,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       'test test test test test test test test test test test junk',
     )
     .option('--block-number <number>', 'Block number to query next sequencer for', parseOptionalInteger)
-    .addOption(pxeOption)
+    .addOption(nodeOption)
     .addOption(l1ChainIdOption)
     .action(async (command, who, options) => {
       const { sequencers } = await import('./sequencers.js');
@@ -42,12 +41,11 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
         command: command,
         who,
         mnemonic: options.mnemonic,
-        rpcUrl: options.rpcUrl,
-        l1RpcUrls: options.l1RpcUrls.split(','),
+        nodeUrl: options.nodeUrl,
+        l1RpcUrls: options.l1RpcUrls,
         chainId: options.l1ChainId,
         blockNumber: options.blockNumber,
         log,
-        debugLogger,
       });
     });
 

package/src/cmds/infrastructure/sequencers.ts

@@ -1,24 +1,25 @@
-import { createCompatibleClient } from '@aztec/aztec.js';
-import { createEthereumChain, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
-import type { LogFn, Logger } from '@aztec/foundation/log';
+import { Fr } from '@aztec/aztec.js/fields';
+import { createAztecNodeClient } from '@aztec/aztec.js/node';
+import { GSEContract, RollupContract, createEthereumChain, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import type { LogFn } from '@aztec/foundation/log';
 import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 
 import { createPublicClient, createWalletClient, fallback, getContract, http } from 'viem';
 import { mnemonicToAccount } from 'viem/accounts';
 
 export async function sequencers(opts: {
-  command: 'list' | 'add' | 'remove' | 'who-next';
+  command: 'list' | 'add' | 'remove' | 'who-next' | 'flush';
   who?: string;
   mnemonic?: string;
-  rpcUrl: string;
+  bn254SecretKey?: bigint;
+  nodeUrl: string;
   l1RpcUrls: string[];
   chainId: number;
   blockNumber?: number;
   log: LogFn;
-  debugLogger: Logger;
 }) {
-  const { command, who: maybeWho, mnemonic, rpcUrl, l1RpcUrls, chainId, log, debugLogger } = opts;
-  const client = await createCompatibleClient(rpcUrl, debugLogger);
+  const { command, who: maybeWho, mnemonic, bn254SecretKey, nodeUrl, l1RpcUrls, chainId, log } = opts;
+  const client = createAztecNodeClient(nodeUrl);
   const { l1ContractAddresses } = await client.getNodeInfo();
 
   const chain = createEthereumChain(l1RpcUrls, chainId);
@@ -35,11 +36,7 @@ export async function sequencers(opts: {
       })
     : undefined;
 
-  const rollup = getContract({
-    address: l1ContractAddresses.rollupAddress.toString(),
-    abi: RollupAbi,
-    client: publicClient,
-  });
+  const rollup = new RollupContract(publicClient, l1ContractAddresses.rollupAddress);
 
   const writeableRollup = walletClient
     ? getContract({
@@ -52,7 +49,7 @@ export async function sequencers(opts: {
   const who = (maybeWho as `0x{string}`) ?? walletClient?.account.address.toString();
 
   if (command === 'list') {
-    const sequencers = await rollup.read.getAttesters();
+    const sequencers = await rollup.getAttesters();
     if (sequencers.length === 0) {
       log(`No sequencers registered on rollup`);
     } else {
@@ -69,23 +66,43 @@ export async function sequencers(opts: {
     log(`Adding ${who} as sequencer`);
 
     const stakingAsset = getContract({
-      address: await rollup.read.getStakingAsset(),
+      address: await rollup.getStakingAsset(),
       abi: TestERC20Abi,
       client: walletClient,
     });
 
     const config = getL1ContractsConfigEnvVars();
 
+    const bn254SecretKeyFieldElement = bn254SecretKey ? new Fr(bn254SecretKey) : Fr.random();
+    const gseAddress = await rollup.getGSE();
+    const gseContract = new GSEContract(publicClient, gseAddress);
+    const registrationTuple = await gseContract.makeRegistrationTuple(bn254SecretKeyFieldElement.toBigInt());
+
     await Promise.all(
       [
-        await stakingAsset.write.mint([walletClient.account.address, config.minimumStake], {} as any),
-        await stakingAsset.write.approve([rollup.address, config.minimumStake], {} as any),
+        await stakingAsset.write.mint([walletClient.account.address, config.activationThreshold], {} as any),
+        await stakingAsset.write.approve([rollup.address, config.activationThreshold], {} as any),
       ].map(txHash => publicClient.waitForTransactionReceipt({ hash: txHash })),
     );
 
-    const hash = await writeableRollup.write.deposit([who, who, who, config.minimumStake]);
+    const hash = await writeableRollup.write.deposit([
+      who,
+      who,
+      registrationTuple.publicKeyInG1,
+      registrationTuple.publicKeyInG2,
+      registrationTuple.proofOfPossession,
+      true,
+    ]);
     await publicClient.waitForTransactionReceipt({ hash });
     log(`Added in tx ${hash}`);
+  } else if (command === 'flush') {
+    if (!writeableRollup) {
+      throw new Error(`Missing sequencer address`);
+    }
+    log(`Flushing staking entry queue`);
+    const hash = await writeableRollup.write.flushEntryQueue();
+    await publicClient.waitForTransactionReceipt({ hash });
+    log(`Flushed staking entry queue in tx ${hash}`);
   } else if (command === 'remove') {
     if (!who || !writeableRollup) {
       throw new Error(`Missing sequencer address`);
@@ -95,7 +112,7 @@ export async function sequencers(opts: {
     await publicClient.waitForTransactionReceipt({ hash });
     log(`Removed in tx ${hash}`);
   } else if (command === 'who-next') {
-    const next = await rollup.read.getCurrentProposer();
+    const next = await rollup.getCurrentProposer();
     log(`Sequencer expected to build is ${next}`);
   } else {
     throw new Error(`Unknown command ${command}`);

package/src/cmds/infrastructure/setup_l2_contract.ts

@@ -1,45 +1,33 @@
-import { type InitialAccountData, deployFundedSchnorrAccounts, getInitialTestAccounts } from '@aztec/accounts/testing';
-import { type AztecAddress, SignerlessWallet, type WaitOpts, createPXEClient, makeFetch } from '@aztec/aztec.js';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { WaitOpts } from '@aztec/aztec.js/contracts';
+import { createAztecNodeClient } from '@aztec/aztec.js/node';
+import { AccountManager } from '@aztec/aztec.js/wallet';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import type { LogFn } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
 
-import { setupCanonicalL2FeeJuice } from '../misc/setup_contracts.js';
-
-export async function setupL2Contracts(
-  rpcUrl: string,
-  testAccounts: boolean,
-  json: boolean,
-  skipProofWait: boolean,
-  log: LogFn,
-) {
+export async function setupL2Contracts(nodeUrl: string, testAccounts: boolean, json: boolean, log: LogFn) {
   const waitOpts: WaitOpts = {
     timeout: 180,
     interval: 1,
-    proven: !skipProofWait,
-    provenTimeout: 600,
   };
   log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
   log('setupL2Contracts: Creating PXE client...');
-  const pxe = createPXEClient(rpcUrl, {}, makeFetch([1, 1, 1, 1, 1], false));
-  const wallet = new SignerlessWallet(pxe);
-
-  log('setupL2Contracts: Getting fee juice portal address...');
-  // Deploy Fee Juice
-  const feeJuicePortalAddress = (await wallet.getNodeInfo()).l1ContractAddresses.feeJuicePortalAddress;
-  log('setupL2Contracts: Setting up fee juice portal...');
-  await setupCanonicalL2FeeJuice(wallet, feeJuicePortalAddress, waitOpts, log);
+  const node = createAztecNodeClient(nodeUrl);
+  const wallet = await TestWallet.create(node);
 
-  let deployedAccounts: InitialAccountData[] = [];
+  let deployedAccountManagers: AccountManager[] = [];
   if (testAccounts) {
     log('setupL2Contracts: Deploying test accounts...');
-    deployedAccounts = await getInitialTestAccounts();
-    await deployFundedSchnorrAccounts(pxe, deployedAccounts, waitOpts);
+    const initialAccountsData = await getInitialTestAccountsData();
+    deployedAccountManagers = await deployFundedSchnorrAccounts(wallet, node, initialAccountsData, waitOpts);
   }
 
   if (json) {
     const toPrint: Record<string, AztecAddress> = { ...ProtocolContractAddress };
-    deployedAccounts.forEach((a, i) => {
+    deployedAccountManagers.forEach((a, i) => {
       toPrint[`testAccount${i}`] = a.address;
     });
     log(JSON.stringify(toPrint, null, 2));

package/src/cmds/l1/advance_epoch.ts

@@ -1,11 +1,13 @@
-import { CheatCodes, createPXEClient, makeFetch } from '@aztec/aztec.js';
+import { createAztecNodeClient } from '@aztec/aztec.js/node';
+import { RollupCheatCodes } from '@aztec/ethereum/test';
 import type { LogFn } from '@aztec/foundation/log';
+import { DateProvider } from '@aztec/foundation/timer';
 
-export async function advanceEpoch(l1RpcUrls: string[], rpcUrl: string, log: LogFn) {
-  const pxe = createPXEClient(rpcUrl, {}, makeFetch([], true));
-  const rollupAddress = await pxe.getNodeInfo().then(i => i.l1ContractAddresses.rollupAddress);
+export async function advanceEpoch(l1RpcUrls: string[], nodeUrl: string, log: LogFn) {
+  const aztecNode = createAztecNodeClient(nodeUrl);
+  const rollupAddress = await aztecNode.getNodeInfo().then(i => i.l1ContractAddresses.rollupAddress);
 
-  const cheat = CheatCodes.createRollup(l1RpcUrls, { rollupAddress });
+  const cheat = RollupCheatCodes.create(l1RpcUrls, { rollupAddress }, new DateProvider());
 
   await cheat.advanceToNextEpoch();
   log(`Warped time to advance to next epoch`);

package/src/cmds/l1/assume_proven_through.ts

@@ -1,18 +1,19 @@
-import { EthCheatCodes, RollupCheatCodes, createPXEClient, makeFetch } from '@aztec/aztec.js';
+import { createAztecNodeClient } from '@aztec/aztec.js/node';
+import { RollupCheatCodes } from '@aztec/ethereum/test';
 import type { LogFn } from '@aztec/foundation/log';
+import { DateProvider } from '@aztec/foundation/timer';
 
 export async function assumeProvenThrough(
   blockNumberOrLatest: number | undefined,
   l1RpcUrls: string[],
-  rpcUrl: string,
+  nodeUrl: string,
   log: LogFn,
 ) {
-  const pxe = createPXEClient(rpcUrl, {}, makeFetch([], true));
-  const rollupAddress = await pxe.getNodeInfo().then(i => i.l1ContractAddresses.rollupAddress);
-  const blockNumber = blockNumberOrLatest ?? (await pxe.getBlockNumber());
+  const aztecNode = createAztecNodeClient(nodeUrl);
+  const rollupAddress = await aztecNode.getNodeInfo().then(i => i.l1ContractAddresses.rollupAddress);
+  const blockNumber = blockNumberOrLatest ?? (await aztecNode.getBlockNumber());
 
-  const ethCheatCode = new EthCheatCodes(l1RpcUrls);
-  const rollupCheatCodes = new RollupCheatCodes(ethCheatCode, { rollupAddress });
+  const rollupCheatCodes = RollupCheatCodes.create(l1RpcUrls, { rollupAddress }, new DateProvider());
 
   await rollupCheatCodes.markAsProven(blockNumber);
   log(`Assumed proven through block ${blockNumber}`);

package/src/cmds/l1/bridge_erc20.ts

@@ -1,5 +1,7 @@
-import { type AztecAddress, type EthAddress, type Fr, L1ToL2TokenPortalManager } from '@aztec/aztec.js';
-import { createEthereumChain, createL1Clients } from '@aztec/ethereum';
+import type { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
+import { L1ToL2TokenPortalManager } from '@aztec/aztec.js/ethereum';
+import type { Fr } from '@aztec/aztec.js/fields';
+import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 
 import { prettyPrintJSON } from '../../utils/commands.js';
@@ -12,6 +14,7 @@ export async function bridgeERC20(
   privateKey: string | undefined,
   mnemonic: string,
   tokenAddress: EthAddress,
+  handlerAddress: EthAddress | undefined,
   portalAddress: EthAddress,
   privateTransfer: boolean,
   mint: boolean,
@@ -21,10 +24,10 @@ export async function bridgeERC20(
 ) {
   // Prepare L1 client
   const chain = createEthereumChain(l1RpcUrls, chainId);
-  const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
+  const l1Client = createExtendedL1Client(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
 
   // Setup portal manager
-  const manager = new L1ToL2TokenPortalManager(portalAddress, tokenAddress, publicClient, walletClient, debugLogger);
+  const manager = new L1ToL2TokenPortalManager(portalAddress, tokenAddress, handlerAddress, l1Client, debugLogger);
   let claimSecret: Fr;
   let messageHash: `0x${string}`;
   if (privateTransfer) {

package/src/cmds/l1/deploy_l1_contracts.ts

@@ -1,10 +1,13 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import type { EthAddress } from '@aztec/aztec.js/addresses';
+import { Fr } from '@aztec/aztec.js/fields';
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum';
-import type { EthAddress } from '@aztec/foundation/eth-address';
+import { SecretValue } from '@aztec/foundation/config';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { getGenesisValues } from '@aztec/world-state/testing';
 
 import { deployAztecContracts } from '../../utils/aztec.js';
+import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
 
 export async function deployL1Contracts(
   rpcUrls: string[],
@@ -14,16 +17,28 @@ export async function deployL1Contracts(
   mnemonicIndex: number,
   salt: number | undefined,
   testAccounts: boolean,
+  sponsoredFPC: boolean,
   acceleratedTestDeployments: boolean,
   json: boolean,
+  createVerificationJson: string | false,
   initialValidators: EthAddress[],
+  realVerifier: boolean,
+  existingToken: EthAddress | undefined,
   log: LogFn,
   debugLogger: Logger,
 ) {
   const config = getL1ContractsConfigEnvVars();
 
-  const initialFundedAccounts = testAccounts ? await getInitialTestAccounts() : [];
-  const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts.map(a => a.address));
+  const initialAccounts = testAccounts ? await getInitialTestAccountsData() : [];
+  const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
+  const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
+  const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
+
+  const initialValidatorOperators = initialValidators.map(a => ({
+    attester: a,
+    withdrawer: a,
+    bn254SecretKey: new SecretValue(Fr.random().toBigInt()),
+  }));
 
   const { l1ContractAddresses } = await deployAztecContracts(
     rpcUrls,
@@ -32,18 +47,21 @@ export async function deployL1Contracts(
     mnemonic,
     mnemonicIndex,
     salt,
-    initialValidators,
+    initialValidatorOperators,
     genesisArchiveRoot,
-    genesisBlockHash,
+    fundingNeeded,
     acceleratedTestDeployments,
     config,
+    existingToken,
+    realVerifier,
+    createVerificationJson,
     debugLogger,
   );
 
   if (json) {
     log(
       JSON.stringify(
-        Object.fromEntries(Object.entries(l1ContractAddresses).map(([k, v]) => [k, v.toString()])),
+        Object.fromEntries(Object.entries(l1ContractAddresses).map(([k, v]) => [k, v?.toString() ?? 'Not deployed'])),
         null,
         2,
       ),
@@ -51,6 +69,7 @@ export async function deployL1Contracts(
   } else {
     log(`Rollup Address: ${l1ContractAddresses.rollupAddress.toString()}`);
     log(`Registry Address: ${l1ContractAddresses.registryAddress.toString()}`);
+    log(`GSE Address: ${l1ContractAddresses.gseAddress?.toString()}`);
     log(`L1 -> L2 Inbox Address: ${l1ContractAddresses.inboxAddress.toString()}`);
     log(`L2 -> L1 Outbox Address: ${l1ContractAddresses.outboxAddress.toString()}`);
     log(`Fee Juice Address: ${l1ContractAddresses.feeJuiceAddress.toString()}`);
@@ -61,5 +80,11 @@ export async function deployL1Contracts(
     log(`GovernanceProposer Address: ${l1ContractAddresses.governanceProposerAddress.toString()}`);
     log(`Governance Address: ${l1ContractAddresses.governanceAddress.toString()}`);
     log(`SlashFactory Address: ${l1ContractAddresses.slashFactoryAddress?.toString()}`);
+    log(`FeeAssetHandler Address: ${l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
+    log(`StakingAssetHandler Address: ${l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
+    log(`ZK Passport Verifier Address: ${l1ContractAddresses.zkPassportVerifierAddress?.toString()}`);
+    log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
+    log(`Initial validators: ${initialValidators.map(a => a.toString()).join(', ')}`);
+    log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
   }
 }

package/src/cmds/l1/deploy_new_rollup.ts

@@ -1,10 +1,11 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
-import { getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import { type Operator, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { getGenesisValues } from '@aztec/world-state/testing';
 
 import { deployNewRollupContracts } from '../../utils/aztec.js';
+import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
 
 export async function deployNewRollup(
   registryAddress: EthAddress,
@@ -15,17 +16,22 @@ export async function deployNewRollup(
   mnemonicIndex: number,
   salt: number | undefined,
   testAccounts: boolean,
+  sponsoredFPC: boolean,
   json: boolean,
-  initialValidators: EthAddress[],
+  initialValidators: Operator[],
+  realVerifier: boolean,
+  createVerificationJson: string | false,
   log: LogFn,
   debugLogger: Logger,
 ) {
   const config = getL1ContractsConfigEnvVars();
 
-  const initialFundedAccounts = testAccounts ? await getInitialTestAccounts() : [];
-  const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts.map(a => a.address));
+  const initialAccounts = testAccounts ? await getInitialTestAccountsData() : [];
+  const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
+  const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
+  const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
 
-  const { payloadAddress, rollup } = await deployNewRollupContracts(
+  const { rollup, slashFactoryAddress } = await deployNewRollupContracts(
     registryAddress,
     rpcUrls,
     chainId,
@@ -35,8 +41,10 @@ export async function deployNewRollup(
     salt,
     initialValidators,
     genesisArchiveRoot,
-    genesisBlockHash,
+    fundingNeeded,
     config,
+    realVerifier,
+    createVerificationJson,
     debugLogger,
   );
 
@@ -44,15 +52,21 @@ export async function deployNewRollup(
     log(
       JSON.stringify(
         {
-          payloadAddress: payloadAddress.toString(),
           rollupAddress: rollup.address,
+          initialFundedAccounts: initialFundedAccounts.map(a => a.toString()),
+          initialValidators: initialValidators.map(a => a.attester.toString()),
+          genesisArchiveRoot: genesisArchiveRoot.toString(),
+          slashFactoryAddress: slashFactoryAddress.toString(),
         },
         null,
         2,
       ),
     );
   } else {
-    log(`Payload Address: ${payloadAddress.toString()}`);
     log(`Rollup Address: ${rollup.address}`);
+    log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
+    log(`Initial validators: ${initialValidators.map(a => a.attester.toString()).join(', ')}`);
+    log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
+    log(`Slash Factory Address: ${slashFactoryAddress.toString()}`);
   }
 }

package/src/cmds/l1/get_l1_addresses.ts

@@ -1,4 +1,4 @@
-import { EthAddress } from '@aztec/aztec.js';
+import { EthAddress } from '@aztec/aztec.js/addresses';
 import { RegistryContract, type ViemPublicClient, createEthereumChain } from '@aztec/ethereum';
 import type { LogFn } from '@aztec/foundation/log';