Clean imports (#265)

matter-labs · Mar 13, 2024 · c88b76c · c88b76c
1 parent 521296c
commit c88b76c
Show file tree

Hide file tree

Showing 87 changed files with 123 additions and 194 deletions.
diff --git a/.solhint.json b/.solhint.json
@@ -15,6 +15,8 @@
     "func-name-mixedcase": "off",
     "no-unused-vars": "off",
     "max-states-count": "off",
+    "no-global-import": "error",
+    "no-unused-import": "error",
     "compiler-version": ["warn", "^0.8.0"]
   }
 }
diff --git a/l1-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol b/l1-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "./IL1SharedBridge.sol";
+import {IL1SharedBridge} from "./IL1SharedBridge.sol";
 
 /// @title L1 Bridge contract legacy interface
 /// @author Matter Labs

diff --git a/l1-contracts/contracts/bridgehub/Bridgehub.sol b/l1-contracts/contracts/bridgehub/Bridgehub.sol
@@ -4,14 +4,14 @@ pragma solidity 0.8.20;
 
 import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol";
 
-import "./IBridgehub.sol";
-import "../bridge/interfaces/IL1SharedBridge.sol";
-import "../state-transition/IStateTransitionManager.sol";
-import "../common/ReentrancyGuard.sol";
-import "../state-transition/chain-interfaces/IZkSyncStateTransition.sol";
+import {L2TransactionRequestDirect, L2TransactionRequestTwoBridgesOuter, L2TransactionRequestTwoBridgesInner} from "./IBridgehub.sol";
+import {IBridgehub, IL1SharedBridge} from "../bridge/interfaces/IL1SharedBridge.sol";
+import {IStateTransitionManager} from "../state-transition/IStateTransitionManager.sol";
+import {ReentrancyGuard} from "../common/ReentrancyGuard.sol";
+import {IZkSyncStateTransition} from "../state-transition/chain-interfaces/IZkSyncStateTransition.sol";
 import {ETH_TOKEN_ADDRESS, TWO_BRIDGES_MAGIC_VALUE, BRIDGEHUB_MIN_SECOND_BRIDGE_ADDRESS} from "../common/Config.sol";
