From 7a329f15f6c51b78abc5ccdc6f4df695c60d04f2 Mon Sep 17 00:00:00 2001 From: Andrei Kozlov Date: Fri, 26 Jul 2024 11:22:01 +0300 Subject: [PATCH] Remove unnececcery imports --- .../transparent-proxy/TransparentProxyFactoryZkSync.sol | 4 +--- .../transparent-proxy/TransparentProxyFactory.sol | 2 +- .../transparent-proxy/TransparentProxyFactoryBase.sol | 9 ++------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src-zksync/contracts/transparent-proxy/TransparentProxyFactoryZkSync.sol b/src-zksync/contracts/transparent-proxy/TransparentProxyFactoryZkSync.sol index 93de2f8..268d4ff 100644 --- a/src-zksync/contracts/transparent-proxy/TransparentProxyFactoryZkSync.sol +++ b/src-zksync/contracts/transparent-proxy/TransparentProxyFactoryZkSync.sol @@ -1,9 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity >=0.8.24; -import {TransparentProxyFactoryBase, ITransparentProxyFactory} from '../../../src/contracts/transparent-proxy/TransparentProxyFactoryBase.sol'; -import {TransparentUpgradeableProxy} from '../../../src/contracts/transparent-proxy/TransparentUpgradeableProxy.sol'; -import {ProxyAdmin} from '../../../src/contracts/transparent-proxy/ProxyAdmin.sol'; +import {TransparentProxyFactoryBase} from '../../../src/contracts/transparent-proxy/TransparentProxyFactoryBase.sol'; import {ITransparentProxyFactoryZkSync} from './interfaces/ITransparentProxyFactoryZkSync.sol'; /** diff --git a/src/contracts/transparent-proxy/TransparentProxyFactory.sol b/src/contracts/transparent-proxy/TransparentProxyFactory.sol index a6446b6..099d2ef 100644 --- a/src/contracts/transparent-proxy/TransparentProxyFactory.sol +++ b/src/contracts/transparent-proxy/TransparentProxyFactory.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity >=0.8.0; -import {TransparentProxyFactoryBase, ITransparentProxyFactory, ProxyAdmin, TransparentUpgradeableProxy} from './TransparentProxyFactoryBase.sol'; +import {TransparentProxyFactoryBase} from './TransparentProxyFactoryBase.sol'; /** * @title TransparentProxyFactory diff --git a/src/contracts/transparent-proxy/TransparentProxyFactoryBase.sol b/src/contracts/transparent-proxy/TransparentProxyFactoryBase.sol index b9c3dad..41c8b06 100644 --- a/src/contracts/transparent-proxy/TransparentProxyFactoryBase.sol +++ b/src/contracts/transparent-proxy/TransparentProxyFactoryBase.sol @@ -67,7 +67,7 @@ abstract contract TransparentProxyFactoryBase is ITransparentProxyFactory { address admin, bytes calldata data, bytes32 salt - ) public view override returns (address) { + ) public view returns (address) { return _predictCreate2Address( address(this), @@ -78,12 +78,7 @@ abstract contract TransparentProxyFactoryBase is ITransparentProxyFactory { } /// @inheritdoc ITransparentProxyFactory - function predictCreateDeterministicProxyAdmin(bytes32 salt) - public - view - override - returns (address) - { + function predictCreateDeterministicProxyAdmin(bytes32 salt) public view returns (address) { return _predictCreate2Address(address(this), salt, type(ProxyAdmin).creationCode, abi.encode()); }