fix: signature utils (#1015)

### Changes: - *Dynamic Domain Separator:* `SignatureUtils.domainSeparator()` is now recomputed for each signature verification. This eliminates the need for storing initial values in storage or as immutables, which is important for beacon proxy support. - ~*Version Bump Command:* Introduced `make bump-version VERSION=2`, which automatically updates the version function's return values.~ - *Version Fn + Constructor Param:* Adds an immutable oz `ShortString` that's set in the constructor.
Layr-Labs · Feb 14, 2025 · 067010c · 067010c
1 parent 7b78901
commit 067010c
Show file tree

Hide file tree

Showing 99 changed files with 791 additions and 4,339 deletions.
diff --git a/Makefile b/Makefile
@@ -45,4 +45,4 @@ gha-docker:
 	docker run -v $(PWD):/build -w /build --rm -i ${CONTAINER_NAME}:latest bash -c "make gha"
 
 storage-report:
-	bash "bin/storage-report.sh" "docs/storage-report/"
+	bash "bin/storage-report.sh" "docs/storage-report/"
diff --git a/script/configs/devnet/deploy_from_scratch.anvil.config.json b/script/configs/devnet/deploy_from_scratch.anvil.config.json
@@ -51,5 +51,6 @@
        "OPERATOR_SET_GENESIS_REWARDS_TIMESTAMP": 1720656000,
        "OPERATOR_SET_MAX_RETROACTIVE_LENGTH": 2592000
   },
-  "ethPOSDepositAddress": "0x00000000219ab540356cBB839Cbe05303d7705Fa"
+  "ethPOSDepositAddress": "0x00000000219ab540356cBB839Cbe05303d7705Fa",
+  "semver": "v1.0.3"
 }
diff --git a/script/configs/devnet/deploy_from_scratch.holesky.config.json b/script/configs/devnet/deploy_from_scratch.holesky.config.json
@@ -51,5 +51,6 @@
        "OPERATOR_SET_GENESIS_REWARDS_TIMESTAMP": 1720656000,
        "OPERATOR_SET_MAX_RETROACTIVE_LENGTH": 2592000
   },
-  "ethPOSDepositAddress": "0x00000000219ab540356cBB839Cbe05303d7705Fa"
-}
+  "ethPOSDepositAddress": "0x00000000219ab540356cBB839Cbe05303d7705Fa",
+  "semver": "v0.0.0"
+}
diff --git a/script/configs/devnet/deploy_from_scratch.holesky.slashing.config.json b/script/configs/devnet/deploy_from_scratch.holesky.slashing.config.json
@@ -43,5 +43,6 @@
       "DEALLOCATION_DELAY": 86400,
       "ALLOCATION_CONFIGURATION_DELAY": 600
     },
-    "ethPOSDepositAddress": "0x4242424242424242424242424242424242424242"
+    "ethPOSDepositAddress": "0x4242424242424242424242424242424242424242",
+     "semver": "v0.0.0"
   }
diff --git a/script/configs/local/deploy_from_scratch.anvil.config.json b/script/configs/local/deploy_from_scratch.anvil.config.json
@@ -57,5 +57,6 @@
           "DEALLOCATION_DELAY": 900,
           "ALLOCATION_CONFIGURATION_DELAY": 1200
      },
-     "ethPOSDepositAddress": "0x00000000219ab540356cBB839Cbe05303d7705Fa"
+     "ethPOSDepositAddress": "0x00000000219ab540356cBB839Cbe05303d7705Fa",
+     "semver": "v0.0.0"
 }
diff --git a/script/configs/local/deploy_from_scratch.slashing.anvil.config.json b/script/configs/local/deploy_from_scratch.slashing.anvil.config.json
@@ -57,5 +57,6 @@
     "OPERATOR_SET_GENESIS_REWARDS_TIMESTAMP": 1720656000,
     "OPERATOR_SET_MAX_RETROACTIVE_LENGTH": 2592000
   },
-  "ethPOSDepositAddress": "0x00000000219ab540356cBB839Cbe05303d7705Fa"
+  "ethPOSDepositAddress": "0x00000000219ab540356cBB839Cbe05303d7705Fa",
+  "semver": "v0.0.0"
 }
