feat: split AllocationManager

.github/workflows/validate-deployment-scripts.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@82dee4ba654bd2146511f85f0d013af94670c4de
         with:
-          version: stable
+          version: v1.3.5
 
       # Run Forge's formatting checker to ensure consistent code style.
       - name: "Forge Fmt"

foundry.toml

@@ -22,7 +22,7 @@
         "forge-std/=lib/forge-std/src/"
     ]
     # Specifies the exact version of Solidity to use, overriding auto-detection.
-    solc_version = '0.8.27'
+    solc_version = '0.8.30'
     # If enabled, treats Solidity compiler warnings as errors, preventing artifact generation if warnings are present.
     deny_warnings = true 
     # If set to true, changes compilation pipeline to go through the new IR optimizer.

script/deploy/devnet/deploy_from_scratch.s.sol

@@ -13,6 +13,7 @@ import "../../../src/contracts/core/DelegationManager.sol";
 import "../../../src/contracts/core/AVSDirectory.sol";
 import "../../../src/contracts/core/RewardsCoordinator.sol";
 import "../../../src/contracts/core/AllocationManager.sol";
+import "../../../src/contracts/core/AllocationManagerView.sol";
 import "../../../src/contracts/permissions/PermissionController.sol";
 import "../../../src/contracts/strategies/StrategyBaseTVLLimits.sol";
 import "../../../src/contracts/strategies/StrategyFactory.sol";
@@ -60,6 +61,8 @@ contract DeployFromScratch is Script, Test {
     StrategyBase public baseStrategyImplementation;
     AllocationManager public allocationManagerImplementation;
     AllocationManager public allocationManager;
+    AllocationManagerView public allocationManagerView;
+    AllocationManagerView public allocationManagerViewImplementation;
     PermissionController public permissionController;
     PermissionController public permissionControllerImplementation;
 
@@ -211,6 +214,9 @@ contract DeployFromScratch is Script, Test {
         strategyFactory = StrategyFactory(
             address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenLayerProxyAdmin), ""))
         );
+        allocationManagerView = AllocationManagerView(
+            address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenLayerProxyAdmin), ""))
+        );
         permissionController = PermissionController(
             address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenLayerProxyAdmin), ""))
         );
