diff --git a/gnosis/eth/contract_common.py b/gnosis/eth/contracts/contract_common.py similarity index 100% rename from gnosis/eth/contract_common.py rename to gnosis/eth/contracts/contract_common.py diff --git a/gnosis/safe/proxy_factory.py b/gnosis/safe/proxy_factory.py index 421b281a5..4d25c4481 100644 --- a/gnosis/safe/proxy_factory.py +++ b/gnosis/safe/proxy_factory.py @@ -5,7 +5,6 @@ from web3 import Web3 from gnosis.eth import EthereumClient, EthereumTxSent -from gnosis.eth.contract_common import ContractCommon from gnosis.eth.contracts import ( get_paying_proxy_deployed_bytecode, get_proxy_1_0_0_deployed_bytecode, @@ -16,6 +15,7 @@ get_proxy_factory_V1_1_1_contract, get_proxy_factory_V1_3_0_contract, ) +from gnosis.eth.contracts.contract_common import ContractCommon from gnosis.eth.utils import compare_byte_code, fast_is_checksum_address from gnosis.util import cache diff --git a/gnosis/safe/safe.py b/gnosis/safe/safe.py index 9193c589f..adfb06eb9 100644 --- a/gnosis/safe/safe.py +++ b/gnosis/safe/safe.py @@ -28,6 +28,7 @@ get_safe_V1_1_1_contract, get_safe_V1_3_0_contract, ) +from gnosis.eth.contracts.contract_common import ContractCommon from gnosis.eth.utils import ( fast_bytes_to_checksum_address, fast_is_checksum_address, @@ -36,7 +37,6 @@ ) from gnosis.safe.proxy_factory import ProxyFactory -from ..eth.contract_common import ContractCommon from ..eth.typing import EthereumData from .exceptions import ( CannotEstimateGas,