Fixup imports for ethereum_types

setup.cfg

@@ -206,7 +206,6 @@ extend-exclude =
     tests/fixtures/
 
 per-file-ignores =
-    src/ethereum/base_types.py:D105,SC100,SC200
     tests/*:D100,D101,D103,D104,E501,SC100,SC200
 
 # vim: set ft=dosini:

src/ethereum/arrow_glacier/blocks.py

@@ -11,7 +11,10 @@
 from dataclasses import dataclass
 from typing import Tuple, Union
 
-from ..base_types import U256, Bytes, Bytes8, Bytes32, Uint, slotted_freezable
+from ethereum_types.bytes import Bytes, Bytes8, Bytes32
+from ethereum_types.frozen import slotted_freezable
+from ethereum_types.numeric import U256, Uint
+
 from ..crypto.hash import Hash32
 from .fork_types import Address, Bloom, Root
 from .transactions import LegacyTransaction

src/ethereum/arrow_glacier/bloom.py

@@ -18,7 +18,8 @@
 
 from typing import Tuple
 
-from ethereum.base_types import Uint
+from ethereum_types.numeric import Uint
+
 from ethereum.crypto.hash import keccak256
 
 from .blocks import Log

src/ethereum/arrow_glacier/fork.py

@@ -15,14 +15,15 @@
 from dataclasses import dataclass
 from typing import List, Optional, Set, Tuple, Union
 
-from ethereum.base_types import Bytes0
+from ethereum_types.bytes import Bytes, Bytes0
+from ethereum_types.numeric import U64, U256, Uint
+
 from ethereum.crypto.elliptic_curve import SECP256K1N, secp256k1_recover
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.ethash import dataset_size, generate_cache, hashimoto_light
 from ethereum.exceptions import InvalidBlock
 
 from .. import rlp
-from ..base_types import U64, U256, Bytes, Uint
 from . import vm
 from .blocks import Block, Header, Log, Receipt
 from .bloom import logs_bloom

src/ethereum/arrow_glacier/fork_types.py

@@ -14,15 +14,11 @@
 
 from dataclasses import dataclass
 
+from ethereum_types.bytes import Bytes, Bytes20, Bytes256
+from ethereum_types.frozen import slotted_freezable
+from ethereum_types.numeric import U256, Uint
+
 from .. import rlp
-from ..base_types import (
-    U256,
-    Bytes,
-    Bytes20,
-    Bytes256,
-    Uint,
-    slotted_freezable,
-)
 from ..crypto.hash import Hash32, keccak256
 
 Address = Bytes20

src/ethereum/arrow_glacier/state.py

@@ -19,7 +19,9 @@
 from dataclasses import dataclass, field
 from typing import Callable, Dict, List, Optional, Set, Tuple
 
-from ethereum.base_types import U256, Bytes, Uint, modify
+from ethereum_types.bytes import Bytes
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
 
 from .fork_types import EMPTY_ACCOUNT, Account, Address, Root
 from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set

src/ethereum/arrow_glacier/transactions.py

@@ -6,16 +6,11 @@
 from dataclasses import dataclass
 from typing import Tuple, Union
 
+from ethereum_types.bytes import Bytes, Bytes0, Bytes32
+from ethereum_types.frozen import slotted_freezable
+from ethereum_types.numeric import U64, U256, Uint
+
 from .. import rlp
-from ..base_types import (
-    U64,
-    U256,
-    Bytes,
-    Bytes0,
-    Bytes32,
-    Uint,
-    slotted_freezable,
-)
 from ..exceptions import InvalidBlock
 from .fork_types import Address
 

src/ethereum/arrow_glacier/trie.py

@@ -28,12 +28,15 @@
     Union,
 )
 
+from ethereum_types.bytes import Bytes
+from ethereum_types.frozen import slotted_freezable
+from ethereum_types.numeric import U256, Uint
+
 from ethereum.crypto.hash import keccak256
 from ethereum.london import trie as previous_trie
 from ethereum.utils.hexadecimal import hex_to_bytes
 
 from .. import rlp
-from ..base_types import U256, Bytes, Uint, slotted_freezable
 from .blocks import Receipt
 from .fork_types import Account, Address, Root, encode_account
 from .transactions import LegacyTransaction

src/ethereum/arrow_glacier/utils/address.py

@@ -14,7 +14,9 @@
 """
 from typing import Union
 
-from ethereum.base_types import U256, Bytes32, Uint
+from ethereum_types.bytes import Bytes32
+from ethereum_types.numeric import U256, Uint
+
 from ethereum.crypto.hash import keccak256
 from ethereum.utils.byte import left_pad_zero_bytes
 

src/ethereum/arrow_glacier/utils/message.py

@@ -14,7 +14,8 @@
 """
 from typing import FrozenSet, Optional, Tuple, Union
 
-from ethereum.base_types import U256, Bytes, Bytes0, Bytes32, Uint
+from ethereum_types.bytes import Bytes, Bytes0, Bytes32
+from ethereum_types.numeric import U256, Uint
 
 from ..fork_types import Address
 from ..state import get_account

src/ethereum/arrow_glacier/vm/__init__.py

@@ -16,7 +16,9 @@
 from dataclasses import dataclass
 from typing import List, Optional, Set, Tuple, Union
 
-from ethereum.base_types import U64, U256, Bytes, Bytes0, Bytes32, Uint
+from ethereum_types.bytes import Bytes, Bytes0, Bytes32
+from ethereum_types.numeric import U64, U256, Uint
+
 from ethereum.crypto.hash import Hash32
 
 from ..blocks import Log

src/ethereum/arrow_glacier/vm/gas.py

@@ -14,7 +14,8 @@
 from dataclasses import dataclass
 from typing import List, Tuple
 
-from ethereum.base_types import U256, Uint
+from ethereum_types.numeric import U256, Uint
+
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
 

src/ethereum/arrow_glacier/vm/instructions/arithmetic.py

@@ -12,7 +12,8 @@
 Implementations of the EVM Arithmetic instructions.
 """
 
-from ethereum.base_types import U256, Uint
+from ethereum_types.numeric import U256, Uint
+
 from ethereum.utils.numeric import get_sign
 
 from .. import Evm

src/ethereum/arrow_glacier/vm/instructions/bitwise.py

@@ -12,7 +12,7 @@
 Implementations of the EVM bitwise instructions.
 """
 
-from ethereum.base_types import U256, Uint
+from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
 from ..gas import GAS_VERY_LOW, charge_gas

src/ethereum/arrow_glacier/vm/instructions/block.py

@@ -12,7 +12,7 @@
 Implementations of the EVM block instructions.
 """
 
-from ethereum.base_types import U256, Uint
+from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
 from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas

src/ethereum/arrow_glacier/vm/instructions/comparison.py

@@ -12,7 +12,7 @@
 Implementations of the EVM Comparison instructions.
 """
 
-from ethereum.base_types import U256, Uint
+from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
 from ..gas import GAS_VERY_LOW, charge_gas

src/ethereum/arrow_glacier/vm/instructions/control_flow.py

@@ -12,7 +12,7 @@
 Implementations of the EVM control flow instructions.
 """
 
-from ethereum.base_types import U256, Uint
+from ethereum_types.numeric import U256, Uint
 
 from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
 from .. import Evm

src/ethereum/arrow_glacier/vm/instructions/environment.py

@@ -12,9 +12,8 @@
 Implementations of the EVM environment related instructions.
 """
 
-from ethereum_types.numeric import ulen
+from ethereum_types.numeric import U256, Uint, ulen
 
-from ethereum.base_types import U256, Uint
 from ethereum.crypto.hash import keccak256
 from ethereum.utils.numeric import ceil32
 

src/ethereum/arrow_glacier/vm/instructions/keccak.py

@@ -12,7 +12,8 @@
 Implementations of the EVM keccak instructions.
 """
 
-from ethereum.base_types import U256, Uint
+from ethereum_types.numeric import U256, Uint
+
 from ethereum.crypto.hash import keccak256
 from ethereum.utils.numeric import ceil32
 

src/ethereum/arrow_glacier/vm/instructions/log.py

@@ -13,7 +13,7 @@
 """
 from functools import partial
 
-from ethereum.base_types import U256, Uint
+from ethereum_types.numeric import U256, Uint
 
 from ...blocks import Log
 from .. import Evm

src/ethereum/arrow_glacier/vm/instructions/memory.py

@@ -11,7 +11,8 @@
 
 Implementations of the EVM Memory instructions.
 """
-from ethereum.base_types import U256, Bytes, Uint
+from ethereum_types.bytes import Bytes
+from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
 from ..gas import (

src/ethereum/arrow_glacier/vm/instructions/stack.py

@@ -14,7 +14,7 @@
 
 from functools import partial
 
-from ethereum.base_types import U256, Uint
+from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError

src/ethereum/arrow_glacier/vm/instructions/storage.py

@@ -11,7 +11,7 @@
 
 Implementations of the EVM storage related instructions.
 """
-from ethereum.base_types import Uint
+from ethereum_types.numeric import Uint
 
 from ...state import get_storage, get_storage_original, set_storage
 from .. import Evm

src/ethereum/arrow_glacier/vm/instructions/system.py

@@ -11,7 +11,9 @@
 
 Implementations of the EVM system related instructions.
 """
-from ethereum.base_types import U256, Bytes0, Uint
+from ethereum_types.bytes import Bytes0
+from ethereum_types.numeric import U256, Uint
+
 from ethereum.utils.numeric import ceil32
 
 from ...fork_types import Address

src/ethereum/arrow_glacier/vm/interpreter.py

@@ -14,9 +14,9 @@
 from dataclasses import dataclass
 from typing import Iterable, Optional, Set, Tuple
 
-from ethereum_types.numeric import ulen
+from ethereum_types.bytes import Bytes0
+from ethereum_types.numeric import U256, Uint, ulen
 
-from ethereum.base_types import U256, Bytes0, Uint
 from ethereum.trace import (
     EvmStop,
     OpEnd,

src/ethereum/arrow_glacier/vm/memory.py

@@ -11,9 +11,10 @@
 
 EVM memory operations.
 """
-from ethereum.utils.byte import right_pad_zero_bytes
+from ethereum_types.bytes import Bytes
+from ethereum_types.numeric import U256, Uint
 
-from ...base_types import U256, Bytes, Uint
+from ethereum.utils.byte import right_pad_zero_bytes
 
 
 def memory_write(

src/ethereum/arrow_glacier/vm/precompiled_contracts/alt_bn128.py

@@ -11,7 +11,8 @@
 
 Implementation of the ALT_BN128 precompiled contracts.
 """
-from ethereum.base_types import U256, Uint
+from ethereum_types.numeric import U256, Uint
+
 from ethereum.crypto.alt_bn128 import (
     ALT_BN128_CURVE_ORDER,
     ALT_BN128_PRIME,

src/ethereum/arrow_glacier/vm/precompiled_contracts/ecrecover.py

@@ -11,7 +11,8 @@
 
 Implementation of the ECRECOVER precompiled contract.
 """
-from ethereum.base_types import U256
+from ethereum_types.numeric import U256
+
 from ethereum.crypto.elliptic_curve import SECP256K1N, secp256k1_recover
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.utils.byte import left_pad_zero_bytes

src/ethereum/arrow_glacier/vm/precompiled_contracts/identity.py

@@ -11,7 +11,8 @@
 
 Implementation of the `IDENTITY` precompiled contract.
 """
-from ethereum.base_types import Uint
+from ethereum_types.numeric import Uint
+
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm

src/ethereum/arrow_glacier/vm/precompiled_contracts/modexp.py

@@ -11,7 +11,8 @@
 
 Implementation of the `MODEXP` precompiled contract.
 """
-from ethereum.base_types import U256, Bytes, Uint
+from ethereum_types.bytes import Bytes
+from ethereum_types.numeric import U256, Uint
 
 from ...vm import Evm
 from ...vm.gas import charge_gas

src/ethereum/arrow_glacier/vm/precompiled_contracts/ripemd160.py

@@ -13,7 +13,8 @@
 """
 import hashlib
 
-from ethereum.base_types import Uint
+from ethereum_types.numeric import Uint
+
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 

src/ethereum/arrow_glacier/vm/precompiled_contracts/sha256.py

@@ -13,7 +13,8 @@
 """
 import hashlib
 
-from ethereum.base_types import Uint
+from ethereum_types.numeric import Uint
+
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm

src/ethereum/arrow_glacier/vm/runtime.py

@@ -13,9 +13,7 @@
 """
 from typing import Set
 
-from ethereum_types.numeric import ulen
-
-from ethereum.base_types import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from .instructions import Ops
 

src/ethereum/arrow_glacier/vm/stack.py

@@ -14,7 +14,7 @@
 
 from typing import List
 
-from ethereum.base_types import U256
+from ethereum_types.numeric import U256
 
 from .exceptions import StackOverflowError, StackUnderflowError