@aztec/cli 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2 → 0.77.0-testnet-ignition.21

package/src/cmds/l1/update_l1_validators.ts

@@ -1,4 +1,3 @@
-import { type EthAddress } from '@aztec/circuits.js';
 import {
   EthCheatCodes,
   createEthereumChain,
@@ -6,14 +5,15 @@ import {
   getL1ContractsConfigEnvVars,
   isAnvilTestChain,
 } from '@aztec/ethereum';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import type { EthAddress } from '@aztec/foundation/eth-address';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 
-import { createPublicClient, createWalletClient, getContract, http } from 'viem';
+import { createPublicClient, createWalletClient, fallback, getContract, http } from 'viem';
 import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 
 export interface RollupCommandArgs {
-  rpcUrl: string;
+  rpcUrls: string[];
   chainId: number;
   privateKey?: string;
   mnemonic?: string;
@@ -37,7 +37,7 @@ export function generateL1Account() {
 }
 
 export async function addL1Validator({
-  rpcUrl,
+  rpcUrls,
   chainId,
   privateKey,
   mnemonic,
@@ -49,8 +49,8 @@ export async function addL1Validator({
 }: RollupCommandArgs & LoggerArgs & { validatorAddress: EthAddress }) {
   const config = getL1ContractsConfigEnvVars();
   const dualLog = makeDualLog(log, debugLogger);
-  const publicClient = getPublicClient(rpcUrl, chainId);
-  const walletClient = getWalletClient(rpcUrl, chainId, privateKey, mnemonic);
+  const publicClient = getPublicClient(rpcUrls, chainId);
+  const walletClient = getWalletClient(rpcUrls, chainId, privateKey, mnemonic);
   const rollup = getContract({
     address: rollupAddress.toString(),
     abi: RollupAbi,
@@ -83,7 +83,7 @@ export async function addL1Validator({
   await publicClient.waitForTransactionReceipt({ hash: txHash });
   if (isAnvilTestChain(chainId)) {
     dualLog(`Funding validator on L1`);
-    const cheatCodes = new EthCheatCodes(rpcUrl, debugLogger);
+    const cheatCodes = new EthCheatCodes(rpcUrls, debugLogger);
     await cheatCodes.setBalance(validatorAddress, 10n ** 20n);
   } else {
     const balance = await publicClient.getBalance({ address: validatorAddress.toString() });
@@ -96,7 +96,7 @@ export async function addL1Validator({
 }
 
 export async function removeL1Validator({
-  rpcUrl,
+  rpcUrls,
   chainId,
   privateKey,
   mnemonic,
@@ -106,8 +106,8 @@ export async function removeL1Validator({
   debugLogger,
 }: RollupCommandArgs & LoggerArgs & { validatorAddress: EthAddress }) {
   const dualLog = makeDualLog(log, debugLogger);
-  const publicClient = getPublicClient(rpcUrl, chainId);
-  const walletClient = getWalletClient(rpcUrl, chainId, privateKey, mnemonic);
+  const publicClient = getPublicClient(rpcUrls, chainId);
+  const walletClient = getWalletClient(rpcUrls, chainId, privateKey, mnemonic);
   const rollup = getContract({
     address: rollupAddress.toString(),
     abi: RollupAbi,
@@ -121,7 +121,7 @@ export async function removeL1Validator({
 }
 
 export async function pruneRollup({
-  rpcUrl,
+  rpcUrls,
   chainId,
   privateKey,
   mnemonic,
@@ -130,8 +130,8 @@ export async function pruneRollup({
   debugLogger,
 }: RollupCommandArgs & LoggerArgs) {
   const dualLog = makeDualLog(log, debugLogger);
-  const publicClient = getPublicClient(rpcUrl, chainId);
-  const walletClient = getWalletClient(rpcUrl, chainId, privateKey, mnemonic);
+  const publicClient = getPublicClient(rpcUrls, chainId);
+  const walletClient = getWalletClient(rpcUrls, chainId, privateKey, mnemonic);
   const rollup = getContract({
     address: rollupAddress.toString(),
     abi: RollupAbi,
@@ -145,7 +145,7 @@ export async function pruneRollup({
 }
 
 export async function fastForwardEpochs({
-  rpcUrl,
+  rpcUrls,
   chainId,
   rollupAddress,
   numEpochs,
@@ -153,14 +153,14 @@ export async function fastForwardEpochs({
   debugLogger,
 }: RollupCommandArgs & LoggerArgs & { numEpochs: bigint }) {
   const dualLog = makeDualLog(log, debugLogger);
-  const publicClient = getPublicClient(rpcUrl, chainId);
+  const publicClient = getPublicClient(rpcUrls, chainId);
   const rollup = getContract({
     address: rollupAddress.toString(),
     abi: RollupAbi,
     client: publicClient,
   });
 
-  const cheatCodes = new EthCheatCodes(rpcUrl, debugLogger);
+  const cheatCodes = new EthCheatCodes(rpcUrls, debugLogger);
   const currentSlot = await rollup.read.getCurrentSlot();
   const l2SlotsInEpoch = await rollup.read.getEpochDuration();
   const timestamp = await rollup.read.getTimestampForSlot([currentSlot + l2SlotsInEpoch * numEpochs]);
@@ -178,9 +178,9 @@ export async function fastForwardEpochs({
   }
 }
 
-export async function debugRollup({ rpcUrl, chainId, rollupAddress, log }: RollupCommandArgs & LoggerArgs) {
+export async function debugRollup({ rpcUrls, chainId, rollupAddress, log }: RollupCommandArgs & LoggerArgs) {
   const config = getL1ContractsConfigEnvVars();
-  const publicClient = getPublicClient(rpcUrl, chainId);
+  const publicClient = getPublicClient(rpcUrls, chainId);
   const rollup = getContract({
     address: rollupAddress.toString(),
     abi: RollupAbi,
@@ -215,13 +215,13 @@ function makeDualLog(log: LogFn, debugLogger: Logger) {
   };
 }
 
-function getPublicClient(rpcUrl: string, chainId: number) {
-  const chain = createEthereumChain(rpcUrl, chainId);
-  return createPublicClient({ chain: chain.chainInfo, transport: http(rpcUrl) });
+function getPublicClient(rpcUrls: string[], chainId: number) {
+  const chain = createEthereumChain(rpcUrls, chainId);
+  return createPublicClient({ chain: chain.chainInfo, transport: fallback(rpcUrls.map(url => http(url))) });
 }
 
 function getWalletClient(
-  rpcUrl: string,
+  rpcUrls: string[],
   chainId: number,
   privateKey: string | undefined,
   mnemonic: string | undefined,
@@ -230,9 +230,9 @@ function getWalletClient(
     throw new Error('Either privateKey or mnemonic must be provided to create a wallet client');
   }
 
-  const chain = createEthereumChain(rpcUrl, chainId);
+  const chain = createEthereumChain(rpcUrls, chainId);
   const account = !privateKey
     ? mnemonicToAccount(mnemonic!)
     : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}` as `0x${string}`);
-  return createWalletClient({ account, chain: chain.chainInfo, transport: http(rpcUrl) });
+  return createWalletClient({ account, chain: chain.chainInfo, transport: fallback(rpcUrls.map(url => http(url))) });
 }

package/src/cmds/misc/compute_selector.ts

@@ -1,5 +1,5 @@
-import { FunctionSelector } from '@aztec/foundation/abi';
-import { type LogFn } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
+import { FunctionSelector } from '@aztec/stdlib/abi';
 
 export async function computeSelector(functionSignature: string, log: LogFn) {
   const selector = await FunctionSelector.fromSignature(functionSignature);

package/src/cmds/misc/example_contracts.ts

@@ -1,4 +1,4 @@
-import { type LogFn } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
 
 import { getExampleContractNames } from '../../utils/aztec.js';
 

package/src/cmds/misc/generate_bootnode_enr.ts

@@ -0,0 +1,12 @@
+import type { LogFn } from '@aztec/foundation/log';
+import { createBootnodeENRandPeerId } from '@aztec/p2p/enr';
+
+export async function generateEncodedBootnodeENR(
+  privateKey: string,
+  udpAnnounceAddress: string,
+  l1ChainId: number,
+  log: LogFn,
+) {
+  const { enr } = await createBootnodeENRandPeerId(privateKey, udpAnnounceAddress, l1ChainId);
+  log(`ENR: ${enr.encodeTxt()}`);
+}

package/src/cmds/misc/generate_p2p_private_key.ts

@@ -1,4 +1,4 @@
-import { type LogFn } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
 
 import { createSecp256k1PeerId } from '@libp2p/peer-id-factory';
 

package/src/cmds/misc/generate_secret_and_hash.ts

@@ -1,6 +1,6 @@
 import { computeSecretHash } from '@aztec/aztec.js';
 import { Fr } from '@aztec/foundation/fields';
-import { type LogFn } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
 
 export function generateSecretAndHash(log: LogFn) {
   const secret = Fr.random();

package/src/cmds/misc/index.ts

@@ -1,8 +1,9 @@
-import { type LogFn } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
+import { printENR } from '@aztec/p2p/enr';
 
-import { type Command } from 'commander';
+import type { Command } from 'commander';
 
-import { prettyPrintJSON } from '../../utils/commands.js';
+import { l1ChainIdOption, prettyPrintJSON } from '../../utils/commands.js';
 
 export function injectCommands(program: Command, log: LogFn) {
   program
@@ -29,6 +30,27 @@ export function injectCommands(program: Command, log: LogFn) {
       await generateP2PPrivateKey(log);
     });
 
+  program
+    .command('generate-bootnode-enr')
+    .summary('Generates the encoded ENR record for a bootnode.')
+    .description('Generates the encoded ENR record for a bootnode.')
+    .argument('<privateKey>', 'The peer id private key of the bootnode')
+    .argument('<udpAnnounceAddress>', 'The bootnode UDP announce address')
+    .addOption(l1ChainIdOption)
+    .action(async (privateKey: string, udpAnnounceAddress: string, options) => {
+      const { generateEncodedBootnodeENR } = await import('./generate_bootnode_enr.js');
+      await generateEncodedBootnodeENR(privateKey, udpAnnounceAddress, options.l1ChainId, log);
+    });
+
+  program
+    .command('decode-enr')
+    .summary('Decodes an ENR record')
+    .description('Decodes and ENR record')
+    .argument('<enr>', 'The encoded ENR string')
+    .action(async (enr: string) => {
+      await printENR(enr, log);
+    });
+
   program
     .command('example-contracts')
     .description('Lists the example contracts available to deploy from @aztec/noir-contracts.js')

package/src/cmds/misc/setup_contracts.ts

@@ -1,7 +1,8 @@
-import { DefaultWaitOpts, type EthAddress, NoFeePaymentMethod, type Wallet } from '@aztec/aztec.js';
-import { FEE_JUICE_INITIAL_MINT, Gas } from '@aztec/circuits.js';
-import { type LogFn } from '@aztec/foundation/log';
+import { DefaultWaitOpts, type EthAddress, FeeJuicePaymentMethod, type Wallet } from '@aztec/aztec.js';
+import { FEE_JUICE_INITIAL_MINT } from '@aztec/constants';
+import type { LogFn } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { Gas } from '@aztec/stdlib/gas';
 
 /**
  * Deploys the contract to pay for gas on L2.
@@ -25,9 +26,10 @@ export async function setupCanonicalL2FeeJuice(
 
   if (portalAddress.isZero()) {
     log('setupCanonicalL2FeeJuice: Calling initialize on fee juice contract...');
+    const paymentMethod = new FeeJuicePaymentMethod(ProtocolContractAddress.FeeJuice);
     await feeJuiceContract.methods
       .initialize(feeJuicePortalAddress, FEE_JUICE_INITIAL_MINT)
-      .send({ fee: { paymentMethod: new NoFeePaymentMethod(), gasSettings: { teardownGasLimits: Gas.empty() } } })
+      .send({ fee: { paymentMethod, gasSettings: { teardownGasLimits: Gas.empty() } } })
       .wait(waitOpts);
   } else {
     log(

package/src/cmds/misc/update/noir.ts

@@ -1,11 +1,11 @@
-import { type LogFn } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
 import { parseNoirPackageConfig } from '@aztec/foundation/noir';
 
 import TOML from '@iarna/toml';
 import { readFile } from 'fs/promises';
 import { join, relative, resolve } from 'path';
 
-import { type DependencyChanges } from './common.js';
+import type { DependencyChanges } from './common.js';
 import { atomicUpdateFile, prettyPrintNargoToml } from './utils.js';
 
 /**

package/src/cmds/misc/update/npm.ts

@@ -1,4 +1,4 @@
-import { type LogFn } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
 
 import { spawnSync } from 'child_process';
 import { existsSync } from 'fs';
@@ -6,7 +6,7 @@ import { readFile } from 'fs/promises';
 import { join, relative, resolve } from 'path';
 import { type SemVer, parse } from 'semver';
 
-import { type DependencyChanges } from './common.js';
+import type { DependencyChanges } from './common.js';
 import { atomicUpdateFile } from './utils.js';
 
 const deprecatedNpmPackages = new Set<string>(['@aztec/cli', '@aztec/aztec-sandbox']);

package/src/cmds/misc/update/utils.ts

@@ -1,4 +1,4 @@
-import { type NoirPackageConfig } from '@aztec/foundation/noir';
+import type { NoirPackageConfig } from '@aztec/foundation/noir';
 
 import TOML from '@iarna/toml';
 import { CommanderError } from 'commander';

package/src/cmds/misc/update.ts

@@ -1,10 +1,10 @@
 /* eslint-disable jsdoc/require-jsdoc */
-import { type LogFn } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
 
 import { relative, resolve } from 'path';
 import { parse } from 'semver';
 
-import { type DependencyChanges } from './update/common.js';
+import type { DependencyChanges } from './update/common.js';
 import { GITHUB_TAG_PREFIX } from './update/github.js';
 import { updateAztecNr } from './update/noir.js';
 import { getNewestVersion, updateAztecDeps, updateLockfile } from './update/npm.js';

package/src/cmds/pxe/add_contract.ts

@@ -1,8 +1,8 @@
 import { AztecAddress, type ContractInstanceWithAddress, type Fr, getContractClassFromArtifact } from '@aztec/aztec.js';
 import { createCompatibleClient } from '@aztec/aztec.js';
-import { PublicKeys } from '@aztec/circuits.js';
-import { computeContractAddressFromInstance } from '@aztec/circuits.js/contract';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import type { LogFn, Logger } from '@aztec/foundation/log';
+import { computeContractAddressFromInstance } from '@aztec/stdlib/contract';
+import { PublicKeys } from '@aztec/stdlib/keys';
 
 import { getContractArtifact } from '../../utils/aztec.js';
 
@@ -18,11 +18,13 @@ export async function addContract(
   log: LogFn,
 ) {
   const artifact = await getContractArtifact(contractArtifactPath, log);
+  const contractClass = await getContractClassFromArtifact(artifact);
   const instance: ContractInstanceWithAddress = {
     version: 1,
     salt,
     initializationHash,
-    contractClassId: (await getContractClassFromArtifact(artifact)).id,
+    currentContractClassId: contractClass.id,
+    originalContractClassId: contractClass.id,
     publicKeys: publicKeys ?? PublicKeys.default(),
     address,
     deployer: deployer ?? AztecAddress.ZERO,
@@ -35,5 +37,5 @@ export async function addContract(
   const client = await createCompatibleClient(rpcUrl, debugLogger);
 
   await client.registerContract({ artifact, instance });
-  log(`\nContract added to PXE at ${address.toString()} with class ${instance.contractClassId.toString()}\n`);
+  log(`\nContract added to PXE at ${address.toString()} with class ${instance.currentContractClassId.toString()}\n`);
 }

package/src/cmds/pxe/block_number.ts

@@ -1,5 +1,5 @@
 import { createCompatibleClient } from '@aztec/aztec.js';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 
 export async function blockNumber(rpcUrl: string, debugLogger: Logger, log: LogFn) {
   const client = await createCompatibleClient(rpcUrl, debugLogger);

package/src/cmds/pxe/get_account.ts

@@ -1,6 +1,6 @@
-import { type AztecAddress } from '@aztec/aztec.js';
+import type { AztecAddress } from '@aztec/aztec.js';
 import { createCompatibleClient } from '@aztec/aztec.js';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 
 export async function getAccount(aztecAddress: AztecAddress, rpcUrl: string, debugLogger: Logger, log: LogFn) {
   const client = await createCompatibleClient(rpcUrl, debugLogger);

package/src/cmds/pxe/get_accounts.ts

@@ -1,5 +1,5 @@
 import { createCompatibleClient } from '@aztec/aztec.js';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 
 export async function getAccounts(
   rpcUrl: string,

package/src/cmds/pxe/get_block.ts

@@ -1,5 +1,5 @@
 import { createCompatibleClient } from '@aztec/aztec.js';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 
 import { inspectBlock } from '../../utils/inspect.js';
 

package/src/cmds/pxe/get_contract_data.ts

@@ -1,6 +1,6 @@
-import { type AztecAddress } from '@aztec/aztec.js';
+import type { AztecAddress } from '@aztec/aztec.js';
 import { createCompatibleClient } from '@aztec/aztec.js';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 
 export async function getContractData(
   rpcUrl: string,
@@ -16,7 +16,9 @@ export async function getContractData(
     isContractPubliclyDeployed: isPubliclyDeployed,
   } = await client.getContractMetadata(contractAddress);
   const contractClass =
-    includeBytecode && instance && (await client.getContractClassMetadata(instance?.contractClassId)).contractClass;
+    includeBytecode &&
+    instance &&
+    (await client.getContractClassMetadata(instance?.currentContractClassId)).contractClass;
 
   const isPrivatelyDeployed = !!instance;
   const initStr = isInitialized ? 'initialized' : 'not initialized';

package/src/cmds/pxe/get_current_base_fee.ts

@@ -1,6 +1,6 @@
 import { createCompatibleClient } from '@aztec/aztec.js';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 
 export async function getCurrentBaseFee(rpcUrl: string, debugLogger: Logger, log: LogFn) {
   const client = await createCompatibleClient(rpcUrl, debugLogger);

package/src/cmds/pxe/get_l1_to_l2_message_witness.ts

@@ -1,5 +1,5 @@
 import { type AztecAddress, type Fr, createCompatibleClient } from '@aztec/aztec.js';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 
 export async function getL1ToL2MessageWitness(
   rpcUrl: string,

package/src/cmds/pxe/get_logs.ts

@@ -1,6 +1,6 @@
-import { type AztecAddress, type LogFilter, type LogId, type TxHash } from '@aztec/aztec.js';
+import type { AztecAddress, LogFilter, LogId, TxHash } from '@aztec/aztec.js';
 import { createCompatibleClient } from '@aztec/aztec.js';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
 
 export async function getLogs(

package/src/cmds/pxe/get_node_info.ts

@@ -1,5 +1,5 @@
 import { type AztecNode, type PXE, createAztecNodeClient, createCompatibleClient } from '@aztec/aztec.js';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 
 export async function getNodeInfo(
   rpcUrl: string,
@@ -34,7 +34,7 @@ export async function getNodeInfo(
         rewardDistributor: info.l1ContractAddresses.rewardDistributorAddress.toString(),
         governanceProposer: info.l1ContractAddresses.governanceProposerAddress.toString(),
         governance: info.l1ContractAddresses.governanceAddress.toString(),
-        slashFactory: info.l1ContractAddresses.slashFactoryAddress.toString(),
+        slashFactory: info.l1ContractAddresses.slashFactoryAddress?.toString(),
       },
       protocolContractAddresses: {
         classRegisterer: info.protocolContractAddresses.classRegisterer.toString(),
@@ -60,7 +60,7 @@ export async function getNodeInfo(
     log(` RewardDistributor Address: ${info.l1ContractAddresses.rewardDistributorAddress.toString()}`);
     log(` GovernanceProposer Address: ${info.l1ContractAddresses.governanceProposerAddress.toString()}`);
     log(` Governance Address: ${info.l1ContractAddresses.governanceAddress.toString()}`);
-    log(` SlashFactory Address: ${info.l1ContractAddresses.slashFactoryAddress.toString()}`);
+    log(` SlashFactory Address: ${info.l1ContractAddresses.slashFactoryAddress?.toString()}`);
 
     log(`L2 Contract Addresses:`);
     log(` Class Registerer: ${info.protocolContractAddresses.classRegisterer.toString()}`);

package/src/cmds/pxe/get_pxe_info.ts

@@ -1,5 +1,5 @@
 import { createCompatibleClient } from '@aztec/aztec.js';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 
 export async function getPXEInfo(rpcUrl: string, debugLogger: Logger, log: LogFn) {
   const client = await createCompatibleClient(rpcUrl, debugLogger);

package/src/cmds/pxe/index.ts

@@ -1,7 +1,7 @@
-import { Fr } from '@aztec/circuits.js';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import { Fr } from '@aztec/foundation/fields';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 
-import { type Command } from 'commander';
+import type { Command } from 'commander';
 
 import {
   logJson,

package/src/utils/aztec.ts

@@ -1,25 +1,15 @@
+import type { EthAddress, PXE } from '@aztec/aztec.js';
 import { type ContractArtifact, type FunctionArtifact, loadContractArtifact } from '@aztec/aztec.js/abi';
-import { type PXE } from '@aztec/circuit-types';
-import { type DeployL1Contracts, type L1ContractsConfig } from '@aztec/ethereum';
-import { FunctionType } from '@aztec/foundation/abi';
-import { type EthAddress } from '@aztec/foundation/eth-address';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
-import { type NoirPackageConfig } from '@aztec/foundation/noir';
-import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
+import type { DeployL1ContractsReturnType, L1ContractsConfig, RollupContract } from '@aztec/ethereum';
+import type { Fr } from '@aztec/foundation/fields';
+import type { LogFn, Logger } from '@aztec/foundation/log';
+import type { NoirPackageConfig } from '@aztec/foundation/noir';
 import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { FunctionType } from '@aztec/stdlib/abi';
 
 import TOML from '@iarna/toml';
 import { readFile } from 'fs/promises';
 import { gtr, ltr, satisfies, valid } from 'semver';
-import {
-  type Account,
-  type Chain,
-  type HttpTransport,
-  type WalletClient,
-  getAddress,
-  getContract,
-  publicActions,
-} from 'viem';
 
 import { encodeArgs } from './encoding.js';
 
@@ -39,55 +29,95 @@ export function getFunctionArtifact(artifact: ContractArtifact, fnName: string):
 
 /**
  * Function to execute the 'deployRollupContracts' command.
- * @param rpcUrl - The RPC URL of the ethereum node.
+ * @param rpcUrls - The RPC URL of the ethereum node.
  * @param chainId - The chain ID of the L1 host.
  * @param privateKey - The private key to be used in contract deployment.
  * @param mnemonic - The mnemonic to be used in contract deployment.
  */
 export async function deployAztecContracts(
-  rpcUrl: string,
+  rpcUrls: string[],
   chainId: number,
   privateKey: string | undefined,
   mnemonic: string,
   mnemonicIndex: number,
   salt: number | undefined,
   initialValidators: EthAddress[],
+  genesisArchiveRoot: Fr,
+  genesisBlockHash: Fr,
   config: L1ContractsConfig,
   debugLogger: Logger,
-): Promise<DeployL1Contracts> {
+): Promise<DeployL1ContractsReturnType> {
   const { createEthereumChain, deployL1Contracts } = await import('@aztec/ethereum');
   const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
 
   const account = !privateKey
     ? mnemonicToAccount(mnemonic!, { addressIndex: mnemonicIndex })
     : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}` as `0x${string}`);
-  const chain = createEthereumChain(rpcUrl, chainId);
-
-  const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vks');
-
-  return await deployL1Contracts(chain.rpcUrl, account, chain.chainInfo, debugLogger, {
-    l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice,
-    vkTreeRoot: await getVKTreeRoot(),
-    protocolContractTreeRoot,
-    salt,
-    initialValidators,
-    ...config,
-  });
+  const chain = createEthereumChain(rpcUrls, chainId);
+
+  const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
+
+  return await deployL1Contracts(
+    chain.rpcUrls,
+    account,
+    chain.chainInfo,
+    debugLogger,
+    {
+      l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice.toField(),
+      vkTreeRoot: getVKTreeRoot(),
+      protocolContractTreeRoot,
+      genesisArchiveRoot,
+      genesisBlockHash,
+      salt,
+      initialValidators,
+      ...config,
+    },
+    config,
+  );
 }
 
-/** Sets the assumed proven block number on the rollup contract on L1 */
-export async function setAssumeProvenThrough(
-  blockNumber: number,
-  rollupAddress: EthAddress,
-  walletClient: WalletClient<HttpTransport, Chain, Account>,
-) {
-  const rollup = getContract({
-    address: getAddress(rollupAddress.toString()),
-    abi: RollupAbi,
-    client: walletClient,
-  });
-  const hash = await rollup.write.setAssumeProvenThroughBlockNumber([BigInt(blockNumber)]);
-  await walletClient.extend(publicActions).waitForTransactionReceipt({ hash });
+export async function deployNewRollupContracts(
+  registryAddress: EthAddress,
+  rpcUrls: string[],
+  chainId: number,
+  privateKey: string | undefined,
+  mnemonic: string,
+  mnemonicIndex: number,
+  salt: number | undefined,
+  initialValidators: EthAddress[],
+  genesisArchiveRoot: Fr,
+  genesisBlockHash: Fr,
+  config: L1ContractsConfig,
+  logger: Logger,
+): Promise<{ payloadAddress: EthAddress; rollup: RollupContract }> {
+  const { createEthereumChain, deployRollupAndPeriphery, createL1Clients } = await import('@aztec/ethereum');
+  const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
+  const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
+
+  const account = !privateKey
+    ? mnemonicToAccount(mnemonic!, { addressIndex: mnemonicIndex })
+    : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}` as `0x${string}`);
+  const chain = createEthereumChain(rpcUrls, chainId);
+  const clients = createL1Clients(rpcUrls, account, chain.chainInfo, mnemonicIndex);
+
+  const { payloadAddress, rollup } = await deployRollupAndPeriphery(
+    clients,
+    {
+      salt,
+      vkTreeRoot: getVKTreeRoot(),
+      protocolContractTreeRoot,
+      l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice.toField(),
+      genesisArchiveRoot,
+      genesisBlockHash,
+      initialValidators,
+      ...config,
+    },
+    registryAddress,
+    logger,
+    config,
+  );
+
+  return { payloadAddress, rollup };
 }
 
 /**