chore: move BitmapUtils and BN254 libraries to middleware (#55)

* chore: move BitmapUtils and BN254 libraries to middleware * fix: actually commit migrated files * chore: update submodule
Layr-Labs · Nov 7, 2023 · 5929f80 · 5929f80
1 parent a3d4a93
commit 5929f80
Show file tree

Hide file tree

Showing 26 changed files with 671 additions and 33 deletions.
diff --git a/lib/eigenlayer-contracts b/lib/eigenlayer-contracts
diff --git a/src/BLSOperatorStateRetriever.sol b/src/BLSOperatorStateRetriever.sol
@@ -5,7 +5,8 @@ import "src/interfaces/IStakeRegistry.sol";
 import "src/interfaces/IBLSPubkeyRegistry.sol";
 import "src/interfaces/IIndexRegistry.sol";
 import "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
-import "eigenlayer-contracts/src/contracts/libraries/BitmapUtils.sol";
+
+import "src/libraries/BitmapUtils.sol";
 
 /**
  * @title BLSOperatorStateRetriever with view functions that allow to retrieve the state of an AVSs registry system.

diff --git a/src/BLSPubkeyRegistry.sol b/src/BLSPubkeyRegistry.sol
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
+import "src/libraries/BN254.sol";
+
 import "src/BLSPubkeyRegistryStorage.sol";
-import "eigenlayer-contracts/src/contracts/libraries/BN254.sol";
 
 contract BLSPubkeyRegistry is BLSPubkeyRegistryStorage {
     using BN254 for BN254.G1Point;

diff --git a/src/BLSPubkeyRegistryStorage.sol b/src/BLSPubkeyRegistryStorage.sol
@@ -4,7 +4,8 @@ pragma solidity =0.8.12;
 import "src/interfaces/IBLSPubkeyRegistry.sol";
 import "src/interfaces/IRegistryCoordinator.sol";
 import "src/interfaces/IBLSPublicKeyCompendium.sol";
-import "eigenlayer-contracts/src/contracts/libraries/BN254.sol";
+
+import "src/libraries/BN254.sol";
 
 import "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
 

diff --git a/src/BLSPublicKeyCompendium.sol b/src/BLSPublicKeyCompendium.sol
@@ -2,7 +2,8 @@
 pragma solidity =0.8.12;
 
 import "src/interfaces/IBLSPublicKeyCompendium.sol";
-import "eigenlayer-contracts/src/contracts/libraries/BN254.sol";
+
+import "src/libraries/BN254.sol";
 
 /**
  * @title A shared contract for EigenLayer operators to register their BLS public keys.

diff --git a/src/BLSRegistryCoordinatorWithIndices.sol b/src/BLSRegistryCoordinatorWithIndices.sol
@@ -6,9 +6,7 @@ import "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
 
 import "eigenlayer-contracts/src/contracts/interfaces/IPauserRegistry.sol";
 import "eigenlayer-contracts/src/contracts/interfaces/ISlasher.sol";
-import "eigenlayer-contracts/src/contracts/libraries/BN254.sol";
 import "eigenlayer-contracts/src/contracts/libraries/EIP1271SignatureUtils.sol";
-import "eigenlayer-contracts/src/contracts/libraries/BitmapUtils.sol";
 import "eigenlayer-contracts/src/contracts/permissions/Pausable.sol";
 
 import "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
@@ -20,6 +18,9 @@ import "src/interfaces/IStakeRegistry.sol";
 import "src/interfaces/IIndexRegistry.sol";
 import "src/interfaces/IRegistryCoordinator.sol";
 
+import "src/libraries/BitmapUtils.sol";
+import "src/libraries/BN254.sol";
+
 
 
 /**

diff --git a/src/BLSSignatureChecker.sol b/src/BLSSignatureChecker.sol
@@ -1,13 +1,14 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import "src/interfaces/IBLSSignatureChecker.sol";
-import "eigenlayer-contracts/src/contracts/libraries/BitmapUtils.sol";
-import "eigenlayer-contracts/src/contracts/libraries/BN254.sol";
 import "src/interfaces/IRegistryCoordinator.sol";
 import "src/interfaces/IStakeRegistry.sol";
 import "src/interfaces/IBLSPubkeyRegistry.sol";
 import "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
+import "src/interfaces/IBLSSignatureChecker.sol";
+
+import "src/libraries/BitmapUtils.sol";
+import "src/libraries/BN254.sol";
 
 /**
  * @title Used for checking BLS aggregate signatures from the operators of a `BLSRegistry`.

diff --git a/src/IndexRegistry.sol b/src/IndexRegistry.sol
@@ -2,7 +2,6 @@
 pragma solidity =0.8.12;
 
 import "src/IndexRegistryStorage.sol";
-import "eigenlayer-contracts/src/contracts/libraries/BN254.sol";
 
 /**
  * @title A `Registry` that keeps track of an ordered list of operators for each quorum

diff --git a/src/ServiceManagerBase.sol b/src/ServiceManagerBase.sol
@@ -3,13 +3,15 @@ pragma solidity ^0.8.9;
 
 import "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
 import "@openzeppelin-upgrades/contracts/access/OwnableUpgradeable.sol";
-import "src/BLSSignatureChecker.sol";
-import "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
-import "src/interfaces/IServiceManager.sol";
 
-import "eigenlayer-contracts/src/contracts/permissions/Pausable.sol";
 import "eigenlayer-contracts/src/contracts/interfaces/IPauserRegistry.sol";
 import "eigenlayer-contracts/src/contracts/interfaces/ISlasher.sol";
+import "eigenlayer-contracts/src/contracts/permissions/Pausable.sol";
+
+import "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
+import "src/interfaces/IServiceManager.sol";
+
+import "src/BLSSignatureChecker.sol";
 
 /**
  * @title Base implementation of `IServiceManager` interface, designed to be inherited from by more complex ServiceManagers.

diff --git a/src/StakeRegistry.sol b/src/StakeRegistry.sol
@@ -1,10 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import "eigenlayer-contracts/src/contracts/libraries/BitmapUtils.sol";
 import "src/interfaces/IServiceManager.sol";
 import "src/interfaces/IStakeRegistry.sol";
 import "src/interfaces/IRegistryCoordinator.sol";
+
+import "src/libraries/BitmapUtils.sol";
+
 import "src/StakeRegistryStorage.sol";
 import {VoteWeigherBase} from "src/VoteWeigherBase.sol";
 

diff --git a/src/interfaces/IBLSPubkeyRegistry.sol b/src/interfaces/IBLSPubkeyRegistry.sol
@@ -2,7 +2,7 @@
 pragma solidity =0.8.12;
 
 import {IRegistry} from "src/interfaces/IRegistry.sol";
-import {BN254} from "eigenlayer-contracts/src/contracts/libraries/BN254.sol";
+import {BN254} from "src/libraries/BN254.sol";
 
 /**
  * @title Minimal interface for a registry that keeps track of aggregate operator public keys for among many quorums.

diff --git a/src/interfaces/IBLSPublicKeyCompendium.sol b/src/interfaces/IBLSPublicKeyCompendium.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity >=0.5.0;
 
-import {BN254}from"eigenlayer-contracts/src/contracts/libraries/BN254.sol";
+import {BN254} from "src/libraries/BN254.sol";
 
 /**
  * @title Minimal interface for the `BLSPublicKeyCompendium` contract.

diff --git a/src/interfaces/IBLSRegistry.sol b/src/interfaces/IBLSRegistry.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.5.0;
 
 import {IQuorumRegistry} from "./IQuorumRegistry.sol";
-import {BN254} from "eigenlayer-contracts/src/contracts/libraries/BN254.sol";
+import {BN254} from "src/libraries/BN254.sol";
 
 
 /**

diff --git a/src/interfaces/IBLSRegistryCoordinatorWithIndices.sol b/src/interfaces/IBLSRegistryCoordinatorWithIndices.sol
@@ -6,7 +6,7 @@ import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
 import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
 import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol";
 import {IIndexRegistry} from "src/interfaces/IIndexRegistry.sol";
-import {BN254} from "eigenlayer-contracts/src/contracts/libraries/BN254.sol";
+import {BN254} from "src/libraries/BN254.sol";
 
 /**
  * @title Minimal interface for the `IBLSStakeRegistryCoordinator` contract.

diff --git a/src/interfaces/IBLSSignatureChecker.sol b/src/interfaces/IBLSSignatureChecker.sol
@@ -5,7 +5,7 @@ import {IBLSRegistryCoordinatorWithIndices} from "src/interfaces/IBLSRegistryCoo
 import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol";
 import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
 import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
-import {BN254} from "eigenlayer-contracts/src/contracts/libraries/BN254.sol";
+import {BN254} from "src/libraries/BN254.sol";
 
 /**
  * @title Used for checking BLS aggregate signatures from the operators of a EigenLayer AVS with the RegistryCoordinator/BLSPubkeyRegistry/StakeRegistry architechture.
+19 −0		README.md
+0 −73		docs/core/EigenPod.md
+0 −346		src/contracts/libraries/BN254.sol
+10 −10		src/contracts/libraries/BeaconChainProofs.sol
+0 −283		src/contracts/libraries/BitmapUtils.sol
+12 −4		src/contracts/pods/EigenPod.sol
+2 −0		src/test/EigenLayerTestHelper.t.sol
+123 −489		src/test/EigenPod.t.sol
+0 −128		src/test/Registration.t.sol
+1 −1		src/test/WithdrawalMigration.t.sol
+0 −41		src/test/harnesses/BitmapUtilsWrapper.sol
+4 −0		src/test/harnesses/EigenPodHarness.sol
+53 −0		src/test/mocks/DelayedWithdrawalRouterMock.sol
+93 −0		src/test/tree/EigenPodManager.tree
+2 −2		src/test/tree/EigenPodManagerUnit.tree
+111 −0		src/test/tree/StrategyManangerUnit.tree
+0 −180		src/test/unit/BitmapUtils.t.sol
+3 −1		src/test/unit/DelegationUnit.t.sol
+11 −32		src/test/unit/EigenPodManagerUnit.t.sol
+535 −0		src/test/unit/EigenPodUnit.t.sol
+1 −1		src/test/unit/SlasherUnit.t.sol
+881 −772		src/test/unit/StrategyManagerUnit.t.sol
+35 −0		src/test/utils/EigenLayerUnitTestBase.sol
+23 −15		src/test/utils/EigenLayerUnitTestSetup.sol
+0 −32		src/test/utils/Operators.sol
+0 −1		src/test/utils/ProofParsing.sol
+1 −1		src/test/utils/Utils.sol