@aztec/cli 3.0.0-nightly.20250908 → 3.0.0-nightly.20250911

package/src/cmds/l1/deploy_new_rollup.ts

@@ -1,4 +1,4 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
+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';
@@ -25,7 +25,7 @@ export async function deployNewRollup(
 ) {
   const config = getL1ContractsConfigEnvVars();
 
-  const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
+  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);

package/src/cmds/l1/index.ts

@@ -1,9 +1,9 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn, Logger } from '@aztec/foundation/log';
-import { withoutHexPrefix } from '@aztec/foundation/string';
 
 import { type Command, Option } from 'commander';
 
+import { getL1RollupAddressFromEnv } from '../../config/get_l1_config.js';
 import {
   ETHEREUM_HOSTS,
   MNEMONIC,
@@ -26,6 +26,8 @@ const l1RpcUrlsOption = new Option(
   .makeOptionMandatory(true)
   .argParser((arg: string) => arg.split(',').map(url => url.trim()));
 
+const networkOption = new Option('--network <string>', 'Network to execute against').env('NETWORK');
+
 export function injectCommands(program: Command, log: LogFn, debugLogger: Logger) {
   program
     .command('deploy-l1-contracts')
@@ -285,8 +287,9 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
 
   program
     .command('add-l1-validator')
-    .description('Adds a validator to the L1 rollup contract.')
+    .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>',
@@ -295,32 +298,29 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     )
     .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('--staking-asset-handler <address>', 'ethereum address of the staking asset handler', parseEthereumAddress)
-    .option('--proof <buffer>', 'The proof to use for the attestation', arg =>
-      Buffer.from(withoutHexPrefix(arg), 'hex'),
-    )
-    .option(
-      '--merkle-proof <string>',
-      'The merkle proof to use for the attestation (comma separated list of 32 byte buffers)',
-      arg => arg.split(','),
-    )
+    .option('--move-with-latest-rollup', 'Whether to move with the latest rollup', true)
+    .option('--rollup <string>', 'Rollup contract address', parseEthereumAddress)
     .action(async options => {
-      const { addL1Validator } = await import('./update_l1_validators.js');
-      await addL1Validator({
+      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,
         attesterAddress: options.attester,
-        stakingAssetHandlerAddress: options.stakingAssetHandler,
-        merkleProof: options.merkleProof,
-        proofParams: options.proof,
         blsSecretKey: options.blsSecretKey,
+        withdrawerAddress: options.withdrawer,
+        rollupAddress,
+        moveWithLatestRollup: options.moveWithLatestRollup,
         log,
         debugLogger,
       });

package/src/cmds/l1/update_l1_validators.ts

@@ -131,6 +131,80 @@ export async function addL1Validator({
   }
 }
 
+export async function addL1ValidatorViaRollup({
+  rpcUrls,
+  chainId,
+  privateKey,
+  mnemonic,
+  attesterAddress,
+  withdrawerAddress,
+  blsSecretKey,
+  moveWithLatestRollup,
+  rollupAddress,
+  log,
+  debugLogger,
+}: RollupCommandArgs &
+  LoggerArgs & {
+    blsSecretKey: bigint; // scalar field element of BN254
+    attesterAddress: EthAddress;
+    moveWithLatestRollup: boolean;
+  }) {
+  const dualLog = makeDualLog(log, debugLogger);
+  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: l1Client,
+  });
+
+  const gseAddress = await rollup.read.getGSE();
+
+  const gse = new GSEContract(l1Client, gseAddress);
+
+  const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
+
+  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, 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, 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,

package/src/config/chain_l2_config.ts

@@ -0,0 +1,382 @@
+import { DefaultL1ContractsConfig, type L1ContractsConfig } from '@aztec/ethereum';
+import type { EnvVar, NetworkNames } from '@aztec/foundation/config';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import type { SharedNodeConfig } from '@aztec/node-lib/config';
+import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
+
+import { mkdir, readFile, stat, writeFile } from 'fs/promises';
+import path, { dirname, join } from 'path';
+
+import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with { type: 'json' };
+
+export type L2ChainConfig = L1ContractsConfig &
+  Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways'> & {
+    l1ChainId: number;
+    testAccounts: boolean;
+    sponsoredFPC: boolean;
+    p2pEnabled: boolean;
+    p2pBootstrapNodes: string[];
+    registryAddress: string;
+    slashFactoryAddress: string;
+    feeAssetHandlerAddress: string;
+    seqMinTxsPerBlock: number;
+    seqMaxTxsPerBlock: number;
+    realProofs: boolean;
+    snapshotsUrl: string;
+    autoUpdate: SharedNodeConfig['autoUpdate'];
+    autoUpdateUrl?: string;
+    maxTxPoolSize: number;
+    publicIncludeMetrics?: string[];
+    publicMetricsCollectorUrl?: string;
+    publicMetricsCollectFrom?: string[];
+
+    // Control whether sentinel is enabled or not. Needed for slashing
+    sentinelEnabled: boolean;
+  };
+
+const DefaultSlashConfig = {
+  /** Tally-style slashing */
+  slasherFlavor: 'tally',
+  /** Allow one round for vetoing */
+  slashingExecutionDelayInRounds: 1,
+  /** How long for a slash payload to be executed */
+  slashingLifetimeInRounds: 5,
+  /** Allow 2 rounds to discover faults */
+  slashingOffsetInRounds: 2,
+  /** No slash vetoer */
+  slashingVetoer: EthAddress.ZERO,
+  /** Use default slash amounts */
+  slashAmountSmall: DefaultL1ContractsConfig.slashAmountSmall,
+  slashAmountMedium: DefaultL1ContractsConfig.slashAmountMedium,
+  slashAmountLarge: DefaultL1ContractsConfig.slashAmountLarge,
+
+  // Slashing stuff
+  slashMinPenaltyPercentage: 0.5,
+  slashMaxPenaltyPercentage: 2.0,
+  slashInactivityTargetPercentage: 0.7,
+  slashInactivityConsecutiveEpochThreshold: 1,
+  slashInactivityPenalty: DefaultL1ContractsConfig.slashAmountSmall,
+  slashPrunePenalty: DefaultL1ContractsConfig.slashAmountSmall,
+  slashDataWithholdingPenalty: DefaultL1ContractsConfig.slashAmountSmall,
+  slashProposeInvalidAttestationsPenalty: DefaultL1ContractsConfig.slashAmountLarge,
+  slashAttestDescendantOfInvalidPenalty: DefaultL1ContractsConfig.slashAmountLarge,
+  slashUnknownPenalty: DefaultL1ContractsConfig.slashAmountSmall,
+  slashBroadcastedInvalidBlockPenalty: DefaultL1ContractsConfig.slashAmountMedium,
+  slashMaxPayloadSize: 50,
+  slashGracePeriodL2Slots: 32 * 2, // Two epochs from genesis
+  slashOffenseExpirationRounds: 8,
+  sentinelEnabled: true,
+} satisfies Partial<L2ChainConfig>;
+
+export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
+  l1ChainId: 11155111,
+  testAccounts: true,
+  sponsoredFPC: false,
+  p2pEnabled: true,
+  p2pBootstrapNodes: [],
+  registryAddress: '0xf299347e765cfb27f913bde8e4983fd0f195676f',
+  slashFactoryAddress: '',
+  feeAssetHandlerAddress: '',
+  seqMinTxsPerBlock: 0,
+  seqMaxTxsPerBlock: 0,
+  realProofs: true,
+  snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/staging-ignition/',
+  autoUpdate: 'config-and-version',
+  autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-ignition.json',
+  maxTxPoolSize: 100_000_000, // 100MB
+  publicIncludeMetrics,
+  publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
+  publicMetricsCollectFrom: ['sequencer'],
+
+  ...DefaultL1ContractsConfig,
+  ...DefaultSlashConfig,
+
+  /** How many seconds an L1 slot lasts. */
+  ethereumSlotDuration: 12,
+  /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */
+  aztecSlotDuration: 36,
+  /** How many L2 slots an epoch lasts. */
+  aztecEpochDuration: 32,
+  /** The target validator committee size. */
+  aztecTargetCommitteeSize: 48,
+  /** The number of epochs after an epoch ends that proofs are still accepted. */
+  aztecProofSubmissionEpochs: 1,
+  /** The mana target for the rollup */
+  manaTarget: 0n,
+  /** The proving cost per mana */
+  provingCostPerMana: 0n,
+};
+
+export const stagingPublicL2ChainConfig: L2ChainConfig = {
+  l1ChainId: 11155111,
+  testAccounts: false,
+  sponsoredFPC: true,
+  p2pEnabled: true,
+  p2pBootstrapNodes: [],
+  registryAddress: '0x2e48addca360da61e4d6c21ff2b1961af56eb83b',
+  slashFactoryAddress: '0xe19410632fd00695bc5a08dd82044b7b26317742',
+  feeAssetHandlerAddress: '0xb46dc3d91f849999330b6dd93473fa29fc45b076',
+  seqMinTxsPerBlock: 0,
+  seqMaxTxsPerBlock: 20,
+  realProofs: true,
+  snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/staging-public/',
+  autoUpdate: 'config-and-version',
+  autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-public.json',
+  publicIncludeMetrics,
+  publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
+  publicMetricsCollectFrom: ['sequencer'],
+  maxTxPoolSize: 100_000_000, // 100MB
+
+  // Deployment stuff
+  /** How many seconds an L1 slot lasts. */
+  ethereumSlotDuration: 12,
+  /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */
+  aztecSlotDuration: 36,
+  /** How many L2 slots an epoch lasts. */
+  aztecEpochDuration: 32,
+  /** The target validator committee size. */
+  aztecTargetCommitteeSize: 48,
+  /** 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. */
+  aztecProofSubmissionEpochs: 1,
+  /** The deposit amount for a validator */
+  activationThreshold: DefaultL1ContractsConfig.activationThreshold,
+  /** The minimum stake for a validator. */
+  ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
+  /** The slashing round size */
+  slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
+  /** Governance proposing round size */
+  governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
+  /** The mana target for the rollup */
+  manaTarget: DefaultL1ContractsConfig.manaTarget,
+  /** The proving cost per mana */
+  provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
+  /** Exit delay for stakers */
+  exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
+
+  ...DefaultSlashConfig,
+};
+
+export const testnetL2ChainConfig: L2ChainConfig = {
+  l1ChainId: 11155111,
+  testAccounts: false,
+  sponsoredFPC: true,
+  p2pEnabled: true,
+  p2pBootstrapNodes: [],
+  registryAddress: '0xcfe61b2574984326679cd15c6566fbd4a724f3b4',
+  slashFactoryAddress: '0x58dc5b14f9d3085c9106f5b8208a1026f94614f0',
+  feeAssetHandlerAddress: '0x7abdec6e68ae27c37feb6a77371382a109ec4763',
+  seqMinTxsPerBlock: 0,
+  seqMaxTxsPerBlock: 20,
+  realProofs: true,
+  snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/testnet/',
+  autoUpdate: 'config-and-version',
+  autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/testnet.json',
+  maxTxPoolSize: 100_000_000, // 100MB
+  publicIncludeMetrics,
+  publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
+  publicMetricsCollectFrom: ['sequencer'],
+
+  // Deployment stuff
+  /** How many seconds an L1 slot lasts. */
+  ethereumSlotDuration: 12,
+  /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */
+  aztecSlotDuration: 36,
+  /** How many L2 slots an epoch lasts. */
+  aztecEpochDuration: 32,
+  /** The target validator committee size. */
+  aztecTargetCommitteeSize: 48,
+  /** The number of epochs after an epoch ends that proofs are still accepted. */
+  aztecProofSubmissionEpochs: 1,
+  /** The deposit amount for a validator */
+  activationThreshold: DefaultL1ContractsConfig.activationThreshold,
+  /** The minimum stake for a validator. */
+  ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
+  /** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */
+  localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
+  /** The slashing round size */
+  slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
+  /** Governance proposing round size */
+  governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
+  /** The mana target for the rollup */
+  manaTarget: DefaultL1ContractsConfig.manaTarget,
+  /** The proving cost per mana */
+  provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
+  /** Exit delay for stakers */
+  exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
+
+  ...DefaultSlashConfig,
+};
+
+const BOOTNODE_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour;
+
+export async function getBootnodes(networkName: NetworkNames, cacheDir?: string) {
+  const cacheFile = cacheDir ? join(cacheDir, networkName, 'bootnodes.json') : undefined;
+  try {
+    if (cacheFile) {
+      const info = await stat(cacheFile);
+      if (info.mtimeMs + BOOTNODE_CACHE_DURATION_MS > Date.now()) {
+        return JSON.parse(await readFile(cacheFile, 'utf-8'))['bootnodes'];
+      }
+    }
+  } catch {
+    // no-op. Get the remote-file
+  }
+
+  const url = `http://static.aztec.network/${networkName}/bootnodes.json`;
+  const response = await fetch(url);
+  if (!response.ok) {
+    throw new Error(
+      `Failed to fetch basic contract addresses from ${url}. Check you are using a correct network name.`,
+    );
+  }
+  const json = await response.json();
+
+  try {
+    if (cacheFile) {
+      await mkdir(dirname(cacheFile), { recursive: true });
+      await writeFile(cacheFile, JSON.stringify(json), 'utf-8');
+    }
+  } catch {
+    // no-op
+  }
+
+  return json['bootnodes'];
+}
+
+export async function getL2ChainConfig(
+  networkName: NetworkNames,
+  cacheDir?: string,
+): Promise<L2ChainConfig | undefined> {
+  let config: L2ChainConfig | undefined;
+  if (networkName === 'staging-public') {
+    config = { ...stagingPublicL2ChainConfig };
+  } else if (networkName === 'testnet') {
+    config = { ...testnetL2ChainConfig };
+  } else if (networkName === 'staging-ignition') {
+    config = { ...stagingIgnitionL2ChainConfig };
+  }
+  if (!config) {
+    return undefined;
+  }
+  // If the bootnodes are not set, get them from the network
+  const bootnodeKey: EnvVar = 'BOOTSTRAP_NODES';
+  if (!process.env[bootnodeKey]) {
+    config.p2pBootstrapNodes = await getBootnodes(networkName, cacheDir);
+  }
+  return config;
+}
+
+function enrichVar(envVar: EnvVar, value: string | undefined) {
+  // Don't override
+  if (process.env[envVar] || value === undefined) {
+    return;
+  }
+  process.env[envVar] = value;
+}
+
+function enrichEthAddressVar(envVar: EnvVar, value: string) {
+  // EthAddress doesn't like being given empty strings
+  if (value === '') {
+    enrichVar(envVar, EthAddress.ZERO.toString());
+    return;
+  }
+  enrichVar(envVar, value);
+}
+
+function getDefaultDataDir(networkName: NetworkNames): string {
+  return path.join(process.env.HOME || '~', '.aztec', networkName, 'data');
+}
+
+export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
+  if (networkName === 'local') {
+    return;
+  }
+
+  enrichVar('DATA_DIRECTORY', getDefaultDataDir(networkName));
+  const cacheDir = process.env.DATA_DIRECTORY ? join(process.env.DATA_DIRECTORY, 'cache') : undefined;
+  const config = await getL2ChainConfig(networkName, cacheDir);
+
+  if (!config) {
+    throw new Error(`Unknown network name: ${networkName}`);
+  }
+
+  enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
+  enrichVar('TEST_ACCOUNTS', config.testAccounts.toString());
+  enrichVar('SPONSORED_FPC', config.sponsoredFPC.toString());
+  enrichVar('P2P_ENABLED', config.p2pEnabled.toString());
+  enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
+  enrichVar('SEQ_MIN_TX_PER_BLOCK', config.seqMinTxsPerBlock.toString());
+  enrichVar('SEQ_MAX_TX_PER_BLOCK', config.seqMaxTxsPerBlock.toString());
+  enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
+  enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
+  enrichVar('SYNC_SNAPSHOTS_URL', config.snapshotsUrl);
+  enrichVar('P2P_MAX_TX_POOL_SIZE', config.maxTxPoolSize.toString());
+
+  if (config.autoUpdate) {
+    enrichVar('AUTO_UPDATE', config.autoUpdate?.toString());
+  }
+
+  if (config.autoUpdateUrl) {
+    enrichVar('AUTO_UPDATE_URL', config.autoUpdateUrl);
+  }
+
+  if (config.publicIncludeMetrics) {
+    enrichVar('PUBLIC_OTEL_INCLUDE_METRICS', config.publicIncludeMetrics.join(','));
+  }
+
+  if (config.publicMetricsCollectorUrl) {
+    enrichVar('PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT', config.publicMetricsCollectorUrl);
+  }
+
+  if (config.publicMetricsCollectFrom) {
+    enrichVar('PUBLIC_OTEL_COLLECT_FROM', config.publicMetricsCollectFrom.join(','));
+  }
+
+  enrichEthAddressVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress);
+  enrichEthAddressVar('SLASH_FACTORY_CONTRACT_ADDRESS', config.slashFactoryAddress);
+  enrichEthAddressVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', config.feeAssetHandlerAddress);
+
+  // Deployment stuff
+  enrichVar('ETHEREUM_SLOT_DURATION', config.ethereumSlotDuration.toString());
+  enrichVar('AZTEC_SLOT_DURATION', config.aztecSlotDuration.toString());
+  enrichVar('AZTEC_EPOCH_DURATION', config.aztecEpochDuration.toString());
+  enrichVar('AZTEC_TARGET_COMMITTEE_SIZE', config.aztecTargetCommitteeSize.toString());
+  enrichVar('AZTEC_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
+  enrichVar('AZTEC_ACTIVATION_THRESHOLD', config.activationThreshold.toString());
+  enrichVar('AZTEC_EJECTION_THRESHOLD', config.ejectionThreshold.toString());
+  enrichVar('AZTEC_LOCAL_EJECTION_THRESHOLD', config.localEjectionThreshold.toString());
+  enrichVar('AZTEC_SLASHING_QUORUM', config.slashingQuorum?.toString());
+  enrichVar('AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS', config.slashingRoundSizeInEpochs.toString());
+  enrichVar('AZTEC_GOVERNANCE_PROPOSER_QUORUM', config.governanceProposerQuorum?.toString());
+  enrichVar('AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE', config.governanceProposerRoundSize.toString());
+  enrichVar('AZTEC_MANA_TARGET', config.manaTarget.toString());
+  enrichVar('AZTEC_PROVING_COST_PER_MANA', config.provingCostPerMana.toString());
+  enrichVar('AZTEC_SLASH_AMOUNT_SMALL', config.slashAmountSmall.toString());
+  enrichVar('AZTEC_SLASH_AMOUNT_MEDIUM', config.slashAmountMedium.toString());
+  enrichVar('AZTEC_SLASH_AMOUNT_LARGE', config.slashAmountLarge.toString());
+  enrichVar('AZTEC_SLASHING_LIFETIME_IN_ROUNDS', config.slashingLifetimeInRounds.toString());
+  enrichVar('AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS', config.slashingExecutionDelayInRounds.toString());
+  enrichVar('AZTEC_SLASHING_OFFSET_IN_ROUNDS', config.slashingOffsetInRounds.toString());
+  enrichVar('AZTEC_SLASHER_FLAVOR', config.slasherFlavor);
+  enrichVar('AZTEC_EXIT_DELAY_SECONDS', config.exitDelaySeconds.toString());
+  enrichEthAddressVar('AZTEC_SLASHING_VETOER', config.slashingVetoer.toString());
+
+  // Slashing
+  enrichVar('SLASH_MIN_PENALTY_PERCENTAGE', config.slashMinPenaltyPercentage.toString());
+  enrichVar('SLASH_MAX_PENALTY_PERCENTAGE', config.slashMaxPenaltyPercentage.toString());
+  enrichVar('SLASH_PRUNE_PENALTY', config.slashPrunePenalty.toString());
+  enrichVar('SLASH_DATA_WITHHOLDING_PENALTY', config.slashDataWithholdingPenalty.toString());
+  enrichVar('SLASH_INACTIVITY_TARGET_PERCENTAGE', config.slashInactivityTargetPercentage.toString());
+  enrichVar('SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD', config.slashInactivityConsecutiveEpochThreshold.toString());
+  enrichVar('SLASH_INACTIVITY_PENALTY', config.slashInactivityPenalty.toString());
+  enrichVar('SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY', config.slashProposeInvalidAttestationsPenalty.toString());
+  enrichVar('SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY', config.slashAttestDescendantOfInvalidPenalty.toString());
+  enrichVar('SLASH_UNKNOWN_PENALTY', config.slashUnknownPenalty.toString());
+  enrichVar('SLASH_INVALID_BLOCK_PENALTY', config.slashBroadcastedInvalidBlockPenalty.toString());
+  enrichVar('SLASH_OFFENSE_EXPIRATION_ROUNDS', config.slashOffenseExpirationRounds.toString());
+  enrichVar('SLASH_MAX_PAYLOAD_SIZE', config.slashMaxPayloadSize.toString());
+
+  enrichVar('SENTINEL_ENABLED', config.sentinelEnabled.toString());
+}

