temp comment scripts

Layr-Labs · Nov 28, 2023 · c94e852 · c94e852
1 parent ab4cd8f
commit c94e852
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 21 deletions.
diff --git a/contracts/lib/eigenlayer-middleware b/contracts/lib/eigenlayer-middleware
diff --git a/contracts/script/EigenDADeployer.s.sol b/contracts/script/EigenDADeployer.s.sol
@@ -1,20 +1,18 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: UNLICENSED 
+/*
 pragma solidity ^0.8.9;
 
 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} from "eigenlayer-middleware/BLSPubkeyRegistry.sol";
-import {IndexRegistry} from "eigenlayer-middleware/IndexRegistry.sol";
-import {StakeRegistry, IStakeRegistry} from "eigenlayer-middleware/StakeRegistry.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 {EigenDAHasher} from "../src/libraries/EigenDAHasher.sol";
-import {IBLSPubkeyRegistry} from "eigenlayer-middleware/interfaces/IBLSPubkeyRegistry.sol";
-import {IIndexRegistry} from "eigenlayer-middleware/interfaces/IIndexRegistry.sol";
-import {IServiceManager} from "eigenlayer-middleware/interfaces/IServiceManager.sol";
 
 import "forge-std/Test.sol";
 import "forge-std/Script.sol";
@@ -95,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), ""))
         );
@@ -217,3 +215,4 @@ contract EigenDADeployer is DeployOpenEigenLayer {
         blsOperatorStateRetriever = new BLSOperatorStateRetriever();
     }
 }
+*/
diff --git a/contracts/script/SetUpEigenDA.s.sol b/contracts/script/SetUpEigenDA.s.sol
@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: UNLICENSED 
+/*
 pragma solidity ^0.8.9;
 
 import "eigenlayer-scripts/middleware/DeployOpenEigenLayer.s.sol";
@@ -184,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,4 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
+/*
 pragma solidity =0.8.12;
 
 import "eigenlayer-scripts/utils/ExistingDeploymentParser.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/core/EigenDAServiceManager.sol b/contracts/src/core/EigenDAServiceManager.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.9;
 
-import "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
-import "@openzeppelin-upgrades/contracts/access/OwnableUpgradeable.sol";
+import {Initializable} from "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
+import {OwnableUpgradeable} from "@openzeppelin-upgrades/contracts/access/OwnableUpgradeable.sol";
 
 import {IDelegationManager} from "eigenlayer-core/contracts/interfaces/IDelegationManager.sol";
 import {BytesLib} from "eigenlayer-core/contracts/libraries/BytesLib.sol";
@@ -11,8 +11,7 @@ import {Pausable} from "eigenlayer-core/contracts/permissions/Pausable.sol";
 import {IStrategyManager} from "eigenlayer-core/contracts/interfaces/IStrategyManager.sol";
 import {ISlasher} from "eigenlayer-core/contracts/interfaces/ISlasher.sol";
 import {IPauserRegistry} from "eigenlayer-core/contracts/interfaces/IPauserRegistry.sol";
-import {BLSSignatureChecker} from "eigenlayer-middleware/BLSSignatureChecker.sol";
-import {IBLSRegistryCoordinatorWithIndices} from "eigenlayer-middleware/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
+import {BLSSignatureChecker, IBLSRegistryCoordinatorWithIndices} from "eigenlayer-middleware/BLSSignatureChecker.sol";
 import {IServiceManager} from "eigenlayer-middleware/interfaces/IServiceManager.sol";
 import {EigenDAServiceManagerStorage} from "./EigenDAServiceManagerStorage.sol";
 import {EigenDAHasher} from "../libraries/EigenDAHasher.sol";

diff --git a/contracts/src/core/EigenDAServiceManagerStorage.sol b/contracts/src/core/EigenDAServiceManagerStorage.sol
@@ -1,11 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.9;
 
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "eigenlayer-core/contracts/interfaces/IDelegationManager.sol";
-import "eigenlayer-core/contracts/interfaces/IStrategyManager.sol";
-
-import "../interfaces/IEigenDAServiceManager.sol";
+import {IEigenDAServiceManager} from "../interfaces/IEigenDAServiceManager.sol";
 
 /**
  * @title Storage variables for the `EigenDAServiceManager` contract.
+0 −3		.gitignore
+2 −0		CONTRIBUTING.md
+2 −2		README.md
+9 −9		src/BLSOperatorStateRetriever.sol
+69 −63		src/BLSPubkeyRegistry.sol
+4 −6		src/BLSPubkeyRegistryStorage.sol
+27 −2		src/BLSPublicKeyCompendium.sol
+393 −300		src/BLSRegistryCoordinatorWithIndices.sol
+5 −7		src/BLSSignatureChecker.sol
+196 −145		src/IndexRegistry.sol
+6 −9		src/IndexRegistryStorage.sol
+502 −329		src/StakeRegistry.sol
+32 −4		src/StakeRegistryStorage.sol
+0 −226		src/VoteWeigherBase.sol
+0 −63		src/VoteWeigherBaseStorage.sol
+14 −9		src/interfaces/IBLSPubkeyRegistry.sol
+6 −0		src/interfaces/IBLSPublicKeyCompendium.sol
+3 −6		src/interfaces/IBLSRegistryCoordinatorWithIndices.sol
+10 −12		src/interfaces/IIndexRegistry.sol
+10 −21		src/interfaces/IRegistryCoordinator.sol
+117 −25		src/interfaces/IStakeRegistry.sol
+0 −97		src/interfaces/IVoteWeigher.sol
+55 −1		src/libraries/BitmapUtils.sol
+3 −0		test/ffi/BLSPubKeyCompendiumFFI.t.sol
+8 −4		test/harnesses/BLSRegistryCoordinatorWithIndicesHarness.sol
+43 −47		test/harnesses/StakeRegistryHarness.sol
+21 −2		test/mocks/BLSPublicKeyCompendiumMock.sol
+9 −8		test/mocks/RegistryCoordinatorMock.sol
+80 −25		test/mocks/StakeRegistryMock.sol
+5 −5		test/unit/BLSOperatorStateRetrieverUnit.t.sol
+66 −40		test/unit/BLSPubkeyRegistryUnit.t.sol
+116 −119		test/unit/BLSRegistryCoordinatorWithIndicesUnit.t.sol
+3 −7		test/unit/BLSSignatureCheckerUnit.t.sol
+86 −124		test/unit/IndexRegistryUnit.t.sol
+120 −160		test/unit/StakeRegistryUnit.t.sol
+436 −443		test/unit/VoteWeigherBaseUnit.t.sol
+37 −41		test/utils/MockAVSDeployer.sol