@aztec/cli 0.0.1-commit.d3ec352c → 0.0.1-commit.fcb71a6

package/src/cmds/validator_keys/staker.ts

@@ -1,9 +1,10 @@
 import { prettyPrintJSON } from '@aztec/cli/utils';
-import { GSEContract, createEthereumChain } from '@aztec/ethereum';
-import { computeBn254G1PublicKey, computeBn254G2PublicKey } from '@aztec/foundation/crypto';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { GSEContract } from '@aztec/ethereum/contracts';
 import { decryptBn254Keystore } from '@aztec/foundation/crypto/bls/bn254_keystore';
+import { computeBn254G1PublicKey, computeBn254G2PublicKey } from '@aztec/foundation/crypto/bn254';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import type { LogFn } from '@aztec/foundation/log';
 import { loadKeystoreFile } from '@aztec/node-keystore/loader';
 import type {
@@ -272,7 +273,7 @@ export async function generateStakerJson(options: StakerOptions, log: LogFn): Pr
   const chain = createEthereumChain(l1RpcUrls, l1ChainId);
   const publicClient = createPublicClient({
     chain: chain.chainInfo,
-    transport: fallback(l1RpcUrls.map(url => http(url))),
+    transport: fallback(l1RpcUrls.map(url => http(url, { batch: false }))),
   });
   const gse = new GSEContract(publicClient, gseAddress);
 

package/src/cmds/validator_keys/utils.ts

@@ -1,5 +1,6 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import { type EthPrivateKey, ethPrivateKeySchema } from '@aztec/node-keystore';
+import { ethPrivateKeySchema } from '@aztec/node-keystore/schemas';
+import type { EthPrivateKey } from '@aztec/node-keystore/types';
 
 export const defaultBlsPath = 'm/12381/3600/0/0/0';
 

package/src/config/chain_l2_config.ts

@@ -1,8 +1,9 @@
-import { DefaultL1ContractsConfig, type L1ContractsConfig, type L1TxUtilsConfig } from '@aztec/ethereum';
+import { DefaultL1ContractsConfig, type L1ContractsConfig } from '@aztec/ethereum/config';
+import type { L1TxUtilsConfig } from '@aztec/ethereum/l1-tx-utils/config';
 import type { NetworkNames } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { SharedNodeConfig } from '@aztec/node-lib/config';
-import type { P2PConfig } from '@aztec/p2p';
+import type { P2PConfig } from '@aztec/p2p/config';
 import type { SequencerConfig, SlasherConfig } from '@aztec/stdlib/interfaces/server';
 
 import path from 'path';
@@ -18,7 +19,7 @@ const tbMapSizeKb = 1_024 * 1_024 * 1_024; // 1 TB
 export type L2ChainConfig = Omit<L1ContractsConfig, keyof L1TxUtilsConfig> &
   Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways' | 'slashOverridePayload' | 'slashSelfAllowed'> &
   Pick<P2PConfig, 'bootstrapNodes' | 'p2pEnabled' | 'txPoolDeleteTxsAfterReorg'> &
-  Pick<SequencerConfig, 'minTxsPerBlock' | 'maxTxsPerBlock'> & {
+  Pick<SequencerConfig, 'buildCheckpointIfEmpty' | 'minTxsPerBlock' | 'maxTxsPerBlock' | 'blockDurationMs'> & {
     l1ChainId: number;
     testAccounts: boolean;
     sponsoredFPC: boolean;
@@ -28,7 +29,7 @@ export type L2ChainConfig = Omit<L1ContractsConfig, keyof L1TxUtilsConfig> &
     snapshotsUrls: string[];
     autoUpdate: SharedNodeConfig['autoUpdate'];
     autoUpdateUrl?: string;
-    maxTxPoolSize: number;
+    maxPendingTxCount: number;
     publicMetricsOptOut: boolean;
     publicIncludeMetrics?: string[];
     publicMetricsCollectorUrl?: string;
@@ -103,11 +104,12 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   bootstrapNodes: [],
   minTxsPerBlock: 0,
   maxTxsPerBlock: 0,
+  buildCheckpointIfEmpty: true,
   realProofs: true,
   snapshotsUrls: [`${SNAPSHOTS_URL}/staging-ignition/`],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-ignition.json',
-  maxTxPoolSize: 0,
+  maxPendingTxCount: 0,
   publicMetricsOptOut: false,
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
@@ -127,6 +129,8 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   lagInEpochsForValidatorSet: 2,
   /** The number of epochs to lag behind the current epoch for randao selection. */
   lagInEpochsForRandao: 2,
+  /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */
+  inboxLag: 1,
   /** The number of epochs after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: 1,
   /** How many sequencers must agree with a slash for it to be executed. */
@@ -188,6 +192,7 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   bootstrapNodes: [],
   minTxsPerBlock: 0,
   maxTxsPerBlock: 20,
+  buildCheckpointIfEmpty: true,
   realProofs: true,
   snapshotsUrls: [`${SNAPSHOTS_URL}/staging-public/`],
   autoUpdate: 'config-and-version',
@@ -196,7 +201,7 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
   publicMetricsCollectFrom: ['sequencer'],
-  maxTxPoolSize: 100_000_000, // 100MB
+  maxPendingTxCount: 1_000, // ~156MB
   txPoolDeleteTxsAfterReorg: true,
 
   // Deployment stuff
@@ -212,6 +217,8 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   lagInEpochsForValidatorSet: DefaultL1ContractsConfig.lagInEpochsForValidatorSet,
   /** The number of epochs to lag behind the current epoch for randao selection. */
   lagInEpochsForRandao: DefaultL1ContractsConfig.lagInEpochsForRandao,
+  /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */
+  inboxLag: DefaultL1ContractsConfig.inboxLag,
   /** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */
   localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
   /** The number of epochs after an epoch ends that proofs are still accepted. */
@@ -245,6 +252,7 @@ export const nextNetL2ChainConfig: L2ChainConfig = {
   bootstrapNodes: [],
   minTxsPerBlock: 0,
   maxTxsPerBlock: 8,
+  buildCheckpointIfEmpty: true,
   realProofs: true,
   snapshotsUrls: [],
   autoUpdate: 'config-and-version',
@@ -253,7 +261,7 @@ export const nextNetL2ChainConfig: L2ChainConfig = {
   publicIncludeMetrics,
   publicMetricsCollectorUrl: '',
   publicMetricsCollectFrom: [''],
-  maxTxPoolSize: 100_000_000, // 100MB
+  maxPendingTxCount: 1_000, // ~156MB
   txPoolDeleteTxsAfterReorg: false,
 
   // Deployment stuff
@@ -269,6 +277,8 @@ export const nextNetL2ChainConfig: L2ChainConfig = {
   lagInEpochsForValidatorSet: DefaultL1ContractsConfig.lagInEpochsForValidatorSet,
   /** The number of epochs to lag behind the current epoch for randao selection. */
   lagInEpochsForRandao: DefaultL1ContractsConfig.lagInEpochsForRandao,
+  /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */
+  inboxLag: DefaultL1ContractsConfig.inboxLag,
   /** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */
   localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
   /** The number of epochs after an epoch ends that proofs are still accepted. */
@@ -301,12 +311,13 @@ export const testnetL2ChainConfig: L2ChainConfig = {
   disableTransactions: true,
   bootstrapNodes: [],
   minTxsPerBlock: 0,
-  maxTxsPerBlock: 0,
+  maxTxsPerBlock: 20,
+  buildCheckpointIfEmpty: true,
   realProofs: true,
   snapshotsUrls: [`${SNAPSHOTS_URL}/testnet/`],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/testnet.json',
-  maxTxPoolSize: 100_000_000, // 100MB
+  maxPendingTxCount: 5_000, // ~760MB
   publicMetricsOptOut: false,
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
@@ -322,55 +333,57 @@ export const testnetL2ChainConfig: L2ChainConfig = {
   /** How many L2 slots an epoch lasts. */
   aztecEpochDuration: 32,
   /** The target validator committee size. */
-  aztecTargetCommitteeSize: 24,
+  aztecTargetCommitteeSize: 48,
   /** The number of epochs to lag behind the current epoch for validator selection. */
   lagInEpochsForValidatorSet: 2,
   /** The number of epochs to lag behind the current epoch for randao selection. */
   lagInEpochsForRandao: 2,
+  /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */
+  inboxLag: 1,
   /** The number of epochs after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: 1,
 
-  // This is a diff from mainnet: we have 2-strikes you're out, rather than 3 on mainnet.
-  localEjectionThreshold: 198_000n * 10n ** 18n,
+  // This is a diff from mainnet: we have 1-strike you're out, rather than 3 on mainnet.
+  localEjectionThreshold: 199_000n * 10n ** 18n,
   /** How many sequencers must agree with a slash for it to be executed. */
-  slashingQuorum: 65,
-  slashingRoundSizeInEpochs: 4,
-  slashingExecutionDelayInRounds: 28,
-  slashingLifetimeInRounds: 34,
-  slashingVetoer: EthAddress.fromString('0xBbB4aF368d02827945748b28CD4b2D42e4A37480'),
+  slashingQuorum: 33,
+  slashingRoundSizeInEpochs: 2,
+  slashingExecutionDelayInRounds: 2,
+  slashingLifetimeInRounds: 5,
+  slashingVetoer: EthAddress.fromString('0xdfe19Da6a717b7088621d8bBB66be59F2d78e924'),
   slashingOffsetInRounds: 2,
 
-  slashingDisableDuration: 259_200, // 3 days
+  slashingDisableDuration: 5 * 24 * 60 * 60, // 5 days
   slasherFlavor: 'tally',
 
-  slashAmountSmall: 2_000n * 10n ** 18n,
-  slashAmountMedium: 2_000n * 10n ** 18n,
-  slashAmountLarge: 2_000n * 10n ** 18n,
+  slashAmountSmall: 10_000n * 10n ** 18n,
+  slashAmountMedium: 50_000n * 10n ** 18n,
+  slashAmountLarge: 200_000n * 10n ** 18n,
 
   /** The mana target for the rollup */
-  manaTarget: 0n,
+  manaTarget: 150_000_000n,
 
   /** The proving cost per mana */
-  provingCostPerMana: 0n,
+  provingCostPerMana: 100n,
 
   exitDelaySeconds: 4 * 24 * 60 * 60, // 4 days
 
   activationThreshold: 200_000n * 10n ** 18n,
   ejectionThreshold: 100_000n * 10n ** 18n,
 
-  governanceProposerRoundSize: 300,
-  governanceProposerQuorum: 151,
+  governanceProposerRoundSize: 100,
+  governanceProposerQuorum: 60,
 
   // Node slashing config
   slashInactivityTargetPercentage: 0.8,
   slashInactivityConsecutiveEpochThreshold: 2,
-  slashInactivityPenalty: 2_000n * 10n ** 18n,
+  slashInactivityPenalty: 10_000n * 10n ** 18n,
   slashPrunePenalty: 0n, // 2_000n * 10n ** 18n, We disable slashing for prune offenses right now
   slashDataWithholdingPenalty: 0n, // 2_000n * 10n ** 18n, We disable slashing for data withholding offenses right now
-  slashProposeInvalidAttestationsPenalty: 2_000n * 10n ** 18n,
-  slashAttestDescendantOfInvalidPenalty: 2_000n * 10n ** 18n,
-  slashUnknownPenalty: 2_000n * 10n ** 18n,
-  slashBroadcastedInvalidBlockPenalty: 2_000n * 10n ** 18n, // 10_000n * 10n ** 18n, Disabled for now until further testing
+  slashProposeInvalidAttestationsPenalty: 10_000n * 10n ** 18n,
+  slashAttestDescendantOfInvalidPenalty: 10_000n * 10n ** 18n,
+  slashUnknownPenalty: 10_000n * 10n ** 18n,
+  slashBroadcastedInvalidBlockPenalty: 10_000n * 10n ** 18n, // 10_000n * 10n ** 18n, Disabled for now until further testing
   slashGracePeriodL2Slots: 1_200, // One day from deployment
   slashOffenseExpirationRounds: 8,
 
@@ -395,11 +408,12 @@ export const mainnetL2ChainConfig: L2ChainConfig = {
   bootstrapNodes: [],
   minTxsPerBlock: 0,
   maxTxsPerBlock: 0,
+  buildCheckpointIfEmpty: true,
   realProofs: true,
   snapshotsUrls: [`${SNAPSHOTS_URL}/mainnet/`],
   autoUpdate: 'notify',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-mainnet/auto-update/mainnet.json',
-  maxTxPoolSize: 0,
+  maxPendingTxCount: 0,
   publicMetricsOptOut: true,
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
@@ -418,6 +432,8 @@ export const mainnetL2ChainConfig: L2ChainConfig = {
   lagInEpochsForValidatorSet: 2,
   /** The number of epochs to lag behind the current epoch for randao selection. */
   lagInEpochsForRandao: 2,
+  /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */
+  inboxLag: 1,
   /** The number of epochs after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: 1,
 
@@ -483,6 +499,7 @@ export const devnetL2ChainConfig: L2ChainConfig = {
   bootstrapNodes: [],
   minTxsPerBlock: 0,
   maxTxsPerBlock: 8,
+  buildCheckpointIfEmpty: true,
   realProofs: false,
   snapshotsUrls: [],
   autoUpdate: 'config-and-version',
@@ -491,7 +508,7 @@ export const devnetL2ChainConfig: L2ChainConfig = {
   publicIncludeMetrics,
   publicMetricsCollectorUrl: '',
   publicMetricsCollectFrom: [''],
-  maxTxPoolSize: 100_000_000, // 100MB
+  maxPendingTxCount: 1_000, // ~156MB
   txPoolDeleteTxsAfterReorg: true,
 
   // Deployment stuff
@@ -507,6 +524,8 @@ export const devnetL2ChainConfig: L2ChainConfig = {
   lagInEpochsForValidatorSet: 1,
   /** The number of epochs to lag behind the current epoch for randao selection. */
   lagInEpochsForRandao: 1,
+  /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */
+  inboxLag: DefaultL1ContractsConfig.inboxLag,
   /** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */
   localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
   /** The number of epochs after an epoch ends that proofs are still accepted. */
@@ -576,10 +595,16 @@ export function enrichEnvironmentWithChainConfig(config: L2ChainConfig) {
   enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
   enrichVar('SEQ_MIN_TX_PER_BLOCK', config.minTxsPerBlock.toString());
   enrichVar('SEQ_MAX_TX_PER_BLOCK', config.maxTxsPerBlock.toString());
+  if (config.blockDurationMs !== undefined) {
+    enrichVar('SEQ_BLOCK_DURATION_MS', config.blockDurationMs.toString());
+  }
+  if (config.buildCheckpointIfEmpty !== undefined) {
+    enrichVar('SEQ_BUILD_CHECKPOINT_IF_EMPTY', config.buildCheckpointIfEmpty.toString());
+  }
   enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
   enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
   enrichVar('SYNC_SNAPSHOTS_URLS', config.snapshotsUrls.join(','));
-  enrichVar('P2P_MAX_TX_POOL_SIZE', config.maxTxPoolSize.toString());
+  enrichVar('P2P_MAX_PENDING_TX_COUNT', config.maxPendingTxCount.toString());
   enrichVar('P2P_TX_POOL_DELETE_TXS_AFTER_REORG', config.txPoolDeleteTxsAfterReorg.toString());
 
   enrichVar('DATA_STORE_MAP_SIZE_KB', config.dataStoreMapSizeKb.toString());
@@ -625,6 +650,7 @@ export function enrichEnvironmentWithChainConfig(config: L2ChainConfig) {
   enrichVar('AZTEC_TARGET_COMMITTEE_SIZE', config.aztecTargetCommitteeSize.toString());
   enrichVar('AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET', config.lagInEpochsForValidatorSet.toString());
   enrichVar('AZTEC_LAG_IN_EPOCHS_FOR_RANDAO', config.lagInEpochsForRandao.toString());
+  enrichVar('AZTEC_INBOX_LAG', config.inboxLag.toString());
   enrichVar('AZTEC_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
   enrichVar('AZTEC_ACTIVATION_THRESHOLD', config.activationThreshold.toString());
   enrichVar('AZTEC_EJECTION_THRESHOLD', config.ejectionThreshold.toString());

package/src/config/get_l1_config.ts

@@ -1,4 +1,7 @@
-import { type L1ContractAddresses, RegistryContract, getL1ContractsConfig, getPublicClient } from '@aztec/ethereum';
+import { getPublicClient } from '@aztec/ethereum/client';
+import { RegistryContract } from '@aztec/ethereum/contracts';
+import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
+import { getL1ContractsConfig } from '@aztec/ethereum/queries';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
 export async function getL1Config(

package/src/config/network_config.ts

@@ -137,4 +137,11 @@ export async function enrichEnvironmentWithNetworkConfig(networkName: NetworkNam
   if (networkConfig.feeAssetHandlerAddress) {
     enrichEthAddressVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', networkConfig.feeAssetHandlerAddress.toString());
   }
+
+  if (networkConfig.blobFileStoreUrls?.length) {
+    enrichVar('BLOB_FILE_STORE_URLS', networkConfig.blobFileStoreUrls.join(','));
+  }
+  if (networkConfig.blockDurationMs !== undefined) {
+    enrichVar('SEQ_BLOCK_DURATION_MS', String(networkConfig.blockDurationMs));
+  }
 }

package/src/utils/aztec.ts

@@ -6,23 +6,23 @@ import {
   loadContractArtifact,
 } from '@aztec/aztec.js/abi';
 import { EthAddress } from '@aztec/aztec.js/addresses';
-import {
-  type DeployL1ContractsReturnType,
-  type L1ContractsConfig,
-  type Operator,
-  RollupContract,
-} from '@aztec/ethereum';
+import type { L1ContractsConfig } from '@aztec/ethereum/config';
+import { RollupContract } from '@aztec/ethereum/contracts';
+import type { Operator } from '@aztec/ethereum/deploy-aztec-l1-contracts';
 import { SecretValue } from '@aztec/foundation/config';
-import { Fr } from '@aztec/foundation/fields';
-import type { LogFn, Logger } from '@aztec/foundation/log';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { type LogFn, createLogger } from '@aztec/foundation/log';
 import type { NoirPackageConfig } from '@aztec/foundation/noir';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
 
 import TOML from '@iarna/toml';
 import { readFile } from 'fs/promises';
+import type { HDAccount, Hex, PrivateKeyAccount } from 'viem';
 
 import { encodeArgs } from './encoding.js';
 
+const logger = createLogger('cli:utils:aztec');
+
 /**
  * Helper to get an ABI function or throw error if it doesn't exist.
  * @param artifact - Contract's build artifact in JSON format.
@@ -37,89 +37,32 @@ export function getFunctionAbi(artifact: ContractArtifact, fnName: string): Func
   return fn;
 }
 
-/**
- * Function to execute the 'deployRollupContracts' command.
- * @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(
-  rpcUrls: string[],
-  chainId: number,
-  privateKey: string | undefined,
-  mnemonic: string,
-  mnemonicIndex: number,
-  salt: number | undefined,
-  initialValidators: Operator[],
-  genesisArchiveRoot: Fr,
-  feeJuicePortalInitialBalance: bigint,
-  acceleratedTestDeployments: boolean,
-  config: L1ContractsConfig,
-  existingToken: EthAddress | undefined,
-  realVerifier: boolean,
-  createVerificationJson: string | false,
-  debugLogger: Logger,
-): Promise<DeployL1ContractsReturnType> {
-  const { createEthereumChain, deployL1Contracts } = await import('@aztec/ethereum');
-  const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
-
-  const account = !privateKey
-    ? mnemonicToAccount(mnemonic!, { addressIndex: mnemonicIndex })
-    : privateKeyToAccount(addLeadingHex(privateKey));
-  const chain = createEthereumChain(rpcUrls, chainId);
-
-  const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
-
-  const result = await deployL1Contracts(
-    chain.rpcUrls,
-    account,
-    chain.chainInfo,
-    debugLogger,
-    {
-      vkTreeRoot: getVKTreeRoot(),
-      protocolContractsHash,
-      genesisArchiveRoot,
-      salt,
-      initialValidators,
-      acceleratedTestDeployments,
-      feeJuicePortalInitialBalance,
-      realVerifier,
-      existingTokenAddress: existingToken,
-      ...config,
-    },
-    config,
-    createVerificationJson,
-  );
-
-  return result;
-}
-
 export async function deployNewRollupContracts(
   registryAddress: EthAddress,
   rpcUrls: string[],
-  chainId: number,
   privateKey: string | undefined,
+  chainId: number,
   mnemonic: string,
   mnemonicIndex: number,
-  salt: number | undefined,
   initialValidators: Operator[],
   genesisArchiveRoot: Fr,
   feeJuicePortalInitialBalance: bigint,
   config: L1ContractsConfig,
   realVerifier: boolean,
-  createVerificationJson: string | false,
-  logger: Logger,
 ): Promise<{ rollup: RollupContract; slashFactoryAddress: EthAddress }> {
-  const { createEthereumChain, deployRollupForUpgrade, createExtendedL1Client } = await import('@aztec/ethereum');
+  const { deployRollupForUpgrade } = await import('@aztec/ethereum/deploy-aztec-l1-contracts');
   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(addLeadingHex(privateKey));
-  const chain = createEthereumChain(rpcUrls, chainId);
-  const client = createExtendedL1Client(rpcUrls, account, chain.chainInfo, undefined, mnemonicIndex);
+  let account: HDAccount | PrivateKeyAccount;
+  if (privateKey) {
+    account = privateKeyToAccount(addLeadingHex(privateKey));
+  } else {
+    account = mnemonicToAccount(mnemonic!, { addressIndex: mnemonicIndex });
+    const privateKeyBuf = account.getHdKey().privateKey;
+    const privateKeyHex = Buffer.from(privateKeyBuf!).toString('hex');
+    privateKey = `0x${privateKeyHex}`;
+  }
 
   if (!initialValidators || initialValidators.length === 0) {
     // initialize the new rollup with Amin's validator address.
@@ -138,9 +81,11 @@ export async function deployNewRollupContracts(
   }
 
   const { rollup, slashFactoryAddress } = await deployRollupForUpgrade(
-    client,
+    privateKey as Hex,
+    rpcUrls[0],
+    chainId,
+    registryAddress,
     {
-      salt,
       vkTreeRoot: getVKTreeRoot(),
       protocolContractsHash,
       genesisArchiveRoot,
@@ -149,13 +94,9 @@ export async function deployNewRollupContracts(
       realVerifier,
       ...config,
     },
-    registryAddress,
-    logger,
-    config,
-    createVerificationJson,
   );
 
-  return { rollup, slashFactoryAddress };
+  return { rollup, slashFactoryAddress: EthAddress.fromString(slashFactoryAddress!) };
 }
 
 /**

package/src/utils/commands.ts

@@ -1,11 +1,12 @@
-import { FunctionSelector } from '@aztec/aztec.js/abi';
-import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
-import { Fr } from '@aztec/aztec.js/fields';
-import { LogId } from '@aztec/aztec.js/log';
-import { TxHash } from '@aztec/aztec.js/tx';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn } from '@aztec/foundation/log';
 import type { PXE } from '@aztec/pxe/server';
+import { FunctionSelector } from '@aztec/stdlib/abi/function-selector';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { PublicKeys } from '@aztec/stdlib/keys';
+import { LogId } from '@aztec/stdlib/logs/log-id';
+import { TxHash } from '@aztec/stdlib/tx/tx-hash';
 
 import { type Command, CommanderError, InvalidArgumentError, Option } from 'commander';
 import { lookup } from 'dns/promises';

package/src/utils/encoding.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { ABIParameter, AbiType, StructType } from '@aztec/stdlib/abi';
 
 /**

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

@@ -1,4 +0,0 @@
-import type { EthAddress } from '@aztec/aztec.js/addresses';
-import type { LogFn, Logger } from '@aztec/foundation/log';
-export declare function deployL1Contracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, 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): Promise<void>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X2wxX2NvbnRyYWN0cy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NtZHMvbDEvZGVwbG95X2wxX2NvbnRyYWN0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUk1RCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFNM0Qsd0JBQXNCLGlCQUFpQixDQUNyQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQ2pCLE9BQU8sRUFBRSxNQUFNLEVBQ2YsVUFBVSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQzlCLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLGFBQWEsRUFBRSxNQUFNLEVBQ3JCLElBQUksRUFBRSxNQUFNLEdBQUcsU0FBUyxFQUN4QixZQUFZLEVBQUUsT0FBTyxFQUNyQixZQUFZLEVBQUUsT0FBTyxFQUNyQiwwQkFBMEIsRUFBRSxPQUFPLEVBQ25DLElBQUksRUFBRSxPQUFPLEVBQ2Isc0JBQXNCLEVBQUUsTUFBTSxHQUFHLEtBQUssRUFDdEMsaUJBQWlCLEVBQUUsVUFBVSxFQUFFLEVBQy9CLFlBQVksRUFBRSxPQUFPLEVBQ3JCLGFBQWEsRUFBRSxVQUFVLEdBQUcsU0FBUyxFQUNyQyxHQUFHLEVBQUUsS0FBSyxFQUNWLFdBQVcsRUFBRSxNQUFNLGlCQThEcEIifQ==

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

@@ -1 +0,0 @@
-{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI5D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,0BAA0B,EAAE,OAAO,EACnC,IAAI,EAAE,OAAO,EACb,sBAAsB,EAAE,MAAM,GAAG,KAAK,EACtC,iBAAiB,EAAE,UAAU,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,UAAU,GAAG,SAAS,EACrC,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA8DpB"}