diff --git a/src/BLSOperatorStateRetriever.sol b/src/BLSOperatorStateRetriever.sol index aba6fd11a..5d2c89ed6 100644 --- a/src/BLSOperatorStateRetriever.sol +++ b/src/BLSOperatorStateRetriever.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "src/interfaces/IStakeRegistry.sol"; -import "src/interfaces/IBLSPubkeyRegistry.sol"; -import "src/interfaces/IIndexRegistry.sol"; -import "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol"; +import {IBLSRegistryCoordinatorWithIndices} from "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol"; +import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol"; +import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol"; +import {IIndexRegistry} from "src/interfaces/IIndexRegistry.sol"; -import "src/libraries/BitmapUtils.sol"; +import {BitmapUtils} from "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 index 60cda66ee..56f404de8 100644 --- a/src/BLSPubkeyRegistry.sol +++ b/src/BLSPubkeyRegistry.sol @@ -1,9 +1,12 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "src/libraries/BN254.sol"; +import {BLSPubkeyRegistryStorage} from "src/BLSPubkeyRegistryStorage.sol"; -import "src/BLSPubkeyRegistryStorage.sol"; +import {IBLSPublicKeyCompendium} from "src/interfaces/IBLSPublicKeyCompendium.sol"; +import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol"; + +import {BN254} from "src/libraries/BN254.sol"; contract BLSPubkeyRegistry is BLSPubkeyRegistryStorage { using BN254 for BN254.G1Point; diff --git a/src/BLSPubkeyRegistryStorage.sol b/src/BLSPubkeyRegistryStorage.sol index 9f5155460..2c0ce9e7a 100644 --- a/src/BLSPubkeyRegistryStorage.sol +++ b/src/BLSPubkeyRegistryStorage.sol @@ -1,13 +1,11 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "src/interfaces/IBLSPubkeyRegistry.sol"; -import "src/interfaces/IRegistryCoordinator.sol"; -import "src/interfaces/IBLSPublicKeyCompendium.sol"; - -import "src/libraries/BN254.sol"; - -import "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol"; +import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol"; +import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol"; +import {IBLSPublicKeyCompendium} from "src/interfaces/IBLSPublicKeyCompendium.sol"; +import {BN254} from "src/libraries/BN254.sol"; +import {Initializable} from "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol"; abstract contract BLSPubkeyRegistryStorage is Initializable, IBLSPubkeyRegistry { /// @notice the registry coordinator contract diff --git a/src/BLSPublicKeyCompendium.sol b/src/BLSPublicKeyCompendium.sol index 15bf3c60b..f9aad7f10 100644 --- a/src/BLSPublicKeyCompendium.sol +++ b/src/BLSPublicKeyCompendium.sol @@ -1,9 +1,8 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "src/interfaces/IBLSPublicKeyCompendium.sol"; - -import "src/libraries/BN254.sol"; +import {IBLSPublicKeyCompendium} from "src/interfaces/IBLSPublicKeyCompendium.sol"; +import {BN254} from "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 index a97d93ced..c200b59f0 100644 --- a/src/BLSRegistryCoordinatorWithIndices.sol +++ b/src/BLSRegistryCoordinatorWithIndices.sol @@ -1,26 +1,24 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "@openzeppelin/contracts/utils/cryptography/draft-EIP712.sol"; -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/EIP1271SignatureUtils.sol"; -import "eigenlayer-contracts/src/contracts/permissions/Pausable.sol"; - -import "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol"; -import "src/interfaces/ISocketUpdater.sol"; -import "src/interfaces/IServiceManager.sol"; -import "src/interfaces/IBLSPubkeyRegistry.sol"; -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"; - - +import {Initializable} from "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol"; +import {EIP712} from "@openzeppelin/contracts/utils/cryptography/draft-EIP712.sol"; + +import {EIP1271SignatureUtils} from "eigenlayer-contracts/src/contracts/libraries/EIP1271SignatureUtils.sol"; +import {IPauserRegistry} from "eigenlayer-contracts/src/contracts/interfaces/IPauserRegistry.sol"; +import {Pausable} from "eigenlayer-contracts/src/contracts/permissions/Pausable.sol"; +import {ISlasher} from "eigenlayer-contracts/src/contracts/interfaces/ISlasher.sol"; + +import {IBLSRegistryCoordinatorWithIndices} from "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol"; +import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol"; +import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol"; +import {IServiceManager} from "src/interfaces/IServiceManager.sol"; +import {ISocketUpdater} from "src/interfaces/ISocketUpdater.sol"; +import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol"; +import {IIndexRegistry} from "src/interfaces/IIndexRegistry.sol"; + +import {BitmapUtils} from "src/libraries/BitmapUtils.sol"; +import {BN254} from "src/libraries/BN254.sol"; /** * @title A `RegistryCoordinator` that has three registries: diff --git a/src/BLSSignatureChecker.sol b/src/BLSSignatureChecker.sol index dd602138d..d5cb998a4 100644 --- a/src/BLSSignatureChecker.sol +++ b/src/BLSSignatureChecker.sol @@ -1,14 +1,14 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -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 {IBLSRegistryCoordinatorWithIndices} from "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol"; +import {IBLSSignatureChecker} from "src/interfaces/IBLSSignatureChecker.sol"; +import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol"; +import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol"; +import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol"; -import "src/libraries/BitmapUtils.sol"; -import "src/libraries/BN254.sol"; +import {BitmapUtils} from "src/libraries/BitmapUtils.sol"; +import {BN254} from "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 index 42052fb44..0d9a8340a 100644 --- a/src/IndexRegistry.sol +++ b/src/IndexRegistry.sol @@ -1,7 +1,8 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "src/IndexRegistryStorage.sol"; +import {IndexRegistryStorage} from "src/IndexRegistryStorage.sol"; +import {IRegistryCoordinator} from "src/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 5f7aecfec..570d5fa8d 100644 --- a/src/IndexRegistryStorage.sol +++ b/src/IndexRegistryStorage.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "src/interfaces/IIndexRegistry.sol"; -import "src/interfaces/IRegistryCoordinator.sol"; +import {Initializable} from "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol"; -import "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol"; +import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol"; +import {IIndexRegistry} from "src/interfaces/IIndexRegistry.sol"; /** * @title Storage variables for the `IndexRegistry` contract. diff --git a/src/ServiceManagerBase.sol b/src/ServiceManagerBase.sol index ae300c436..3a794a003 100644 --- a/src/ServiceManagerBase.sol +++ b/src/ServiceManagerBase.sol @@ -1,17 +1,17 @@ // 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 {OwnableUpgradeable} from "@openzeppelin-upgrades/contracts/access/OwnableUpgradeable.sol"; +import {Initializable} from "@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/permissions/Pausable.sol"; +import {IPauserRegistry} from "eigenlayer-contracts/src/contracts/interfaces/IPauserRegistry.sol"; +import {ISlasher} from "eigenlayer-contracts/src/contracts/interfaces/ISlasher.sol"; +import {Pausable} from "eigenlayer-contracts/src/contracts/permissions/Pausable.sol"; -import "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol"; -import "src/interfaces/IServiceManager.sol"; +import {BLSSignatureChecker} from "src/BLSSignatureChecker.sol"; -import "src/BLSSignatureChecker.sol"; +import {IBLSRegistryCoordinatorWithIndices} from "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol"; +import {IServiceManager} from "src/interfaces/IServiceManager.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 index 2b493632b..da2d04ee1 100644 --- a/src/StakeRegistry.sol +++ b/src/StakeRegistry.sol @@ -1,13 +1,15 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "src/interfaces/IServiceManager.sol"; -import "src/interfaces/IStakeRegistry.sol"; -import "src/interfaces/IRegistryCoordinator.sol"; +import {IDelegationManager} from "eigenlayer-contracts/src/contracts/interfaces/IDelegationManager.sol"; -import "src/libraries/BitmapUtils.sol"; +import {StakeRegistryStorage} from "src/StakeRegistryStorage.sol"; -import "src/StakeRegistryStorage.sol"; +import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol"; +import {IServiceManager} from "src/interfaces/IServiceManager.sol"; +import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol"; + +import {BitmapUtils} from "src/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 e018cecdd..2d08d8ceb 100644 --- a/src/StakeRegistryStorage.sol +++ b/src/StakeRegistryStorage.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import {IStrategyManager} from "eigenlayer-contracts/src/contracts/interfaces/IStrategyManager.sol"; 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 {IServiceManager} from "src/interfaces/IServiceManager.sol"; import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol"; -import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol"; /** * @title Storage variables for the `StakeRegistry` contract. diff --git a/src/interfaces/IBLSRegistry.sol b/src/interfaces/IBLSRegistry.sol index 8cecc0734..ba074b355 100644 --- a/src/interfaces/IBLSRegistry.sol +++ b/src/interfaces/IBLSRegistry.sol @@ -4,7 +4,6 @@ pragma solidity >=0.5.0; import {IQuorumRegistry} from "./IQuorumRegistry.sol"; import {BN254} from "src/libraries/BN254.sol"; - /** * @title Minimal interface extension to `IQuorumRegistry`. * @author Layr Labs, Inc. diff --git a/src/interfaces/IBLSRegistryCoordinatorWithIndices.sol b/src/interfaces/IBLSRegistryCoordinatorWithIndices.sol index 3267f227a..04b648159 100644 --- a/src/interfaces/IBLSRegistryCoordinatorWithIndices.sol +++ b/src/interfaces/IBLSRegistryCoordinatorWithIndices.sol @@ -2,10 +2,12 @@ pragma solidity =0.8.12; import {ISignatureUtils} from "eigenlayer-contracts/src/contracts/interfaces/ISignatureUtils.sol"; + import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol"; -import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol"; import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol"; +import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol"; import {IIndexRegistry} from "src/interfaces/IIndexRegistry.sol"; + import {BN254} from "src/libraries/BN254.sol"; /** diff --git a/src/interfaces/IBLSSignatureChecker.sol b/src/interfaces/IBLSSignatureChecker.sol index bf098accd..0162e0c62 100644 --- a/src/interfaces/IBLSSignatureChecker.sol +++ b/src/interfaces/IBLSSignatureChecker.sol @@ -2,9 +2,10 @@ pragma solidity =0.8.12; import {IBLSRegistryCoordinatorWithIndices} from "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol"; -import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol"; import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol"; +import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol"; import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol"; + import {BN254} from "src/libraries/BN254.sol"; /** diff --git a/src/interfaces/IIndexRegistry.sol b/src/interfaces/IIndexRegistry.sol index 552c1a4dd..1765802d1 100644 --- a/src/interfaces/IIndexRegistry.sol +++ b/src/interfaces/IIndexRegistry.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import "./IRegistry.sol"; +import {IRegistry} from "./IRegistry.sol"; /** * @title Interface for a `Registry`-type contract that keeps track of an ordered list of operators for up to 256 quorums. diff --git a/src/interfaces/IQuorumRegistry.sol b/src/interfaces/IQuorumRegistry.sol index d59dfcf16..21c10deec 100644 --- a/src/interfaces/IQuorumRegistry.sol +++ b/src/interfaces/IQuorumRegistry.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity >=0.5.0; -import "./IRegistry.sol"; +import {IRegistry} from "./IRegistry.sol"; /** * @title Interface for a `Registry`-type contract that uses either 1 or 2 quorums. diff --git a/src/interfaces/IStakeRegistry.sol b/src/interfaces/IStakeRegistry.sol index 880557b65..63a16b9a8 100644 --- a/src/interfaces/IStakeRegistry.sol +++ b/src/interfaces/IStakeRegistry.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity =0.8.12; -import {IStrategy} from "eigenlayer-contracts/src/contracts/interfaces/IStrategy.sol"; import {IDelegationManager} from "eigenlayer-contracts/src/contracts/interfaces/IDelegationManager.sol"; +import {IStrategy} from "eigenlayer-contracts/src/contracts/interfaces/IStrategy.sol"; -import {IRegistry} from "./IRegistry.sol"; import {IServiceManager} from "./IServiceManager.sol"; +import {IRegistry} from "./IRegistry.sol"; /** * @title Interface for a `Registry` that keeps track of stakes of operators for up to 256 quorums.