Enter ExtRollupLib3

Author: spalladino

l1-contracts/src/core/RollupCore.sol

@@ -20,6 +20,7 @@ import {CommitteeAttestations} from "@aztec/shared/libraries/SignatureLib.sol";
 import {Errors} from "@aztec/core/libraries/Errors.sol";
 import {ExtRollupLib} from "@aztec/core/libraries/rollup/ExtRollupLib.sol";
 import {ExtRollupLib2} from "@aztec/core/libraries/rollup/ExtRollupLib2.sol";
+import {ExtRollupLib3} from "@aztec/core/libraries/rollup/ExtRollupLib3.sol";
 import {EthValue, FeeLib} from "@aztec/core/libraries/rollup/FeeLib.sol";
 import {ProposeArgs} from "@aztec/core/libraries/rollup/ProposeLib.sol";
 import {STFLib, GenesisState} from "@aztec/core/libraries/rollup/STFLib.sol";
@@ -86,7 +87,7 @@ contract RollupCore is
     );
 
     Timestamp exitDelay = Timestamp.wrap(_config.exitDelaySeconds);
-    ISlasher slasher = ExtRollupLib2.deploySlasher(
+    ISlasher slasher = ExtRollupLib3.deploySlasher(
       _config.slashingQuorum,
       _config.slashingRoundSize,
       _config.slashingLifetimeInRounds,
@@ -101,7 +102,7 @@ contract RollupCore is
 
     // If no booster specifically provided deploy one.
     if (address(_config.rewardConfig.booster) == address(0)) {
-      _config.rewardConfig.booster = ExtRollupLib2.deployRewardBooster(_config.rewardBoostConfig);
+      _config.rewardConfig.booster = ExtRollupLib3.deployRewardBooster(_config.rewardBoostConfig);
     }
 
     RewardLib.setConfig(_config.rewardConfig);

l1-contracts/src/core/libraries/rollup/ExtRollupLib2.sol

@@ -9,39 +9,10 @@ import {StakingLib} from "./StakingLib.sol";
 import {InvalidateLib} from "./InvalidateLib.sol";
 import {ValidatorSelectionLib} from "./ValidatorSelectionLib.sol";
 import {CommitteeAttestations} from "@aztec/shared/libraries/SignatureLib.sol";
-import {
-  RewardBooster,
-  RewardBoostConfig,
-  IBoosterCore,
-  IValidatorSelection
-} from "@aztec/core/reward-boost/RewardBooster.sol";
-import {Slasher, ISlasher} from "@aztec/core/slashing/Slasher.sol";
 
 library ExtRollupLib2 {
   using TimeLib for Timestamp;
 
-  function deployRewardBooster(RewardBoostConfig memory _config) external returns (IBoosterCore) {
-    RewardBooster booster = new RewardBooster(IValidatorSelection(address(this)), _config);
-    return IBoosterCore(address(booster));
-  }
-
-  function deploySlasher(
-    uint256 _slashingQuorum,
-    uint256 _slashingRoundSize,
-    uint256 _slashingLifetimeInRounds,
-    uint256 _slashingExecutionDelayInRounds,
-    address _slashingVetoer
-  ) external returns (ISlasher) {
-    Slasher slasher = new Slasher(
-      _slashingQuorum,
-      _slashingRoundSize,
-      _slashingLifetimeInRounds,
-      _slashingExecutionDelayInRounds,
-      _slashingVetoer
-    );
-    return ISlasher(address(slasher));
-  }
-
   function setSlasher(address _slasher) external {
     StakingLib.setSlasher(_slasher);
   }

l1-contracts/src/core/libraries/rollup/ExtRollupLib3.sol

@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2024 Aztec Labs.
+// solhint-disable imports-order
+pragma solidity >=0.8.27;
+
+import {
+  RewardBooster,
+  RewardBoostConfig,
+  IBoosterCore,
+  IValidatorSelection
+} from "@aztec/core/reward-boost/RewardBooster.sol";
+import {Slasher, ISlasher} from "@aztec/core/slashing/Slasher.sol";
+
+library ExtRollupLib3 {
+  function deployRewardBooster(RewardBoostConfig memory _config) external returns (IBoosterCore) {
+    RewardBooster booster = new RewardBooster(IValidatorSelection(address(this)), _config);
+    return IBoosterCore(address(booster));
+  }
+
+  function deploySlasher(
+    uint256 _slashingQuorum,
+    uint256 _slashingRoundSize,
+    uint256 _slashingLifetimeInRounds,
+    uint256 _slashingExecutionDelayInRounds,
+    address _slashingVetoer
+  ) external returns (ISlasher) {
+    Slasher slasher = new Slasher(
+      _slashingQuorum,
+      _slashingRoundSize,
+      _slashingLifetimeInRounds,
+      _slashingExecutionDelayInRounds,
+      _slashingVetoer
+    );
+    return ISlasher(address(slasher));
+  }
+}

yarn-project/ethereum/src/l1_artifacts.ts

@@ -3,6 +3,8 @@ import {
   CoinIssuerBytecode,
   ExtRollupLib2Abi,
   ExtRollupLib2Bytecode,
+  ExtRollupLib3Abi,
+  ExtRollupLib3Bytecode,
   ExtRollupLibAbi,
   ExtRollupLibBytecode,
   FeeAssetHandlerAbi,
@@ -88,6 +90,11 @@ export const RollupArtifact = {
         contractAbi: ExtRollupLib2Abi,
         contractBytecode: ExtRollupLib2Bytecode as Hex,
       },
+      ExtRollupLib3: {
+        name: 'ExtRollupLib3',
+        contractAbi: ExtRollupLib3Abi,
+        contractBytecode: ExtRollupLib3Bytecode as Hex,
+      },
     },
   },
 };

yarn-project/l1-artifacts/scripts/generate-artifacts.sh

@@ -15,6 +15,7 @@ contracts=(
   "EmpireBase"
   "ExtRollupLib"
   "ExtRollupLib2"
+  "ExtRollupLib3"
   "FeeJuicePortal"
   "Governance"
   "GovernanceProposer"