package/src/config/get_l1_config.ts

@@ -0,0 +1,28 @@
+import { type L1ContractAddresses, RegistryContract, getL1ContractsConfig, getPublicClient } from '@aztec/ethereum';
+import { EthAddress } from '@aztec/foundation/eth-address';
+
+export async function getL1Config(
+  registryAddress: EthAddress,
+  l1RpcUrls: string[],
+  l1ChainId: number,
+  rollupVersion: number | 'canonical' = 'canonical',
+): Promise<{ addresses: L1ContractAddresses; config: Awaited<ReturnType<typeof getL1ContractsConfig>> }> {
+  const publicClient = getPublicClient({ l1RpcUrls, l1ChainId });
+  const addresses = await RegistryContract.collectAddresses(publicClient, registryAddress, rollupVersion);
+
+  const config = await getL1ContractsConfig(publicClient, addresses);
+
+  return {
+    addresses,
+    config,
+  };
+}
+
+export async function getL1RollupAddressFromEnv(l1RpcUrls: string[], l1ChainId: number) {
+  const registryAddress = process.env.REGISTRY_CONTRACT_ADDRESS;
+  if (!registryAddress || !EthAddress.isAddress(registryAddress)) {
+    throw new Error(`Failed to extract registry address`);
+  }
+  const { addresses } = await getL1Config(EthAddress.fromString(registryAddress), l1RpcUrls, l1ChainId);
+  return addresses.rollupAddress;
+}

