Chore/rebase master

src/BLSApkRegistry.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import {BLSApkRegistryStorage} from "src/BLSApkRegistryStorage.sol";
+import {BLSApkRegistryStorage} from "./BLSApkRegistryStorage.sol";
 
-import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
+import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";
 
-import {BN254} from "src/libraries/BN254.sol";
+import {BN254} from "./libraries/BN254.sol";
 
 contract BLSApkRegistry is BLSApkRegistryStorage {
     using BN254 for BN254.G1Point;

src/BLSApkRegistryStorage.sol

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import {IBLSApkRegistry} from "src/interfaces/IBLSApkRegistry.sol";
-import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
+import {IBLSApkRegistry} from "./interfaces/IBLSApkRegistry.sol";
+import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";
 
 import {Initializable} from "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
 
-import {BN254} from "src/libraries/BN254.sol";
+import {BN254} from "./libraries/BN254.sol";
 
 abstract contract BLSApkRegistryStorage is Initializable, IBLSApkRegistry {
     /// @notice the hash of the zero pubkey aka BN254.G1Point(0,0)

src/BLSSignatureChecker.sol

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import {IBLSSignatureChecker} from "src/interfaces/IBLSSignatureChecker.sol";
-import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
-import {IBLSApkRegistry} from "src/interfaces/IBLSApkRegistry.sol";
-import {IStakeRegistry, IDelegationManager} from "src/interfaces/IStakeRegistry.sol";
+import {IBLSSignatureChecker} from "./interfaces/IBLSSignatureChecker.sol";
+import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";
+import {IBLSApkRegistry} from "./interfaces/IBLSApkRegistry.sol";
+import {IStakeRegistry, IDelegationManager} from "./interfaces/IStakeRegistry.sol";
 
-import {BitmapUtils} from "src/libraries/BitmapUtils.sol";
-import {BN254} from "src/libraries/BN254.sol";
+import {BitmapUtils} from "./libraries/BitmapUtils.sol";
+import {BN254} from "./libraries/BN254.sol";
 
 /**
  * @title Used for checking BLS aggregate signatures from the operators of a `BLSRegistry`.

src/IndexRegistry.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import {IndexRegistryStorage} from "src/IndexRegistryStorage.sol";
-import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
+import {IndexRegistryStorage} from "./IndexRegistryStorage.sol";
+import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";
 
 /**
  * @title A `Registry` that keeps track of an ordered list of operators for each quorum

src/IndexRegistryStorage.sol

@@ -3,8 +3,8 @@ pragma solidity =0.8.12;
 
 import {Initializable} from "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
 
-import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
-import {IIndexRegistry} from "src/interfaces/IIndexRegistry.sol";
+import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";
+import {IIndexRegistry} from "./interfaces/IIndexRegistry.sol";
 
 /**
  * @title Storage variables for the `IndexRegistry` contract.

src/OperatorStateRetriever.sol

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
-import {IBLSApkRegistry} from "src/interfaces/IBLSApkRegistry.sol";
-import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
-import {IIndexRegistry} from "src/interfaces/IIndexRegistry.sol";
+import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";
+import {IBLSApkRegistry} from "./interfaces/IBLSApkRegistry.sol";
+import {IStakeRegistry} from "./interfaces/IStakeRegistry.sol";
+import {IIndexRegistry} from "./interfaces/IIndexRegistry.sol";
 
-import {BitmapUtils} from "src/libraries/BitmapUtils.sol";
+import {BitmapUtils} from "./libraries/BitmapUtils.sol";
 
 /**
  * @title OperatorStateRetriever with view functions that allow to retrieve the state of an AVSs registry system.

src/RegistryCoordinator.sol

@@ -9,16 +9,16 @@ import {EIP1271SignatureUtils} from "eigenlayer-contracts/src/contracts/librarie
 import {IPauserRegistry} from "eigenlayer-contracts/src/contracts/interfaces/IPauserRegistry.sol";
 import {Pausable} from "eigenlayer-contracts/src/contracts/permissions/Pausable.sol";
 
-import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
+import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";
 import {ISignatureUtils} from "eigenlayer-contracts/src/contracts/interfaces/ISignatureUtils.sol";
-import {IBLSApkRegistry} from "src/interfaces/IBLSApkRegistry.sol";
-import {ISocketUpdater} from "src/interfaces/ISocketUpdater.sol";
-import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
-import {IIndexRegistry} from "src/interfaces/IIndexRegistry.sol";
-import {IServiceManager} from "src/interfaces/IServiceManager.sol";
-
-import {BitmapUtils} from "src/libraries/BitmapUtils.sol";
-import {BN254} from "src/libraries/BN254.sol";
+import {IBLSApkRegistry} from "./interfaces/IBLSApkRegistry.sol";
+import {ISocketUpdater} from "./interfaces/ISocketUpdater.sol";
+import {IStakeRegistry} from "./interfaces/IStakeRegistry.sol";
+import {IIndexRegistry} from "./interfaces/IIndexRegistry.sol";
+import {IServiceManager} from "./interfaces/IServiceManager.sol";
+
+import {BitmapUtils} from "./libraries/BitmapUtils.sol";
+import {BN254} from "./libraries/BN254.sol";
 
 /**
  * @title A `RegistryCoordinator` that has three registries:

src/ServiceManagerBase.sol

@@ -3,13 +3,13 @@ pragma solidity =0.8.12;
 
 import {OwnableUpgradeable} from "@openzeppelin-upgrades/contracts/access/OwnableUpgradeable.sol";
 
-import {BitmapUtils} from "src/libraries/BitmapUtils.sol"; 
+import {BitmapUtils} from "./libraries/BitmapUtils.sol"; 
 import {ISignatureUtils} from "eigenlayer-contracts/src/contracts/interfaces/ISignatureUtils.sol";
 import {IDelegationManager} from "eigenlayer-contracts/src/contracts/interfaces/IDelegationManager.sol";
 
-import {IServiceManager} from "src/interfaces/IServiceManager.sol";
-import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
-import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
+import {IServiceManager} from "./interfaces/IServiceManager.sol";
+import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";
+import {IStakeRegistry} from "./interfaces/IStakeRegistry.sol";
 
 /**
  * @title Minimal implementation of a ServiceManager-type contract.

src/StakeRegistry.sol

@@ -3,12 +3,12 @@ pragma solidity =0.8.12;
 
 import {IDelegationManager} from "eigenlayer-contracts/src/contracts/interfaces/IDelegationManager.sol";
 
-import {StakeRegistryStorage} from "src/StakeRegistryStorage.sol";
+import {StakeRegistryStorage} from "./StakeRegistryStorage.sol";
 
-import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
-import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
+import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";
+import {IStakeRegistry} from "./interfaces/IStakeRegistry.sol";
 
-import {BitmapUtils} from "src/libraries/BitmapUtils.sol";
+import {BitmapUtils} from "./libraries/BitmapUtils.sol";
 
 /**
  * @title A `Registry` that keeps track of stakes of operators for up to 256 quorums.

src/StakeRegistryStorage.sol

@@ -4,8 +4,8 @@ pragma solidity =0.8.12;
 import {IDelegationManager} from "eigenlayer-contracts/src/contracts/interfaces/IDelegationManager.sol";
 import {IStrategyManager} from "eigenlayer-contracts/src/contracts/interfaces/IStrategyManager.sol";
 
-import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
-import {IStakeRegistry} from  "src/interfaces/IStakeRegistry.sol";
+import {IRegistryCoordinator} from "./interfaces/IRegistryCoordinator.sol";
+import {IStakeRegistry} from  "./interfaces/IStakeRegistry.sol";
 
 /**
  * @title Storage variables for the `StakeRegistry` contract.

src/interfaces/IBLSApkRegistry.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import {IRegistry} from "src/interfaces/IRegistry.sol";
+import {IRegistry} from "./IRegistry.sol";
 
-import {BN254} from "src/libraries/BN254.sol";
+import {BN254} from "../libraries/BN254.sol";
 
 /**
  * @title Minimal interface for a registry that keeps track of aggregate operator public keys for among many quorums.

src/interfaces/IBLSSignatureChecker.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
-import {IBLSApkRegistry} from "src/interfaces/IBLSApkRegistry.sol";
-import {IStakeRegistry, IDelegationManager} from "src/interfaces/IStakeRegistry.sol";
+import {IRegistryCoordinator} from "./IRegistryCoordinator.sol";
+import {IBLSApkRegistry} from "./IBLSApkRegistry.sol";
+import {IStakeRegistry, IDelegationManager} from "./IStakeRegistry.sol";
 
-import {BN254} from "src/libraries/BN254.sol";
+import {BN254} from "../libraries/BN254.sol";
 
 /**
  * @title Used for checking BLS aggregate signatures from the operators of a EigenLayer AVS with the RegistryCoordinator/BLSApkRegistry/StakeRegistry architechture.

src/interfaces/IRegistryCoordinator.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import {IBLSApkRegistry} from "src/interfaces/IBLSApkRegistry.sol";
-import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
-import {IIndexRegistry} from "src/interfaces/IIndexRegistry.sol";
-import {BN254} from "src/libraries/BN254.sol";
+import {IBLSApkRegistry} from "./IBLSApkRegistry.sol";
+import {IStakeRegistry} from "./IStakeRegistry.sol";
+import {IIndexRegistry} from "./IIndexRegistry.sol";
+import {BN254} from "../libraries/BN254.sol";
 
 /**
  * @title Interface for a contract that coordinates between various registries for an AVS.

test/ffi/BLSPubKeyCompendiumFFI.t.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import "src/BLSApkRegistry.sol";
-import "test/ffi/util/G2Operations.sol";
-import {IBLSApkRegistry} from "src/interfaces/IBLSApkRegistry.sol";
+import "../../src/BLSApkRegistry.sol";
+import "../ffi/util/G2Operations.sol";
+import {IBLSApkRegistry} from "../../src/interfaces/IBLSApkRegistry.sol";
 
 contract BLSApkRegistryFFITests is G2Operations {
     using BN254 for BN254.G1Point;

test/ffi/BLSSignatureCheckerFFI.t.sol

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import {G2Operations} from "test/ffi/util/G2Operations.sol";
-import {MockAVSDeployer} from "test/utils/MockAVSDeployer.sol";
-import {BLSSignatureChecker} from "src/BLSSignatureChecker.sol";
-import {OperatorStateRetriever} from "src/OperatorStateRetriever.sol";
-import {BN254} from "src/libraries/BN254.sol";
-import {BitmapUtils} from "src/libraries/BitmapUtils.sol";
+import {G2Operations} from "../ffi/util/G2Operations.sol";
+import {MockAVSDeployer} from "../utils/MockAVSDeployer.sol";
+import {BLSSignatureChecker} from "../../src/BLSSignatureChecker.sol";
+import {OperatorStateRetriever} from "../../src/OperatorStateRetriever.sol";
+import {BN254} from "../../src/libraries/BN254.sol";
+import {BitmapUtils} from "../../src/libraries/BitmapUtils.sol";
 
 
 contract BLSSignatureCheckerFFITests is MockAVSDeployer, G2Operations {

test/ffi/util/G2Operations.sol

@@ -3,7 +3,7 @@ pragma solidity =0.8.12;
 
 import "forge-std/Test.sol";
 import "openzeppelin-contracts/contracts/utils/Strings.sol";
-import "src/libraries/BN254.sol";
+import "../../../src/libraries/BN254.sol";
 
 contract G2Operations is Test {
     using Strings for uint256;

test/harnesses/BLSApkRegistryHarness.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import "src/BLSApkRegistry.sol";
+import "../../src/BLSApkRegistry.sol";
 
 // wrapper around the BLSApkRegistry contract that exposes internal functionality, for unit testing _other functionality_.
 contract BLSApkRegistryHarness is BLSApkRegistry {

test/harnesses/BitmapUtilsWrapper.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import "src/libraries/BitmapUtils.sol";
+import "../../src/libraries/BitmapUtils.sol";
 
 // wrapper around the BitmapUtils library that exposes the internal functions
 contract BitmapUtilsWrapper {

test/harnesses/RegistryCoordinatorHarness.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import "src/RegistryCoordinator.sol";
+import "../../src/RegistryCoordinator.sol";
 
 import "forge-std/Test.sol";
 

test/harnesses/StakeRegistryHarness.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import "src/StakeRegistry.sol";
+import "../../src/StakeRegistry.sol";
 
 // wrapper around the StakeRegistry contract that exposes the internal functions for unit testing.
 contract StakeRegistryHarness is StakeRegistry {

test/mocks/RegistryCoordinatorMock.sol

@@ -2,7 +2,7 @@
 pragma solidity =0.8.12;
 
 
-import "src/interfaces/IRegistryCoordinator.sol";
+import "../../src/interfaces/IRegistryCoordinator.sol";
 
 
 contract RegistryCoordinatorMock is IRegistryCoordinator {

test/mocks/StakeRegistryMock.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import "src/interfaces/IStakeRegistry.sol";
-import "src/interfaces/IRegistryCoordinator.sol";
+import "../../src/interfaces/IStakeRegistry.sol";
+import "../../src/interfaces/IRegistryCoordinator.sol";
 
 /**
  * @title Interface for a `Registry` that keeps track of stakes of operators for up to 256 quorums.

test/unit/BLSSignatureCheckerUnit.t.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import "src/BLSSignatureChecker.sol";
-import "test/utils/BLSMockAVSDeployer.sol";
+import "../../src/BLSSignatureChecker.sol";
+import "../utils/BLSMockAVSDeployer.sol";
 
 contract BLSSignatureCheckerUnitTests is BLSMockAVSDeployer {
     using BN254 for BN254.G1Point;

test/unit/IndexRegistryUnit.t.sol

@@ -1,10 +1,10 @@
 //SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.12;
 
-import "src/interfaces/IIndexRegistry.sol";
-import "src/IndexRegistry.sol";
-import "test/mocks/RegistryCoordinatorMock.sol";
-import "test/harnesses/BitmapUtilsWrapper.sol";
+import "../../src/interfaces/IIndexRegistry.sol";
+import "../../src/IndexRegistry.sol";
+import "../mocks/RegistryCoordinatorMock.sol";
+import "../harnesses/BitmapUtilsWrapper.sol";
 
 import "forge-std/Test.sol";
 

test/unit/RegistryCoordinatorUnit.t.sol

@@ -354,11 +354,13 @@ contract RegistryCoordinatorUnit is MockAVSDeployer {
         stakeRegistry.setOperatorWeight(uint8(quorumNumbers[0]), defaultOperator, defaultStake);
         cheats.prank(defaultOperator);
         cheats.roll(registrationBlockNumber);
+
         registryCoordinator.registerOperator(quorumNumbers, defaultSocket, pubkeyRegistrationParams, emptySig);
 
         cheats.prank(defaultOperator);
         cheats.roll(nextRegistrationBlockNumber);
         cheats.expectRevert("RegistryCoordinator._registerOperator: operator already registered for some quorums being registered for");
+
         registryCoordinator.registerOperator(quorumNumbers, defaultSocket, pubkeyRegistrationParams, emptySig);
     }
 
@@ -597,7 +599,6 @@ contract RegistryCoordinatorUnit is MockAVSDeployer {
 
         // re-register the operator
         registryCoordinator.registerOperator(quorumNumbers, defaultSocket, pubkeyRegistrationParams, emptySig);
-
         // check success of registration
         uint256 quorumBitmap = BitmapUtils.orderedBytesArrayToBitmap(quorumNumbers);
         assertEq(registryCoordinator.getOperatorId(defaultOperator), defaultOperatorId, "1");

test/unit/StakeRegistryUnit.t.sol

@@ -8,21 +8,21 @@ import {Slasher} from "eigenlayer-contracts/src/contracts/core/Slasher.sol";
 import {PauserRegistry} from "eigenlayer-contracts/src/contracts/permissions/PauserRegistry.sol";
 import {ISlasher} from "eigenlayer-contracts/src/contracts/interfaces/ISlasher.sol";
 import {IStrategy} from "eigenlayer-contracts/src/contracts/interfaces/IStrategy.sol";
-import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
-import {IIndexRegistry} from "src/interfaces/IIndexRegistry.sol";
-import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
-import {IBLSApkRegistry} from "src/interfaces/IBLSApkRegistry.sol";
-import {IServiceManager} from "src/interfaces/IServiceManager.sol";
+import {IStakeRegistry} from "../../src/interfaces/IStakeRegistry.sol";
+import {IIndexRegistry} from "../../src/interfaces/IIndexRegistry.sol";
+import {IRegistryCoordinator} from "../../src/interfaces/IRegistryCoordinator.sol";
+import {IBLSApkRegistry} from "../../src/interfaces/IBLSApkRegistry.sol";
+import {IServiceManager} from "../../src/interfaces/IServiceManager.sol";
 
-import {BitmapUtils} from "src/libraries/BitmapUtils.sol";
+import {BitmapUtils} from "../../src/libraries/BitmapUtils.sol";
 
 import {StrategyManagerMock} from "eigenlayer-contracts/src/test/mocks/StrategyManagerMock.sol";
 import {EigenPodManagerMock} from "eigenlayer-contracts/src/test/mocks/EigenPodManagerMock.sol";
 import {DelegationManagerMock} from "eigenlayer-contracts/src/test/mocks/DelegationManagerMock.sol";
 
-import {StakeRegistryHarness} from "test/harnesses/StakeRegistryHarness.sol";
-import {StakeRegistry} from "src/StakeRegistry.sol";
-import {RegistryCoordinatorHarness} from "test/harnesses/RegistryCoordinatorHarness.t.sol";
+import {StakeRegistryHarness} from "../harnesses/StakeRegistryHarness.sol";
+import {StakeRegistry} from "../../src/StakeRegistry.sol";
+import {RegistryCoordinatorHarness} from "../harnesses/RegistryCoordinatorHarness.t.sol";
 
 import "forge-std/Test.sol";
 

test/unit/VoteWeigherBaseUnit.t.sol

@@ -9,10 +9,11 @@ import {IStrategyManager} from "eigenlayer-contracts/src/contracts/interfaces/IS
 import {IStrategy} from "eigenlayer-contracts/src/contracts/interfaces/IStrategy.sol";
 import {IEigenPodManager} from "eigenlayer-contracts/src/contracts/interfaces/IEigenPodManager.sol";
 import {ISlasher} from "eigenlayer-contracts/src/contracts/interfaces/ISlasher.sol";
-import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
-import {StakeRegistry} from "src/StakeRegistry.sol";
+import {IServiceManager} from "../../src/interfaces/IServiceManager.sol";
+import {StakeRegistry, IStakeRegistry} from "../../src/StakeRegistry.sol";
+
+import {RegistryCoordinatorMock} from "../mocks/RegistryCoordinatorMock.sol";
 
-import {RegistryCoordinatorMock} from "test/mocks/RegistryCoordinatorMock.sol";
 import {OwnableMock} from "eigenlayer-contracts/src/test/mocks/OwnableMock.sol";
 import {DelegationManagerMock} from "eigenlayer-contracts/src/test/mocks/DelegationManagerMock.sol";