feat: add SemVerMixin (#1034)

* feat: add `SemVerMixin` * refactor: add `_majorVersion` helper for `SignatureUtils` * test: passing * test: passing * refactor: rename EIP712_VERSION * refactor: review changes
Layr-Labs · Jan 21, 2025 · 943d7ee · 943d7ee
1 parent 6920ec1
commit 943d7ee
Show file tree

Hide file tree

Showing 26 changed files with 327 additions and 172 deletions.
diff --git a/script/deploy/devnet/deploy_from_scratch.s.sol b/script/deploy/devnet/deploy_from_scratch.s.sol
@@ -76,7 +76,7 @@ contract DeployFromScratch is Script, Test {
     // strategies deployed
     StrategyBaseTVLLimits[] public deployedStrategyArray;
 
-    string EIP712_VERSION;
+    string SEMVER;
 
     // IMMUTABLES TO SET
     uint64 GOERLI_GENESIS_TIME = 1616508000;
@@ -123,7 +123,7 @@ contract DeployFromScratch is Script, Test {
         string memory config_data = vm.readFile(deployConfigPath);
         // bytes memory parsedData = vm.parseJson(config_data);
 
-        EIP712_VERSION = stdJson.readString(config_data, ".eip712_version");
+        SEMVER = stdJson.readString(config_data, ".SEMVER");
 
         STRATEGY_MANAGER_INIT_PAUSED_STATUS = stdJson.readUint(config_data, ".strategyManager.init_paused_status");
         DELEGATION_INIT_PAUSED_STATUS = stdJson.readUint(config_data, ".delegation.init_paused_status");
@@ -245,30 +245,40 @@ contract DeployFromScratch is Script, Test {
             eigenLayerPauserReg, 
             permissionController, 
             MIN_WITHDRAWAL_DELAY,
-            EIP712_VERSION
+            SEMVER
         );
 
-        strategyManagerImplementation = new StrategyManager(delegation, eigenLayerPauserReg, EIP712_VERSION);
-        avsDirectoryImplementation = new AVSDirectory(delegation, eigenLayerPauserReg, EIP712_VERSION);
+        strategyManagerImplementation = new StrategyManager(delegation, eigenLayerPauserReg, SEMVER);
+        avsDirectoryImplementation = new AVSDirectory(delegation, eigenLayerPauserReg, SEMVER);
         eigenPodManagerImplementation = new EigenPodManager(
             ethPOSDeposit,
             eigenPodBeacon,
             delegation,
             eigenLayerPauserReg
         );
         rewardsCoordinatorImplementation = new RewardsCoordinator(
-            delegation,
-            strategyManager,
-            allocationManager,
-            eigenLayerPauserReg,
-            permissionController,
-            REWARDS_COORDINATOR_CALCULATION_INTERVAL_SECONDS,
-            REWARDS_COORDINATOR_MAX_REWARDS_DURATION,
-            REWARDS_COORDINATOR_MAX_RETROACTIVE_LENGTH,
-            REWARDS_COORDINATOR_MAX_FUTURE_LENGTH,
-            REWARDS_COORDINATOR_GENESIS_REWARDS_TIMESTAMP
-        );
-        allocationManagerImplementation = new AllocationManager(delegation, eigenLayerPauserReg, permissionController, DEALLOCATION_DELAY, ALLOCATION_CONFIGURATION_DELAY);
+            IRewardsCoordinatorTypes.RewardsCoordinatorConstructorParams(
+                delegation,
+                strategyManager,
+                allocationManager,
+                eigenLayerPauserReg,
+                permissionController,
+                REWARDS_COORDINATOR_CALCULATION_INTERVAL_SECONDS,
+                REWARDS_COORDINATOR_MAX_REWARDS_DURATION,
+                REWARDS_COORDINATOR_MAX_RETROACTIVE_LENGTH,
+                REWARDS_COORDINATOR_MAX_FUTURE_LENGTH,
+                REWARDS_COORDINATOR_GENESIS_REWARDS_TIMESTAMP,
+                SEMVER
+            )
+        );
+        allocationManagerImplementation = new AllocationManager(
+            delegation, 
+            eigenLayerPauserReg, 
+            permissionController, 
+            DEALLOCATION_DELAY, 
+            ALLOCATION_CONFIGURATION_DELAY, 
+            SEMVER
+        );
         permissionControllerImplementation = new PermissionController();
         strategyFactoryImplementation = new StrategyFactory(strategyManager, eigenLayerPauserReg);
 

diff --git a/script/deploy/local/Deploy_From_Scratch.s.sol b/script/deploy/local/Deploy_From_Scratch.s.sol
@@ -79,7 +79,7 @@ contract DeployFromScratch is Script, Test {
     // strategies deployed
     StrategyBaseTVLLimits[] public deployedStrategyArray;
 
-    string EIP712_VERSION;
+    string SEMVER;
 
     // IMMUTABLES TO SET
     uint64 GOERLI_GENESIS_TIME = 1616508000;
@@ -126,7 +126,7 @@ contract DeployFromScratch is Script, Test {
         string memory config_data = vm.readFile(deployConfigPath);
         // bytes memory parsedData = vm.parseJson(config_data);
 
-        EIP712_VERSION = stdJson.readString(config_data, ".eip712_version");
+        SEMVER = stdJson.readString(config_data, ".SEMVER");
 
         STRATEGY_MANAGER_INIT_PAUSED_STATUS = stdJson.readUint(config_data, ".strategyManager.init_paused_status");
         DELEGATION_INIT_PAUSED_STATUS = stdJson.readUint(config_data, ".delegation.init_paused_status");
@@ -257,29 +257,39 @@ contract DeployFromScratch is Script, Test {
             eigenLayerPauserReg, 
             permissionController, 
             MIN_WITHDRAWAL_DELAY,
-            EIP712_VERSION
+            SEMVER
         );
-        strategyManagerImplementation = new StrategyManager(delegation, eigenLayerPauserReg, EIP712_VERSION);
-        avsDirectoryImplementation = new AVSDirectory(delegation, eigenLayerPauserReg, EIP712_VERSION);
+        strategyManagerImplementation = new StrategyManager(delegation, eigenLayerPauserReg, SEMVER);
+        avsDirectoryImplementation = new AVSDirectory(delegation, eigenLayerPauserReg, SEMVER);
         eigenPodManagerImplementation = new EigenPodManager(
             ethPOSDeposit,
             eigenPodBeacon,
             delegation,
             eigenLayerPauserReg
         );
         rewardsCoordinatorImplementation = new RewardsCoordinator(
-            delegation,
-            strategyManager,
-            allocationManager,
-            eigenLayerPauserReg,
-            permissionController,
-            REWARDS_COORDINATOR_CALCULATION_INTERVAL_SECONDS,
-            REWARDS_COORDINATOR_MAX_REWARDS_DURATION,
-            REWARDS_COORDINATOR_MAX_RETROACTIVE_LENGTH,
-            REWARDS_COORDINATOR_MAX_FUTURE_LENGTH,
-            REWARDS_COORDINATOR_GENESIS_REWARDS_TIMESTAMP
-        );
-        allocationManagerImplementation = new AllocationManager(delegation, eigenLayerPauserReg, permissionController, DEALLOCATION_DELAY, ALLOCATION_CONFIGURATION_DELAY);
+            IRewardsCoordinatorTypes.RewardsCoordinatorConstructorParams(
+                delegation,
+                strategyManager,
+                allocationManager,
+                eigenLayerPauserReg,
+                permissionController,
+                REWARDS_COORDINATOR_CALCULATION_INTERVAL_SECONDS,
+                REWARDS_COORDINATOR_MAX_REWARDS_DURATION,
+                REWARDS_COORDINATOR_MAX_RETROACTIVE_LENGTH,
+                REWARDS_COORDINATOR_MAX_FUTURE_LENGTH,
+                REWARDS_COORDINATOR_GENESIS_REWARDS_TIMESTAMP,
+                SEMVER
+            )
+        );
+        allocationManagerImplementation = new AllocationManager(
+            delegation, 
+            eigenLayerPauserReg, 
+            permissionController, 
+            DEALLOCATION_DELAY, 
+            ALLOCATION_CONFIGURATION_DELAY,
+            SEMVER
+        );
         permissionControllerImplementation = new PermissionController();
 
         // Third, upgrade the proxy contracts to use the correct implementation contracts and initialize them.

diff --git a/script/deploy/local/deploy_from_scratch.slashing.s.sol b/script/deploy/local/deploy_from_scratch.slashing.s.sol
@@ -73,7 +73,7 @@ contract DeployFromScratch is Script, Test {
     address operationsMultisig;
     address pauserMultisig;
 
-    string EIP712_VERSION;
+    string SEMVER;
 
     // the ETH2 deposit contract -- if not on mainnet, we deploy a mock as stand-in
     IETHPOSDeposit public ethPOSDeposit;
@@ -126,7 +126,7 @@ contract DeployFromScratch is Script, Test {
         string memory config_data = vm.readFile(deployConfigPath);
         // bytes memory parsedData = vm.parseJson(config_data);
 
-        EIP712_VERSION = stdJson.readString(config_data, ".eip712_version");
+        SEMVER = stdJson.readString(config_data, ".SEMVER");
 
         MIN_WITHDRAWAL_DELAY = uint32(stdJson.readUint(config_data, ".delegation.withdrawal_delay_blocks"));
         STRATEGY_MANAGER_INIT_PAUSED_STATUS = stdJson.readUint(config_data, ".strategyManager.init_paused_status");
@@ -252,29 +252,39 @@ contract DeployFromScratch is Script, Test {
             eigenLayerPauserReg, 
             permissionController, 
             MIN_WITHDRAWAL_DELAY,
-            EIP712_VERSION
+            SEMVER
         );
-        strategyManagerImplementation = new StrategyManager(delegation, eigenLayerPauserReg, EIP712_VERSION);
-        avsDirectoryImplementation = new AVSDirectory(delegation, eigenLayerPauserReg, EIP712_VERSION);
+        strategyManagerImplementation = new StrategyManager(delegation, eigenLayerPauserReg, SEMVER);
+        avsDirectoryImplementation = new AVSDirectory(delegation, eigenLayerPauserReg, SEMVER);
         eigenPodManagerImplementation = new EigenPodManager(
             ethPOSDeposit,
             eigenPodBeacon,
             delegation,
             eigenLayerPauserReg
         );
         rewardsCoordinatorImplementation = new RewardsCoordinator(
-            delegation,
-            strategyManager,
-            allocationManager,
-            eigenLayerPauserReg,
-            permissionController,
-            REWARDS_COORDINATOR_CALCULATION_INTERVAL_SECONDS,
-            REWARDS_COORDINATOR_MAX_REWARDS_DURATION,
-            REWARDS_COORDINATOR_MAX_RETROACTIVE_LENGTH,
-            REWARDS_COORDINATOR_MAX_FUTURE_LENGTH,
-            REWARDS_COORDINATOR_GENESIS_REWARDS_TIMESTAMP
-        );
-        allocationManagerImplementation = new AllocationManager(delegation, eigenLayerPauserReg, permissionController, DEALLOCATION_DELAY, ALLOCATION_CONFIGURATION_DELAY);
+            IRewardsCoordinatorTypes.RewardsCoordinatorConstructorParams(
+                delegation,
+                strategyManager,
+                allocationManager,
+                eigenLayerPauserReg,
+                permissionController,
+                REWARDS_COORDINATOR_CALCULATION_INTERVAL_SECONDS,
+                REWARDS_COORDINATOR_MAX_REWARDS_DURATION,
+                REWARDS_COORDINATOR_MAX_RETROACTIVE_LENGTH,
+                REWARDS_COORDINATOR_MAX_FUTURE_LENGTH,
+                REWARDS_COORDINATOR_GENESIS_REWARDS_TIMESTAMP,
+                SEMVER
+            )
+        );
+        allocationManagerImplementation = new AllocationManager(
+            delegation, 
+            eigenLayerPauserReg, 
+            permissionController, 
+            DEALLOCATION_DELAY, 
+            ALLOCATION_CONFIGURATION_DELAY,
+            SEMVER
+        );
         permissionControllerImplementation = new PermissionController();
 
         // Third, upgrade the proxy contracts to use the correct implementation contracts and initialize them.

diff --git a/script/releases/v1.0.0-slashing/1-deployContracts.s.sol b/script/releases/v1.0.0-slashing/1-deployContracts.s.sol
@@ -56,7 +56,8 @@ contract Deploy is EOADeployer {
                 _pauserRegistry: Env.impl.pauserRegistry(),
                 _permissionController: Env.proxy.permissionController(),
                 _DEALLOCATION_DELAY: Env.MIN_WITHDRAWAL_DELAY(),
-                _ALLOCATION_CONFIGURATION_DELAY: Env.ALLOCATION_CONFIGURATION_DELAY()
+                _ALLOCATION_CONFIGURATION_DELAY: Env.ALLOCATION_CONFIGURATION_DELAY(),
+                _version: Env.version()
             }))
         });
 