-import {BridgehubL2TransactionRequest} from "../common/Messaging.sol";
-import "../vendor/AddressAliasHelper.sol";
+import {BridgehubL2TransactionRequest, L2Message, L2Log, TxStatus} from "../common/Messaging.sol";
+import {AddressAliasHelper} from "../vendor/AddressAliasHelper.sol";
 
 contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2Step {
     /// @notice all the ether is held by the weth bridge

diff --git a/l1-contracts/contracts/bridgehub/IBridgehub.sol b/l1-contracts/contracts/bridgehub/IBridgehub.sol
@@ -3,9 +3,7 @@
 pragma solidity 0.8.20;
 
 import {IL1SharedBridge} from "../bridge/interfaces/IL1SharedBridge.sol";
-import "../common/Messaging.sol";
-import "../state-transition/IStateTransitionManager.sol";
-import "../state-transition/libraries/Diamond.sol";
+import {L2Message, L2Log, TxStatus} from "../common/Messaging.sol";
 
 struct L2TransactionRequestDirect {
     uint256 chainId;

diff --git a/l1-contracts/contracts/common/Dependencies.sol b/l1-contracts/contracts/common/Dependencies.sol
@@ -2,5 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
-import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
+/* solhint-disable-next-line no-unused-import */
+import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+/* solhint-disable-next-line no-unused-import */
+import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
diff --git a/l1-contracts/contracts/dev-contracts/RevertTransferERC20.sol b/l1-contracts/contracts/dev-contracts/RevertTransferERC20.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "./TestnetERC20Token.sol";
+import {TestnetERC20Token} from "./TestnetERC20Token.sol";
 
 /// @title RevertTransferERC20Token - A ERC20 token contract which can revert transfers depending on a flag
 /// @dev Used for testing failed ERC-20 withdrawals from the zkSync smart contract

diff --git a/l1-contracts/contracts/dev-contracts/TestnetERC20Token.sol b/l1-contracts/contracts/dev-contracts/TestnetERC20Token.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract TestnetERC20Token is ERC20 {
     // add this to be excluded from coverage report

diff --git a/l1-contracts/contracts/dev-contracts/test/AddressAliasHelperTest.sol b/l1-contracts/contracts/dev-contracts/test/AddressAliasHelperTest.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "../../vendor/AddressAliasHelper.sol";
+import {AddressAliasHelper} from "../../vendor/AddressAliasHelper.sol";
 
 contract AddressAliasHelperTest {
     function applyL1ToL2Alias(address _l1Address) external pure returns (address) {

diff --git a/l1-contracts/contracts/dev-contracts/test/AdminFacetTest.sol b/l1-contracts/contracts/dev-contracts/test/AdminFacetTest.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "../../state-transition/chain-deps/facets/Admin.sol";
+import {AdminFacet} from "../../state-transition/chain-deps/facets/Admin.sol";
 
 contract AdminFacetTest is AdminFacet {
     // add this to be excluded from coverage report

diff --git a/l1-contracts/contracts/dev-contracts/test/CustomUpgradeTest.sol b/l1-contracts/contracts/dev-contracts/test/CustomUpgradeTest.sol
@@ -2,8 +2,8 @@
 
 pragma solidity 0.8.20;
 
-import "../../state-transition/libraries/Diamond.sol";
-import "../../upgrades/BaseZkSyncUpgrade.sol";
+import {Diamond} from "../../state-transition/libraries/Diamond.sol";
+import {BaseZkSyncUpgrade, ProposedUpgrade} from "../../upgrades/BaseZkSyncUpgrade.sol";
 
 contract CustomUpgradeTest is BaseZkSyncUpgrade {
     // add this to be excluded from coverage report

diff --git a/l1-contracts/contracts/dev-contracts/test/DiamondCutTestContract.sol b/l1-contracts/contracts/dev-contracts/test/DiamondCutTestContract.sol
@@ -2,8 +2,8 @@
 
 pragma solidity 0.8.20;
 
-import "../../state-transition/libraries/Diamond.sol";
-import "../../state-transition/chain-deps/facets/Getters.sol";
+import {Diamond} from "../../state-transition/libraries/Diamond.sol";
+import {GettersFacet} from "../../state-transition/chain-deps/facets/Getters.sol";
 
 contract DiamondCutTestContract is GettersFacet {
     function diamondCut(Diamond.DiamondCutData memory _diamondCut) external {

diff --git a/l1-contracts/contracts/dev-contracts/test/DiamondProxyTest.sol b/l1-contracts/contracts/dev-contracts/test/DiamondProxyTest.sol
@@ -2,8 +2,8 @@
 
 pragma solidity 0.8.20;
 
-import "../../state-transition/libraries/Diamond.sol";
-import "../../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";
+import {Diamond} from "../../state-transition/libraries/Diamond.sol";
+import {ZkSyncStateTransitionBase} from "../../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";
 
 contract DiamondProxyTest is ZkSyncStateTransitionBase {
     // add this to be excluded from coverage report

diff --git a/l1-contracts/contracts/dev-contracts/test/DummyAdminFacet.sol b/l1-contracts/contracts/dev-contracts/test/DummyAdminFacet.sol
@@ -3,7 +3,7 @@
 pragma solidity 0.8.20;
 
 import {Diamond} from "../../state-transition/libraries/Diamond.sol";
-import "../../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";
+import {ZkSyncStateTransitionBase} from "../../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";
 
 contract DummyAdminFacet is ZkSyncStateTransitionBase {
     // add this to be excluded from coverage report

diff --git a/l1-contracts/contracts/dev-contracts/test/DummyAdminFacet2.sol b/l1-contracts/contracts/dev-contracts/test/DummyAdminFacet2.sol
@@ -3,7 +3,7 @@
 pragma solidity 0.8.20;
 
 import {Diamond} from "../../state-transition/libraries/Diamond.sol";
-import "../../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";
+import {ZkSyncStateTransitionBase} from "../../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";
 
 contract DummyAdminFacet2 is ZkSyncStateTransitionBase {
     // add this to be excluded from coverage report

diff --git a/l1-contracts/contracts/dev-contracts/test/DummyExecutor.sol b/l1-contracts/contracts/dev-contracts/test/DummyExecutor.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "../../state-transition/chain-interfaces/IExecutor.sol";
+import {IExecutor} from "../../state-transition/chain-interfaces/IExecutor.sol";
 
 /// @title DummyExecutor
 /// @notice A test smart contract implementing the IExecutor interface to simulate Executor behavior for testing purposes.

diff --git a/l1-contracts/contracts/dev-contracts/test/DummySharedBridge.sol b/l1-contracts/contracts/dev-contracts/test/DummySharedBridge.sol
@@ -4,8 +4,8 @@ pragma solidity 0.8.20;
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-import {L2TransactionRequestTwoBridgesInner, L2TransactionRequestDirect} from "../../bridgehub/IBridgehub.sol";
-import {ETH_TOKEN_ADDRESS, TWO_BRIDGES_MAGIC_VALUE, BRIDGEHUB_MIN_SECOND_BRIDGE_ADDRESS} from "../../common/Config.sol";
+import {L2TransactionRequestTwoBridgesInner} from "../../bridgehub/IBridgehub.sol";
+import {TWO_BRIDGES_MAGIC_VALUE} from "../../common/Config.sol";
 
 contract DummySharedBridge {
     event BridgehubDepositBaseTokenInitiated(

diff --git a/l1-contracts/contracts/dev-contracts/test/DummyStateTransitionManager.sol b/l1-contracts/contracts/dev-contracts/test/DummyStateTransitionManager.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "../../state-transition/StateTransitionManager.sol";
+import {StateTransitionManager} from "../../state-transition/StateTransitionManager.sol";
 
 /// @title DummyExecutor
 /// @notice A test smart contract implementing the IExecutor interface to simulate Executor behavior for testing purposes.

diff --git a/...ontracts/contracts/dev-contracts/test/DummyStateTransitionManagerWithBridgeHubAddress.sol b/...ontracts/contracts/dev-contracts/test/DummyStateTransitionManagerWithBridgeHubAddress.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "../../state-transition/StateTransitionManager.sol";
+import {StateTransitionManager} from "../../state-transition/StateTransitionManager.sol";
 
 /// @title DummyExecutor
 /// @notice A test smart contract implementing the IExecutor interface to simulate Executor behavior for testing purposes.

diff --git a/l1-contracts/contracts/dev-contracts/test/ExecutorProvingTest.sol b/l1-contracts/contracts/dev-contracts/test/ExecutorProvingTest.sol
@@ -5,7 +5,7 @@ pragma solidity 0.8.20;
 import {ExecutorFacet} from "../../state-transition/chain-deps/facets/Executor.sol";
 import {VerifierParams, PubdataPricingMode} from "../../state-transition/chain-deps/ZkSyncStateTransitionStorage.sol";
 import {LogProcessingOutput} from "../../state-transition/chain-interfaces/IExecutor.sol";
-import {PubdataSource, LogProcessingOutput} from "../../state-transition/chain-interfaces/IExecutor.sol";
+import {LogProcessingOutput} from "../../state-transition/chain-interfaces/IExecutor.sol";
 
 contract ExecutorProvingTest is ExecutorFacet {
     function getBatchProofPublicInput(

diff --git a/l1-contracts/contracts/dev-contracts/test/L1ERC20BridgeTest.sol b/l1-contracts/contracts/dev-contracts/test/L1ERC20BridgeTest.sol
@@ -2,9 +2,8 @@
 
 pragma solidity 0.8.20;
 
-import "../../bridge/L1ERC20Bridge.sol";
-import {IMailbox} from "../../state-transition/chain-interfaces/IMailbox.sol";
-import "../../bridge/interfaces/IL1SharedBridge.sol";
+import {L1ERC20Bridge} from "../../bridge/L1ERC20Bridge.sol";
+import {IBridgehub, IL1SharedBridge} from "../../bridge/interfaces/IL1SharedBridge.sol";
 
 /// @author Matter Labs
 contract L1ERC20BridgeTest is L1ERC20Bridge {

diff --git a/l1-contracts/contracts/dev-contracts/test/L1SharedBridgeTest.sol b/l1-contracts/contracts/dev-contracts/test/L1SharedBridgeTest.sol
@@ -2,9 +2,11 @@
 
 pragma solidity 0.8.20;
 
-import "../../bridge/L1SharedBridge.sol";
-import {IMailbox} from "../../state-transition/chain-interfaces/IMailbox.sol";
-import "../../bridge/interfaces/IL1SharedBridge.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+
+import {L1SharedBridge} from "../../bridge/L1SharedBridge.sol";
+import {IL1ERC20Bridge, IBridgehub} from "../../bridge/interfaces/IL1SharedBridge.sol";
+import {ETH_TOKEN_ADDRESS, ERA_CHAIN_ID} from "../../common/Config.sol";
 
 /// @author Matter Labs
 contract L1SharedBridgeTest is L1SharedBridge {

diff --git a/l1-contracts/contracts/dev-contracts/test/MerkleTest.sol b/l1-contracts/contracts/dev-contracts/test/MerkleTest.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "../../state-transition/libraries/Merkle.sol";
+import {Merkle} from "../../state-transition/libraries/Merkle.sol";
 
 contract MerkleTest {
     function calculateRoot(

diff --git a/l1-contracts/contracts/dev-contracts/test/MockExecutor.sol b/l1-contracts/contracts/dev-contracts/test/MockExecutor.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "../../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";
+import {ZkSyncStateTransitionBase} from "../../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";
 
 contract MockExecutorFacet is ZkSyncStateTransitionBase {
     // add this to be excluded from coverage report

diff --git a/l1-contracts/contracts/dev-contracts/test/PriorityQueueTest.sol b/l1-contracts/contracts/dev-contracts/test/PriorityQueueTest.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "../../state-transition/libraries/PriorityQueue.sol";
+import {PriorityQueue, PriorityOperation} from "../../state-transition/libraries/PriorityQueue.sol";
 
 contract PriorityQueueTest {
     PriorityQueue.Queue priorityQueue;

diff --git a/l1-contracts/contracts/dev-contracts/test/UncheckedMathTest.sol b/l1-contracts/contracts/dev-contracts/test/UncheckedMathTest.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "../../common/libraries/UncheckedMath.sol";
+import {UncheckedMath} from "../../common/libraries/UncheckedMath.sol";
 
 contract UncheckedMathTest {
     function uncheckedInc(uint256 _number) external pure returns (uint256) {

diff --git a/l1-contracts/contracts/dev-contracts/test/UnsafeBytesTest.sol b/l1-contracts/contracts/dev-contracts/test/UnsafeBytesTest.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "../../common/libraries/UnsafeBytes.sol";
+import {UnsafeBytes} from "../../common/libraries/UnsafeBytes.sol";
 
 contract UnsafeBytesTest {
     // add this to be excluded from coverage report

diff --git a/l1-contracts/contracts/dev-contracts/test/VerifierRecursiveTest.sol b/l1-contracts/contracts/dev-contracts/test/VerifierRecursiveTest.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "../../state-transition/Verifier.sol";
+import {Verifier} from "../../state-transition/Verifier.sol";
 
 /// @author Matter Labs
 contract VerifierRecursiveTest is Verifier {

diff --git a/l1-contracts/contracts/dev-contracts/test/VerifierTest.sol b/l1-contracts/contracts/dev-contracts/test/VerifierTest.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "../../state-transition/Verifier.sol";
+import {Verifier} from "../../state-transition/Verifier.sol";
 
 /// @author Matter Labs
 contract VerifierTest is Verifier {

diff --git a/l1-contracts/contracts/state-transition/StateTransitionManager.sol b/l1-contracts/contracts/state-transition/StateTransitionManager.sol
@@ -16,7 +16,7 @@ import {L2CanonicalTransaction} from "../common/Messaging.sol";
 import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol";
 import {ProposedUpgrade} from "../upgrades/BaseZkSyncUpgrade.sol";
 import {ReentrancyGuard} from "../common/ReentrancyGuard.sol";
-import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA, L2_TO_L1_LOG_SERIALIZE_SIZE, DEFAULT_L2_LOGS_TREE_ROOT_HASH, EMPTY_STRING_KECCAK, SYSTEM_UPGRADE_L2_TX_TYPE, ERA_DIAMOND_PROXY, ERA_CHAIN_ID} from "../common/Config.sol";
+import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA, L2_TO_L1_LOG_SERIALIZE_SIZE, DEFAULT_L2_LOGS_TREE_ROOT_HASH, EMPTY_STRING_KECCAK, SYSTEM_UPGRADE_L2_TX_TYPE} from "../common/Config.sol";
 import {VerifierParams} from "./chain-interfaces/IVerifier.sol";
 
 /// @title StateTransition contract

diff --git a/l1-contracts/contracts/state-transition/Verifier.sol b/l1-contracts/contracts/state-transition/Verifier.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "./chain-interfaces/IVerifier.sol";
+import {IVerifier} from "./chain-interfaces/IVerifier.sol";
 
 /* solhint-disable max-line-length */
 /// @author Matter Labs

diff --git a/l1-contracts/contracts/state-transition/chain-deps/DiamondInit.sol b/l1-contracts/contracts/state-transition/chain-deps/DiamondInit.sol
@@ -4,12 +4,8 @@ pragma solidity 0.8.20;
 
 import {Diamond} from "../libraries/Diamond.sol";
 import {ZkSyncStateTransitionBase} from "./facets/ZkSyncStateTransitionBase.sol";
-import {FeeParams} from "./ZkSyncStateTransitionStorage.sol";
 import {L2_TO_L1_LOG_SERIALIZE_SIZE, MAX_GAS_PER_TRANSACTION} from "../../common/Config.sol";
 import {InitializeData, IDiamondInit} from "../chain-interfaces/IDiamondInit.sol";
-import {VerifierParams} from "../chain-interfaces/IVerifier.sol";
-
-import "../l2-deps/ISystemContext.sol";
 
 /// @author Matter Labs
 /// @dev The contract is used only once to initialize the diamond proxy.

diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol
@@ -11,14 +11,12 @@ import {TransactionValidator} from "../../libraries/TransactionValidator.sol";
 import {WritePriorityOpParams, L2CanonicalTransaction, L2Message, L2Log, TxStatus, BridgehubL2TransactionRequest} from "../../../common/Messaging.sol";
 import {FeeParams, PubdataPricingMode} from "../ZkSyncStateTransitionStorage.sol";
 import {UncheckedMath} from "../../../common/libraries/UncheckedMath.sol";
-import {UnsafeBytes} from "../../../common/libraries/UnsafeBytes.sol";
 import {L2ContractHelper} from "../../../common/libraries/L2ContractHelper.sol";
 import {AddressAliasHelper} from "../../../vendor/AddressAliasHelper.sol";
 import {ZkSyncStateTransitionBase} from "./ZkSyncStateTransitionBase.sol";
 import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA, L1_GAS_PER_PUBDATA_BYTE, L2_L1_LOGS_TREE_DEFAULT_LEAF_HASH, PRIORITY_OPERATION_L2_TX_TYPE, PRIORITY_EXPIRATION, MAX_NEW_FACTORY_DEPS, ETH_TOKEN_ADDRESS, ERA_CHAIN_ID} from "../../../common/Config.sol";
-import {L2_BOOTLOADER_ADDRESS, L2_TO_L1_MESSENGER_SYSTEM_CONTRACT_ADDR, L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR} from "../../../common/L2ContractAddresses.sol";
+import {L2_BOOTLOADER_ADDRESS, L2_TO_L1_MESSENGER_SYSTEM_CONTRACT_ADDR} from "../../../common/L2ContractAddresses.sol";
 
-import {IBridgehub} from "../../../bridgehub/IBridgehub.sol";
 import {IL1SharedBridge} from "../../../bridge/interfaces/IL1SharedBridge.sol";
 
 // While formally the following import is not used, it is needed to inherit documentation from it

diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol
@@ -2,7 +2,6 @@
 
 pragma solidity 0.8.20;
 
-import {L2CanonicalTransaction} from "../../common/Messaging.sol";
 import {IVerifier, VerifierParams} from "./IVerifier.sol";
 import {FeeParams} from "../chain-deps/ZkSyncStateTransitionStorage.sol";
 

diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncStateTransition.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncStateTransition.sol
@@ -6,11 +6,9 @@ import {IAdmin} from "./IAdmin.sol";
 import {IExecutor} from "./IExecutor.sol";
 import {IGetters} from "./IGetters.sol";
 import {IMailbox} from "./IMailbox.sol";
-import {Verifier} from "../Verifier.sol";
-import {VerifierParams} from "./IVerifier.sol";
 
 // kl to do remove this, needed for the server for now
-import "../libraries/Diamond.sol";
+import {Diamond} from "../libraries/Diamond.sol";
 
 interface IZkSyncStateTransition is IAdmin, IExecutor, IGetters, IMailbox {
     // KL todo: need this in the server for now

diff --git a/l1-contracts/contracts/upgrades/BaseZkSyncUpgrade.sol b/l1-contracts/contracts/upgrades/BaseZkSyncUpgrade.sol
@@ -3,7 +3,6 @@
 pragma solidity 0.8.20;
 
 import {ZkSyncStateTransitionBase} from "../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";
-import {IMailbox} from "../state-transition/chain-interfaces/IMailbox.sol";
 import {VerifierParams} from "../state-transition/chain-interfaces/IVerifier.sol";
 import {IVerifier} from "../state-transition/chain-interfaces/IVerifier.sol";
 import {L2ContractHelper} from "../common/libraries/L2ContractHelper.sol";

diff --git a/l1-contracts/contracts/upgrades/BaseZkSyncUpgradeGenesis.sol b/l1-contracts/contracts/upgrades/BaseZkSyncUpgradeGenesis.sol
@@ -2,13 +2,7 @@
 
 pragma solidity 0.8.20;
 
-import "../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";
-import "../state-transition/chain-interfaces/IMailbox.sol";
-import "../state-transition/chain-interfaces/IVerifier.sol";
-import "../common/libraries/L2ContractHelper.sol";
-import "../common/Messaging.sol";
-import "../state-transition/libraries/TransactionValidator.sol";
-import {MAX_NEW_FACTORY_DEPS, SYSTEM_UPGRADE_L2_TX_TYPE, MAX_ALLOWED_PROTOCOL_VERSION_DELTA} from "../common/Config.sol";
+import {MAX_ALLOWED_PROTOCOL_VERSION_DELTA} from "../common/Config.sol";
 import {ProposedUpgrade, BaseZkSyncUpgrade} from "./BaseZkSyncUpgrade.sol";
 
 /// @author Matter Labs

diff --git a/l1-contracts/contracts/upgrades/GenesisUpgrade.sol b/l1-contracts/contracts/upgrades/GenesisUpgrade.sol
@@ -2,9 +2,9 @@
 
 pragma solidity 0.8.20;
 
-import "../state-transition/libraries/Diamond.sol";
-import "./BaseZkSyncUpgradeGenesis.sol";
-import "./IDefaultUpgrade.sol";
+import {Diamond} from "../state-transition/libraries/Diamond.sol";
+import {BaseZkSyncUpgradeGenesis} from "./BaseZkSyncUpgradeGenesis.sol";
+import {ProposedUpgrade} from "./IDefaultUpgrade.sol";
 
 /// @author Matter Labs
 /// @custom:security-contact security@matterlabs.dev

diff --git a/...ntracts/test/foundry/unit/concrete/Bridgehub/BridgehubMailbox/FinalizeEthWithdrawal.t.sol b/...ntracts/test/foundry/unit/concrete/Bridgehub/BridgehubMailbox/FinalizeEthWithdrawal.t.sol
@@ -4,8 +4,6 @@ pragma solidity ^0.8.17;
 
 import {BridgehubMailboxTest} from "./_BridgehubMailbox_Shared.t.sol";
 
-import {IMailbox} from "solpp/state-transition/chain-interfaces/IMailbox.sol";
-
 contract FinalizeEthWithdrawalTest is BridgehubMailboxTest {
     // uint256 internal l2BlockNumber;
     // uint256 internal l2MessageIndex;