diff --git a/src/BLSApkRegistry.sol b/src/BLSApkRegistry.sol index ea6d318f..bd140036 100644 --- a/src/BLSApkRegistry.sol +++ b/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; diff --git a/src/BLSApkRegistryStorage.sol b/src/BLSApkRegistryStorage.sol index 878d8a10..e40a2957 100644 --- a/src/BLSApkRegistryStorage.sol +++ b/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) diff --git a/src/BLSSignatureChecker.sol b/src/BLSSignatureChecker.sol index 03dbe42d..5aecde91 100644 --- a/src/BLSSignatureChecker.sol +++ b/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`. diff --git a/src/IndexRegistry.sol b/src/IndexRegistry.sol index 0d9a8340..05611deb 100644 --- a/src/IndexRegistry.sol +++ b/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 diff --git a/src/IndexRegistryStorage.sol b/src/IndexRegistryStorage.sol index 2b4a57eb..0c403779 100644 --- a/src/IndexRegistryStorage.sol +++ b/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. diff --git a/src/OperatorStateRetriever.sol b/src/OperatorStateRetriever.sol index f87439b3..d899679d 100644 --- a/src/OperatorStateRetriever.sol +++ b/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. diff --git a/src/RegistryCoordinator.sol b/src/RegistryCoordinator.sol index 9345ac5b..b96a32f1 100644 --- a/src/RegistryCoordinator.sol +++ b/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: diff --git a/src/ServiceManagerBase.sol b/src/ServiceManagerBase.sol index 2bdf3e07..eb58ab40 100644 --- a/src/ServiceManagerBase.sol +++ b/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. diff --git a/src/StakeRegistry.sol b/src/StakeRegistry.sol index e83b3278..964501a9 100644 --- a/src/StakeRegistry.sol +++ b/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. diff --git a/src/StakeRegistryStorage.sol b/src/StakeRegistryStorage.sol index 30f8365e..768819a4 100644 --- a/src/StakeRegistryStorage.sol +++ b/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. diff --git a/src/interfaces/IBLSApkRegistry.sol b/src/interfaces/IBLSApkRegistry.sol index 62a3e6b1..bec2ac7f 100644 --- a/src/interfaces/IBLSApkRegistry.sol +++ b/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. diff --git a/src/interfaces/IBLSSignatureChecker.sol b/src/interfaces/IBLSSignatureChecker.sol index ac63096c..18f3626e 100644 --- a/src/interfaces/IBLSSignatureChecker.sol +++ b/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. diff --git a/src/interfaces/IRegistryCoordinator.sol b/src/interfaces/IRegistryCoordinator.sol index 04976a10..b0530568 100644 --- a/src/interfaces/IRegistryCoordinator.sol +++ b/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. diff --git a/test/ffi/BLSPubKeyCompendiumFFI.t.sol b/test/ffi/BLSPubKeyCompendiumFFI.t.sol index 3bb75118..431e7b86 100644 --- a/test/ffi/BLSPubKeyCompendiumFFI.t.sol +++ b/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; diff --git a/test/ffi/BLSSignatureCheckerFFI.t.sol b/test/ffi/BLSSignatureCheckerFFI.t.sol index 6161cdc1..153311f0 100644 --- a/test/ffi/BLSSignatureCheckerFFI.t.sol +++ b/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 { diff --git a/test/ffi/util/G2Operations.sol b/test/ffi/util/G2Operations.sol index 488c30b2..d94b61d9 100644 --- a/test/ffi/util/G2Operations.sol +++ b/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; diff --git a/test/harnesses/BLSApkRegistryHarness.sol b/test/harnesses/BLSApkRegistryHarness.sol index a888986e..6cd6ed4e 100644 --- a/test/harnesses/BLSApkRegistryHarness.sol +++ b/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 { diff --git a/test/harnesses/BitmapUtilsWrapper.sol b/test/harnesses/BitmapUtilsWrapper.sol index 57c2073c..4a231916 100644 --- a/test/harnesses/BitmapUtilsWrapper.sol +++ b/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 { diff --git a/test/harnesses/RegistryCoordinatorHarness.t.sol b/test/harnesses/RegistryCoordinatorHarness.t.sol index 0429b50f..70bd306b 100644 --- a/test/harnesses/RegistryCoordinatorHarness.t.sol +++ b/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"; diff --git a/test/harnesses/StakeRegistryHarness.sol b/test/harnesses/StakeRegistryHarness.sol index 96f529ba..b24b54ff 100644 --- a/test/harnesses/StakeRegistryHarness.sol +++ b/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 { diff --git a/test/integration/CoreRegistration.t.sol b/test/integration/CoreRegistration.t.sol index 88254c10..66a9e31b 100644 --- a/test/integration/CoreRegistration.t.sol +++ b/test/integration/CoreRegistration.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "test/utils/MockAVSDeployer.sol"; +import "../utils/MockAVSDeployer.sol"; import { DelegationManager } from "eigenlayer-contracts/src/contracts/core/DelegationManager.sol"; import { IDelegationManager } from "eigenlayer-contracts/src/contracts/interfaces/IDelegationManager.sol"; @@ -185,4 +185,4 @@ contract Test_CoreRegistration is MockAVSDeployer { return operatorSignature; } -} \ No newline at end of file +} diff --git a/test/mocks/RegistryCoordinatorMock.sol b/test/mocks/RegistryCoordinatorMock.sol index fb68a38f..938427af 100644 --- a/test/mocks/RegistryCoordinatorMock.sol +++ b/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 { diff --git a/test/mocks/StakeRegistryMock.sol b/test/mocks/StakeRegistryMock.sol index 24769ca0..455163a1 100644 --- a/test/mocks/StakeRegistryMock.sol +++ b/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. diff --git a/test/unit/BLSApkRegistryUnit.t.sol b/test/unit/BLSApkRegistryUnit.t.sol index 3a055f13..6a4e0a2f 100644 --- a/test/unit/BLSApkRegistryUnit.t.sol +++ b/test/unit/BLSApkRegistryUnit.t.sol @@ -3,8 +3,8 @@ pragma solidity =0.8.12; import "forge-std/Test.sol"; -import "test/harnesses/BLSApkRegistryHarness.sol"; -import "test/mocks/RegistryCoordinatorMock.sol"; +import "../harnesses/BLSApkRegistryHarness.sol"; +import "../mocks/RegistryCoordinatorMock.sol"; contract BLSApkRegistryUnitTests is Test { diff --git a/test/unit/BLSSignatureCheckerUnit.t.sol b/test/unit/BLSSignatureCheckerUnit.t.sol index 0954abac..46974297 100644 --- a/test/unit/BLSSignatureCheckerUnit.t.sol +++ b/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; diff --git a/test/unit/IndexRegistryUnit.t.sol b/test/unit/IndexRegistryUnit.t.sol index bea011b9..6e9271fa 100644 --- a/test/unit/IndexRegistryUnit.t.sol +++ b/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"; diff --git a/test/unit/RegistryCoordinatorUnit.t.sol b/test/unit/RegistryCoordinatorUnit.t.sol index 633271c5..0ab7584b 100644 --- a/test/unit/RegistryCoordinatorUnit.t.sol +++ b/test/unit/RegistryCoordinatorUnit.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "test/utils/MockAVSDeployer.sol"; +import "../utils/MockAVSDeployer.sol"; contract RegistryCoordinatorUnit is MockAVSDeployer { using BN254 for BN254.G1Point; @@ -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"); diff --git a/test/unit/StakeRegistryUnit.t.sol b/test/unit/StakeRegistryUnit.t.sol index 4add656b..0560efed 100644 --- a/test/unit/StakeRegistryUnit.t.sol +++ b/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"; diff --git a/test/unit/VoteWeigherBaseUnit.t.sol b/test/unit/VoteWeigherBaseUnit.t.sol index e6448c1c..3c41364b 100644 --- a/test/unit/VoteWeigherBaseUnit.t.sol +++ b/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"; diff --git a/test/utils/BLSMockAVSDeployer.sol b/test/utils/BLSMockAVSDeployer.sol index ab0122e2..a0231e1d 100644 --- a/test/utils/BLSMockAVSDeployer.sol +++ b/test/utils/BLSMockAVSDeployer.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import {BLSSignatureChecker} from "src/BLSSignatureChecker.sol"; -import {MockAVSDeployer} from "test/utils/MockAVSDeployer.sol"; -import {BN254} from "src/libraries/BN254.sol"; -import {OperatorStateRetriever} from "src/OperatorStateRetriever.sol"; -import {BitmapUtils} from "src/libraries/BitmapUtils.sol"; +import {BLSSignatureChecker} from "../../src/BLSSignatureChecker.sol"; +import {MockAVSDeployer} from "../utils/MockAVSDeployer.sol"; +import {BN254} from "../../src/libraries/BN254.sol"; +import {OperatorStateRetriever} from "../../src/OperatorStateRetriever.sol"; +import {BitmapUtils} from "../../src/libraries/BitmapUtils.sol"; contract BLSMockAVSDeployer is MockAVSDeployer { using BN254 for BN254.G1Point; diff --git a/test/utils/MockAVSDeployer.sol b/test/utils/MockAVSDeployer.sol index 85eea82e..236fed40 100644 --- a/test/utils/MockAVSDeployer.sol +++ b/test/utils/MockAVSDeployer.sol @@ -9,30 +9,30 @@ import {ISlasher} from "eigenlayer-contracts/src/contracts/interfaces/ISlasher.s import {PauserRegistry} from "eigenlayer-contracts/src/contracts/permissions/PauserRegistry.sol"; import {IStrategy} from "eigenlayer-contracts/src/contracts/interfaces/IStrategy.sol"; import {ISignatureUtils} from "eigenlayer-contracts/src/contracts/interfaces/ISignatureUtils.sol"; -import {BitmapUtils} from "src/libraries/BitmapUtils.sol"; -import {BN254} from "src/libraries/BN254.sol"; - -import {OperatorStateRetriever} from "src/OperatorStateRetriever.sol"; -import {RegistryCoordinator} from "src/RegistryCoordinator.sol"; -import {RegistryCoordinatorHarness} from "test/harnesses/RegistryCoordinatorHarness.t.sol"; -import {BLSApkRegistry} from "src/BLSApkRegistry.sol"; -import {ServiceManagerBase} from "src/ServiceManagerBase.sol"; -import {StakeRegistry} from "src/StakeRegistry.sol"; -import {IndexRegistry} from "src/IndexRegistry.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 "src/interfaces/IRegistryCoordinator.sol"; -import {IServiceManager} from "src/interfaces/IServiceManager.sol"; +import {BitmapUtils} from "../../src/libraries/BitmapUtils.sol"; +import {BN254} from "../../src/libraries/BN254.sol"; + +import {OperatorStateRetriever} from "../../src/OperatorStateRetriever.sol"; +import {RegistryCoordinator} from "../../src/RegistryCoordinator.sol"; +import {RegistryCoordinatorHarness} from "../harnesses/RegistryCoordinatorHarness.t.sol"; +import {BLSApkRegistry} from "../../src/BLSApkRegistry.sol"; +import {ServiceManagerBase} from "../../src/ServiceManagerBase.sol"; +import {StakeRegistry} from "../../src/StakeRegistry.sol"; +import {IndexRegistry} from "../../src/IndexRegistry.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 "../../src/interfaces/IRegistryCoordinator.sol"; +import {IServiceManager} from "../../src/interfaces/IServiceManager.sol"; import {StrategyManagerMock} from "eigenlayer-contracts/src/test/mocks/StrategyManagerMock.sol"; import {EigenPodManagerMock} from "eigenlayer-contracts/src/test/mocks/EigenPodManagerMock.sol"; -import {DelegationMock} from "test/mocks/DelegationMock.sol"; -import {BLSApkRegistryHarness} from "test/harnesses/BLSApkRegistryHarness.sol"; +import {DelegationMock} from "../mocks/DelegationMock.sol"; +import {BLSApkRegistryHarness} from "../harnesses/BLSApkRegistryHarness.sol"; import {EmptyContract} from "eigenlayer-contracts/src/test/mocks/EmptyContract.sol"; -import {StakeRegistryHarness} from "test/harnesses/StakeRegistryHarness.sol"; +import {StakeRegistryHarness} from "../harnesses/StakeRegistryHarness.sol"; import "forge-std/Test.sol"; diff --git a/test/utils/Operators.sol b/test/utils/Operators.sol index 5bc607f7..dd32c23c 100644 --- a/test/utils/Operators.sol +++ b/test/utils/Operators.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "src/libraries/BN254.sol"; +import "../../src/libraries/BN254.sol"; import "forge-std/Test.sol"; import "forge-std/StdJson.sol"; diff --git a/test/utils/ProofParsing.sol b/test/utils/ProofParsing.sol index ddc22259..193256c4 100644 --- a/test/utils/ProofParsing.sol +++ b/test/utils/ProofParsing.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "src/libraries/BN254.sol"; +import "../../src/libraries/BN254.sol"; import "forge-std/Test.sol"; import "forge-std/StdJson.sol";