chore: bump up eigenlayer-contracts dependency

.gitmodules

@@ -4,7 +4,7 @@
 [submodule "lib/eigenlayer-contracts"]
 	path = lib/eigenlayer-contracts
 	url = https://github.com/Layr-labs/eigenlayer-contracts
-	branch = dev
+	branch = release-dev/multichain
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/Openzeppelin/openzeppelin-contracts

test/integration/IntegrationDeployer.t.sol

@@ -24,6 +24,8 @@ import "eigenlayer-contracts/src/contracts/pods/EigenPodManager.sol";
 import "eigenlayer-contracts/src/contracts/pods/EigenPod.sol";
 import "eigenlayer-contracts/src/contracts/permissions/PauserRegistry.sol";
 import "eigenlayer-contracts/src/contracts/permissions/PermissionController.sol";
+import "eigenlayer-contracts/src/contracts/core/SlashEscrowFactory.sol";
+import "eigenlayer-contracts/src/contracts/core/SlashEscrow.sol";
 import "eigenlayer-contracts/src/test/mocks/ETHDepositMock.sol";
 
 // Middleware contracts
@@ -62,6 +64,7 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
     ETHPOSDepositMock ethPOSDeposit;
     AllocationManager public allocationManager;
     PermissionController permissionController;
+    SlashEscrowFactory slashEscrowFactory;
 
     // Base strategy implementation in case we want to create more strategies later
     StrategyBase baseStrategyImplementation;
@@ -188,8 +191,14 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
             )
         );
 
+        slashEscrowFactory = SlashEscrowFactory(
+            address(
+                new TransparentUpgradeableProxy(address(emptyContract), address(proxyAdmin), "")
+            )
+        );
+
         // Deploy EigenPod Contracts
-        pod = new EigenPod(ethPOSDeposit, eigenPodManager, GENESIS_TIME_LOCAL, "v0.0.1");
+        pod = new EigenPod(ethPOSDeposit, eigenPodManager, "v0.0.1");
 
         eigenPodBeacon = new UpgradeableBeacon(address(pod));
 
@@ -206,7 +215,7 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
             "v0.0.1"
         );
         StrategyManager strategyManagerImplementation =
-            new StrategyManager(delegationManager, pauserRegistry, "v0.0.1");
+            new StrategyManager(delegationManager, slashEscrowFactory, pauserRegistry, "v0.0.1");
         EigenPodManager eigenPodManagerImplementation = new EigenPodManager(
             ethPOSDeposit, eigenPodBeacon, delegationManager, pauserRegistry, "v0.0.1"
         );
@@ -238,6 +247,14 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
             "v0.0.1" // Added config parameter
         );
 
+        // Deploy SlashEscrow implementation
+        SlashEscrow slashEscrowImpl = new SlashEscrow();
+
+        // Deploy SlashEscrowFactory implementation
+        SlashEscrowFactory slashEscrowFactoryImplementation = new SlashEscrowFactory(
+            allocationManager, strategyManager, pauserRegistry, slashEscrowImpl, "v0.0.1"
+        );
+
         // Third, upgrade the proxy contracts to point to the implementations
         uint256 minWithdrawalDelayBlocks = 7 days / 12 seconds;
         IStrategy[] memory initializeStrategiesToSetDelayBlocks = new IStrategy[](0);
@@ -247,9 +264,7 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
             ITransparentUpgradeableProxy(payable(address(delegationManager))),
             address(delegationImplementation),
             abi.encodeWithSelector(
-                DelegationManager.initialize.selector,
-                eigenLayerReputedMultisig, // initialOwner
-                0 /* initialPausedStatus */
+                DelegationManager.initialize.selector, 0 /* initialPausedStatus */
             )
         );
         // StrategyManager
@@ -308,11 +323,22 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
             address(allocationManagerImplementation),
             abi.encodeWithSelector(
                 AllocationManager.initialize.selector,
-                eigenLayerReputedMultisig, // initialOwner
                 0 // initialPausedStatus
             )
         );
 
