@aztec/ethereum 0.0.1-commit.179ed20 → 0.0.1-commit.189eedb3

package/src/contracts/{tally_slashing_proposer.ts → slashing_proposer.ts}

@@ -7,7 +7,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { hexToBuffer } from '@aztec/foundation/string';
 import { SlasherAbi } from '@aztec/l1-artifacts/SlasherAbi';
-import { TallySlashingProposerAbi } from '@aztec/l1-artifacts/TallySlashingProposerAbi';
+import { SlashingProposerAbi } from '@aztec/l1-artifacts/SlashingProposerAbi';
 
 import {
   type GetContractReturnType,
@@ -19,13 +19,11 @@ import {
 } from 'viem';
 
 /**
- * Wrapper around the TallySlashingProposer contract that provides
+ * Wrapper around the SlashingProposer contract that provides
  * a TypeScript interface for interacting with the consensus-based slashing system.
  */
-export class TallySlashingProposerContract {
-  private readonly contract: GetContractReturnType<typeof TallySlashingProposerAbi, ViemClient>;
-
-  public readonly type = 'tally' as const;
+export class SlashingProposerContract {
+  private readonly contract: GetContractReturnType<typeof SlashingProposerAbi, ViemClient>;
 
   constructor(
     public readonly client: ViemClient,
@@ -33,7 +31,7 @@ export class TallySlashingProposerContract {
   ) {
     this.contract = getContract({
       address: typeof address === 'string' ? address : address.toString(),
-      abi: TallySlashingProposerAbi,
+      abi: SlashingProposerAbi,
       client,
     });
   }
@@ -136,12 +134,12 @@ export class TallySlashingProposerContract {
 
   /** Tries to extract a VoteCast event from the given logs. */
   public tryExtractVoteCastEvent(logs: Log[]) {
-    return tryExtractEvent(logs, this.address.toString(), TallySlashingProposerAbi, 'VoteCast');
+    return tryExtractEvent(logs, this.address.toString(), SlashingProposerAbi, 'VoteCast');
   }
 
   /** Tries to extract a RoundExecuted event from the given logs. */
   public tryExtractRoundExecutedEvent(logs: Log[]) {
-    return tryExtractEvent(logs, this.address.toString(), TallySlashingProposerAbi, 'RoundExecuted');
+    return tryExtractEvent(logs, this.address.toString(), SlashingProposerAbi, 'RoundExecuted');
   }
 
   /**
@@ -161,9 +159,9 @@ export class TallySlashingProposerContract {
 
     return {
       to: this.contract.address,
-      abi: TallySlashingProposerAbi,
+      abi: SlashingProposerAbi,
       data: encodeFunctionData({
-        abi: TallySlashingProposerAbi,
+        abi: SlashingProposerAbi,
         functionName: 'vote',
         args: [votes, signature.toViemSignature()],
       }),
@@ -173,7 +171,7 @@ export class TallySlashingProposerContract {
   /** Returns the typed data definition to EIP712-sign for voting */
   public buildVoteTypedData(votes: Hex, slot: SlotNumber): TypedDataDefinition {
     const domain = {
-      name: 'TallySlashingProposer',
+      name: 'SlashingProposer',
       version: '1',
       chainId: this.client.chain.id,
       verifyingContract: this.contract.address,
@@ -209,9 +207,9 @@ export class TallySlashingProposerContract {
   public buildVoteRequestWithSignature(votes: Hex, signature: { v: number; r: Hex; s: Hex }): L1TxRequest {
     return {
       to: this.contract.address,
-      abi: TallySlashingProposerAbi,
+      abi: SlashingProposerAbi,
       data: encodeFunctionData({
-        abi: TallySlashingProposerAbi,
+        abi: SlashingProposerAbi,
         functionName: 'vote',
         args: [votes, signature],
       }),
@@ -227,9 +225,9 @@ export class TallySlashingProposerContract {
   public buildExecuteRoundRequest(round: bigint, committees: EthAddress[][]): L1TxRequest {
     return {
       to: this.contract.address,
-      abi: mergeAbis([TallySlashingProposerAbi, SlasherAbi]),
+      abi: mergeAbis([SlashingProposerAbi, SlasherAbi]),
       data: encodeFunctionData({
-        abi: TallySlashingProposerAbi,
+        abi: SlashingProposerAbi,
         functionName: 'executeRound',
         args: [round, committees.map(c => c.map(addr => addr.toString()))],
       }),

package/src/deploy_aztec_l1_contracts.ts

@@ -15,7 +15,7 @@ import { tmpdir } from 'os';
 import { dirname, join, resolve } from 'path';
 import readline from 'readline';
 import type { Hex } from 'viem';
-import { foundry, mainnet, sepolia } from 'viem/chains';
+import { mainnet, sepolia } from 'viem/chains';
 
 import { createEthereumChain, isAnvilTestChain } from './chain.js';
 import { createExtendedL1Client } from './client.js';
@@ -23,7 +23,6 @@ import type { L1ContractsConfig } from './config.js';
 import { deployMulticall3 } from './contracts/multicall.js';
 import { RollupContract } from './contracts/rollup.js';
 import type { L1ContractAddresses } from './l1_contract_addresses.js';
-import type { L1TxUtilsConfig } from './l1_tx_utils/config.js';
 import type { ExtendedViemWalletClient } from './types.js';
 
 const logger = createLogger('ethereum:deploy_aztec_l1_contracts');
@@ -31,9 +30,9 @@ const logger = createLogger('ethereum:deploy_aztec_l1_contracts');
 const JSON_DEPLOY_RESULT_PREFIX = 'JSON DEPLOY RESULT:';
 
 /**
- * Runs a process with the given command, arguments, and environment.
- * If the process outputs a line starting with JSON_DEPLOY_RESULT_PREFIX,
- * the JSON is parsed and returned.
+ * Runs a process and parses JSON deploy results from stdout.
+ * Lines starting with JSON_DEPLOY_RESULT_PREFIX are parsed and returned.
+ * All other stdout goes to logger.info, stderr goes to logger.warn.
  */
 function runProcess<T>(
   command: string,
@@ -49,26 +48,41 @@ function runProcess<T>(
   });
 
   let result: T | undefined;
+  let parseError: Error | undefined;
+  let settled = false;
 
   readline.createInterface({ input: proc.stdout }).on('line', line => {
     const trimmedLine = line.trim();
     if (trimmedLine.startsWith(JSON_DEPLOY_RESULT_PREFIX)) {
       const jsonStr = trimmedLine.slice(JSON_DEPLOY_RESULT_PREFIX.length).trim();
-      // TODO(AD): should this be a zod parse?
-      result = JSON.parse(jsonStr);
+      try {
+        result = JSON.parse(jsonStr);
+      } catch {
+        parseError = new Error(`Failed to parse deploy result JSON: ${jsonStr.slice(0, 200)}`);
+      }
     } else {
       logger.info(line);
     }
   });
-  readline.createInterface({ input: proc.stderr }).on('line', logger.error.bind(logger));
+  readline.createInterface({ input: proc.stderr }).on('line', logger.warn.bind(logger));
 
   proc.on('error', error => {
+    if (settled) {
+      return;
+    }
+    settled = true;
     reject(new Error(`Failed to spawn ${command}: ${error.message}`));
   });
 
   proc.on('close', code => {
+    if (settled) {
+      return;
+    }
+    settled = true;
     if (code !== 0) {
-      reject(new Error(`${command} exited with code ${code}. See logs for details.\n`));
+      reject(new Error(`${command} exited with code ${code}`));
+    } else if (parseError) {
+      reject(parseError);
     } else {
       resolve(result);
     }
@@ -168,6 +182,9 @@ export function prepareL1ContractsForDeployment(): string {
   const foundryTomlPath = join(basePath, 'foundry.toml');
   let foundryToml = readFileSync(foundryTomlPath, 'utf-8');
   const solcPathMatch = foundryToml.match(/solc\s*=\s*"\.\/solc-([^"]+)"/);
+  // Did we find a hardcoded solc path that we need to make absolute?
+  // This code path happens in CI currently as we bundle solc there to avoid race conditions when
+  // downloading solc.
   if (solcPathMatch) {
     const solcVersion = solcPathMatch[1];
     const absoluteSolcPath = join(basePath, `solc-${solcVersion}`);
@@ -213,7 +230,6 @@ export function computeValidatorData(operator: Operator): ValidatorJson {
 export interface RollupUpgradeAddresses {
   rollupAddress: string;
   verifierAddress: string;
-  slashFactoryAddress: string;
   inboxAddress: string;
   outboxAddress: string;
   feeJuicePortalAddress: string;
@@ -226,7 +242,6 @@ export interface RollupUpgradeAddresses {
 export interface ForgeRollupUpgradeResult {
   rollupAddress: Hex;
   verifierAddress: Hex;
-  slashFactoryAddress: Hex;
   inboxAddress: Hex;
   outboxAddress: Hex;
   feeJuicePortalAddress: Hex;
@@ -318,11 +333,8 @@ export async function deployAztecL1Contracts(
     );
   }
 
-  // From heuristic testing. More caused issues with anvil.
-  const MAGIC_ANVIL_BATCH_SIZE = 8;
-  // Anvil seems to stall with unbounded batch size. Otherwise no max batch size is desirable.
+  const scriptPath = join(getL1ContractsPath(), 'scripts', 'forge_broadcast.js');
   const forgeArgs = [
-    'script',
     FORGE_SCRIPT,
     '--sig',
     'run()',
@@ -330,8 +342,6 @@ export async function deployAztecL1Contracts(
     privateKey,
     '--rpc-url',
     rpcUrl,
-    '--broadcast',
-    ...(chainId === foundry.id ? ['--batch-size', MAGIC_ANVIL_BATCH_SIZE.toString()] : []),
     ...(shouldVerify ? ['--verify'] : []),
   ];
   const forgeEnv = {
@@ -340,7 +350,12 @@ export async function deployAztecL1Contracts(
     FOUNDRY_PROFILE: chainId === mainnet.id ? 'production' : undefined,
     ...getDeployAztecL1ContractsEnvVars(args),
   };
-  const result = await runProcess<ForgeL1ContractsDeployResult>('forge', forgeArgs, forgeEnv, l1ContractsPath);
+  const result = await runProcess<ForgeL1ContractsDeployResult>(
+    process.execPath,
+    [scriptPath, ...forgeArgs],
+    forgeEnv,
+    l1ContractsPath,
+  );
   if (!result) {
     throw new Error('Forge script did not output deployment result');
   }
@@ -386,7 +401,6 @@ export async function deployAztecL1Contracts(
       governanceProposerAddress: EthAddress.fromString(result.governanceProposerAddress),
       governanceAddress: EthAddress.fromString(result.governanceAddress),
       stakingAssetAddress: EthAddress.fromString(result.stakingAssetAddress),
-      slashFactoryAddress: result.slashFactoryAddress ? EthAddress.fromString(result.slashFactoryAddress) : undefined,
       feeAssetHandlerAddress: result.feeAssetHandlerAddress
         ? EthAddress.fromString(result.feeAssetHandlerAddress)
         : undefined,
@@ -473,7 +487,25 @@ export type VerificationRecord = {
   libraries: VerificationLibraryEntry[];
 };
 
-export interface DeployAztecL1ContractsArgs extends Omit<L1ContractsConfig, keyof L1TxUtilsConfig> {
+export interface DeployAztecL1ContractsArgs
+  extends Omit<
+    L1ContractsConfig,
+    | 'gasLimitBufferPercentage'
+    | 'maxGwei'
+    | 'maxBlobGwei'
+    | 'priorityFeeBumpPercentage'
+    | 'priorityFeeRetryBumpPercentage'
+    | 'minimumPriorityFeePerGas'
+    | 'maxSpeedUpAttempts'
+    | 'checkIntervalMs'
+    | 'stallTimeMs'
+    | 'txTimeoutMs'
+    | 'cancelTxOnTimeout'
+    | 'txCancellationFinalTimeoutMs'
+    | 'txUnseenConsideredDroppedMs'
+    | 'enableDelayer'
+    | 'txDelayerMaxInclusionTimeIntoSlot'
+  > {
   /** The vk tree root. */
   vkTreeRoot: Fr;
   /** The hash of the protocol contracts. */
@@ -550,7 +582,7 @@ export function getDeployRollupForUpgradeEnvVars(
     AZTEC_EXIT_DELAY_SECONDS: args.exitDelaySeconds.toString(),
     AZTEC_PROVING_COST_PER_MANA: args.provingCostPerMana.toString(),
     AZTEC_INITIAL_ETH_PER_FEE_ASSET: args.initialEthPerFeeAsset.toString(),
-    AZTEC_SLASHER_FLAVOR: args.slasherFlavor,
+    AZTEC_SLASHER_ENABLED: args.slasherEnabled ? 'true' : 'false',
     AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: args.slashingRoundSizeInEpochs.toString(),
     AZTEC_SLASHING_QUORUM: args.slashingQuorum?.toString(),
     AZTEC_SLASHING_OFFSET_IN_ROUNDS: args.slashingOffsetInRounds.toString(),
@@ -583,17 +615,8 @@ export const deployRollupForUpgrade = async (
   const FORGE_SCRIPT = 'script/deploy/DeployRollupForUpgrade.s.sol';
   await maybeForgeForceProductionBuild(l1ContractsPath, FORGE_SCRIPT, chainId);
 
-  const forgeArgs = [
-    'script',
-    FORGE_SCRIPT,
-    '--sig',
-    'run()',
-    '--private-key',
-    privateKey,
-    '--rpc-url',
-    rpcUrl,
-    '--broadcast',
-  ];
+  const scriptPath = join(getL1ContractsPath(), 'scripts', 'forge_broadcast.js');
+  const forgeArgs = [FORGE_SCRIPT, '--sig', 'run()', '--private-key', privateKey, '--rpc-url', rpcUrl];
   const forgeEnv = {
     FOUNDRY_PROFILE: chainId === mainnet.id ? 'production' : undefined,
     // Env vars required by l1-contracts/script/deploy/RollupConfiguration.sol.
@@ -602,7 +625,12 @@ export const deployRollupForUpgrade = async (
     ...getDeployRollupForUpgradeEnvVars(args),
   };
 
-  const result = await runProcess<ForgeRollupUpgradeResult>('forge', forgeArgs, forgeEnv, l1ContractsPath);
+  const result = await runProcess<ForgeRollupUpgradeResult>(
+    process.execPath,
+    [scriptPath, ...forgeArgs],
+    forgeEnv,
+    l1ContractsPath,
+  );
   if (!result) {
     throw new Error('Forge script did not output deployment result');
   }
@@ -614,6 +642,5 @@ export const deployRollupForUpgrade = async (
 
   return {
     rollup,
-    slashFactoryAddress: result.slashFactoryAddress,
   };
 };

package/src/deploy_l1_contract.ts

@@ -24,7 +24,7 @@ import {
 } from './deploy_aztec_l1_contracts.js';
 import { RegisterNewRollupVersionPayloadArtifact } from './l1_artifacts.js';
 import { type L1TxUtilsConfig, getL1TxUtilsConfigEnvVars } from './l1_tx_utils/config.js';
-import { createL1TxUtilsFromViemWallet } from './l1_tx_utils/factory.js';
+import { createL1TxUtils } from './l1_tx_utils/factory.js';
 import type { L1TxUtils } from './l1_tx_utils/l1_tx_utils.js';
 import type { GasPrice, L1TxConfig, L1TxRequest } from './l1_tx_utils/types.js';
 import type { ExtendedViemWalletClient } from './types.js';
@@ -46,7 +46,7 @@ export class L1Deployer {
     private createVerificationJson: boolean = false,
   ) {
     this.salt = maybeSalt ? padHex(numberToHex(maybeSalt), { size: 32 }) : undefined;
-    this.l1TxUtils = createL1TxUtilsFromViemWallet(
+    this.l1TxUtils = createL1TxUtils(
       this.client,
       { logger: this.logger, dateProvider },
       { ...this.txUtilsConfig, debugMaxGasLimit: acceleratedTestDeployments },
@@ -179,7 +179,7 @@ export async function deployL1Contract(
 
   if (!l1TxUtils) {
     const config = getL1TxUtilsConfigEnvVars();
-    l1TxUtils = createL1TxUtilsFromViemWallet(
+    l1TxUtils = createL1TxUtils(
       extendedClient,
       { logger },
       { ...config, debugMaxGasLimit: acceleratedTestDeployments },

package/src/generated/l1-contracts-defaults.ts

@@ -4,7 +4,7 @@
 /** Default L1 contracts configuration values from network-defaults.yml */
 export const l1ContractsDefaultEnv = {
   ETHEREUM_SLOT_DURATION: 12,
-  AZTEC_SLOT_DURATION: 36,
+  AZTEC_SLOT_DURATION: 72,
   AZTEC_EPOCH_DURATION: 32,
   AZTEC_TARGET_COMMITTEE_SIZE: 48,
   AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
@@ -18,7 +18,7 @@ export const l1ContractsDefaultEnv = {
   AZTEC_MANA_TARGET: 100000000,
   AZTEC_PROVING_COST_PER_MANA: 100,
   AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
-  AZTEC_SLASHER_FLAVOR: 'tally',
+  AZTEC_SLASHER_ENABLED: true,
   AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
   AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
   AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 0,

package/src/l1_artifacts.ts

@@ -3,10 +3,6 @@ import {
   CoinIssuerBytecode,
   DateGatedRelayerAbi,
   DateGatedRelayerBytecode,
-  EmpireSlasherDeploymentExtLibAbi,
-  EmpireSlasherDeploymentExtLibBytecode,
-  EmpireSlashingProposerAbi,
-  EmpireSlashingProposerBytecode,
   FeeAssetHandlerAbi,
   FeeAssetHandlerBytecode,
   FeeJuicePortalAbi,
@@ -42,16 +38,14 @@ import {
   RollupLinkReferences,
   RollupOperationsExtLibAbi,
   RollupOperationsExtLibBytecode,
-  SlashFactoryAbi,
-  SlashFactoryBytecode,
   SlasherAbi,
   SlasherBytecode,
+  SlasherDeploymentExtLibAbi,
+  SlasherDeploymentExtLibBytecode,
+  SlashingProposerAbi,
+  SlashingProposerBytecode,
   StakingAssetHandlerAbi,
   StakingAssetHandlerBytecode,
-  TallySlasherDeploymentExtLibAbi,
-  TallySlasherDeploymentExtLibBytecode,
-  TallySlashingProposerAbi,
-  TallySlashingProposerBytecode,
   TestERC20Abi,
   TestERC20Bytecode,
   ValidatorOperationsExtLibAbi,
@@ -107,15 +101,10 @@ export const RollupArtifact = {
         contractAbi: RewardExtLibAbi,
         contractBytecode: RewardExtLibBytecode as Hex,
       },
-      TallySlasherDeploymentExtLib: {
-        name: 'TallySlasherDeploymentExtLib',
-        contractAbi: TallySlasherDeploymentExtLibAbi,
-        contractBytecode: TallySlasherDeploymentExtLibBytecode as Hex,
-      },
-      EmpireSlasherDeploymentExtLib: {
-        name: 'EmpireSlasherDeploymentExtLib',
-        contractAbi: EmpireSlasherDeploymentExtLibAbi,
-        contractBytecode: EmpireSlasherDeploymentExtLibBytecode as Hex,
+      SlasherDeploymentExtLib: {
+        name: 'SlasherDeploymentExtLib',
+        contractAbi: SlasherDeploymentExtLibAbi,
+        contractBytecode: SlasherDeploymentExtLibBytecode as Hex,
       },
     },
   },
@@ -175,22 +164,10 @@ export const SlasherArtifact = {
   contractBytecode: SlasherBytecode as Hex,
 };
 
-export const EmpireSlashingProposerArtifact = {
-  name: 'EmpireSlashingProposer',
-  contractAbi: EmpireSlashingProposerAbi,
-  contractBytecode: EmpireSlashingProposerBytecode as Hex,
-};
-
-export const TallySlashingProposerArtifact = {
-  name: 'TallySlashingProposer',
-  contractAbi: TallySlashingProposerAbi,
-  contractBytecode: TallySlashingProposerBytecode as Hex,
-};
-
-export const SlashFactoryArtifact = {
-  name: 'SlashFactory',
-  contractAbi: SlashFactoryAbi,
-  contractBytecode: SlashFactoryBytecode as Hex,
+export const SlashingProposerArtifact = {
+  name: 'SlashingProposer',
+  contractAbi: SlashingProposerAbi,
+  contractBytecode: SlashingProposerBytecode as Hex,
 };
 
 export const RegisterNewRollupVersionPayloadArtifact = {

package/src/l1_contract_addresses.ts

@@ -1,15 +1,15 @@
-import type { ConfigMappingsType } from '@aztec/foundation/config';
+import type { ConfigMapping, ConfigMappingsType } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { schemas, zodFor } from '@aztec/foundation/schemas';
+import { schemas } from '@aztec/foundation/schemas';
 
 import { z } from 'zod';
 
 /**
- * The names of the current L1 contract addresses.
+ * Required L1 contract address keys.
  * NOTE: When changing this list, make sure to update CLI & CI scripts accordingly.
  * For reference: https://github.com/AztecProtocol/aztec-packages/pull/5553
  */
-export const L1ContractsNames = [
+const REQUIRED_L1_CONTRACT_ADDRESS_KEYS = [
   'rollupAddress',
   'registryAddress',
   'inboxAddress',
@@ -23,102 +23,128 @@ export const L1ContractsNames = [
   'stakingAssetAddress',
 ] as const;
 
+/** Optional L1 contract address keys — present only in some deployments. */
+export const OPTIONAL_L1_CONTRACT_ADDRESS_KEYS = [
+  'feeAssetHandlerAddress',
+  'stakingAssetHandlerAddress',
+  'zkPassportVerifierAddress',
+  'gseAddress',
+  'dateGatedRelayerAddress',
+] as const;
+
+type RequiredContractKey = (typeof REQUIRED_L1_CONTRACT_ADDRESS_KEYS)[number];
+type OptionalContractKey = (typeof OPTIONAL_L1_CONTRACT_ADDRESS_KEYS)[number];
+
 /** Provides the directory of current L1 contract addresses */
 export type L1ContractAddresses = {
-  [K in (typeof L1ContractsNames)[number]]: EthAddress;
+  [K in RequiredContractKey]: EthAddress;
 } & {
-  slashFactoryAddress?: EthAddress | undefined;
-  feeAssetHandlerAddress?: EthAddress | undefined;
-  stakingAssetHandlerAddress?: EthAddress | undefined;
-  zkPassportVerifierAddress?: EthAddress | undefined;
-  gseAddress?: EthAddress | undefined;
-  dateGatedRelayerAddress?: EthAddress | undefined;
+  [K in OptionalContractKey]?: EthAddress;
 };
 
-export const L1ContractAddressesSchema = zodFor<L1ContractAddresses>()(
-  z.object({
-    rollupAddress: schemas.EthAddress,
-    registryAddress: schemas.EthAddress,
-    inboxAddress: schemas.EthAddress,
-    outboxAddress: schemas.EthAddress,
-    feeJuiceAddress: schemas.EthAddress,
-    stakingAssetAddress: schemas.EthAddress,
-    feeJuicePortalAddress: schemas.EthAddress,
-    coinIssuerAddress: schemas.EthAddress,
-    rewardDistributorAddress: schemas.EthAddress,
-    governanceProposerAddress: schemas.EthAddress,
-    governanceAddress: schemas.EthAddress,
-    slashFactoryAddress: schemas.EthAddress.optional(),
-    feeAssetHandlerAddress: schemas.EthAddress.optional(),
-    stakingAssetHandlerAddress: schemas.EthAddress.optional(),
-    zkPassportVerifierAddress: schemas.EthAddress.optional(),
-    gseAddress: schemas.EthAddress.optional(),
-    dateGatedRelayerAddress: schemas.EthAddress.optional(),
-  }),
-);
+/**
+ * Names of required L1 contract addresses.
+ * NOTE: When changing the set of contracts, update CLI & CI scripts accordingly.
+ * For reference: https://github.com/AztecProtocol/aztec-packages/pull/5553
+ */
+export const L1ContractsNames = REQUIRED_L1_CONTRACT_ADDRESS_KEYS;
 
 const parseEnv = (val: string) => EthAddress.fromString(val);
+const addrEnv = (description: string, env?: ConfigMapping<EthAddress>['env']): ConfigMapping<EthAddress> => ({
+  description,
+  parseEnv,
+  ...(env && { env }),
+});
 
-export const l1ContractAddressesMapping: ConfigMappingsType<
-  Omit<L1ContractAddresses, 'gseAddress' | 'zkPassportVerifierAddress' | 'dateGatedRelayerAddress'>
-> = {
-  registryAddress: {
-    env: 'REGISTRY_CONTRACT_ADDRESS',
-    description: 'The deployed L1 registry contract address.',
-    parseEnv,
-  },
-  slashFactoryAddress: {
-    env: 'SLASH_FACTORY_CONTRACT_ADDRESS',
-    description: 'The deployed L1 slashFactory contract address',
-    parseEnv,
-  },
-  feeAssetHandlerAddress: {
-    env: 'FEE_ASSET_HANDLER_CONTRACT_ADDRESS',
-    description: 'The deployed L1 feeAssetHandler contract address',
-    parseEnv,
-  },
-  rollupAddress: {
-    description: 'The deployed L1 rollup contract address.',
-    parseEnv,
-  },
-  inboxAddress: {
-    description: 'The deployed L1 inbox contract address.',
-    parseEnv,
-  },
-  outboxAddress: {
-    description: 'The deployed L1 outbox contract address.',
-    parseEnv,
-  },
-  feeJuiceAddress: {
-    description: 'The deployed L1 Fee Juice contract address.',
-    parseEnv,
-  },
-  stakingAssetAddress: {
-    description: 'The deployed L1 staking asset contract address.',
-    parseEnv,
-  },
-  feeJuicePortalAddress: {
-    description: 'The deployed L1 Fee Juice portal contract address.',
-    parseEnv,
-  },
-  coinIssuerAddress: {
-    description: 'The deployed L1 coinIssuer contract address',
-    parseEnv,
-  },
-  rewardDistributorAddress: {
-    description: 'The deployed L1 rewardDistributor contract address',
-    parseEnv,
-  },
-  governanceProposerAddress: {
-    description: 'The deployed L1 governanceProposer contract address',
-    parseEnv,
-  },
-  governanceAddress: {
-    description: 'The deployed L1 governance contract address',
-    parseEnv,
-  },
-  stakingAssetHandlerAddress: {
-    description: 'The deployed L1 stakingAssetHandler contract address',
-    parseEnv,
-  },
+/**
+ * Config mapping for all L1 contract addresses.
+ * This is the single source of truth for which contract addresses exist and how to parse them.
+ */
+export const l1ContractAddressesMapping: ConfigMappingsType<L1ContractAddresses> = {
+  rollupAddress: addrEnv('The deployed L1 rollup contract address.'),
+  registryAddress: addrEnv('The deployed L1 registry contract address.', 'REGISTRY_CONTRACT_ADDRESS'),
+  inboxAddress: addrEnv('The deployed L1 inbox contract address.'),
+  outboxAddress: addrEnv('The deployed L1 outbox contract address.'),
+  feeJuiceAddress: addrEnv('The deployed L1 Fee Juice contract address.'),
+  feeJuicePortalAddress: addrEnv('The deployed L1 Fee Juice portal contract address.'),
+  coinIssuerAddress: addrEnv('The deployed L1 coinIssuer contract address'),
+  rewardDistributorAddress: addrEnv('The deployed L1 rewardDistributor contract address'),
+  governanceProposerAddress: addrEnv('The deployed L1 governanceProposer contract address'),
+  governanceAddress: addrEnv('The deployed L1 governance contract address'),
+  stakingAssetAddress: addrEnv('The deployed L1 staking asset contract address.'),
+  feeAssetHandlerAddress: addrEnv(
+    'The deployed L1 feeAssetHandler contract address',
+    'FEE_ASSET_HANDLER_CONTRACT_ADDRESS',
+  ),
+  stakingAssetHandlerAddress: addrEnv('The deployed L1 stakingAssetHandler contract address'),
+  zkPassportVerifierAddress: addrEnv('The deployed L1 ZK passport verifier contract address'),
+  gseAddress: addrEnv('The deployed L1 GSE contract address'),
+  dateGatedRelayerAddress: addrEnv('The deployed L1 date-gated relayer contract address'),
 };
+
+/** Keys present in {@link l1ContractAddressesMapping}. */
+export type L1ContractAddressMappingKey = keyof typeof l1ContractAddressesMapping;
+
+type RequiredAddressShape = { [K in RequiredContractKey]: typeof schemas.EthAddress };
+type OptionalAddressShape = { [K in OptionalContractKey]: ReturnType<typeof schemas.EthAddress.optional> };
+
+export const L1ContractAddressesSchema = z.object({
+  ...(Object.fromEntries(REQUIRED_L1_CONTRACT_ADDRESS_KEYS.map(k => [k, schemas.EthAddress])) as RequiredAddressShape),
+  ...(Object.fromEntries(
+    OPTIONAL_L1_CONTRACT_ADDRESS_KEYS.map(k => [k, schemas.EthAddress.optional()]),
+  ) as OptionalAddressShape),
+});
+
+/**
+ * Selects entries from {@link l1ContractAddressesMapping} so composed configs can reuse the same
+ * env vars, descriptions, and parsers without duplicating definitions.
+ *
+ * @example
+ * ```ts
+ * const mappings = {
+ *   ...pickL1ContractAddressMappings('rollupAddress'),
+ *   nodeId: { ... },
+ * };
+ * ```
+ */
+export function pickL1ContractAddressMappings<const K extends readonly L1ContractAddressMappingKey[]>(
+  ...keys: K
+): Pick<typeof l1ContractAddressesMapping, K[number]> {
+  return Object.fromEntries(keys.map(key => [key, l1ContractAddressesMapping[key]] as const)) as Pick<
+    typeof l1ContractAddressesMapping,
+    K[number]
+  >;
+}
+
+/**
+ * Like {@link pickL1ContractAddressMappings}, but returns a fragment of {@link L1ContractAddressesSchema}'s shape for
+ * spreading into `z.object({ ...pickL1ContractAddressesSchemaShape('rollupAddress'), localField: z... })`.
+ */
+export function pickL1ContractAddressesSchema<const K extends readonly L1ContractAddressMappingKey[]>(
+  ...keys: K
+): Pick<typeof L1ContractAddressesSchema.shape, K[number]> {
+  return Object.fromEntries(keys.map(key => [key, L1ContractAddressesSchema.shape[key]])) as Pick<
+    typeof L1ContractAddressesSchema.shape,
+    K[number]
+  >;
+}
+
+/** Builds an {@link L1ContractAddresses} object from config that stores those fields at the top level. */
+export function pickL1ContractAddresses<T extends L1ContractAddresses>(config: T): L1ContractAddresses {
+  const result: Partial<L1ContractAddresses> = {};
+  for (const key of REQUIRED_L1_CONTRACT_ADDRESS_KEYS) {
+    result[key] = config[key];
+  }
+  for (const key of OPTIONAL_L1_CONTRACT_ADDRESS_KEYS) {
+    const v = config[key];
+    if (v !== undefined) {
+      result[key] = v;
+    }
+  }
+  return result as L1ContractAddresses;
+}
+
+export function randomL1ContractAddresses(includeOptional: boolean = false): L1ContractAddresses {
+  const keys = includeOptional ? [...L1ContractsNames, ...OPTIONAL_L1_CONTRACT_ADDRESS_KEYS] : L1ContractsNames;
+  return Object.fromEntries(keys.map(name => [name, EthAddress.random()])) as L1ContractAddresses;
+}