Layr-Labs · ian-shim · Feb 2, 2024 · Nov 22, 2023 · Nov 28, 2023 · Jan 5, 2024
diff --git a/contracts/foundry.toml b/contracts/foundry.toml
@@ -4,15 +4,6 @@ out = 'out'
 libs = ['lib']
 fs_permissions = [{ access = "read-write", path = "./"}]
 
-remappings = [
-    "@eigenlayer-middleware/=lib/eigenlayer-middleware/src/",
-    "@eigenlayer-core/=lib/eigenlayer-contracts/src/",
-    "@eigenlayer-scripts/=lib/eigenlayer-contracts/script/",
-    "@openzeppelin/=lib/openzeppelin-contracts/",
-    "@openzeppelin-upgrades/=lib/openzeppelin-contracts-upgradeable/",
-    "forge-std/=lib/forge-std/src/"
-]
-
 gas_reports = ["*"]
 
 # A list of ignored solc error codes

diff --git a/contracts/lib/eigenlayer-contracts b/contracts/lib/eigenlayer-contracts
diff --git a/contracts/lib/eigenlayer-middleware b/contracts/lib/eigenlayer-middleware
diff --git a/contracts/remappings.txt b/contracts/remappings.txt
@@ -0,0 +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/
+forge-std/=lib/forge-std/src/
diff --git a/contracts/script/EigenDADeployer.s.sol b/contracts/script/EigenDADeployer.s.sol
@@ -1,23 +1,20 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: UNLICENSED 
+/*
 pragma solidity ^0.8.9;
 
-import "@eigenlayer-scripts/middleware/DeployOpenEigenLayer.s.sol";
-
-import "@eigenlayer-core/contracts/permissions/PauserRegistry.sol";
-import "@eigenlayer-core/test/mocks/EmptyContract.sol";
-
-import "@eigenlayer-middleware/BLSPublicKeyCompendium.sol";
-import "@eigenlayer-middleware/BLSRegistryCoordinatorWithIndices.sol";
-import "@eigenlayer-middleware/BLSPubkeyRegistry.sol";
-import "@eigenlayer-middleware/IndexRegistry.sol";
-import "@eigenlayer-middleware/StakeRegistry.sol";
-import "@eigenlayer-middleware/BLSOperatorStateRetriever.sol";
-
+import "eigenlayer-scripts/middleware/DeployOpenEigenLayer.s.sol";
+import {PauserRegistry} from "eigenlayer-core/contracts/permissions/PauserRegistry.sol";
+import {EmptyContract} from "eigenlayer-core/test/mocks/EmptyContract.sol";
+import {BLSPublicKeyCompendium} from "eigenlayer-middleware/BLSPublicKeyCompendium.sol";
+import {BLSRegistryCoordinatorWithIndices, IBLSRegistryCoordinatorWithIndices} from "eigenlayer-middleware/BLSRegistryCoordinatorWithIndices.sol";
+import {BLSPubkeyRegistry, IBLSPubkeyRegistry} from "eigenlayer-middleware/BLSPubkeyRegistry.sol";
+import {IndexRegistry, IIndexRegistry} from "eigenlayer-middleware/IndexRegistry.sol";
+import {StakeRegistry, IStakeRegistry, IServiceManager} from "eigenlayer-middleware/StakeRegistry.sol";
+import {BLSOperatorStateRetriever} from "eigenlayer-middleware/BLSOperatorStateRetriever.sol";
 import {EigenDAServiceManager} from "../src/core/EigenDAServiceManager.sol";
-import "../src/libraries/EigenDAHasher.sol";
+import {EigenDAHasher} from "../src/libraries/EigenDAHasher.sol";
 
 import "forge-std/Test.sol";
-
 import "forge-std/Script.sol";
 import "forge-std/StdJson.sol";
 
@@ -96,7 +93,7 @@ contract EigenDADeployer is DeployOpenEigenLayer {
         /**
          * 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), ""))
         );
@@ -218,3 +215,4 @@ contract EigenDADeployer is DeployOpenEigenLayer {
         blsOperatorStateRetriever = new BLSOperatorStateRetriever();
     }
 }
+*/
diff --git a/contracts/script/MockRollupDeployer.s.sol b/contracts/script/MockRollupDeployer.s.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.9;
 
 import "forge-std/Script.sol";
