consolidate submodules

.gitmodules

@@ -7,10 +7,6 @@
 [submodule "contracts/lib/openzeppelin-contracts-upgradeable"]
 	path = contracts/lib/openzeppelin-contracts-upgradeable
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
-[submodule "contracts/lib/eigenlayer-contracts"]
-	path = contracts/lib/eigenlayer-contracts
-	url = https://github.com/Layr-Labs/eigenlayer-contracts
-	branch = m2-mainnet-fixes
 [submodule "contracts/lib/eigenlayer-middleware"]
 	path = contracts/lib/eigenlayer-middleware
 	url = https://github.com/Layr-Labs/eigenlayer-middleware

contracts/remappings.txt

@@ -1,6 +1,6 @@
 @openzeppelin-upgrades/=lib/openzeppelin-contracts-upgradeable/
 @openzeppelin/=lib/openzeppelin-contracts/
 eigenlayer-middleware/=lib/eigenlayer-middleware/src/
-eigenlayer-core/=lib/eigenlayer-contracts/src/
-eigenlayer-scripts/=lib/eigenlayer-contracts/script/
+eigenlayer-core/=lib/eigenlayer-middleware/lib/eigenlayer-contracts/src/
+eigenlayer-scripts/=lib/eigenlayer-middleware/lib/eigenlayer-contracts/script/
 forge-std/=lib/forge-std/src/

contracts/script/EigenDADeployer.s.sol

@@ -10,15 +10,15 @@ import {OperatorStateRetriever} from "eigenlayer-middleware/OperatorStateRetriev
 import {IRegistryCoordinator} from "eigenlayer-middleware/interfaces/IRegistryCoordinator.sol";
 import {IndexRegistry} from "eigenlayer-middleware/IndexRegistry.sol";
 import {IIndexRegistry} from "eigenlayer-middleware/interfaces/IIndexRegistry.sol";
-import {StakeRegistry} from "eigenlayer-middleware/StakeRegistry.sol";
-import {IStakeRegistry} from "eigenlayer-middleware/interfaces/IStakeRegistry.sol";
+import {StakeRegistry, IStrategy} from "eigenlayer-middleware/StakeRegistry.sol";
+import {IStakeRegistry, IDelegationManager} from "eigenlayer-middleware/interfaces/IStakeRegistry.sol";
 import {IServiceManager} from "eigenlayer-middleware/interfaces/IServiceManager.sol";
 import {IBLSApkRegistry} from "eigenlayer-middleware/interfaces/IBLSApkRegistry.sol";
 
-import {EigenDAServiceManager} from "../src/core/EigenDAServiceManager.sol";
+import {EigenDAServiceManager, IAVSDirectory} from "../src/core/EigenDAServiceManager.sol";
 import {EigenDAHasher} from "../src/libraries/EigenDAHasher.sol";
 
-import "eigenlayer-scripts/middleware/DeployOpenEigenLayer.s.sol";
+import {DeployOpenEigenLayer, ProxyAdmin, ERC20PresetFixedSupply, TransparentUpgradeableProxy, IPauserRegistry} from "eigenlayer-scripts/middleware/DeployOpenEigenLayer.s.sol";
 import "forge-std/Test.sol";
 import "forge-std/Script.sol";
 import "forge-std/StdJson.sol";
@@ -123,7 +123,7 @@ contract EigenDADeployer is DeployOpenEigenLayer {
 
         stakeRegistryImplementation = new StakeRegistry(
             registryCoordinator,
-            delegation
+            IDelegationManager(address(delegation))
         );
 
         eigenDAProxyAdmin.upgrade(
@@ -163,7 +163,7 @@ contract EigenDADeployer is DeployOpenEigenLayer {
             for (uint i = 0; i < numStrategies; i++) {
                 strategyAndWeightingMultipliers[i] = new IStakeRegistry.StrategyParams[](1);
                 strategyAndWeightingMultipliers[i][0] = IStakeRegistry.StrategyParams({
-                    strategy: deployedStrategyArray[i],
+                    strategy: IStrategy(address(deployedStrategyArray[i])),
                     multiplier: 1 ether
                 });
             }
@@ -186,7 +186,7 @@ contract EigenDADeployer is DeployOpenEigenLayer {
         }
 
         eigenDAServiceManagerImplementation = new EigenDAServiceManager(
-            avsDirectory,
+            IAVSDirectory(address(avsDirectory)),
             registryCoordinator,
             stakeRegistry
         );

contracts/script/deploy/goerliv2/GoerliV2_Deploy.s.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
-
+/*
 import {PauserRegistry} from "eigenlayer-core/contracts/permissions/PauserRegistry.sol";
 import {EmptyContract} from "eigenlayer-core/test/mocks/EmptyContract.sol";
 
@@ -83,7 +83,7 @@ contract Deployer_GV2 is ExistingDeploymentParser {
         /**
          * First, deploy upgradeable proxy contracts that **will point** to the implementations. Since the implementation contracts are
          * not yet deployed, we give these proxies an empty contract as the initial implementation, to act as if they have no code.
-         */
+         *//*
         eigenDAServiceManager = EigenDAServiceManager(
             address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenDAProxyAdmin), ""))
         );
@@ -359,3 +359,4 @@ contract Deployer_GV2 is ExistingDeploymentParser {
         ejector = stdJson.readAddress(config_data, ".permissions.ejector");
     }
 }
+*/

contracts/src/core/EigenDAServiceManager.sol

@@ -2,10 +2,9 @@
 pragma solidity ^0.8.9;
 
 import {Pausable} from "eigenlayer-core/contracts/permissions/Pausable.sol";
-import {IAVSDirectory} from "eigenlayer-core/contracts/interfaces/IAVSDirectory.sol";
 import {IPauserRegistry} from "eigenlayer-core/contracts/interfaces/IPauserRegistry.sol";
 
-import {ServiceManagerBase} from "eigenlayer-middleware/ServiceManagerBase.sol";
+import {ServiceManagerBase, IAVSDirectory} from "eigenlayer-middleware/ServiceManagerBase.sol";
 import {BLSSignatureChecker} from "eigenlayer-middleware/BLSSignatureChecker.sol";
 import {IRegistryCoordinator} from "eigenlayer-middleware/interfaces/IRegistryCoordinator.sol";
 import {IStakeRegistry} from "eigenlayer-middleware/interfaces/IStakeRegistry.sol";