@@ -228,22 +234,23 @@ contract DeployFromScratch is Script, Test {
         delegationImplementation = new DelegationManager(
             strategyManager,
             eigenPodManager,
-            allocationManager,
+            IAllocationManager(address(allocationManager)),
             eigenLayerPauserReg,
             permissionController,
             MIN_WITHDRAWAL_DELAY,
             SEMVER
         );
 
-        strategyManagerImplementation = new StrategyManager(allocationManager, delegation, eigenLayerPauserReg, SEMVER);
+        strategyManagerImplementation =
+            new StrategyManager(IAllocationManager(address(allocationManager)), delegation, eigenLayerPauserReg, SEMVER);
         avsDirectoryImplementation = new AVSDirectory(delegation, eigenLayerPauserReg, SEMVER);
         eigenPodManagerImplementation =
             new EigenPodManager(ethPOSDeposit, eigenPodBeacon, delegation, eigenLayerPauserReg, SEMVER);
         rewardsCoordinatorImplementation = new RewardsCoordinator(
             IRewardsCoordinatorTypes.RewardsCoordinatorConstructorParams(
                 delegation,
                 strategyManager,
-                allocationManager,
+                IAllocationManager(address(allocationManager)),
                 eigenLayerPauserReg,
                 permissionController,
                 REWARDS_COORDINATOR_CALCULATION_INTERVAL_SECONDS,
@@ -255,6 +262,7 @@ contract DeployFromScratch is Script, Test {
             )
         );
         allocationManagerImplementation = new AllocationManager(
+            allocationManagerView,
             delegation,
             eigenStrategy,
             eigenLayerPauserReg,
@@ -263,6 +271,8 @@ contract DeployFromScratch is Script, Test {
             ALLOCATION_CONFIGURATION_DELAY,
             SEMVER
         );
+        allocationManagerViewImplementation =
+            new AllocationManagerView(delegation, eigenStrategy, DEALLOCATION_DELAY, ALLOCATION_CONFIGURATION_DELAY);
         permissionControllerImplementation = new PermissionController(SEMVER);
         strategyFactoryImplementation = new StrategyFactory(strategyManager, eigenLayerPauserReg, SEMVER);
 
@@ -319,6 +329,11 @@ contract DeployFromScratch is Script, Test {
             )
         );
 
+        eigenLayerProxyAdmin.upgrade(
+            ITransparentUpgradeableProxy(payable(address(allocationManagerView))),
+            address(allocationManagerViewImplementation)
+        );
+
         eigenLayerProxyAdmin.upgrade(
             ITransparentUpgradeableProxy(payable(address(permissionController))),
             address(permissionControllerImplementation)
@@ -480,7 +495,7 @@ contract DeployFromScratch is Script, Test {
             "rewardsCoordinator: strategyManager address not set correctly"
         );
         require(
-            delegationContract.allocationManager() == allocationManager,
+            delegationContract.allocationManager() == IAllocationManager(address(allocationManager)),
             "delegationManager: allocationManager address not set correctly"
         );
         require(

script/deploy/local/deploy_from_scratch.slashing.s.sol

@@ -14,6 +14,7 @@ import "../../../src/contracts/core/DelegationManager.sol";
 import "../../../src/contracts/core/AVSDirectory.sol";
 import "../../../src/contracts/core/RewardsCoordinator.sol";
 import "../../../src/contracts/core/AllocationManager.sol";
+import "../../../src/contracts/core/AllocationManagerView.sol";
 import "../../../src/contracts/permissions/PermissionController.sol";
 
 import "../../../src/contracts/strategies/StrategyBaseTVLLimits.sol";
@@ -65,6 +66,8 @@ contract DeployFromScratch is Script, Test {
     StrategyBase public baseStrategyImplementation;
     AllocationManager public allocationManagerImplementation;
     AllocationManager public allocationManager;
+    AllocationManagerView public allocationManagerView;
+    AllocationManagerView public allocationManagerViewImplementation;
     PermissionController public permissionControllerImplementation;
     PermissionController public permissionController;
 
@@ -219,6 +222,9 @@ contract DeployFromScratch is Script, Test {
         allocationManager = AllocationManager(
             address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenLayerProxyAdmin), ""))
         );
+        allocationManagerView = AllocationManagerView(
+            address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenLayerProxyAdmin), ""))
+        );
         permissionController = PermissionController(
             address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenLayerProxyAdmin), ""))
         );
