chore: Validate L1 config in ts-land

spalladino · spalladino · commit 22ba44df10dc · 2025-08-29T16:57:31.000-03:00
Validates L1 config _before_ trying to deploy L1 contracts, so we can
get an early warning if the deployment would fail.

Also, changes the slashRoundSize setting to slashRoundSizeInEpochs, to
force it to be a multiple of epochs, as required by the slash proposer.
It also makes the quorum settings optional, defaulting them to half the
round size plus one. This should make configuration easier.
diff --git a/l1-contracts/src/core/libraries/Errors.sol b/l1-contracts/src/core/libraries/Errors.sol
@@ -198,6 +198,7 @@ library Errors {
   error TallySlashingProposer__SlashOffsetMustBeGreaterThanZero(uint256 slashOffset);
   error TallySlashingProposer__InvalidEpochIndex(uint256 epochIndex, uint256 roundSizeInEpochs);
   error TallySlashingProposer__VoteSizeTooBig(uint256 voteSize, uint256 maxSize);
+  error TallySlashingProposer__VotesMustBeMultipleOf4(uint256 votes);
 
   // SlashPayloadLib
   error SlashPayload_ArraySizeMismatch(uint256 expected, uint256 actual);
diff --git a/l1-contracts/src/core/slashing/TallySlashingProposer.sol b/l1-contracts/src/core/slashing/TallySlashingProposer.sol
@@ -355,6 +355,11 @@ contract TallySlashingProposer is EIP712 {
     // We have allocated 4 bytes32 slots = 128 bytes maximum
     uint256 voteSize = COMMITTEE_SIZE * ROUND_SIZE_IN_EPOCHS / 4;
     require(voteSize <= 128, Errors.TallySlashingProposer__VoteSizeTooBig(voteSize, 128));
+
+    require(
+      COMMITTEE_SIZE * ROUND_SIZE_IN_EPOCHS % 4 == 0,
+      Errors.TallySlashingProposer__VotesMustBeMultipleOf4(COMMITTEE_SIZE * ROUND_SIZE_IN_EPOCHS)
+    );
   }
 
   /**
diff --git a/yarn-project/aztec/src/cli/chain_l2_config.ts b/yarn-project/aztec/src/cli/chain_l2_config.ts
@@ -123,11 +123,7 @@ export const alphaTestnetL2ChainConfig: L2ChainConfig = {
   /** The minimum stake for a validator. */
   ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
   /** The slashing round size */
-  slashingRoundSize: 32 * 6, // 6 epochs
-  /** The slashing quorum */
-  slashingQuorum: (32 * 6) / 2 + 1, // 6 epochs, majority of validators
-  /** Governance proposing quorum */
-  governanceProposerQuorum: 151,
+  slashingRoundSizeInEpochs: 4,
   /** Governance proposing round size */
   governanceProposerRoundSize: 300,
   /** The mana target for the rollup */
@@ -219,9 +215,9 @@ export async function getL2ChainConfig(
   return undefined;
 }
 
-function enrichVar(envVar: EnvVar, value: string) {
+function enrichVar(envVar: EnvVar, value: string | undefined) {
   // Don't override
-  if (process.env[envVar]) {
+  if (process.env[envVar] || value === undefined) {
     return;
   }
   process.env[envVar] = value;
@@ -306,9 +302,9 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames
   enrichVar('AZTEC_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
   enrichVar('AZTEC_ACTIVATION_THRESHOLD', config.activationThreshold.toString());
   enrichVar('AZTEC_EJECTION_THRESHOLD', config.ejectionThreshold.toString());
-  enrichVar('AZTEC_SLASHING_QUORUM', config.slashingQuorum.toString());
-  enrichVar('AZTEC_SLASHING_ROUND_SIZE', config.slashingRoundSize.toString());
-  enrichVar('AZTEC_GOVERNANCE_PROPOSER_QUORUM', config.governanceProposerQuorum.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());
diff --git a/yarn-project/end-to-end/src/e2e_epochs/epochs_invalidate_block.test.ts b/yarn-project/end-to-end/src/e2e_epochs/epochs_invalidate_block.test.ts
@@ -52,6 +52,8 @@ describe('e2e_epochs/epochs_invalidate_block', () => {
       archiverPollingIntervalMS: 200,
       anvilAccounts: 20,
       anvilPort: ++anvilPort,
+      slashingRoundSizeInEpochs: 4,
+      slashingOffsetInRounds: 256,
       slasherFlavor: 'tally',
     });
 
diff --git a/yarn-project/end-to-end/src/e2e_p2p/add_rollup.test.ts b/yarn-project/end-to-end/src/e2e_p2p/add_rollup.test.ts
@@ -75,7 +75,6 @@ describe('e2e_p2p_add_rollup', () => {
       initialConfig: {
         ...SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES,
         listenAddress: '127.0.0.1',
-        governanceProposerQuorum: 6,
         governanceProposerRoundSize: 10,
       },
     });
@@ -158,7 +157,7 @@ describe('e2e_p2p_add_rollup', () => {
         aztecTargetCommitteeSize: t.ctx.aztecNodeConfig.aztecTargetCommitteeSize,
         aztecProofSubmissionEpochs: t.ctx.aztecNodeConfig.aztecProofSubmissionEpochs,
         slashingQuorum: t.ctx.aztecNodeConfig.slashingQuorum,
-        slashingRoundSize: t.ctx.aztecNodeConfig.slashingRoundSize,
+        slashingRoundSizeInEpochs: t.ctx.aztecNodeConfig.slashingRoundSizeInEpochs,
         slashingLifetimeInRounds: t.ctx.aztecNodeConfig.slashingLifetimeInRounds,
         slashingExecutionDelayInRounds: t.ctx.aztecNodeConfig.slashingExecutionDelayInRounds,
         slashingVetoer: t.ctx.aztecNodeConfig.slashingVetoer,
diff --git a/yarn-project/end-to-end/src/e2e_p2p/data_withholding_slash.test.ts b/yarn-project/end-to-end/src/e2e_p2p/data_withholding_slash.test.ts
@@ -58,7 +58,7 @@ describe('e2e_p2p_data_withholding_slash', () => {
         aztecSlotDuration,
         aztecProofSubmissionEpochs: 0, // effectively forces instant reorgs
         slashingQuorum,
-        slashingRoundSize,
+        slashingRoundSizeInEpochs: slashingRoundSize / 2,
         slashAmountSmall: slashingUnit,
         slashAmountMedium: slashingUnit * 2n,
         slashAmountLarge: slashingUnit * 3n,
diff --git a/yarn-project/end-to-end/src/e2e_p2p/gossip_network.test.ts b/yarn-project/end-to-end/src/e2e_p2p/gossip_network.test.ts
@@ -59,7 +59,7 @@ describe('e2e_p2p_network', () => {
       initialConfig: {
         ...SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES,
         aztecEpochDuration: 4,
-        slashingRoundSize: 8,
+        slashingRoundSizeInEpochs: 2,
         slashingQuorum: 5,
         listenAddress: '127.0.0.1',
       },
diff --git a/yarn-project/end-to-end/src/e2e_p2p/inactivity_slash.test.ts b/yarn-project/end-to-end/src/e2e_p2p/inactivity_slash.test.ts
@@ -41,7 +41,7 @@ describe('e2e_p2p_inactivity_slash', () => {
       basePort: BOOT_NODE_UDP_PORT,
       startProverNode: true,
       initialConfig: {
-        aztecTargetCommitteeSize: NUM_NODES, // ensure we can progress even after slash happens
+        aztecTargetCommitteeSize: NUM_VALIDATORS,
         aztecSlotDuration: AZTEC_SLOT_DURATION,
         ethereumSlotDuration: ETHEREUM_SLOT_DURATION,
         aztecProofSubmissionEpochs: 1024, // effectively do not reorg
@@ -51,7 +51,7 @@ describe('e2e_p2p_inactivity_slash', () => {
         validatorReexecute: false,
         sentinelEnabled: true,
         slashingQuorum: SLASHING_QUORUM,
-        slashingRoundSize: SLASHING_ROUND_SIZE,
+        slashingRoundSizeInEpochs: SLASHING_ROUND_SIZE / EPOCH_DURATION,
         slashInactivityTargetPercentage: 0.5,
         slashAmountSmall: SLASHING_UNIT,
         slashAmountMedium: SLASHING_UNIT * 2n,
diff --git a/yarn-project/end-to-end/src/e2e_p2p/p2p_network.ts b/yarn-project/end-to-end/src/e2e_p2p/p2p_network.ts
@@ -116,7 +116,8 @@ export class P2PNetworkTest {
         aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
         aztecProofSubmissionEpochs:
           initialValidatorConfig.aztecProofSubmissionEpochs ?? l1ContractsConfig.aztecProofSubmissionEpochs,
-        slashingRoundSize: initialValidatorConfig.slashingRoundSize ?? l1ContractsConfig.slashingRoundSize,
+        slashingRoundSizeInEpochs:
+          initialValidatorConfig.slashingRoundSizeInEpochs ?? l1ContractsConfig.slashingRoundSizeInEpochs,
         slasherFlavor: initialValidatorConfig.slasherFlavor ?? 'tally',
         aztecTargetCommitteeSize: numberOfValidators,
         salt: 420,
@@ -127,7 +128,8 @@ export class P2PNetworkTest {
       {
         ...initialValidatorConfig,
         aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
-        slashingRoundSize: initialValidatorConfig.slashingRoundSize ?? l1ContractsConfig.slashingRoundSize,
+        slashingRoundSizeInEpochs:
+          initialValidatorConfig.slashingRoundSizeInEpochs ?? l1ContractsConfig.slashingRoundSizeInEpochs,
         slasherFlavor: initialValidatorConfig.slasherFlavor ?? 'tally',
 
         ethereumSlotDuration: initialValidatorConfig.ethereumSlotDuration ?? l1ContractsConfig.ethereumSlotDuration,
diff --git a/yarn-project/end-to-end/src/e2e_p2p/reqresp.test.ts b/yarn-project/end-to-end/src/e2e_p2p/reqresp.test.ts
@@ -36,8 +36,6 @@ describe('e2e_p2p_reqresp_tx', () => {
         ...SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES,
         listenAddress: '127.0.0.1',
         aztecEpochDuration: 64, // stable committee
-        slashingRoundSize: 128,
-        slashingQuorum: 65,
       },
     });
     await t.applyBaseSnapshots();
diff --git a/yarn-project/end-to-end/src/e2e_p2p/reqresp_no_handshake.test.ts b/yarn-project/end-to-end/src/e2e_p2p/reqresp_no_handshake.test.ts
@@ -41,8 +41,6 @@ describe('e2e_p2p_reqresp_tx_no_handshake', () => {
         p2pDisableStatusHandshake: true, // DIFFERENCE FROM reqresp.test.ts
         listenAddress: '127.0.0.1',
         aztecEpochDuration: 64, // stable committee
-        slashingRoundSize: 128,
-        slashingQuorum: 65,
       },
     });
     await t.applyBaseSnapshots();
diff --git a/yarn-project/end-to-end/src/e2e_p2p/slash_veto_demo.test.ts b/yarn-project/end-to-end/src/e2e_p2p/slash_veto_demo.test.ts
@@ -88,7 +88,7 @@ describe('veto slash', () => {
         slashAmountSmall: SLASHING_UNIT,
         slashAmountMedium: SLASHING_UNIT * 2n,
         slashAmountLarge: SLASHING_UNIT * 3n,
-        slashingRoundSize: SLASHING_ROUND_SIZE,
+        slashingRoundSizeInEpochs: SLASHING_ROUND_SIZE / EPOCH_DURATION,
         slashingQuorum: SLASHING_QUORUM,
         slashInactivityTargetPercentage: SLASH_INACTIVITY_TARGET_PERCENTAGE,
       },
diff --git a/yarn-project/end-to-end/src/e2e_p2p/upgrade_governance_proposer.test.ts b/yarn-project/end-to-end/src/e2e_p2p/upgrade_governance_proposer.test.ts
@@ -48,7 +48,6 @@ describe('e2e_p2p_governance_proposer', () => {
       initialConfig: {
         ...SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES,
         listenAddress: '127.0.0.1',
-        governanceProposerQuorum: 6,
         governanceProposerRoundSize: 10,
         activationThreshold: 10n ** 22n,
         ejectionThreshold: 5n ** 22n,
diff --git a/yarn-project/end-to-end/src/e2e_p2p/valid_epoch_pruned.test.ts b/yarn-project/end-to-end/src/e2e_p2p/valid_epoch_pruned.test.ts
@@ -48,7 +48,7 @@ describe('e2e_p2p_valid_epoch_pruned', () => {
         aztecSlotDuration,
         aztecProofSubmissionEpochs: 0, // reorg as soon as epoch ends
         slashingQuorum,
-        slashingRoundSize,
+        slashingRoundSizeInEpochs: slashingRoundSize / 2,
         slashSelfAllowed: true,
         slashAmountSmall: slashingUnit,
         slashAmountMedium: slashingUnit * 2n,
diff --git a/yarn-project/end-to-end/src/e2e_p2p/validators_sentinel.test.ts b/yarn-project/end-to-end/src/e2e_p2p/validators_sentinel.test.ts
@@ -44,8 +44,7 @@ describe('e2e_p2p_validators_sentinel', () => {
         listenAddress: '127.0.0.1',
         minTxsPerBlock: 0,
         aztecEpochDuration: EPOCH_DURATION,
-        slashingRoundSize: EPOCH_DURATION * 2,
-        slashingQuorum: EPOCH_DURATION + 1,
+        slashingRoundSizeInEpochs: 2,
         validatorReexecute: false,
         sentinelEnabled: true,
         slashInactivityPenalty: 0n, // Set to 0 to disable
diff --git a/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts b/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts
@@ -306,9 +306,13 @@ async function setupFromFresh(
 
   const blobSinkPort = await getPort();
 
+  // Default to no slashing
+  opts.slasherFlavor ??= 'none';
+  deployL1ContractsArgs.slasherFlavor ??= opts.slasherFlavor;
+
   // Fetch the AztecNode config.
   // TODO: For some reason this is currently the union of a bunch of subsystems. That needs fixing.
-  const aztecNodeConfig: AztecNodeConfig & SetupOptions = { ...getConfigEnvVars(), slasherFlavor: 'none', ...opts };
+  const aztecNodeConfig: AztecNodeConfig & SetupOptions = { ...getConfigEnvVars(), ...opts };
   aztecNodeConfig.peerCheckIntervalMS = TEST_PEER_CHECK_INTERVAL_MS;
   aztecNodeConfig.maxTxPoolSize = opts.maxTxPoolSize ?? TEST_MAX_TX_POOL_SIZE;
   // Only enable proving if specifically requested.
diff --git a/yarn-project/end-to-end/src/spartan/upgrade_rollup_version.test.ts b/yarn-project/end-to-end/src/spartan/upgrade_rollup_version.test.ts
@@ -95,7 +95,7 @@
 //           aztecProofSubmissionEpochs: 1,
 //           aztecTargetCommitteeSize: 48,
 //           slashingQuorum: 5,
-//           slashingRoundSize: 8,
+//           slashingRoundSizeInEpochs: 2,
 //           slashingLifetimeInRounds: 5,
 //           slashingExecutionDelayInRounds: 0,
 //           slashingVetoer: EthAddress.ZERO,
diff --git a/yarn-project/ethereum/src/config.ts b/yarn-project/ethereum/src/config.ts
diff --git a/yarn-project/ethereum/src/contracts/tally_slashing_proposer.test.ts b/yarn-project/ethereum/src/contracts/tally_slashing_proposer.test.ts
diff --git a/yarn-project/ethereum/src/deploy_l1_contracts.ts b/yarn-project/ethereum/src/deploy_l1_contracts.ts
diff --git a/yarn-project/ethereum/src/queries.ts b/yarn-project/ethereum/src/queries.ts
diff --git a/yarn-project/foundation/src/config/env_var.ts b/yarn-project/foundation/src/config/env_var.ts
diff --git a/yarn-project/slasher/src/slash_round_monitor.ts b/yarn-project/slasher/src/slash_round_monitor.ts
