fix: align benchmark with slashing proposer

Author: LHerskind

l1-contracts/test/benchmark/happy.t.sol

@@ -61,13 +61,8 @@ import {Timestamp, Slot, Epoch, TimeLib} from "@aztec/core/libraries/TimeLib.sol
 import {MultiAdder, CheatDepositArgs} from "@aztec/mock/MultiAdder.sol";
 import {RollupBuilder} from "../builder/RollupBuilder.sol";
 import {ProposedHeader} from "@aztec/core/libraries/rollup/ProposedHeaderLib.sol";
-import {EmpireSlashingProposer} from "@aztec/core/slashing/EmpireSlashingProposer.sol";
-import {SlashFactory} from "@aztec/periphery/SlashFactory.sol";
-import {IValidatorSelection} from "@aztec/core/interfaces/IValidatorSelection.sol";
 import {Slasher} from "@aztec/core/slashing/Slasher.sol";
-import {SlasherFlavor} from "@aztec/core/interfaces/ISlasher.sol";
-import {TallySlashingProposer} from "@aztec/core/slashing/TallySlashingProposer.sol";
-import {IPayload} from "@aztec/governance/interfaces/IPayload.sol";
+import {SlashingProposer} from "@aztec/core/slashing/SlashingProposer.sol";
 import {StakingQueueConfig} from "@aztec/core/libraries/compressed-data/StakingQueueConfig.sol";
 import {BN254Lib, G1Point, G2Point} from "@aztec/shared/libraries/BN254Lib.sol";
 import {SlashRound} from "@aztec/core/libraries/SlashRoundLib.sol";