@@ -99,18 +100,21 @@ contract Deploy is EOADeployer {
 
         deployImpl({
             name: type(RewardsCoordinator).name,
-            deployedTo: address(new RewardsCoordinator({
-                _delegationManager: Env.proxy.delegationManager(),
-                _strategyManager: Env.proxy.strategyManager(),
-                _allocationManager: Env.proxy.allocationManager(),
-                _pauserRegistry: Env.impl.pauserRegistry(),
-                _permissionController: Env.proxy.permissionController(),
-                _CALCULATION_INTERVAL_SECONDS: Env.CALCULATION_INTERVAL_SECONDS(),
-                _MAX_REWARDS_DURATION: Env.MAX_REWARDS_DURATION(),
-                _MAX_RETROACTIVE_LENGTH: Env.MAX_RETROACTIVE_LENGTH(),
-                _MAX_FUTURE_LENGTH: Env.MAX_FUTURE_LENGTH(),
-                _GENESIS_REWARDS_TIMESTAMP: Env.GENESIS_REWARDS_TIMESTAMP()
-            }))
+            deployedTo: address(new RewardsCoordinator(
+                IRewardsCoordinatorTypes.RewardsCoordinatorConstructorParams({
+                    delegationManager: Env.proxy.delegationManager(),
+                    strategyManager: Env.proxy.strategyManager(),
+                    allocationManager: Env.proxy.allocationManager(),
+                    pauserRegistry: Env.impl.pauserRegistry(),
+                    permissionController: Env.proxy.permissionController(),
+                    CALCULATION_INTERVAL_SECONDS: Env.CALCULATION_INTERVAL_SECONDS(),
+                    MAX_REWARDS_DURATION: Env.MAX_REWARDS_DURATION(),
+                    MAX_RETROACTIVE_LENGTH: Env.MAX_RETROACTIVE_LENGTH(),
+                    MAX_FUTURE_LENGTH: Env.MAX_FUTURE_LENGTH(),
+                    GENESIS_REWARDS_TIMESTAMP: Env.GENESIS_REWARDS_TIMESTAMP(),
+                    version: Env.version()
+                })
+            ))
         });
 
         deployImpl({

diff --git a/script/releases/v1.0.1-slashing/1-eoa.s.sol b/script/releases/v1.0.1-slashing/1-eoa.s.sol
@@ -21,7 +21,8 @@ contract Deploy is EOADeployer {
                 _pauserRegistry: Env.impl.pauserRegistry(),
                 _permissionController: Env.proxy.permissionController(),
                 _DEALLOCATION_DELAY: Env.MIN_WITHDRAWAL_DELAY(),
-                _ALLOCATION_CONFIGURATION_DELAY: Env.ALLOCATION_CONFIGURATION_DELAY()
+                _ALLOCATION_CONFIGURATION_DELAY: Env.ALLOCATION_CONFIGURATION_DELAY(),
+                _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
@@ -56,7 +56,8 @@ contract Deploy is EOADeployer {
                 _pauserRegistry: Env.impl.pauserRegistry(),
                 _permissionController: Env.proxy.permissionController(),
                 _DEALLOCATION_DELAY: Env.MIN_WITHDRAWAL_DELAY(),
-                _ALLOCATION_CONFIGURATION_DELAY: Env.ALLOCATION_CONFIGURATION_DELAY()
+                _ALLOCATION_CONFIGURATION_DELAY: Env.ALLOCATION_CONFIGURATION_DELAY(),
+                _version: Env.version()
             }))
         });
 