diff --git a/script/configs/mainnet/mainnet-addresses.config.json b/script/configs/mainnet/mainnet-addresses.config.json
@@ -75,6 +75,7 @@
         "executorMultisig": "0x369e6F597e22EaB55fFb173C6d9cD234BD699111",
         "operationsMultisig": "0xBE1685C81aA44FF9FB319dD389addd9374383e90",
         "pauserMultisig": "0x5050389572f2d220ad927CcbeA0D406831012390",
-        "timelock": "0xA6Db1A8C5a981d1536266D2a393c5F8dDb210EAF"
+        "timelock": "0xA6Db1A8C5a981d1536266D2a393c5F8dDb210EAF",
+        "semver": "v0.5.4"
     }
 }
diff --git a/script/deploy/devnet/deploy_from_scratch.s.sol b/script/deploy/devnet/deploy_from_scratch.s.sol
@@ -76,6 +76,8 @@ contract DeployFromScratch is Script, Test {
     // strategies deployed
     StrategyBaseTVLLimits[] public deployedStrategyArray;
 
+    string SEMVER;
+
     // IMMUTABLES TO SET
     uint64 GOERLI_GENESIS_TIME = 1616508000;
 
@@ -121,6 +123,8 @@ contract DeployFromScratch is Script, Test {
         string memory config_data = vm.readFile(deployConfigPath);
         // bytes memory parsedData = vm.parseJson(config_data);
 
+        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");
         DELEGATION_WITHDRAWAL_DELAY_BLOCKS = stdJson.readUint(config_data, ".delegation.init_withdrawal_delay_blocks");
@@ -227,37 +231,58 @@ contract DeployFromScratch is Script, Test {
         eigenPodImplementation = new EigenPod(
             ethPOSDeposit,
             eigenPodManager,
-            GOERLI_GENESIS_TIME
+            GOERLI_GENESIS_TIME,
+            SEMVER
         );
 
         eigenPodBeacon = new UpgradeableBeacon(address(eigenPodImplementation));
 
         // Second, deploy the *implementation* contracts, using the *proxy contracts* as inputs
 
-        delegationImplementation = new DelegationManager(strategyManager, eigenPodManager, allocationManager, eigenLayerPauserReg, permissionController, MIN_WITHDRAWAL_DELAY);
-        strategyManagerImplementation = new StrategyManager(delegation, eigenLayerPauserReg);
-        avsDirectoryImplementation = new AVSDirectory(delegation, eigenLayerPauserReg);
+        delegationImplementation = new DelegationManager(
+            strategyManager, 
+            eigenPodManager, 
+            allocationManager, 
+            eigenLayerPauserReg, 
+            permissionController, 
+            MIN_WITHDRAWAL_DELAY,
+            SEMVER
+        );
+
+        strategyManagerImplementation = new StrategyManager(delegation, eigenLayerPauserReg, SEMVER);
+        avsDirectoryImplementation = new AVSDirectory(delegation, eigenLayerPauserReg, SEMVER);
         eigenPodManagerImplementation = new EigenPodManager(
             ethPOSDeposit,
             eigenPodBeacon,
             delegation,
-            eigenLayerPauserReg
+            eigenLayerPauserReg,
+            SEMVER
         );
         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
+            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
         );
-        allocationManagerImplementation = new AllocationManager(delegation, eigenLayerPauserReg, permissionController, DEALLOCATION_DELAY, ALLOCATION_CONFIGURATION_DELAY);
-        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.
         {
@@ -325,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
@@ -79,6 +79,8 @@ contract DeployFromScratch is Script, Test {
     // strategies deployed
     StrategyBaseTVLLimits[] public deployedStrategyArray;
 
+    string SEMVER;
+
     // IMMUTABLES TO SET
     uint64 GOERLI_GENESIS_TIME = 1616508000;
 
@@ -124,6 +126,8 @@ contract DeployFromScratch is Script, Test {
         string memory config_data = vm.readFile(deployConfigPath);
         // bytes memory parsedData = vm.parseJson(config_data);
 
+        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");
         DELEGATION_WITHDRAWAL_DELAY_BLOCKS = stdJson.readUint(config_data, ".delegation.init_withdrawal_delay_blocks");
@@ -240,35 +244,54 @@ 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));
 
         // Second, deploy the *implementation* contracts, using the *proxy contracts* as inputs
 
-        delegationImplementation = new DelegationManager(strategyManager, eigenPodManager, allocationManager, eigenLayerPauserReg, permissionController, MIN_WITHDRAWAL_DELAY);
-        strategyManagerImplementation = new StrategyManager(delegation, eigenLayerPauserReg);
-        avsDirectoryImplementation = new AVSDirectory(delegation, eigenLayerPauserReg);
+        delegationImplementation = new DelegationManager(
+            strategyManager, 
+            eigenPodManager, 
+            allocationManager, 
+            eigenLayerPauserReg, 
+            permissionController, 
+            MIN_WITHDRAWAL_DELAY,
+            SEMVER
+        );
+        strategyManagerImplementation = new StrategyManager(delegation, eigenLayerPauserReg, SEMVER);
+        avsDirectoryImplementation = new AVSDirectory(delegation, eigenLayerPauserReg, SEMVER);
         eigenPodManagerImplementation = new EigenPodManager(
             ethPOSDeposit,
             eigenPodBeacon,
             delegation,
-            eigenLayerPauserReg
+            eigenLayerPauserReg,
+            SEMVER
         );
         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
+            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
         );
-        allocationManagerImplementation = new AllocationManager(delegation, eigenLayerPauserReg, permissionController, DEALLOCATION_DELAY, ALLOCATION_CONFIGURATION_DELAY);
-        permissionControllerImplementation = new PermissionController();
+        permissionControllerImplementation = new PermissionController(SEMVER);
 
         // Third, upgrade the proxy contracts to use the correct implementation contracts and initialize them.
         {
@@ -340,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
@@ -73,6 +73,8 @@ contract DeployFromScratch is Script, Test {
     address operationsMultisig;
     address pauserMultisig;
 
+    string SEMVER;
+
     // the ETH2 deposit contract -- if not on mainnet, we deploy a mock as stand-in
     IETHPOSDeposit public ethPOSDeposit;
 
@@ -124,6 +126,8 @@ contract DeployFromScratch is Script, Test {
         string memory config_data = vm.readFile(deployConfigPath);
         // bytes memory parsedData = vm.parseJson(config_data);
 
+        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");
         DELEGATION_INIT_PAUSED_STATUS = stdJson.readUint(config_data, ".delegation.init_paused_status");
@@ -234,36 +238,56 @@ contract DeployFromScratch is Script, Test {
         eigenPodImplementation = new EigenPod(
             ethPOSDeposit,
             eigenPodManager,
-            GOERLI_GENESIS_TIME
+            GOERLI_GENESIS_TIME,
+            SEMVER
         );
 
         eigenPodBeacon = new UpgradeableBeacon(address(eigenPodImplementation));
 
         // Second, deploy the *implementation* contracts, using the *proxy contracts* as inputs
 
-        delegationImplementation = new DelegationManager(strategyManager, eigenPodManager, allocationManager, eigenLayerPauserReg, permissionController, MIN_WITHDRAWAL_DELAY);
-        strategyManagerImplementation = new StrategyManager(delegation, eigenLayerPauserReg);
-        avsDirectoryImplementation = new AVSDirectory(delegation, eigenLayerPauserReg);
+        delegationImplementation = new DelegationManager(
+            strategyManager, 
+            eigenPodManager, 
+            allocationManager, 
+            eigenLayerPauserReg, 
+            permissionController, 
+            MIN_WITHDRAWAL_DELAY,
+            SEMVER
+        );
+        strategyManagerImplementation = new StrategyManager(delegation, eigenLayerPauserReg, SEMVER);
+        avsDirectoryImplementation = new AVSDirectory(delegation, eigenLayerPauserReg, SEMVER);
         eigenPodManagerImplementation = new EigenPodManager(
             ethPOSDeposit,
             eigenPodBeacon,
             delegation,
-            eigenLayerPauserReg
+            eigenLayerPauserReg,
+            SEMVER
         );
         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
+            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
         );
-        allocationManagerImplementation = new AllocationManager(delegation, eigenLayerPauserReg, permissionController, DEALLOCATION_DELAY, ALLOCATION_CONFIGURATION_DELAY);
-        permissionControllerImplementation = new PermissionController();
+        permissionControllerImplementation = new PermissionController(SEMVER);
 
         // Third, upgrade the proxy contracts to use the correct implementation contracts and initialize them.
         {
@@ -335,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)) {