feat: add remaining semver (#1041)

* feat: remaining semver * feat: remaining semver
Layr-Labs · Jan 22, 2025 · 390ec5f · 390ec5f
1 parent f288708
commit 390ec5f
Show file tree

Hide file tree

Showing 26 changed files with 130 additions and 69 deletions.
diff --git a/script/deploy/devnet/deploy_from_scratch.s.sol b/script/deploy/devnet/deploy_from_scratch.s.sol
@@ -231,7 +231,8 @@ contract DeployFromScratch is Script, Test {
         eigenPodImplementation = new EigenPod(
             ethPOSDeposit,
             eigenPodManager,
-            GOERLI_GENESIS_TIME
+            GOERLI_GENESIS_TIME,
+            SEMVER
         );
 
         eigenPodBeacon = new UpgradeableBeacon(address(eigenPodImplementation));
@@ -254,7 +255,8 @@ contract DeployFromScratch is Script, Test {
             ethPOSDeposit,
             eigenPodBeacon,
             delegation,
-            eigenLayerPauserReg
+            eigenLayerPauserReg,
+            SEMVER
         );
         rewardsCoordinatorImplementation = new RewardsCoordinator(
             IRewardsCoordinatorTypes.RewardsCoordinatorConstructorParams(
@@ -279,8 +281,8 @@ contract DeployFromScratch is Script, Test {
             ALLOCATION_CONFIGURATION_DELAY, 
             SEMVER
         );
-        permissionControllerImplementation = new PermissionController();
-        strategyFactoryImplementation = new StrategyFactory(strategyManager, eigenLayerPauserReg);
+        permissionControllerImplementation = new PermissionController(SEMVER);
+        strategyFactoryImplementation = new StrategyFactory(strategyManager, eigenLayerPauserReg, SEMVER);
 
         // Third, upgrade the proxy contracts to use the correct implementation contracts and initialize them.
         {
@@ -348,7 +350,7 @@ contract DeployFromScratch is Script, Test {
 
         // Deploy strategyFactory & base
         // Create base strategy implementation
-        baseStrategyImplementation = new StrategyBase(strategyManager, eigenLayerPauserReg);
+        baseStrategyImplementation = new StrategyBase(strategyManager, eigenLayerPauserReg, SEMVER);
 
         // Create a proxy beacon for base strategy implementation
         strategyBeacon = new UpgradeableBeacon(address(baseStrategyImplementation));

diff --git a/script/deploy/local/Deploy_From_Scratch.s.sol b/script/deploy/local/Deploy_From_Scratch.s.sol
@@ -244,7 +244,7 @@ contract DeployFromScratch is Script, Test {
         } else {
             ethPOSDeposit = IETHPOSDeposit(stdJson.readAddress(config_data, ".ethPOSDepositAddress"));
         }
-        eigenPodImplementation = new EigenPod(ethPOSDeposit, eigenPodManager, GOERLI_GENESIS_TIME);
+        eigenPodImplementation = new EigenPod(ethPOSDeposit, eigenPodManager, GOERLI_GENESIS_TIME, SEMVER);
 
         eigenPodBeacon = new UpgradeableBeacon(address(eigenPodImplementation));
 
@@ -265,7 +265,8 @@ contract DeployFromScratch is Script, Test {
             ethPOSDeposit,
             eigenPodBeacon,
             delegation,
-            eigenLayerPauserReg
+            eigenLayerPauserReg,
+            SEMVER
         );
         rewardsCoordinatorImplementation = new RewardsCoordinator(
             IRewardsCoordinatorTypes.RewardsCoordinatorConstructorParams(
@@ -290,7 +291,7 @@ contract DeployFromScratch is Script, Test {
             ALLOCATION_CONFIGURATION_DELAY,
             SEMVER
         );
-        permissionControllerImplementation = new PermissionController();
+        permissionControllerImplementation = new PermissionController(SEMVER);
 
         // Third, upgrade the proxy contracts to use the correct implementation contracts and initialize them.
         {
@@ -362,7 +363,7 @@ contract DeployFromScratch is Script, Test {
         );
 
         // deploy StrategyBaseTVLLimits contract implementation
-        baseStrategyImplementation = new StrategyBaseTVLLimits(strategyManager, eigenLayerPauserReg);
+        baseStrategyImplementation = new StrategyBaseTVLLimits(strategyManager, eigenLayerPauserReg, SEMVER);
         // create upgradeable proxies that each point to the implementation and initialize them
         for (uint256 i = 0; i < strategyConfigs.length; ++i) {
             if (strategyConfigs[i].tokenAddress == address(0)) {

diff --git a/script/deploy/local/deploy_from_scratch.slashing.s.sol b/script/deploy/local/deploy_from_scratch.slashing.s.sol
@@ -238,7 +238,8 @@ contract DeployFromScratch is Script, Test {
         eigenPodImplementation = new EigenPod(
             ethPOSDeposit,
             eigenPodManager,
-            GOERLI_GENESIS_TIME
+            GOERLI_GENESIS_TIME,
+            SEMVER
         );
 
         eigenPodBeacon = new UpgradeableBeacon(address(eigenPodImplementation));
@@ -260,7 +261,8 @@ contract DeployFromScratch is Script, Test {
             ethPOSDeposit,
             eigenPodBeacon,
             delegation,
-            eigenLayerPauserReg
+            eigenLayerPauserReg,
+            SEMVER
         );
         rewardsCoordinatorImplementation = new RewardsCoordinator(
             IRewardsCoordinatorTypes.RewardsCoordinatorConstructorParams(
@@ -285,7 +287,7 @@ contract DeployFromScratch is Script, Test {
             ALLOCATION_CONFIGURATION_DELAY,
             SEMVER
         );
-        permissionControllerImplementation = new PermissionController();
+        permissionControllerImplementation = new PermissionController(SEMVER);
 
         // Third, upgrade the proxy contracts to use the correct implementation contracts and initialize them.
         {
@@ -357,7 +359,7 @@ contract DeployFromScratch is Script, Test {
         );
 
         // deploy StrategyBaseTVLLimits contract implementation
-        baseStrategyImplementation = new StrategyBaseTVLLimits(strategyManager, eigenLayerPauserReg);
+        baseStrategyImplementation = new StrategyBaseTVLLimits(strategyManager, eigenLayerPauserReg, SEMVER);
         // create upgradeable proxies that each point to the implementation and initialize them
         for (uint256 i = 0; i < strategyConfigs.length; ++i) {
             if (strategyConfigs[i].tokenAddress == address(0)) {

diff --git a/script/releases/v1.0.0-slashing/1-deployContracts.s.sol b/script/releases/v1.0.0-slashing/1-deployContracts.s.sol
@@ -35,7 +35,7 @@ contract Deploy is EOADeployer {
 
         deployImpl({
             name: type(PermissionController).name,
-            deployedTo: address(new PermissionController())
+            deployedTo: address(new PermissionController(Env.version()))
         });
 
         deployProxy({
@@ -134,7 +134,8 @@ contract Deploy is EOADeployer {
                 _ethPOS: Env.ethPOS(),
                 _eigenPodBeacon: Env.beacon.eigenPod(),
                 _delegationManager: Env.proxy.delegationManager(),
-                _pauserRegistry: Env.impl.pauserRegistry()
+                _pauserRegistry: Env.impl.pauserRegistry(),
+                _version: Env.version()
             }))
         });
 
@@ -143,7 +144,8 @@ contract Deploy is EOADeployer {
             deployedTo: address(new EigenPod({
                 _ethPOS: Env.ethPOS(),
                 _eigenPodManager: Env.proxy.eigenPodManager(),
-                _GENESIS_TIME: Env.EIGENPOD_GENESIS_TIME()
+                _GENESIS_TIME: Env.EIGENPOD_GENESIS_TIME(),
+                _version: Env.version()
             }))
         });
 
@@ -153,23 +155,26 @@ contract Deploy is EOADeployer {
             name: type(StrategyBaseTVLLimits).name,
             deployedTo: address(new StrategyBaseTVLLimits({
                 _strategyManager: Env.proxy.strategyManager(),
-                _pauserRegistry: Env.impl.pauserRegistry()
+                _pauserRegistry: Env.impl.pauserRegistry(),
+                _version: Env.version()
             }))
         });
 
         deployImpl({
             name: type(EigenStrategy).name,
             deployedTo: address(new EigenStrategy({
                 _strategyManager: Env.proxy.strategyManager(),
-                _pauserRegistry: Env.impl.pauserRegistry()
+                _pauserRegistry: Env.impl.pauserRegistry(),
+                _version: Env.version()
             }))
         });
 
         deployImpl({
             name: type(StrategyFactory).name,
             deployedTo: address(new StrategyFactory({
                 _strategyManager: Env.proxy.strategyManager(),
-                _pauserRegistry: Env.impl.pauserRegistry()
+                _pauserRegistry: Env.impl.pauserRegistry(),
+                _version: Env.version()
             }))
         });
 
@@ -178,7 +183,8 @@ contract Deploy is EOADeployer {
             name: type(StrategyBase).name,
             deployedTo: address(new StrategyBase({
                 _strategyManager: Env.proxy.strategyManager(),
-                _pauserRegistry: Env.impl.pauserRegistry()
+                _pauserRegistry: Env.impl.pauserRegistry(),
+                _version: Env.version()
             }))
         });
 

diff --git a/script/releases/v1.0.2-slashing-consolidated/1-deployContracts.s.sol b/script/releases/v1.0.2-slashing-consolidated/1-deployContracts.s.sol
@@ -35,7 +35,7 @@ contract Deploy is EOADeployer {
 
         deployImpl({
             name: type(PermissionController).name,
-            deployedTo: address(new PermissionController())
+            deployedTo: address(new PermissionController(Env.version()))
         });
 
         deployProxy({
@@ -134,7 +134,8 @@ contract Deploy is EOADeployer {
                 _ethPOS: Env.ethPOS(),
                 _eigenPodBeacon: Env.beacon.eigenPod(),
                 _delegationManager: Env.proxy.delegationManager(),
-                _pauserRegistry: Env.impl.pauserRegistry()
+                _pauserRegistry: Env.impl.pauserRegistry(),
+                _version: Env.version()
             }))
         });
 
@@ -143,7 +144,8 @@ contract Deploy is EOADeployer {
             deployedTo: address(new EigenPod({
                 _ethPOS: Env.ethPOS(),
                 _eigenPodManager: Env.proxy.eigenPodManager(),
-                _GENESIS_TIME: Env.EIGENPOD_GENESIS_TIME()
+                _GENESIS_TIME: Env.EIGENPOD_GENESIS_TIME(),
+                _version: Env.version()
             }))
         });
 
@@ -153,23 +155,26 @@ contract Deploy is EOADeployer {
             name: type(StrategyBaseTVLLimits).name,
             deployedTo: address(new StrategyBaseTVLLimits({
                 _strategyManager: Env.proxy.strategyManager(),
-                _pauserRegistry: Env.impl.pauserRegistry()
+                _pauserRegistry: Env.impl.pauserRegistry(),
+                _version: Env.version()
             }))
         });
 
         deployImpl({
             name: type(EigenStrategy).name,
             deployedTo: address(new EigenStrategy({
                 _strategyManager: Env.proxy.strategyManager(),
-                _pauserRegistry: Env.impl.pauserRegistry()
+                _pauserRegistry: Env.impl.pauserRegistry(),
+                _version: Env.version()
             }))
         });
 
         deployImpl({
             name: type(StrategyFactory).name,
             deployedTo: address(new StrategyFactory({
                 _strategyManager: Env.proxy.strategyManager(),
-                _pauserRegistry: Env.impl.pauserRegistry()
+                _pauserRegistry: Env.impl.pauserRegistry(),
+                _version: Env.version()
             }))
         });
 
@@ -178,7 +183,8 @@ contract Deploy is EOADeployer {
             name: type(StrategyBase).name,
             deployedTo: address(new StrategyBase({
                 _strategyManager: Env.proxy.strategyManager(),
-                _pauserRegistry: Env.impl.pauserRegistry()
+                _pauserRegistry: Env.impl.pauserRegistry(),
+                _version: Env.version()
             }))
         });
 

diff --git a/script/utils/ExistingDeploymentParser.sol b/script/utils/ExistingDeploymentParser.sol
@@ -214,7 +214,7 @@ contract ExistingDeploymentParser is Script, Logger {
         eigenLayerPauserReg = PauserRegistry(json.readAddress(".addresses.eigenLayerPauserReg"));
 
         // FIXME: hotfix - remove later...
-        permissionControllerImplementation = new PermissionController();
+        permissionControllerImplementation = new PermissionController(SEMVER);
         permissionController = PermissionController(
             address(new TransparentUpgradeableProxy(address(permissionControllerImplementation), address(eigenLayerProxyAdmin), ""))
         );

diff --git a/src/contracts/permissions/PermissionController.sol b/src/contracts/permissions/PermissionController.sol
@@ -2,9 +2,10 @@
 pragma solidity ^0.8.27;
 
 import "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
+import "../mixins/SemVerMixin.sol";
 import "./PermissionControllerStorage.sol";
 
-contract PermissionController is Initializable, PermissionControllerStorage {
+contract PermissionController is Initializable, SemVerMixin, PermissionControllerStorage {
     using EnumerableSet for *;
 
     modifier onlyAdmin(
@@ -19,7 +20,9 @@ contract PermissionController is Initializable, PermissionControllerStorage {
      *                         INITIALIZING FUNCTIONS
      *
      */
-    constructor() {
+    constructor(
+        string memory _version
+    ) SemVerMixin(_version) {
         _disableInitializers();
     }
 

diff --git a/src/contracts/pods/EigenPod.sol b/src/contracts/pods/EigenPod.sol
@@ -8,6 +8,8 @@ import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "../libraries/BeaconChainProofs.sol";
 import "../libraries/BytesLib.sol";
 
+import "../mixins/SemVerMixin.sol";
+
 import "../interfaces/IETHPOSDeposit.sol";
 import "../interfaces/IEigenPodManager.sol";
 import "../interfaces/IPausable.sol";
@@ -23,7 +25,13 @@ import "./EigenPodStorage.sol";
  * @dev Note that all beacon chain balances are stored as gwei within the beacon chain datastructures. We choose
  *   to account balances in terms of gwei in the EigenPod contract and convert to wei when making calls to other contracts
  */
-contract EigenPod is Initializable, ReentrancyGuardUpgradeable, EigenPodPausingConstants, EigenPodStorage {
+contract EigenPod is
+    Initializable,
+    ReentrancyGuardUpgradeable,
+    EigenPodPausingConstants,
+    EigenPodStorage,
+    SemVerMixin
+{
     using BytesLib for bytes;
     using SafeERC20 for IERC20;
     using BeaconChainProofs for *;
@@ -94,7 +102,12 @@ contract EigenPod is Initializable, ReentrancyGuardUpgradeable, EigenPodPausingC
      *                               CONSTRUCTOR / INIT
      *
      */
-    constructor(IETHPOSDeposit _ethPOS, IEigenPodManager _eigenPodManager, uint64 _GENESIS_TIME) {
+    constructor(
+        IETHPOSDeposit _ethPOS,
+        IEigenPodManager _eigenPodManager,
+        uint64 _GENESIS_TIME,
+        string memory _version
+    ) SemVerMixin(_version) {
         ethPOS = _ethPOS;
         eigenPodManager = _eigenPodManager;
         GENESIS_TIME = _GENESIS_TIME;

diff --git a/src/contracts/pods/EigenPodManager.sol b/src/contracts/pods/EigenPodManager.sol
@@ -7,6 +7,7 @@ import "@openzeppelin-upgrades/contracts/access/OwnableUpgradeable.sol";
 import "@openzeppelin-upgrades/contracts/security/ReentrancyGuardUpgradeable.sol";
 
 import "../libraries/SlashingLib.sol";
+import "../mixins/SemVerMixin.sol";
 import "../permissions/Pausable.sol";
 import "./EigenPodPausingConstants.sol";
 import "./EigenPodManagerStorage.sol";
@@ -27,7 +28,8 @@ contract EigenPodManager is
     Pausable,
     EigenPodPausingConstants,
     EigenPodManagerStorage,
-    ReentrancyGuardUpgradeable
+    ReentrancyGuardUpgradeable,
+    SemVerMixin
 {
     using SlashingLib for *;
     using Math for *;
@@ -48,8 +50,13 @@ contract EigenPodManager is
         IETHPOSDeposit _ethPOS,
         IBeacon _eigenPodBeacon,
         IDelegationManager _delegationManager,
-        IPauserRegistry _pauserRegistry
-    ) EigenPodManagerStorage(_ethPOS, _eigenPodBeacon, _delegationManager) Pausable(_pauserRegistry) {
+        IPauserRegistry _pauserRegistry,
+        string memory _version
+    )
+        EigenPodManagerStorage(_ethPOS, _eigenPodBeacon, _delegationManager)
+        Pausable(_pauserRegistry)
+        SemVerMixin(_version)
+    {
         _disableInitializers();
     }
 

diff --git a/src/contracts/strategies/EigenStrategy.sol b/src/contracts/strategies/EigenStrategy.sol
@@ -38,8 +38,9 @@ contract EigenStrategy is StrategyBase {
     /// @notice Since this contract is designed to be initializable, the constructor simply sets `strategyManager`, the only immutable variable.
     constructor(
         IStrategyManager _strategyManager,
-        IPauserRegistry _pauserRegistry
-    ) StrategyBase(_strategyManager, _pauserRegistry) {}
+        IPauserRegistry _pauserRegistry,
+        string memory _version
+    ) StrategyBase(_strategyManager, _pauserRegistry, _version) {}
 
     function initialize(IEigen _EIGEN, IERC20 _bEIGEN) public virtual initializer {
         EIGEN = _EIGEN;

diff --git a/src/contracts/strategies/StrategyBase.sol b/src/contracts/strategies/StrategyBase.sol
@@ -3,6 +3,7 @@ pragma solidity ^0.8.27;
 
 import "../interfaces/IStrategyManager.sol";
 import "../permissions/Pausable.sol";
+import "../mixins/SemVerMixin.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
@@ -28,7 +29,7 @@ import "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
  * [this thread](https://github.com/OpenZeppelin/openzeppelin-contracts/issues/3706) on the OpenZeppelin repo.
  * We specifically use a share offset of `SHARES_OFFSET` and a balance offset of `BALANCE_OFFSET`.
  */
-contract StrategyBase is Initializable, Pausable, IStrategy {
+contract StrategyBase is Initializable, Pausable, IStrategy, SemVerMixin {
     using SafeERC20 for IERC20;
 
     uint8 internal constant PAUSED_DEPOSITS = 0;
@@ -69,7 +70,11 @@ contract StrategyBase is Initializable, Pausable, IStrategy {
     }
 
     /// @notice Since this contract is designed to be initializable, the constructor simply sets `strategyManager`, the only immutable variable.
-    constructor(IStrategyManager _strategyManager, IPauserRegistry _pauserRegistry) Pausable(_pauserRegistry) {
+    constructor(
+        IStrategyManager _strategyManager,
+        IPauserRegistry _pauserRegistry,
+        string memory _version
+    ) Pausable(_pauserRegistry) SemVerMixin(_version) {
         strategyManager = _strategyManager;
         _disableInitializers();
     }