package/src/config/index.ts

@@ -0,0 +1,2 @@
+export * from './chain_l2_config.js';
+export * from './get_l1_config.js';

package/src/utils/setup_contracts.ts

@@ -1,16 +1,5 @@
-import {
-  AztecAddress,
-  DefaultWaitOpts,
-  Fr,
-  type PXE,
-  SignerlessWallet,
-  SponsoredFeePaymentMethod,
-  type WaitForProvenOpts,
-  getContractInstanceFromInstantiationParams,
-  waitForProven,
-} from '@aztec/aztec.js';
+import { Fr, type PXE, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js';
 import { SPONSORED_FPC_SALT } from '@aztec/constants';
-import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multicall';
 import type { LogFn } from '@aztec/foundation/log';
 
 async function getSponsoredFPCContract() {
@@ -28,31 +17,12 @@ export async function getSponsoredFPCAddress() {
   return sponsoredFPCInstance.address;
 }
 
-export async function setupSponsoredFPC(
-  pxe: PXE,
-  log: LogFn,
-  waitOpts = DefaultWaitOpts,
-  waitForProvenOptions?: WaitForProvenOpts,
-) {
+export async function setupSponsoredFPC(pxe: PXE, log: LogFn) {
   const SponsoredFPCContract = await getSponsoredFPCContract();
-  const address = await getSponsoredFPCAddress();
-  const paymentMethod = new SponsoredFeePaymentMethod(address);
-  const { l1ChainId: chainId, rollupVersion } = await pxe.getNodeInfo();
-
-  const deployer = new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(chainId, rollupVersion));
-
-  const deployTx = SponsoredFPCContract.deploy(deployer).send({
-    from: AztecAddress.ZERO,
-    contractAddressSalt: new Fr(SPONSORED_FPC_SALT),
-    universalDeploy: true,
-    fee: { paymentMethod },
+  const sponsoredFPCInstance = await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
+    salt: new Fr(SPONSORED_FPC_SALT),
   });
+  await pxe.registerContract({ instance: sponsoredFPCInstance, artifact: SponsoredFPCContract.artifact });
 
-  const deployed = await deployTx.deployed(waitOpts);
-
-  if (waitForProvenOptions !== undefined) {
-    await waitForProven(pxe, await deployTx.getReceipt(), waitForProvenOptions);
-  }
-
-  log(`SponsoredFPC: ${deployed.address}`);
+  log(`SponsoredFPC: ${sponsoredFPCInstance.address}`);
 }