+        // SlashEscrowFactory
+        proxyAdmin.upgradeAndCall(
+            ITransparentUpgradeableProxy(payable(address(slashEscrowFactory))),
+            address(slashEscrowFactoryImplementation),
+            abi.encodeWithSelector(
+                SlashEscrowFactory.initialize.selector,
+                eigenLayerReputedMultisig, // initialOwner
+                0, // initialPausedStatus
+                7 days / 12 // initialGlobalDelayBlocks (7 days worth of blocks)
+            )
+        );
+
         // Deploy and whitelist strategies
         baseStrategyImplementation = new StrategyBase(strategyManager, pauserRegistry, "v0.0.1");
         for (uint256 i = 0; i < MAX_STRATEGY_COUNT; i++) {

test/mocks/AllocationManagerMock.sol

@@ -13,7 +13,10 @@ import {ISemVerMixin} from "eigenlayer-contracts/src/contracts/interfaces/ISemVe
 contract AllocationManagerIntermediate is IAllocationManager {
     function initialize(address initialOwner, uint256 initialPausedStatus) external virtual {}
 
-    function slashOperator(address avs, SlashingParams calldata params) external virtual {}
+    function slashOperator(
+        address avs,
+        SlashingParams calldata params
+    ) external virtual returns (uint256 slashId, uint256[] memory shares) {}
 
     function modifyAllocations(
         address operator,
@@ -183,10 +186,76 @@ contract AllocationManagerIntermediate is IAllocationManager {
     function version() external pure virtual returns (string memory) {
         return "v0.0.1";
     }
+
+    function DEALLOCATION_DELAY() external pure virtual returns (uint32) {}
+
+    function createRedistributingOperatorSets(
+        address avs,
+        CreateSetParams[] calldata params,
+        address[] calldata redistributionRecipients
+    ) external virtual {}
+
+    function getRedistributionRecipient(
+        OperatorSet memory operatorSet
+    ) external pure virtual returns (address) {}
+
+    function getSlashCount(
+        OperatorSet memory operatorSet
+    ) external pure virtual returns (uint256) {}
+
+    function initialize(
+        uint256 initialPausedStatus
+    ) external virtual {}
+
+    function isOperatorRedistributable(
+        address operator
+    ) external pure virtual returns (bool) {}
+
+    function isRedistributingOperatorSet(
+        OperatorSet memory operatorSet
+    ) external pure virtual returns (bool) {}
 }
 
 contract AllocationManagerMock is AllocationManagerIntermediate {
-    uint32 public constant DEALLOCATION_DELAY = 86400;
+    uint32 internal constant _DEALLOCATION_DELAY = 86400;
+
+    function DEALLOCATION_DELAY() external pure override returns (uint32) {
+        return _DEALLOCATION_DELAY;
+    }
+
+    function createRedistributingOperatorSets(
+        address avs,
+        CreateSetParams[] calldata params,
+        address[] calldata redistributionRecipients
+    ) external override {}
+
+    function getRedistributionRecipient(
+        OperatorSet memory operatorSet
+    ) external pure override returns (address) {
+        return address(0);
+    }
+
+    function getSlashCount(
+        OperatorSet memory operatorSet
+    ) external pure override returns (uint256) {
+        return 0;
+    }
+
+    function initialize(
+        uint256 initialPausedStatus
+    ) external override {}
+
+    function isOperatorRedistributable(
+        address operator
+    ) external pure override returns (bool) {
+        return false;
+    }
+
+    function isRedistributingOperatorSet(
+        OperatorSet memory operatorSet
+    ) external pure override returns (bool) {
+        return false;
+    }
 
     function getAllocatedStake(
         address operator,

test/mocks/DelegationMock.sol

@@ -18,10 +18,15 @@ import {
 } from "eigenlayer-contracts/src/contracts/interfaces/ISignatureUtilsMixin.sol";
 import {ISemVerMixin} from "eigenlayer-contracts/src/contracts/interfaces/ISemVerMixin.sol";
 import {SlashingLib} from "eigenlayer-contracts/src/contracts/libraries/SlashingLib.sol";
+import {OperatorSet} from "eigenlayer-contracts/src/contracts/libraries/OperatorSetLib.sol";
 
 contract DelegationIntermediate is IDelegationManager {
     function initialize(address initialOwner, uint256 initialPausedStatus) external virtual {}
 
+    function initialize(
+        uint256 initialPausedStatus
+    ) external virtual {}
+
     function registerAsOperator(
         OperatorDetails calldata registeringOperatorDetails,
         uint32 allocationDelay,
@@ -240,6 +245,15 @@ contract DelegationIntermediate is IDelegationManager {
         uint64 newMaxMagnitude
     ) external {}
 
+    function slashOperatorShares(
+        address operator,
+        OperatorSet calldata operatorSet,
+        uint256 slashId,
+        IStrategy strategy,
+        uint64 prevMaxMagnitude,
+        uint64 newMaxMagnitude
+    ) external virtual returns (uint256 totalDepositSharesToSlash) {}
+
     function getQueuedWithdrawal(
         bytes32 withdrawalRoot
     )
@@ -309,6 +323,10 @@ contract DelegationMock is DelegationIntermediate {
     mapping(address => bool) internal _isOperator;
     mapping(address => mapping(IStrategy => uint256)) internal _weightOf;
 
+    function initialize(
+        uint256 initialPausedStatus
+    ) external override {}
+
     function setOperatorShares(
         address operator,
         IStrategy strategy,

test/mocks/EigenPodManagerMock.sol

@@ -5,6 +5,7 @@ import "forge-std/Test.sol";
 import "eigenlayer-contracts/src/contracts/permissions/Pausable.sol";
 import "eigenlayer-contracts/src/contracts/interfaces/IEigenPodManager.sol";
 import "eigenlayer-contracts/src/contracts/interfaces/ISemVerMixin.sol";
+import {OperatorSet} from "eigenlayer-contracts/src/contracts/libraries/OperatorSetLib.sol";
 
 contract EigenPodManagerMock is Test, Pausable, IEigenPodManager {
     receive() external payable {}
@@ -126,6 +127,13 @@ contract EigenPodManagerMock is Test, Pausable, IEigenPodManager {
 
     function increaseBurnableShares(IStrategy strategy, uint256 addedSharesToBurn) external {}
 
+    function increaseBurnOrRedistributableShares(
+        OperatorSet calldata operatorSet,
+        uint256 slashId,
+        IStrategy strategy,
+        uint256 addedSharesToBurn
+    ) external {}
+
     /**
      * @notice Returns the version of the contract
      * @return The version string

test/mocks/KeyRegistrarMock.sol

@@ -53,9 +53,9 @@ contract KeyRegistrarMock is IKeyRegistrar {
         address operator
     ) external pure returns (bool) {}
 
-    function getOperatorSetConfig(
+    function getOperatorSetCurveType(
         OperatorSet memory operatorSet
-    ) external pure returns (OperatorSetConfig memory) {}
+    ) external pure returns (CurveType) {}
 
     function getBN254Key(
         OperatorSet memory operatorSet,
@@ -73,6 +73,17 @@ contract KeyRegistrarMock is IKeyRegistrar {
         address operator
     ) external pure returns (bytes memory) {}
 
+    /**
+     * @notice Gets the ECDSA public key for an operator with a specific operator set
+     * @param operatorSet The operator set to get the key for
+     * @param operator Address of the operator
+     * @return pubkey The ECDSA public key
+     */
+    function getECDSAAddress(
+        OperatorSet memory operatorSet,
+        address operator
+    ) external pure returns (address) {}
+
     function isKeyGloballyRegistered(
         bytes32 keyHash
     ) external view returns (bool) {}

test/unit/middlewareV2/AVSRegistrarAllowlistUnit.t.sol

@@ -278,6 +278,7 @@ contract AVSRegistrarWithAllowlistUnitTests_deregisterOperator is
         address notAllocationManager
     ) public {
         cheats.assume(notAllocationManager != address(allocationManagerMock));
+        cheats.assume(notAllocationManager != address(proxyAdmin));
 
         cheats.prank(notAllocationManager);
         cheats.expectRevert(NotAllocationManager.selector);

test/unit/middlewareV2/AVSRegistrarSocketUnit.t.sol

@@ -136,6 +136,7 @@ contract AVSRegistrarSocketUnitTests_updateSocket is AVSRegistrarSocketUnitTests
     ) public {
         _registerOperator(defaultOperatorSetId.toArrayU32());
         cheats.assume(notOperator != defaultOperator);
+        cheats.assume(notOperator != address(proxyAdmin));
 
         cheats.prank(notOperator);
         cheats.expectRevert(CallerNotOperator.selector);

test/unit/middlewareV2/AVSRegistrarUnit.t.sol

@@ -31,6 +31,7 @@ contract AVSRegistrarUnitTests_RegisterOperator is AVSRegistrarUnitTests {
         address notAllocationManager
     ) public {
         cheats.assume(notAllocationManager != address(allocationManagerMock));
+        cheats.assume(notAllocationManager != address(proxyAdmin));
 
         cheats.prank(notAllocationManager);
         cheats.expectRevert(NotAllocationManager.selector);
@@ -66,6 +67,7 @@ contract AVSRegistrarUnitTests_DeregisterOperator is AVSRegistrarUnitTests {
         address notAllocationManager
     ) public {
         cheats.assume(notAllocationManager != address(allocationManagerMock));
+        cheats.assume(notAllocationManager != address(proxyAdmin));
 
         cheats.prank(notAllocationManager);
         cheats.expectRevert(NotAllocationManager.selector);