@@ -99,18 +100,21 @@ contract Deploy is EOADeployer {
 
         deployImpl({
             name: type(RewardsCoordinator).name,
-            deployedTo: address(new RewardsCoordinator({
-                _delegationManager: Env.proxy.delegationManager(),
-                _strategyManager: Env.proxy.strategyManager(),
-                _allocationManager: Env.proxy.allocationManager(),
-                _pauserRegistry: Env.impl.pauserRegistry(),
-                _permissionController: Env.proxy.permissionController(),
-                _CALCULATION_INTERVAL_SECONDS: Env.CALCULATION_INTERVAL_SECONDS(),
-                _MAX_REWARDS_DURATION: Env.MAX_REWARDS_DURATION(),
-                _MAX_RETROACTIVE_LENGTH: Env.MAX_RETROACTIVE_LENGTH(),
-                _MAX_FUTURE_LENGTH: Env.MAX_FUTURE_LENGTH(),
-                _GENESIS_REWARDS_TIMESTAMP: Env.GENESIS_REWARDS_TIMESTAMP()
-            }))
+            deployedTo: address(new RewardsCoordinator(
+                IRewardsCoordinatorTypes.RewardsCoordinatorConstructorParams({
+                    delegationManager: Env.proxy.delegationManager(),
+                    strategyManager: Env.proxy.strategyManager(),
+                    allocationManager: Env.proxy.allocationManager(),
+                    pauserRegistry: Env.impl.pauserRegistry(),
+                    permissionController: Env.proxy.permissionController(),
+                    CALCULATION_INTERVAL_SECONDS: Env.CALCULATION_INTERVAL_SECONDS(),
+                    MAX_REWARDS_DURATION: Env.MAX_REWARDS_DURATION(),
+                    MAX_RETROACTIVE_LENGTH: Env.MAX_RETROACTIVE_LENGTH(),
+                    MAX_FUTURE_LENGTH: Env.MAX_FUTURE_LENGTH(),
+                    GENESIS_REWARDS_TIMESTAMP: Env.GENESIS_REWARDS_TIMESTAMP(),
+                    version: Env.version()
+                })
+            ))
         });
 
         deployImpl({

diff --git a/script/releases/v1.0.3-slashing/1-eoa.s.sol b/script/releases/v1.0.3-slashing/1-eoa.s.sol
@@ -53,18 +53,21 @@ contract Deploy is EOADeployer {
         // Deploy RC
         deployImpl({
             name: type(RewardsCoordinator).name,
-            deployedTo: address(new RewardsCoordinator({
-                _delegationManager: Env.proxy.delegationManager(),
-                _strategyManager: Env.proxy.strategyManager(),
-                _allocationManager: Env.proxy.allocationManager(),
-                _pauserRegistry: Env.impl.pauserRegistry(),
-                _permissionController: Env.proxy.permissionController(),
-                _CALCULATION_INTERVAL_SECONDS: Env.CALCULATION_INTERVAL_SECONDS(),
-                _MAX_REWARDS_DURATION: Env.MAX_REWARDS_DURATION(),
-                _MAX_RETROACTIVE_LENGTH: Env.MAX_RETROACTIVE_LENGTH(),
-                _MAX_FUTURE_LENGTH: Env.MAX_FUTURE_LENGTH(),
-                _GENESIS_REWARDS_TIMESTAMP: Env.GENESIS_REWARDS_TIMESTAMP()
-            }))
+            deployedTo: address(new RewardsCoordinator(
+                IRewardsCoordinatorTypes.RewardsCoordinatorConstructorParams({
+                    delegationManager: Env.proxy.delegationManager(),
+                    strategyManager: Env.proxy.strategyManager(),
+                    allocationManager: Env.proxy.allocationManager(),
+                    pauserRegistry: Env.impl.pauserRegistry(),
+                    permissionController: Env.proxy.permissionController(),
+                    CALCULATION_INTERVAL_SECONDS: Env.CALCULATION_INTERVAL_SECONDS(),
+                    MAX_REWARDS_DURATION: Env.MAX_REWARDS_DURATION(),
+                    MAX_RETROACTIVE_LENGTH: Env.MAX_RETROACTIVE_LENGTH(),
+                    MAX_FUTURE_LENGTH: Env.MAX_FUTURE_LENGTH(),
+                    GENESIS_REWARDS_TIMESTAMP: Env.GENESIS_REWARDS_TIMESTAMP(),
+                    version: Env.version()
+                })
+            ))
         });
 
         vm.stopBroadcast();

diff --git a/script/utils/ExistingDeploymentParser.sol b/script/utils/ExistingDeploymentParser.sol
@@ -50,6 +50,7 @@ contract ExistingDeploymentParser is Script, Logger {
     /// EigenLayer Contract Parameters
     /// -----------------------------------------------------------------------
 
+    string public SEMVER;
     /// @dev AllocationManager
     uint256 ALLOCATION_MANAGER_INIT_PAUSED_STATUS;
     uint32 DEALLOCATION_DELAY;
@@ -193,6 +194,8 @@ contract ExistingDeploymentParser is Script, Logger {
         // READ JSON CONFIG DATA
         string memory json = cheats.readFile(existingDeploymentInfoPath);
 
+        SEMVER = stdJson.readString(json, ".parameters.version");
+
         // check that the chainID matches the one in the config
         uint256 configChainId = json.readUint(".chainInfo.chainId");
         assertEq(configChainId, currentChainId, "You are on the wrong chain for this config");
@@ -221,7 +224,8 @@ contract ExistingDeploymentParser is Script, Logger {
             eigenLayerPauserReg, 
             permissionController, 
             DEALLOCATION_DELAY, 
-            ALLOCATION_CONFIGURATION_DELAY
+            ALLOCATION_CONFIGURATION_DELAY,
+            SEMVER
         );
         allocationManager = AllocationManager(
             address(new TransparentUpgradeableProxy(address(allocationManagerImplementation), address(eigenLayerProxyAdmin), ""))