-import "../test/mocks/MockRollup.sol";
+import "../src/rollup/MockRollup.sol";
 import {IEigenDAServiceManager} from "../src/interfaces/IEigenDAServiceManager.sol";
 
 contract MockRollupDeployer is Script {

diff --git a/contracts/script/SetUpEigenDA.s.sol b/contracts/script/SetUpEigenDA.s.sol
@@ -1,26 +1,22 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: UNLICENSED 
+/*
 pragma solidity ^0.8.9;
 
-import "@eigenlayer-scripts/middleware/DeployOpenEigenLayer.s.sol";
-
-import "@eigenlayer-core/contracts/permissions/PauserRegistry.sol";
-import "@eigenlayer-core/test/mocks/EmptyContract.sol";
-
-import "@eigenlayer-middleware/BLSPublicKeyCompendium.sol";
-import "@eigenlayer-middleware/BLSRegistryCoordinatorWithIndices.sol";
-import "@eigenlayer-middleware/BLSPubkeyRegistry.sol";
-import "@eigenlayer-middleware/IndexRegistry.sol";
-import "@eigenlayer-middleware/StakeRegistry.sol";
-
-
+import "eigenlayer-scripts/middleware/DeployOpenEigenLayer.s.sol";
+import {PauserRegistry} from "eigenlayer-core/contracts/permissions/PauserRegistry.sol";
+import {EmptyContract} from "eigenlayer-core/test/mocks/EmptyContract.sol";
+import {BLSPublicKeyCompendium} from "eigenlayer-middleware/BLSPublicKeyCompendium.sol";
+import {BLSRegistryCoordinatorWithIndices} from "eigenlayer-middleware/BLSRegistryCoordinatorWithIndices.sol";
+import {BLSPubkeyRegistry} from "eigenlayer-middleware/BLSPubkeyRegistry.sol";
+import {IndexRegistry} from "eigenlayer-middleware/IndexRegistry.sol";
+import {IIndexRegistry} from "eigenlayer-middleware/interfaces/IIndexRegistry.sol";
+import {StakeRegistry} from "eigenlayer-middleware/StakeRegistry.sol";
 import {EigenDAServiceManager} from "../src/core/EigenDAServiceManager.sol";
-import "../src/libraries/EigenDAHasher.sol";
-
-import "./EigenDADeployer.s.sol";
-import "./EigenLayerUtils.s.sol";
+import {EigenDAHasher} from "../src/libraries/EigenDAHasher.sol";
+import {EigenDADeployer} from "./EigenDADeployer.s.sol";
+import {EigenLayerUtils} from "./EigenLayerUtils.s.sol";
 
 import "forge-std/Test.sol";
-
 import "forge-std/Script.sol";
 import "forge-std/StdJson.sol";
 
@@ -189,3 +185,4 @@ contract SetupEigenDA is EigenDADeployer, EigenLayerUtils {
         vm.writeJson(finalJson, "./script/output/eigenda_deploy_output.json");        
     }
 }
+*/
diff --git a/contracts/script/m2/M2_Deploy.s.sol b/contracts/script/m2/M2_Deploy.s.sol
@@ -1,16 +1,17 @@
 // SPDX-License-Identifier: BUSL-1.1
+/*
 pragma solidity =0.8.12;
 
-import "@eigenlayer-scripts/utils/ExistingDeploymentParser.sol";
+import "eigenlayer-scripts/utils/ExistingDeploymentParser.sol";
 
-import "@eigenlayer-middleware/BLSPublicKeyCompendium.sol";
-import "@eigenlayer-middleware/BLSRegistryCoordinatorWithIndices.sol";
-import "@eigenlayer-middleware/BLSPubkeyRegistry.sol";
-import "@eigenlayer-middleware/IndexRegistry.sol";
-import "@eigenlayer-middleware/StakeRegistry.sol";
-import "@eigenlayer-middleware/BLSOperatorStateRetriever.sol";
+import "eigenlayer-middleware/BLSPublicKeyCompendium.sol";
+import "eigenlayer-middleware/BLSRegistryCoordinatorWithIndices.sol";
+import "eigenlayer-middleware/BLSPubkeyRegistry.sol";
+import "eigenlayer-middleware/IndexRegistry.sol";
+import "eigenlayer-middleware/StakeRegistry.sol";
+import "eigenlayer-middleware/BLSOperatorStateRetriever.sol";
 
-import "@eigenlayer-core/contracts/permissions/PauserRegistry.sol";
+import "eigenlayer-core/contracts/permissions/PauserRegistry.sol";
 
 import {EigenDAServiceManager} from "../../src/core/EigenDAServiceManager.sol";
 
@@ -336,5 +337,5 @@ contract Deployer_M2 is ExistingDeploymentParser {
         string memory finalJson = vm.serializeString(parent_object, permissions, permissions_output);
         vm.writeJson(finalJson, outputPath);
     } 
-
-}
+}
+*/
diff --git a/contracts/src/Imports.sol b/contracts/src/Imports.sol
@@ -1,5 +1,5 @@
 // Imports used for compiling for bindings for clients
 
-import "@eigenlayer-middleware/BLSOperatorStateRetriever.sol";
-import "@eigenlayer-middleware/BLSPublicKeyCompendium.sol";
-import "@eigenlayer-middleware/BLSRegistryCoordinatorWithIndices.sol";
+import "eigenlayer-middleware/OperatorStateRetriever.sol";
+import "eigenlayer-middleware/BLSApkRegistry.sol";
+import "eigenlayer-middleware/RegistryCoordinator.sol";
+34 −0		.github/ISSUE_TEMPLATE/bug_report.md
+30 −0		.github/ISSUE_TEMPLATE/design.md
+24 −0		.github/ISSUE_TEMPLATE/feature_request.md
+26 −0		.github/ISSUE_TEMPLATE/test.md
+1 −0		.github/workflows/tests.yml
+1 −0		.gitmodules
+39 −79		README.md
+0 −21		docs/BLSOperatorStateRetriever.md
+0 −36		docs/BLSPubkeyRegistry.md
+0 −27		docs/BLSPublicKeyCompendium.md
+0 −86		docs/BLSRegistryCoordinatorWithIndices.md
+185 −29		docs/BLSSignatureChecker.md
+0 −48		docs/IndexRegistry.md
+0 −15		docs/Middleware-registration-operator-flow.md
+152 −0		docs/README.md
+334 −0		docs/RegistryCoordinator.md
+68 −0		docs/ServiceManagerBase.md
+0 −56		docs/StakeRegistry.md
+4 −4		docs/experimental/AVS-Guide.md
+161 −0		docs/registries/BLSApkRegistry.md
+166 −0		docs/registries/IndexRegistry.md
+339 −0		docs/registries/StakeRegistry.md
+3 −0		foundry.toml
+1 −1		lib/eigenlayer-contracts
+0 −2		script/AVSContractsDeploy.s.sol
+9 −12		script/DeploySharedContracts.s.sol
+284 −0		src/BLSApkRegistry.sol
+40 −0		src/BLSApkRegistryStorage.sol
+0 −213		src/BLSPubkeyRegistry.sol
+0 −34		src/BLSPubkeyRegistryStorage.sol
+0 −91		src/BLSPublicKeyCompendium.sol
+0 −655		src/BLSRegistryCoordinatorWithIndices.sol
+166 −91		src/BLSSignatureChecker.sol
+198 −146		src/IndexRegistry.sol
+11 −14		src/IndexRegistryStorage.sol
+20 −20		src/OperatorStateRetriever.sol
+874 −0		src/RegistryCoordinator.sol
+122 −68		src/ServiceManagerBase.sol
+515 −335		src/StakeRegistry.sol
+31 −9		src/StakeRegistryStorage.sol
+0 −226		src/VoteWeigherBase.sol
+0 −63		src/VoteWeigherBaseStorage.sol
+140 −0		src/interfaces/IBLSApkRegistry.sol
+0 −85		src/interfaces/IBLSPubkeyRegistry.sol
+0 −43		src/interfaces/IBLSPublicKeyCompendium.sol
+0 −70		src/interfaces/IBLSRegistry.sol
+0 −68		src/interfaces/IBLSRegistryCoordinatorWithIndices.sol
+13 −7		src/interfaces/IBLSSignatureChecker.sol
+11 −13		src/interfaces/IIndexRegistry.sol
+0 −155		src/interfaces/IQuorumRegistry.sol
+1 −3		src/interfaces/IRegistry.sol
+76 −20		src/interfaces/IRegistryCoordinator.sol
+38 −11		src/interfaces/IServiceManager.sol
+113 −25		src/interfaces/IStakeRegistry.sol
+0 −97		src/interfaces/IVoteWeigher.sol
+8 −4		src/libraries/BN254.sol
+67 −3		src/libraries/BitmapUtils.sol
+21 −16		test/ffi/BLSPubKeyCompendiumFFI.t.sol
+7 −7		test/ffi/BLSSignatureCheckerFFI.t.sol
+1 −1		test/ffi/util/G2Operations.sol
+21 −0		test/harnesses/BLSApkRegistryHarness.sol
+0 −33		test/harnesses/BLSRegistryCoordinatorWithIndicesHarness.sol
+3 −3		test/harnesses/BitmapUtilsWrapper.sol
+39 −0		test/harnesses/RegistryCoordinatorHarness.t.sol
+44 −49		test/harnesses/StakeRegistryHarness.sol
+188 −0		test/integration/CoreRegistration.t.sol
+0 −44		test/mocks/BLSPublicKeyCompendiumMock.sol
+185 −0		test/mocks/DelegationMock.sol
+0 −39		test/mocks/MiddlewareRegistryMock.sol
+33 −9		test/mocks/RegistryCoordinatorMock.sol
+0 −31		test/mocks/ServiceManagerMock.sol
+83 −29		test/mocks/StakeRegistryMock.sol
+348 −0		test/unit/BLSApkRegistryUnit.t.sol
+0 −254		test/unit/BLSPubkeyRegistryUnit.t.sol
+0 −80		test/unit/BLSPublicKeyCompendiumUnit.t.sol
+5 −9		test/unit/BLSSignatureCheckerUnit.t.sol
+7 −7		test/unit/BitmapUtils.t.sol
+0 −82		test/unit/DelegationManager.tree
+90 −128		test/unit/IndexRegistryUnit.t.sol
+10 −10		test/unit/OperatorStateRetrieverUnit.t.sol
+214 −159		test/unit/RegistryCoordinatorUnit.t.sol
+138 −188		test/unit/StakeRegistryUnit.t.sol
+440 −451		test/unit/VoteWeigherBaseUnit.t.sol
+6 −6		test/utils/BLSMockAVSDeployer.sol
+110 −97		test/utils/MockAVSDeployer.sol
+8 −8		test/utils/Operators.sol
+2 −2		test/utils/Owners.sol
+14 −14		test/utils/ProofParsing.sol