@@ -122,7 +117,6 @@ contract BenchmarkRollupTest is FeeModelTestPoints, DecoderBase {
 
   enum TestSlash {
     NONE,
-    EMPIRE,
     TALLY
   }
 
@@ -151,7 +145,6 @@ contract BenchmarkRollupTest is FeeModelTestPoints, DecoderBase {
   Multicall3 internal multicall = new Multicall3();
 
   address internal slashingProposer;
-  IPayload internal slashPayload;
 
   modifier prepare(uint256 _validatorCount, bool _noValidators, TestSlash _slashing) {
     // We deploy a the rollup and sets the time and all to
@@ -179,14 +172,13 @@ contract BenchmarkRollupTest is FeeModelTestPoints, DecoderBase {
     RollupBuilder builder = new RollupBuilder(address(this)).setProvingCostPerMana(provingCost)
       .setManaTarget(MANA_TARGET).setSlotDuration(SLOT_DURATION).setEpochDuration(EPOCH_DURATION).setMintFeeAmount(1e30)
       .setValidators(initialValidators).setTargetCommitteeSize(_noValidators ? 0 : TARGET_COMMITTEE_SIZE)
-      .setStakingQueueConfig(stakingQueueConfig).setSlashingQuorum(VOTING_ROUND_SIZE)
-      .setSlashingRoundSize(VOTING_ROUND_SIZE);
+      .setStakingQueueConfig(stakingQueueConfig);
 
     if (_slashing == TestSlash.TALLY) {
       // For tally slashing, we need a round size that's a multiple of epoch duration
       uint256 tallyRoundSize = EPOCH_DURATION * 2; // 64; // 2 * EPOCH_DURATION (32) = 64
       uint256 tallyQuorum = tallyRoundSize / 2 + 1; // Must be > ROUND_SIZE / 2
-      builder.setSlasherFlavor(SlasherFlavor.TALLY).setSlashingQuorum(tallyQuorum).setSlashingRoundSize(tallyRoundSize)
+      builder.setSlasherEnabled(true).setSlashingQuorum(tallyQuorum).setSlashingRoundSize(tallyRoundSize)
         .setSlashingLifetimeInRounds(5).setSlashingExecutionDelayInRounds(1).setSlashAmountSmall(1e18)
         .setSlashAmountMedium(2e18).setSlashAmountLarge(3e18);
     }
@@ -198,12 +190,6 @@ contract BenchmarkRollupTest is FeeModelTestPoints, DecoderBase {
     slasher = Slasher(rollup.getSlasher());
     slashingProposer = address(slasher) == address(0) ? address(0) : slasher.PROPOSER();
 
-    SlashFactory slashFactory = new SlashFactory(IValidatorSelection(address(rollup)));
-    address[] memory toSlash = new address[](0);
-    uint96[] memory amounts = new uint96[](0);
-    uint128[][] memory offenses = new uint128[][](0);
-    slashPayload = slashFactory.createSlashPayload(toSlash, amounts, offenses);
-
     vm.label(coinbase, "coinbase");
     vm.label(address(rollup), "ROLLUP");
     vm.label(address(asset), "ASSET");
@@ -363,26 +349,6 @@ contract BenchmarkRollupTest is FeeModelTestPoints, DecoderBase {
     return CommitteeAttestation({addr: _signer, signature: emptySignature});
   }
 
-  /**
-   * @notice Creates an EIP-712 signature for signalWithSig
-   * @param _signer The address that should sign (must match a proposer)
-   * @param _payload The payload to signal
-   * @return The EIP-712 signature
-   */
-  function createEmpireSignalSignature(address _signer, IPayload _payload, Slot _slot)
-    internal
-    view
-    returns (Signature memory)
-  {
-    uint256 privateKey = attesterPrivateKeys[_signer];
-    require(privateKey != 0, "Private key not found for signer");
-    bytes32 digest = EmpireSlashingProposer(slashingProposer).getSignalSignatureDigest(_payload, _slot);
-
-    (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, digest);
-
-    return Signature({v: v, r: r, s: s});
-  }
-
   /**
    * @notice Creates vote data for tally slashing
    * @param _size - The number of validators
@@ -420,7 +386,7 @@ contract BenchmarkRollupTest is FeeModelTestPoints, DecoderBase {
   {
     uint256 privateKey = attesterPrivateKeys[_signer];
     require(privateKey != 0, "Private key not found for signer");
-    bytes32 digest = TallySlashingProposer(slashingProposer).getVoteSignatureDigest(votes, slot);
+    bytes32 digest = SlashingProposer(slashingProposer).getVoteSignatureDigest(votes, slot);
 
     (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, digest);
 
@@ -446,7 +412,7 @@ contract BenchmarkRollupTest is FeeModelTestPoints, DecoderBase {
     });
     calls[1] = Multicall3.Call3({
       target: address(slashingProposer),
-      callData: abi.encodeCall(TallySlashingProposer(slashingProposer).vote, (voteData, sig)),
+      callData: abi.encodeCall(SlashingProposer(slashingProposer).vote, (voteData, sig)),
       allowFailure: false
     });
     multicall.aggregate3(calls);
@@ -456,8 +422,6 @@ contract BenchmarkRollupTest is FeeModelTestPoints, DecoderBase {
     // Do nothing for the first epoch
     Slot nextSlot = Slot.wrap(EPOCH_DURATION * 3 + 1);
     Epoch nextEpoch = Epoch.wrap(4);
-    bool warmedUp = false;
-
     uint256 stopAtCheckpoint = 150;
 
     // Loop through all of the L1 metadata
@@ -468,13 +432,6 @@ contract BenchmarkRollupTest is FeeModelTestPoints, DecoderBase {
 
       _loadL1Metadata(i);
 
-      if (_slashing == TestSlash.EMPIRE && !warmedUp && rollup.getCurrentSlot() == Slot.wrap(EPOCH_DURATION * 2)) {
-        address proposer = rollup.getCurrentProposer();
-        Signature memory sig = createEmpireSignalSignature(proposer, slashPayload, rollup.getCurrentSlot());
-        EmpireSlashingProposer(slashingProposer).signalWithSig(slashPayload, sig);
-        warmedUp = true;
-      }
-
       // For every "new" slot we encounter, we construct a checkpoint using current L1 data and
       // the decoded checkpoint fixture. The checkpoint cannot be proven, but it will be accepted
       // as a proposal so it is useful for testing a long range of checkpoints.
@@ -490,31 +447,8 @@ contract BenchmarkRollupTest is FeeModelTestPoints, DecoderBase {
         uint256 currentCheckpointNumber = rollup.getPendingCheckpointNumber() + 1;
         checkpointAttestations[currentCheckpointNumber] = AttestationLibHelper.packAttestations(b.attestations);
 
-        if (_slashing == TestSlash.EMPIRE) {
-          Signature memory sig = createEmpireSignalSignature(proposer, slashPayload, rollup.getCurrentSlot());
-          Multicall3.Call3[] memory calls = new Multicall3.Call3[](2);
-          calls[0] = Multicall3.Call3({
-            target: address(rollup),
-            callData: abi.encodeCall(
-              rollup.propose,
-              (
-                b.proposeArgs,
-                AttestationLibHelper.packAttestations(b.attestations),
-                b.signers,
-                b.attestationsAndSignersSignature,
-                b.blobInputs
-              )
-            ),
-            allowFailure: false
-          });
-          calls[1] = Multicall3.Call3({
-            target: address(slashingProposer),
-            callData: abi.encodeCall(EmpireSlashingProposer(slashingProposer).signalWithSig, (slashPayload, sig)),
-            allowFailure: false
-          });
-          multicall.aggregate3(calls);
-        } else if (_slashing == TestSlash.TALLY) {
-          SlashRound slashRound = TallySlashingProposer(slashingProposer).getCurrentRound();
+        if (_slashing == TestSlash.TALLY) {
+          SlashRound slashRound = SlashingProposer(slashingProposer).getCurrentRound();
           // We are offset + 1, because the first round after the offset is used entirely on warming the storage up, so
           // we don't get a off-balance update
           if (SlashRound.unwrap(slashRound) >= 3) {