From 5700d688f5389682607224c2a83427bc9d45f7ae Mon Sep 17 00:00:00 2001 From: chrismaree Date: Wed, 16 Mar 2022 10:16:53 +0200 Subject: [PATCH 1/2] fix[N15] Unnecessary import statements Signed-off-by: chrismaree --- contracts/Ethereum_SpokePool.sol | 6 +----- contracts/HubPoolInterface.sol | 3 ++- contracts/MerkleLib.sol | 3 ++- contracts/Optimism_SpokePool.sol | 4 ++-- contracts/PolygonTokenBridger.sol | 5 +++-- contracts/Polygon_SpokePool.sol | 7 ++++--- contracts/SpokePool.sol | 6 ++---- contracts/chain-adapters/Arbitrum_Adapter.sol | 4 ---- contracts/chain-adapters/Ethereum_Adapter.sol | 1 - contracts/chain-adapters/Polygon_Adapter.sol | 3 --- 10 files changed, 16 insertions(+), 26 deletions(-) diff --git a/contracts/Ethereum_SpokePool.sol b/contracts/Ethereum_SpokePool.sol index 12ac97aee..5d5084fa5 100644 --- a/contracts/Ethereum_SpokePool.sol +++ b/contracts/Ethereum_SpokePool.sol @@ -1,13 +1,9 @@ // SPDX-License-Identifier: GPL-3.0-only pragma solidity ^0.8.0; -import "./interfaces/WETH9.sol"; - -import "@openzeppelin/contracts/access/Ownable.sol"; -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - import "./SpokePool.sol"; import "./SpokePoolInterface.sol"; +import "@openzeppelin/contracts/access/Ownable.sol"; /** * @notice Ethereum L1 specific SpokePool. Used on Ethereum L1 to facilitate L2->L1 transfers. diff --git a/contracts/HubPoolInterface.sol b/contracts/HubPoolInterface.sol index 692ac40d2..cbc452b73 100644 --- a/contracts/HubPoolInterface.sol +++ b/contracts/HubPoolInterface.sol @@ -1,9 +1,10 @@ // SPDX-License-Identifier: GPL-3.0-only pragma solidity ^0.8.0; -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "./interfaces/AdapterInterface.sol"; +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; + /** * @notice Concise list of functions in HubPool implementation. */ diff --git a/contracts/MerkleLib.sol b/contracts/MerkleLib.sol index 85666ca8b..f7e129697 100644 --- a/contracts/MerkleLib.sol +++ b/contracts/MerkleLib.sol @@ -1,10 +1,11 @@ // SPDX-License-Identifier: GPL-3.0-only pragma solidity ^0.8.0; -import "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol"; import "./SpokePoolInterface.sol"; import "./HubPoolInterface.sol"; +import "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol"; + /** * @notice Library to help with merkle roots, proofs, and claims. */ diff --git a/contracts/Optimism_SpokePool.sol b/contracts/Optimism_SpokePool.sol index 2be41a32b..609c49fa8 100644 --- a/contracts/Optimism_SpokePool.sol +++ b/contracts/Optimism_SpokePool.sol @@ -1,13 +1,13 @@ // SPDX-License-Identifier: GPL-3.0-only pragma solidity ^0.8.0; +import "./SpokePool.sol"; import "./interfaces/WETH9.sol"; +import "./SpokePoolInterface.sol"; import "@eth-optimism/contracts/libraries/bridge/CrossDomainEnabled.sol"; import "@eth-optimism/contracts/libraries/constants/Lib_PredeployAddresses.sol"; import "@eth-optimism/contracts/L2/messaging/IL2ERC20Bridge.sol"; -import "./SpokePool.sol"; -import "./SpokePoolInterface.sol"; /** * @notice OVM specific SpokePool. Uses OVM cross-domain-enabled logic to implement admin only access to functions. diff --git a/contracts/PolygonTokenBridger.sol b/contracts/PolygonTokenBridger.sol index c8f3cbc3d..197a4c3b0 100644 --- a/contracts/PolygonTokenBridger.sol +++ b/contracts/PolygonTokenBridger.sol @@ -1,11 +1,12 @@ // SPDX-License-Identifier: AGPL-3.0-only pragma solidity ^0.8.0; -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import "./Lockable.sol"; import "./interfaces/WETH9.sol"; +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; + // ERC20s (on polygon) compatible with polygon's bridge have a withdraw method. interface PolygonIERC20 is IERC20 { function withdraw(uint256 amount) external; diff --git a/contracts/Polygon_SpokePool.sol b/contracts/Polygon_SpokePool.sol index 142456afb..fb5ec7bb5 100644 --- a/contracts/Polygon_SpokePool.sol +++ b/contracts/Polygon_SpokePool.sol @@ -1,12 +1,13 @@ // SPDX-License-Identifier: GPL-3.0-only pragma solidity ^0.8.0; +import "./SpokePool.sol"; +import "./PolygonTokenBridger.sol"; import "./interfaces/WETH9.sol"; +import "./SpokePoolInterface.sol"; + import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; -import "./SpokePool.sol"; -import "./SpokePoolInterface.sol"; -import "./PolygonTokenBridger.sol"; // IFxMessageProcessor represents interface to process messages. interface IFxMessageProcessor { diff --git a/contracts/SpokePool.sol b/contracts/SpokePool.sol index c42cec6f8..48c0ce31b 100644 --- a/contracts/SpokePool.sol +++ b/contracts/SpokePool.sol @@ -3,18 +3,16 @@ pragma solidity ^0.8.0; import "./MerkleLib.sol"; import "./interfaces/WETH9.sol"; +import "./Lockable.sol"; +import "./SpokePoolInterface.sol"; import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts/utils/Address.sol"; import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; - import "@uma/core/contracts/common/implementation/Testable.sol"; import "@uma/core/contracts/common/implementation/MultiCaller.sol"; -import "./Lockable.sol"; -import "./MerkleLib.sol"; -import "./SpokePoolInterface.sol"; /** * @title SpokePool diff --git a/contracts/chain-adapters/Arbitrum_Adapter.sol b/contracts/chain-adapters/Arbitrum_Adapter.sol index cad7da7d7..244eeb7fe 100644 --- a/contracts/chain-adapters/Arbitrum_Adapter.sol +++ b/contracts/chain-adapters/Arbitrum_Adapter.sol @@ -2,10 +2,6 @@ pragma solidity ^0.8.0; import "../interfaces/AdapterInterface.sol"; -import "../interfaces/AdapterInterface.sol"; -import "../interfaces/WETH9.sol"; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; interface ArbitrumL1InboxLike { function createRetryableTicket( diff --git a/contracts/chain-adapters/Ethereum_Adapter.sol b/contracts/chain-adapters/Ethereum_Adapter.sol index 9a315612b..769626de9 100644 --- a/contracts/chain-adapters/Ethereum_Adapter.sol +++ b/contracts/chain-adapters/Ethereum_Adapter.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.0; import "../interfaces/AdapterInterface.sol"; -import "../interfaces/WETH9.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; diff --git a/contracts/chain-adapters/Polygon_Adapter.sol b/contracts/chain-adapters/Polygon_Adapter.sol index 0f9d0da60..63cef029c 100644 --- a/contracts/chain-adapters/Polygon_Adapter.sol +++ b/contracts/chain-adapters/Polygon_Adapter.sol @@ -3,10 +3,7 @@ pragma solidity ^0.8.0; import "../interfaces/AdapterInterface.sol"; import "../interfaces/WETH9.sol"; -import "../Lockable.sol"; -import "@eth-optimism/contracts/libraries/bridge/CrossDomainEnabled.sol"; -import "@eth-optimism/contracts/L1/messaging/IL1StandardBridge.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; From d81295d3fd433a1f08fdd42c75a0aa3233a77dbe Mon Sep 17 00:00:00 2001 From: chrismaree Date: Fri, 18 Mar 2022 07:31:18 +0200 Subject: [PATCH 2/2] nit Signed-off-by: chrismaree --- contracts/Arbitrum_SpokePool.sol | 1 - contracts/Ethereum_SpokePool.sol | 1 - contracts/Optimism_SpokePool.sol | 1 - contracts/interfaces/LpTokenFactoryInterface.sol | 2 -- 4 files changed, 5 deletions(-) diff --git a/contracts/Arbitrum_SpokePool.sol b/contracts/Arbitrum_SpokePool.sol index 81a59e718..42bb5435c 100644 --- a/contracts/Arbitrum_SpokePool.sol +++ b/contracts/Arbitrum_SpokePool.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.0; import "./SpokePool.sol"; -import "./SpokePoolInterface.sol"; interface StandardBridgeLike { function outboundTransfer( diff --git a/contracts/Ethereum_SpokePool.sol b/contracts/Ethereum_SpokePool.sol index 5d5084fa5..e94888913 100644 --- a/contracts/Ethereum_SpokePool.sol +++ b/contracts/Ethereum_SpokePool.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.0; import "./SpokePool.sol"; -import "./SpokePoolInterface.sol"; import "@openzeppelin/contracts/access/Ownable.sol"; /** diff --git a/contracts/Optimism_SpokePool.sol b/contracts/Optimism_SpokePool.sol index 609c49fa8..ebef91f2c 100644 --- a/contracts/Optimism_SpokePool.sol +++ b/contracts/Optimism_SpokePool.sol @@ -3,7 +3,6 @@ pragma solidity ^0.8.0; import "./SpokePool.sol"; import "./interfaces/WETH9.sol"; -import "./SpokePoolInterface.sol"; import "@eth-optimism/contracts/libraries/bridge/CrossDomainEnabled.sol"; import "@eth-optimism/contracts/libraries/constants/Lib_PredeployAddresses.sol"; diff --git a/contracts/interfaces/LpTokenFactoryInterface.sol b/contracts/interfaces/LpTokenFactoryInterface.sol index f1740c468..92b7bf9e8 100644 --- a/contracts/interfaces/LpTokenFactoryInterface.sol +++ b/contracts/interfaces/LpTokenFactoryInterface.sol @@ -1,8 +1,6 @@ // SPDX-License-Identifier: AGPL-3.0-only pragma solidity ^0.8.0; -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - interface LpTokenFactoryInterface { function createLpToken(address l1Token) external returns (address); }