Don't allow relative imports outside of a fork

SamWilsn · SamWilsn · commit 6b0f7951e191 · 2025-09-04T09:14:10.000-04:00
diff --git a/src/ethereum/arrow_glacier/blocks.py b/src/ethereum/arrow_glacier/blocks.py
@@ -16,7 +16,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import (
     AccessListTransaction,
diff --git a/src/ethereum/arrow_glacier/fork_types.py b/src/ethereum/arrow_glacier/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/berlin/blocks.py b/src/ethereum/berlin/blocks.py
@@ -16,7 +16,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import AccessListTransaction, LegacyTransaction, Transaction
 
diff --git a/src/ethereum/berlin/fork_types.py b/src/ethereum/berlin/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/byzantium/blocks.py b/src/ethereum/byzantium/blocks.py
@@ -15,7 +15,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import Transaction
 
diff --git a/src/ethereum/byzantium/fork_types.py b/src/ethereum/byzantium/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/cancun/blocks.py b/src/ethereum/cancun/blocks.py
@@ -16,7 +16,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U64, U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import (
     AccessListTransaction,
diff --git a/src/ethereum/cancun/fork_types.py b/src/ethereum/cancun/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/constantinople/blocks.py b/src/ethereum/constantinople/blocks.py
@@ -15,7 +15,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import Transaction
 
diff --git a/src/ethereum/constantinople/fork_types.py b/src/ethereum/constantinople/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/dao_fork/blocks.py b/src/ethereum/dao_fork/blocks.py
@@ -15,7 +15,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import Transaction
 
diff --git a/src/ethereum/dao_fork/fork_types.py b/src/ethereum/dao_fork/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/frontier/blocks.py b/src/ethereum/frontier/blocks.py
@@ -15,7 +15,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import Transaction
 
diff --git a/src/ethereum/frontier/fork_types.py b/src/ethereum/frontier/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/gray_glacier/blocks.py b/src/ethereum/gray_glacier/blocks.py
@@ -16,7 +16,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import (
     AccessListTransaction,
diff --git a/src/ethereum/gray_glacier/fork_types.py b/src/ethereum/gray_glacier/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/homestead/blocks.py b/src/ethereum/homestead/blocks.py
@@ -15,7 +15,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import Transaction
 
diff --git a/src/ethereum/homestead/fork_types.py b/src/ethereum/homestead/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/istanbul/blocks.py b/src/ethereum/istanbul/blocks.py
@@ -15,7 +15,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import Transaction
 
diff --git a/src/ethereum/istanbul/fork_types.py b/src/ethereum/istanbul/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/london/blocks.py b/src/ethereum/london/blocks.py
@@ -16,7 +16,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import (
     AccessListTransaction,
diff --git a/src/ethereum/london/fork_types.py b/src/ethereum/london/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/muir_glacier/blocks.py b/src/ethereum/muir_glacier/blocks.py
@@ -15,7 +15,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import Transaction
 
diff --git a/src/ethereum/muir_glacier/fork_types.py b/src/ethereum/muir_glacier/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/osaka/blocks.py b/src/ethereum/osaka/blocks.py
@@ -16,7 +16,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U64, U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import (
     AccessListTransaction,
diff --git a/src/ethereum/osaka/fork_types.py b/src/ethereum/osaka/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U8, U64, U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/paris/blocks.py b/src/ethereum/paris/blocks.py
@@ -16,7 +16,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import (
     AccessListTransaction,
diff --git a/src/ethereum/paris/fork_types.py b/src/ethereum/paris/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/prague/blocks.py b/src/ethereum/prague/blocks.py
@@ -16,7 +16,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U64, U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import (
     AccessListTransaction,
diff --git a/src/ethereum/prague/fork_types.py b/src/ethereum/prague/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U8, U64, U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/shanghai/blocks.py b/src/ethereum/shanghai/blocks.py
@@ -16,7 +16,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U64, U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import (
     AccessListTransaction,
diff --git a/src/ethereum/shanghai/fork_types.py b/src/ethereum/shanghai/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/spurious_dragon/blocks.py b/src/ethereum/spurious_dragon/blocks.py
@@ -15,7 +15,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import Transaction
 
diff --git a/src/ethereum/spurious_dragon/fork_types.py b/src/ethereum/spurious_dragon/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum/tangerine_whistle/blocks.py b/src/ethereum/tangerine_whistle/blocks.py
@@ -15,7 +15,8 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32
+
 from .fork_types import Address, Bloom, Root
 from .transactions import Transaction
 
diff --git a/src/ethereum/tangerine_whistle/fork_types.py b/src/ethereum/tangerine_whistle/fork_types.py
@@ -19,7 +19,7 @@
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
-from ..crypto.hash import Hash32, keccak256
+from ethereum.crypto.hash import Hash32, keccak256
 
 Address = Bytes20
 Root = Hash32
diff --git a/src/ethereum_spec_tools/lint/__init__.py b/src/ethereum_spec_tools/lint/__init__.py
@@ -12,7 +12,6 @@
 from abc import ABCMeta, abstractmethod
 from dataclasses import dataclass
 from itertools import zip_longest
-from pathlib import Path
 from typing import Generator, List, Optional, Sequence, Tuple, TypeVar
 
 from ..forks import Hardfork
diff --git a/src/ethereum_spec_tools/lint/lints/import_hygiene.py b/src/ethereum_spec_tools/lint/lints/import_hygiene.py
