Skip to content

Commit beba12d

Browse files
0x0aa00x0aa0
authored
cleanup imports (#78)
1 parent 9ec2158 commit beba12d

17 files changed

+73
-70
lines changed

‎src/BLSOperatorStateRetriever.sol

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity =0.8.12;
33

4-
import "src/interfaces/IStakeRegistry.sol";
5-
import "src/interfaces/IBLSPubkeyRegistry.sol";
6-
import "src/interfaces/IIndexRegistry.sol";
7-
import "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
4+
import {IBLSRegistryCoordinatorWithIndices} from "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
5+
import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol";
6+
import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
7+
import {IIndexRegistry} from "src/interfaces/IIndexRegistry.sol";
88

9-
import "src/libraries/BitmapUtils.sol";
9+
import {BitmapUtils} from "src/libraries/BitmapUtils.sol";
1010

1111
/**
1212
* @title BLSOperatorStateRetriever with view functions that allow to retrieve the state of an AVSs registry system.

‎src/BLSPubkeyRegistry.sol

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity =0.8.12;
33

4-
import "src/libraries/BN254.sol";
4+
import {BLSPubkeyRegistryStorage} from "src/BLSPubkeyRegistryStorage.sol";
55

6-
import "src/BLSPubkeyRegistryStorage.sol";
6+
import {IBLSPublicKeyCompendium} from "src/interfaces/IBLSPublicKeyCompendium.sol";
7+
import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
8+
9+
import {BN254} from "src/libraries/BN254.sol";
710

811
contract BLSPubkeyRegistry is BLSPubkeyRegistryStorage {
912
using BN254 for BN254.G1Point;

‎src/BLSPubkeyRegistryStorage.sol

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity =0.8.12;
33

4-
import "src/interfaces/IBLSPubkeyRegistry.sol";
5-
import "src/interfaces/IRegistryCoordinator.sol";
6-
import "src/interfaces/IBLSPublicKeyCompendium.sol";
7-
8-
import "src/libraries/BN254.sol";
9-
10-
import "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
4+
import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol";
5+
import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
6+
import {IBLSPublicKeyCompendium} from "src/interfaces/IBLSPublicKeyCompendium.sol";
7+
import {BN254} from "src/libraries/BN254.sol";
8+
import {Initializable} from "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
119

1210
abstract contract BLSPubkeyRegistryStorage is Initializable, IBLSPubkeyRegistry {
1311
/// @notice the registry coordinator contract

‎src/BLSPublicKeyCompendium.sol

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity =0.8.12;
33

4-
import "src/interfaces/IBLSPublicKeyCompendium.sol";
5-
6-
import "src/libraries/BN254.sol";
4+
import {IBLSPublicKeyCompendium} from "src/interfaces/IBLSPublicKeyCompendium.sol";
5+
import {BN254} from "src/libraries/BN254.sol";
76

87
/**
98
* @title A shared contract for EigenLayer operators to register their BLS public keys.

‎src/BLSRegistryCoordinatorWithIndices.sol

+18-20
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity =0.8.12;
33

4-
import "@openzeppelin/contracts/utils/cryptography/draft-EIP712.sol";
5-
import "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
6-
7-
import "eigenlayer-contracts/src/contracts/interfaces/IPauserRegistry.sol";
8-
import "eigenlayer-contracts/src/contracts/interfaces/ISlasher.sol";
9-
import "eigenlayer-contracts/src/contracts/libraries/EIP1271SignatureUtils.sol";
10-
import "eigenlayer-contracts/src/contracts/permissions/Pausable.sol";
11-
12-
import "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
13-
import "src/interfaces/ISocketUpdater.sol";
14-
import "src/interfaces/IServiceManager.sol";
15-
import "src/interfaces/IBLSPubkeyRegistry.sol";
16-
import "src/interfaces/IStakeRegistry.sol";
17-
import "src/interfaces/IIndexRegistry.sol";
18-
import "src/interfaces/IRegistryCoordinator.sol";
19-
20-
import "src/libraries/BitmapUtils.sol";
21-
import "src/libraries/BN254.sol";
22-
23-
4+
import {Initializable} from "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
5+
import {EIP712} from "@openzeppelin/contracts/utils/cryptography/draft-EIP712.sol";
6+
7+
import {EIP1271SignatureUtils} from "eigenlayer-contracts/src/contracts/libraries/EIP1271SignatureUtils.sol";
8+
import {IPauserRegistry} from "eigenlayer-contracts/src/contracts/interfaces/IPauserRegistry.sol";
9+
import {Pausable} from "eigenlayer-contracts/src/contracts/permissions/Pausable.sol";
10+
import {ISlasher} from "eigenlayer-contracts/src/contracts/interfaces/ISlasher.sol";
11+
12+
import {IBLSRegistryCoordinatorWithIndices} from "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
13+
import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
14+
import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol";
15+
import {IServiceManager} from "src/interfaces/IServiceManager.sol";
16+
import {ISocketUpdater} from "src/interfaces/ISocketUpdater.sol";
17+
import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
18+
import {IIndexRegistry} from "src/interfaces/IIndexRegistry.sol";
19+
20+
import {BitmapUtils} from "src/libraries/BitmapUtils.sol";
21+
import {BN254} from "src/libraries/BN254.sol";
2422

2523
/**
2624
* @title A `RegistryCoordinator` that has three registries:

‎src/BLSSignatureChecker.sol

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity =0.8.12;
33

4-
import "src/interfaces/IRegistryCoordinator.sol";
5-
import "src/interfaces/IStakeRegistry.sol";
6-
import "src/interfaces/IBLSPubkeyRegistry.sol";
7-
import "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
8-
import "src/interfaces/IBLSSignatureChecker.sol";
4+
import {IBLSRegistryCoordinatorWithIndices} from "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
5+
import {IBLSSignatureChecker} from "src/interfaces/IBLSSignatureChecker.sol";
6+
import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
7+
import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol";
8+
import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
99

10-
import "src/libraries/BitmapUtils.sol";
11-
import "src/libraries/BN254.sol";
10+
import {BitmapUtils} from "src/libraries/BitmapUtils.sol";
11+
import {BN254} from "src/libraries/BN254.sol";
1212

1313
/**
1414
* @title Used for checking BLS aggregate signatures from the operators of a `BLSRegistry`.

‎src/IndexRegistry.sol

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity =0.8.12;
33

4-
import "src/IndexRegistryStorage.sol";
4+
import {IndexRegistryStorage} from "src/IndexRegistryStorage.sol";
5+
import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
56

67
/**
78
* @title A `Registry` that keeps track of an ordered list of operators for each quorum

‎src/IndexRegistryStorage.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity =0.8.12;
33

4-
import "src/interfaces/IIndexRegistry.sol";
5-
import "src/interfaces/IRegistryCoordinator.sol";
4+
import {Initializable} from "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
65

7-
import "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
6+
import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
7+
import {IIndexRegistry} from "src/interfaces/IIndexRegistry.sol";
88

99
/**
1010
* @title Storage variables for the `IndexRegistry` contract.

‎src/ServiceManagerBase.sol

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// SPDX-License-Identifier: UNLICENSED
22
pragma solidity ^0.8.9;
33

4-
import "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
5-
import "@openzeppelin-upgrades/contracts/access/OwnableUpgradeable.sol";
4+
import {OwnableUpgradeable} from "@openzeppelin-upgrades/contracts/access/OwnableUpgradeable.sol";
5+
import {Initializable} from "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
66

7-
import "eigenlayer-contracts/src/contracts/interfaces/IPauserRegistry.sol";
8-
import "eigenlayer-contracts/src/contracts/interfaces/ISlasher.sol";
9-
import "eigenlayer-contracts/src/contracts/permissions/Pausable.sol";
7+
import {IPauserRegistry} from "eigenlayer-contracts/src/contracts/interfaces/IPauserRegistry.sol";
8+
import {ISlasher} from "eigenlayer-contracts/src/contracts/interfaces/ISlasher.sol";
9+
import {Pausable} from "eigenlayer-contracts/src/contracts/permissions/Pausable.sol";
1010

11-
import "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
12-
import "src/interfaces/IServiceManager.sol";
11+
import {BLSSignatureChecker} from "src/BLSSignatureChecker.sol";
1312

14-
import "src/BLSSignatureChecker.sol";
13+
import {IBLSRegistryCoordinatorWithIndices} from "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
14+
import {IServiceManager} from "src/interfaces/IServiceManager.sol";
1515

1616
/**
1717
* @title Base implementation of `IServiceManager` interface, designed to be inherited from by more complex ServiceManagers.

‎src/StakeRegistry.sol

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity =0.8.12;
33

4-
import "src/interfaces/IServiceManager.sol";
5-
import "src/interfaces/IStakeRegistry.sol";
6-
import "src/interfaces/IRegistryCoordinator.sol";
4+
import {IDelegationManager} from "eigenlayer-contracts/src/contracts/interfaces/IDelegationManager.sol";
75

8-
import "src/libraries/BitmapUtils.sol";
6+
import {StakeRegistryStorage} from "src/StakeRegistryStorage.sol";
97

10-
import "src/StakeRegistryStorage.sol";
8+
import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
9+
import {IServiceManager} from "src/interfaces/IServiceManager.sol";
10+
import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
11+
12+
import {BitmapUtils} from "src/libraries/BitmapUtils.sol";
1113

1214
/**
1315
* @title A `Registry` that keeps track of stakes of operators for up to 256 quorums.

‎src/StakeRegistryStorage.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity =0.8.12;
33

4-
import {IStrategyManager} from "eigenlayer-contracts/src/contracts/interfaces/IStrategyManager.sol";
54
import {IDelegationManager} from "eigenlayer-contracts/src/contracts/interfaces/IDelegationManager.sol";
5+
import {IStrategyManager} from "eigenlayer-contracts/src/contracts/interfaces/IStrategyManager.sol";
66

7+
import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
78
import {IServiceManager} from "src/interfaces/IServiceManager.sol";
89
import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
9-
import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
1010

1111
/**
1212
* @title Storage variables for the `StakeRegistry` contract.

‎src/interfaces/IBLSRegistry.sol

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ pragma solidity >=0.5.0;
44
import {IQuorumRegistry} from "./IQuorumRegistry.sol";
55
import {BN254} from "src/libraries/BN254.sol";
66

7-
87
/**
98
* @title Minimal interface extension to `IQuorumRegistry`.
109
* @author Layr Labs, Inc.

‎src/interfaces/IBLSRegistryCoordinatorWithIndices.sol

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
pragma solidity =0.8.12;
33

44
import {ISignatureUtils} from "eigenlayer-contracts/src/contracts/interfaces/ISignatureUtils.sol";
5+
56
import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
6-
import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
77
import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol";
8+
import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
89
import {IIndexRegistry} from "src/interfaces/IIndexRegistry.sol";
10+
911
import {BN254} from "src/libraries/BN254.sol";
1012

1113
/**

‎src/interfaces/IBLSSignatureChecker.sol

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
pragma solidity =0.8.12;
33

44
import {IBLSRegistryCoordinatorWithIndices} from "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
5-
import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol";
65
import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
6+
import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol";
77
import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
8+
89
import {BN254} from "src/libraries/BN254.sol";
910

1011
/**

‎src/interfaces/IIndexRegistry.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity =0.8.12;
33

4-
import "./IRegistry.sol";
4+
import {IRegistry} from "./IRegistry.sol";
55

66
/**
77
* @title Interface for a `Registry`-type contract that keeps track of an ordered list of operators for up to 256 quorums.

‎src/interfaces/IQuorumRegistry.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity >=0.5.0;
33

4-
import "./IRegistry.sol";
4+
import {IRegistry} from "./IRegistry.sol";
55

66
/**
77
* @title Interface for a `Registry`-type contract that uses either 1 or 2 quorums.

‎src/interfaces/IStakeRegistry.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity =0.8.12;
33

4-
import {IStrategy} from "eigenlayer-contracts/src/contracts/interfaces/IStrategy.sol";
54
import {IDelegationManager} from "eigenlayer-contracts/src/contracts/interfaces/IDelegationManager.sol";
5+
import {IStrategy} from "eigenlayer-contracts/src/contracts/interfaces/IStrategy.sol";
66

7-
import {IRegistry} from "./IRegistry.sol";
87
import {IServiceManager} from "./IServiceManager.sol";
8+
import {IRegistry} from "./IRegistry.sol";
99

1010
/**
1111
* @title Interface for a `Registry` that keeps track of stakes of operators for up to 256 quorums.

0 commit comments

Comments
 (0)