diff --git a/src/ethereum/arrow_glacier/vm/interpreter.py b/src/ethereum/arrow_glacier/vm/interpreter.py index 1082ad4fc1..ac38967b9c 100644 --- a/src/ethereum/arrow_glacier/vm/interpreter.py +++ b/src/ethereum/arrow_glacier/vm/interpreter.py @@ -18,6 +18,7 @@ from ethereum_types.bytes import Bytes0 from ethereum_types.numeric import U256, Uint, ulen +from ethereum.exceptions import EthereumException from ethereum.trace import ( EvmStop, OpEnd, @@ -51,7 +52,6 @@ from . import Environment, Evm from .exceptions import ( AddressCollision, - EthereumException, ExceptionalHalt, InvalidContractPrefix, InvalidOpcode, diff --git a/src/ethereum/berlin/vm/interpreter.py b/src/ethereum/berlin/vm/interpreter.py index c340b9b909..bc7d4eb589 100644 --- a/src/ethereum/berlin/vm/interpreter.py +++ b/src/ethereum/berlin/vm/interpreter.py @@ -18,6 +18,7 @@ from ethereum_types.bytes import Bytes0 from ethereum_types.numeric import U256, Uint, ulen +from ethereum.exceptions import EthereumException from ethereum.trace import ( EvmStop, OpEnd, @@ -51,7 +52,6 @@ from . import Environment, Evm from .exceptions import ( AddressCollision, - EthereumException, ExceptionalHalt, InvalidOpcode, OutOfGasError, diff --git a/src/ethereum/byzantium/vm/interpreter.py b/src/ethereum/byzantium/vm/interpreter.py index b1157e2ef2..3d2e368c9b 100644 --- a/src/ethereum/byzantium/vm/interpreter.py +++ b/src/ethereum/byzantium/vm/interpreter.py @@ -18,6 +18,7 @@ from ethereum_types.bytes import Bytes0 from ethereum_types.numeric import U256, Uint, ulen +from ethereum.exceptions import EthereumException from ethereum.trace import ( EvmStop, OpEnd, @@ -50,7 +51,6 @@ from . import Environment, Evm from .exceptions import ( AddressCollision, - EthereumException, ExceptionalHalt, InvalidOpcode, OutOfGasError, diff --git a/src/ethereum/cancun/vm/interpreter.py b/src/ethereum/cancun/vm/interpreter.py index fa24567d99..cfb5f32843 100644 --- a/src/ethereum/cancun/vm/interpreter.py +++ b/src/ethereum/cancun/vm/interpreter.py @@ -18,6 +18,7 @@ from ethereum_types.bytes import Bytes0 from ethereum_types.numeric import U256, Uint, ulen +from ethereum.exceptions import EthereumException from ethereum.trace import ( EvmStop, OpEnd, @@ -51,7 +52,6 @@ from . import Environment, Evm from .exceptions import ( AddressCollision, - EthereumException, ExceptionalHalt, InvalidContractPrefix, InvalidOpcode, diff --git a/src/ethereum/constantinople/vm/interpreter.py b/src/ethereum/constantinople/vm/interpreter.py index 11d14ec0e9..b35dd23706 100644 --- a/src/ethereum/constantinople/vm/interpreter.py +++ b/src/ethereum/constantinople/vm/interpreter.py @@ -18,6 +18,7 @@ from ethereum_types.bytes import Bytes0 from ethereum_types.numeric import U256, Uint, ulen +from ethereum.exceptions import EthereumException from ethereum.trace import ( EvmStop, OpEnd, @@ -50,7 +51,6 @@ from . import Environment, Evm from .exceptions import ( AddressCollision, - EthereumException, ExceptionalHalt, InvalidOpcode, OutOfGasError, diff --git a/src/ethereum/dao_fork/vm/interpreter.py b/src/ethereum/dao_fork/vm/interpreter.py index c19647d183..d9e55e4891 100644 --- a/src/ethereum/dao_fork/vm/interpreter.py +++ b/src/ethereum/dao_fork/vm/interpreter.py @@ -18,6 +18,7 @@ from ethereum_types.bytes import Bytes0 from ethereum_types.numeric import U256, Uint, ulen +from ethereum.exceptions import EthereumException from ethereum.trace import ( EvmStop, OpEnd, @@ -48,7 +49,6 @@ from . import Environment, Evm from .exceptions import ( AddressCollision, - EthereumException, ExceptionalHalt, InvalidOpcode, StackDepthLimitError, diff --git a/src/ethereum/frontier/vm/interpreter.py b/src/ethereum/frontier/vm/interpreter.py index 0d83731b4f..0c392d68ef 100644 --- a/src/ethereum/frontier/vm/interpreter.py +++ b/src/ethereum/frontier/vm/interpreter.py @@ -18,6 +18,7 @@ from ethereum_types.bytes import Bytes0 from ethereum_types.numeric import U256, Uint, ulen +from ethereum.exceptions import EthereumException from ethereum.trace import ( EvmStop, OpEnd, @@ -48,7 +49,6 @@ from . import Environment, Evm from .exceptions import ( AddressCollision, - EthereumException, ExceptionalHalt, InvalidOpcode, StackDepthLimitError, diff --git a/src/ethereum/gray_glacier/vm/interpreter.py b/src/ethereum/gray_glacier/vm/interpreter.py index 1082ad4fc1..ac38967b9c 100644 --- a/src/ethereum/gray_glacier/vm/interpreter.py +++ b/src/ethereum/gray_glacier/vm/interpreter.py @@ -18,6 +18,7 @@ from ethereum_types.bytes import Bytes0 from ethereum_types.numeric import U256, Uint, ulen +from ethereum.exceptions import EthereumException from ethereum.trace import ( EvmStop, OpEnd, @@ -51,7 +52,6 @@ from . import Environment, Evm from .exceptions import ( AddressCollision, - EthereumException, ExceptionalHalt, InvalidContractPrefix, InvalidOpcode, diff --git a/src/ethereum/homestead/vm/interpreter.py b/src/ethereum/homestead/vm/interpreter.py index c6c9c128ef..bc689e930e 100644 --- a/src/ethereum/homestead/vm/interpreter.py +++ b/src/ethereum/homestead/vm/interpreter.py @@ -18,6 +18,7 @@ from ethereum_types.bytes import Bytes0 from ethereum_types.numeric import U256, Uint, ulen +from ethereum.exceptions import EthereumException from ethereum.trace import ( EvmStop, OpEnd, @@ -48,7 +49,6 @@ from . import Environment, Evm from .exceptions import ( AddressCollision, - EthereumException, ExceptionalHalt, InvalidOpcode, StackDepthLimitError, diff --git a/src/ethereum/istanbul/vm/interpreter.py b/src/ethereum/istanbul/vm/interpreter.py index 6323dfca29..ed68411e7a 100644 --- a/src/ethereum/istanbul/vm/interpreter.py +++ b/src/ethereum/istanbul/vm/interpreter.py @@ -18,6 +18,7 @@ from ethereum_types.bytes import Bytes0 from ethereum_types.numeric import U256, Uint, ulen +from ethereum.exceptions import EthereumException from ethereum.trace import ( EvmStop, OpEnd, @@ -51,7 +52,6 @@ from . import Environment, Evm from .exceptions import ( AddressCollision, - EthereumException, ExceptionalHalt, InvalidOpcode, OutOfGasError, diff --git a/src/ethereum/london/vm/interpreter.py b/src/ethereum/london/vm/interpreter.py index 897c7c6e52..ac38967b9c 100644 --- a/src/ethereum/london/vm/interpreter.py +++ b/src/ethereum/london/vm/interpreter.py @@ -18,8 +18,8 @@ from ethereum_types.bytes import Bytes0 from ethereum_types.numeric import U256, Uint, ulen +from ethereum.exceptions import EthereumException from ethereum.trace import ( - EthereumException, EvmStop, OpEnd, OpException, diff --git a/src/ethereum/muir_glacier/vm/interpreter.py b/src/ethereum/muir_glacier/vm/interpreter.py index 54d1415671..62f47456eb 100644 --- a/src/ethereum/muir_glacier/vm/interpreter.py +++ b/src/ethereum/muir_glacier/vm/interpreter.py @@ -18,8 +18,8 @@ from ethereum_types.bytes import Bytes0 from ethereum_types.numeric import U256, Uint, ulen +from ethereum.exceptions import EthereumException from ethereum.trace import ( - EthereumException, EvmStop, OpEnd, OpException, diff --git a/src/ethereum/paris/vm/interpreter.py b/src/ethereum/paris/vm/interpreter.py index 9b75d03e4b..6d09addd76 100644 --- a/src/ethereum/paris/vm/interpreter.py +++ b/src/ethereum/paris/vm/interpreter.py @@ -18,6 +18,7 @@ from ethereum_types.bytes import Bytes0 from ethereum_types.numeric import U256, Uint, ulen +from ethereum.exceptions import EthereumException from ethereum.trace import ( EvmStop, OpEnd, @@ -51,7 +52,6 @@ from . import Environment, Evm from .exceptions import ( AddressCollision, - EthereumException, ExceptionalHalt, InvalidContractPrefix, InvalidOpcode, diff --git a/src/ethereum/shanghai/vm/interpreter.py b/src/ethereum/shanghai/vm/interpreter.py index 5432e9ee2c..760b954168 100644 --- a/src/ethereum/shanghai/vm/interpreter.py +++ b/src/ethereum/shanghai/vm/interpreter.py @@ -18,6 +18,7 @@ from ethereum_types.bytes import Bytes0 from ethereum_types.numeric import U256, Uint, ulen +from ethereum.exceptions import EthereumException from ethereum.trace import ( EvmStop, OpEnd, @@ -51,7 +52,6 @@ from . import Environment, Evm from .exceptions import ( AddressCollision, - EthereumException, ExceptionalHalt, InvalidContractPrefix, InvalidOpcode, diff --git a/src/ethereum/spurious_dragon/vm/interpreter.py b/src/ethereum/spurious_dragon/vm/interpreter.py index d8f5bb26fd..f31e77ea07 100644 --- a/src/ethereum/spurious_dragon/vm/interpreter.py +++ b/src/ethereum/spurious_dragon/vm/interpreter.py @@ -18,6 +18,7 @@ from ethereum_types.bytes import Bytes0 from ethereum_types.numeric import U256, Uint, ulen +from ethereum.exceptions import EthereumException from ethereum.trace import ( EvmStop, OpEnd, @@ -50,7 +51,6 @@ from . import Environment, Evm from .exceptions import ( AddressCollision, - EthereumException, ExceptionalHalt, InvalidOpcode, OutOfGasError, diff --git a/src/ethereum/tangerine_whistle/vm/interpreter.py b/src/ethereum/tangerine_whistle/vm/interpreter.py index 24b8483451..c1f4296a3c 100644 --- a/src/ethereum/tangerine_whistle/vm/interpreter.py +++ b/src/ethereum/tangerine_whistle/vm/interpreter.py @@ -18,6 +18,7 @@ from ethereum_types.bytes import Bytes0 from ethereum_types.numeric import U256, Uint, ulen +from ethereum.exceptions import EthereumException from ethereum.trace import ( EvmStop, OpEnd, @@ -48,7 +49,6 @@ from . import Environment, Evm from .exceptions import ( AddressCollision, - EthereumException, ExceptionalHalt, InvalidOpcode, StackDepthLimitError,