@@ -238,21 +244,22 @@ contract DeployFromScratch is Script, Test {
         delegationImplementation = new DelegationManager(
             strategyManager,
             eigenPodManager,
-            allocationManager,
+            IAllocationManager(address(allocationManager)),
             eigenLayerPauserReg,
             permissionController,
             MIN_WITHDRAWAL_DELAY,
             SEMVER
         );
-        strategyManagerImplementation = new StrategyManager(allocationManager, delegation, eigenLayerPauserReg, SEMVER);
+        strategyManagerImplementation =
+            new StrategyManager(IAllocationManager(address(allocationManager)), delegation, eigenLayerPauserReg, SEMVER);
         avsDirectoryImplementation = new AVSDirectory(delegation, eigenLayerPauserReg, SEMVER);
         eigenPodManagerImplementation =
             new EigenPodManager(ethPOSDeposit, eigenPodBeacon, delegation, eigenLayerPauserReg, SEMVER);
         rewardsCoordinatorImplementation = new RewardsCoordinator(
             IRewardsCoordinatorTypes.RewardsCoordinatorConstructorParams(
                 delegation,
                 strategyManager,
-                allocationManager,
+                IAllocationManager(address(allocationManager)),
                 eigenLayerPauserReg,
                 permissionController,
                 REWARDS_COORDINATOR_CALCULATION_INTERVAL_SECONDS,
@@ -264,6 +271,7 @@ contract DeployFromScratch is Script, Test {
             )
         );
         allocationManagerImplementation = new AllocationManager(
+            allocationManagerView,
             delegation,
             eigenStrategy,
             eigenLayerPauserReg,
@@ -272,6 +280,8 @@ contract DeployFromScratch is Script, Test {
             ALLOCATION_CONFIGURATION_DELAY,
             SEMVER
         );
+        allocationManagerViewImplementation =
+            new AllocationManagerView(delegation, eigenStrategy, DEALLOCATION_DELAY, ALLOCATION_CONFIGURATION_DELAY);
         permissionControllerImplementation = new PermissionController(SEMVER);
 
         // Third, upgrade the proxy contracts to use the correct implementation contracts and initialize them.
@@ -334,6 +344,11 @@ contract DeployFromScratch is Script, Test {
             )
         );
 
+        eigenLayerProxyAdmin.upgrade(
+            ITransparentUpgradeableProxy(payable(address(allocationManagerView))),
+            address(allocationManagerViewImplementation)
+        );
+
         eigenLayerProxyAdmin.upgrade(
             ITransparentUpgradeableProxy(payable(address(permissionController))),
             address(permissionControllerImplementation)

script/releases/Env.sol

@@ -11,12 +11,14 @@ import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.so
 
 /// core/
 import "src/contracts/core/AllocationManager.sol";
+import "src/contracts/core/AllocationManagerView.sol";
 import "src/contracts/core/AVSDirectory.sol";
 import "src/contracts/core/DelegationManager.sol";
 import "src/contracts/core/RewardsCoordinator.sol";
 import "src/contracts/interfaces/IRewardsCoordinator.sol";
 import "src/contracts/core/StrategyManager.sol";
 import "src/contracts/core/ReleaseManager.sol";
+import "src/contracts/core/ProtocolRegistry.sol";
 
 /// permissions/
 import "src/contracts/permissions/PauserRegistry.sol";
@@ -206,14 +208,20 @@ library Env {
      */
     function allocationManager(
         DeployedProxy
-    ) internal view returns (AllocationManager) {
-        return AllocationManager(_deployedProxy(type(AllocationManager).name));
+    ) internal view returns (IAllocationManager) {
+        return IAllocationManager(_deployedProxy(type(AllocationManager).name));
     }
 
     function allocationManager(
         DeployedImpl
-    ) internal view returns (AllocationManager) {
-        return AllocationManager(_deployedImpl(type(AllocationManager).name));
+    ) internal view returns (IAllocationManager) {
+        return IAllocationManager(_deployedImpl(type(AllocationManager).name));
+    }
+
+    function allocationManagerView(
+        DeployedImpl
+    ) internal view returns (IAllocationManagerView) {
+        return IAllocationManagerView(_deployedImpl(type(AllocationManagerView).name));
     }
 
     function avsDirectory(
@@ -276,6 +284,18 @@ library Env {
         return ReleaseManager(_deployedImpl(type(ReleaseManager).name));
     }
 
+    function protocolRegistry(
+        DeployedProxy
+    ) internal view returns (ProtocolRegistry) {
+        return ProtocolRegistry(_deployedProxy(type(ProtocolRegistry).name));
+    }
+
+    function protocolRegistry(
+        DeployedImpl
+    ) internal view returns (ProtocolRegistry) {
+        return ProtocolRegistry(_deployedImpl(type(ProtocolRegistry).name));
+    }
+
     /**
      * permissions/
      */

script/releases/v1.7.0-v1.8.0-multichain-hourglass-combined/1-deploySourceChain.s.sol

@@ -25,7 +25,7 @@ contract DeploySourceChain is EOADeployer {
             deployedTo: address(
                 new KeyRegistrar({
                     _permissionController: Env.proxy.permissionController(),
-                    _allocationManager: Env.proxy.allocationManager(),
+                    _allocationManager: IAllocationManager(address(Env.proxy.allocationManager())),
                     _version: Env.deployVersion()
                 })
             )
@@ -48,7 +48,7 @@ contract DeploySourceChain is EOADeployer {
             name: type(CrossChainRegistry).name,
             deployedTo: address(
                 new CrossChainRegistry({
-                    _allocationManager: Env.proxy.allocationManager(),
+                    _allocationManager: IAllocationManager(address(Env.proxy.allocationManager())),
                     _keyRegistrar: Env.proxy.keyRegistrar(),
                     _permissionController: Env.proxy.permissionController(),
                     _pauserRegistry: Env.impl.pauserRegistry(),

script/tasks/complete_withdrawal_from_strategy.s.sol

@@ -75,7 +75,8 @@ contract CompleteWithdrawFromStrategy is Script, Test {
         DepositScalingFactor memory dsf = DepositScalingFactor(dm.depositScalingFactor(msg.sender, strategies[0]));
 
         // Get TM for Operator in strategies
-        uint64[] memory maxMagnitudes = am.getMaxMagnitudesAtBlock(msg.sender, strategies, startBlock);
+        uint64[] memory maxMagnitudes =
+            IAllocationManager(address(am)).getMaxMagnitudesAtBlock(msg.sender, strategies, startBlock);
         uint256 slashingFactor = _getSlashingFactor(em, msg.sender, strategies[0], maxMagnitudes[0]);
         uint256 sharesToWithdraw = dsf.calcWithdrawable(amount, slashingFactor);
 

script/utils/ExistingDeploymentParser.sol

@@ -10,6 +10,7 @@ import "../../src/contracts/core/DelegationManager.sol";
 import "../../src/contracts/core/AVSDirectory.sol";
 import "../../src/contracts/core/RewardsCoordinator.sol";
 import "../../src/contracts/core/AllocationManager.sol";
+import "../../src/contracts/core/AllocationManagerView.sol";
 import "../../src/contracts/permissions/PermissionController.sol";
 
 import "../../src/contracts/strategies/StrategyFactory.sol";
@@ -104,8 +105,11 @@ contract ExistingDeploymentParser is Script, Logger {
     UpgradeableBeacon public strategyBeacon;
 
     /// @dev AllocationManager
-    AllocationManager public allocationManager;
-    AllocationManager public allocationManagerImplementation;
+    IAllocationManager public allocationManager;
+    IAllocationManager public allocationManagerImplementation;
+
+    IAllocationManagerView public allocationManagerView;
+    IAllocationManagerView public allocationManagerViewImplementation;
 
     /// @dev AVSDirectory
     AVSDirectory public avsDirectory;
@@ -230,9 +234,16 @@ contract ExistingDeploymentParser is Script, Logger {
         );
 
         // AllocationManager
-        allocationManager = AllocationManager(json.readAddress(".addresses.allocationManager"));
+        allocationManager = IAllocationManager(json.readAddress(".addresses.allocationManager"));
         allocationManagerImplementation =
-            AllocationManager(json.readAddress(".addresses.allocationManagerImplementation"));
+            IAllocationManager(json.readAddress(".addresses.allocationManagerImplementation"));
+
+        // allocationManagerView = IAllocationManagerView(json.readAddress(".addresses.allocationManagerView"));
+
+        // FIXME: hotfix - remove later...
+        allocationManagerView = new AllocationManagerView(
+            delegationManager, eigenStrategy, DEALLOCATION_DELAY, ALLOCATION_CONFIGURATION_DELAY
+        );
 
         // AVSDirectory
         avsDirectory = AVSDirectory(json.readAddress(".addresses.avsDirectory"));

src/contracts/core/AVSDirectory.sol

@@ -7,7 +7,7 @@ import "@openzeppelin-upgrades/contracts/security/ReentrancyGuardUpgradeable.sol
 
 import "../mixins/SignatureUtilsMixin.sol";
 import "../permissions/Pausable.sol";
-import "./AVSDirectoryStorage.sol";
+import "./storage/AVSDirectoryStorage.sol";
 
 contract AVSDirectory is
     Initializable,