feat!: adds signed and unsigned ints to list of types

.github/workflows/codeql.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

.github/workflows/commitlint.yaml

@@ -10,12 +10,12 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
           with:
               fetch-depth: 0
 
         - name: Setup Python
-          uses: actions/setup-python@v4
+          uses: actions/setup-python@v5
           with:
               python-version: "3.10"
 

.github/workflows/docs.yaml

@@ -15,10 +15,10 @@ jobs:
           contents: write
 
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
 
         - name: Setup Python
-          uses: actions/setup-python@v4
+          uses: actions/setup-python@v5
           with:
               python-version: "3.10"
 

.github/workflows/prtitle.yaml

@@ -12,10 +12,10 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
 
         - name: Setup Python
-          uses: actions/setup-python@v4
+          uses: actions/setup-python@v5
           with:
               python-version: "3.10"
 

.github/workflows/publish.yaml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: "3.10"
 

.github/workflows/test.yaml

@@ -14,10 +14,10 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
 
         - name: Setup Python
-          uses: actions/setup-python@v4
+          uses: actions/setup-python@v5
           with:
               python-version: "3.10"
 
@@ -42,10 +42,10 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
 
         - name: Setup Python
-          uses: actions/setup-python@v4
+          uses: actions/setup-python@v5
           with:
               python-version: "3.10"
 
@@ -63,18 +63,18 @@ jobs:
         strategy:
             matrix:
                 os: [ubuntu-latest, macos-latest, windows-latest]
-                python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
+                python-version: [3.9, "3.10", "3.11", "3.12"]
 
         env:
           GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
           with:
             fetch-depth: 0
 
         - name: Setup Python
-          uses: actions/setup-python@v4
+          uses: actions/setup-python@v5
           with:
               python-version: ${{ matrix.python-version }}
 
@@ -94,10 +94,10 @@ jobs:
 #            fail-fast: true
 #
 #        steps:
-#        - uses: actions/checkout@v3
+#        - uses: actions/checkout@v4
 #
 #        - name: Setup Python
-#          uses: actions/setup-python@v4
+#          uses: actions/setup-python@v5
 #          with:
 #              python-version: "3.10"
 #

.pre-commit-config.yaml

@@ -10,18 +10,18 @@ repos:
       - id: isort
 
 -   repo: https://github.com/psf/black
-    rev: 24.3.0
+    rev: 24.8.0
     hooks:
       - id: black
         name: black
 
 -   repo: https://github.com/pycqa/flake8
-    rev: 7.0.0
+    rev: 7.1.1
     hooks:
     -   id: flake8
 
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.9.0
+    rev: v1.11.1
     hooks:
     -   id: mypy
         additional_dependencies: [types-setuptools, pydantic]

eth_pydantic_types/_error.py

@@ -1,4 +1,5 @@
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 from pydantic_core import PydanticCustomError
 

eth_pydantic_types/address.py

@@ -1,4 +1,4 @@
-from typing import Any, ClassVar, Optional, Tuple, cast
+from typing import Annotated, Any, ClassVar, Optional, cast
 
 from eth_typing import ChecksumAddress
 from eth_utils import is_checksum_address, to_checksum_address
@@ -8,7 +8,6 @@
     str_schema,
     with_info_before_validator_function,
 )
-from typing_extensions import Annotated
 
 from .hex import HexStr20
 
@@ -26,7 +25,7 @@ class Address(HexStr20):
     """
 
     schema_pattern: ClassVar[str] = ADDRESS_PATTERN
-    schema_examples: ClassVar[Tuple[str, ...]] = (
+    schema_examples: ClassVar[tuple[str, ...]] = (
         "0x0000000000000000000000000000000000000000",  # Zero address
         "0x02c84e944F97F4A4f60221e6fb5d5DbAE49c7aaB",  # Leading zero
         "0xa5a13f62ce1113838e0d9b4559b8caf5f76463c0",  # Trailing zero

eth_pydantic_types/bip122.py

@@ -1,6 +1,6 @@
 from enum import Enum
 from functools import cached_property
-from typing import Any, Optional, Tuple
+from typing import Any, Optional
 
 from pydantic_core import CoreSchema
 from pydantic_core.core_schema import (
@@ -50,7 +50,7 @@ def __eth_pydantic_validate__(cls, value: Any, info: Optional[ValidationInfo] =
         return f"{cls.prefix}{genesis_hash[2:]}/{block_keyword.value}/{block_hash[2:]}"
 
     @classmethod
-    def parse(cls, value: str) -> Tuple[str, Bip122UriType, str]:
+    def parse(cls, value: str) -> tuple[str, Bip122UriType, str]:
         protocol_suffix = value.replace(cls.prefix, "")
         protocol_parsed = protocol_suffix.split("/")
         if len(protocol_parsed) != 3:
@@ -68,7 +68,7 @@ def parse(cls, value: str) -> Tuple[str, Bip122UriType, str]:
         )
 
     @cached_property
-    def parsed(self) -> Tuple[str, Bip122UriType, str]:
+    def parsed(self) -> tuple[str, Bip122UriType, str]:
         return self.parse(self)
 
     @property

eth_pydantic_types/hex.py

@@ -1,4 +1,4 @@
-from typing import Any, ClassVar, Optional, Tuple, Union, cast
+from typing import Any, ClassVar, Optional, Union, cast
 
 from eth_typing import HexStr as EthTypingHexStr
 from eth_utils import add_0x_prefix
@@ -38,7 +38,7 @@
 class BaseHex:
     size: ClassVar[int] = 0
     schema_pattern: ClassVar[str] = schema_pattern
-    schema_examples: ClassVar[Tuple[str, ...]] = schema_examples
+    schema_examples: ClassVar[tuple[str, ...]] = schema_examples
 
     @classmethod
     def __get_pydantic_json_schema__(cls, core_schema, handler):
@@ -81,6 +81,11 @@ def validate_size(cls, value: bytes) -> bytes:
 
 
 class BoundHexBytes(HexBytes):
+    """
+    Use when receiving ``hexbytes.HexBytes`` values and a specific size is required.
+    Includes a pydantic validator and serializer.
+    """
+
     size: ClassVar[int] = 32
 
     @classmethod
@@ -92,12 +97,6 @@ def __get_pydantic_core_schema__(cls, value, handle=None) -> CoreSchema:
         schema["serialization"] = hex_serializer
         return schema
 
-    @classmethod
-    def __eth_pydantic_validate__(
-        cls, value: Any, info: Optional[ValidationInfo] = None
-    ) -> BaseHexBytes:
-        return cls(cls.validate_size(HexBytes(value)))
-
     @classmethod
     def validate_size(cls, value: bytes) -> bytes:
         str_size = cls.size * 2
@@ -124,8 +123,9 @@ def __eth_pydantic_validate__(cls, value):
 
     @classmethod
     def from_bytes(cls, data: bytes) -> "BaseHexStr":
-        hex_str = data.hex()
-        return cls(hex_str if hex_str.startswith("0x") else hex_str)
+        hex_value = data.hex()
+        hex_str = hex_value if hex_value.startswith("0x") else f"0x{hex_value}"
+        return cls(hex_str)
 
     @classmethod
     def validate_hex(cls, data: Union[bytes, str, int]):
@@ -136,7 +136,8 @@ def validate_hex(cls, data: Union[bytes, str, int]):
             return validate_hex_str(data)
 
         elif isinstance(data, int):
-            return BaseHexBytes(data).hex()
+            hex_value = BaseHexBytes(data).hex()
+            return hex_value if hex_value.startswith("0x") else f"0x{hex_value}"
 
         raise HexValueError(data)
 
@@ -172,7 +173,7 @@ def from_bytes(cls, data: bytes) -> "HexStr":
 
 
 class BoundHexStr(BaseHexStr):
-    """A hex string value, typically from a hash."""
+    """A hex string value, typically from a hash, that is required to be a specific size."""
 
     size: ClassVar[int] = 32
     calculate_schema: ClassVar[bool] = True

eth_pydantic_types/serializers.py

@@ -1,3 +1,9 @@
 from pydantic_core.core_schema import plain_serializer_function_ser_schema
 
-hex_serializer = plain_serializer_function_ser_schema(function=lambda x: x.hex())
+
+def serialize_hex(value: bytes):
+    hex_value = value.hex()
+    return hex_value if hex_value.startswith("0x") else f"0x{hex_value}"
+
+
+hex_serializer = plain_serializer_function_ser_schema(function=serialize_hex)

eth_pydantic_types/utils.py

@@ -1,4 +1,5 @@
-from typing import Any, Callable, Dict, Optional, Sized, Tuple, TypeVar, cast
+from collections.abc import Sized
+from typing import Any, Callable, Optional, TypeVar, cast
 
 from pydantic import WithJsonSchema
 from pydantic_core.core_schema import bytes_schema
@@ -11,7 +12,7 @@
 class WithBytesSchema(WithJsonSchema):
     def __init__(self, **kwargs):
         mode = kwargs.pop("mode", None)
-        schema = cast(Dict[str, Any], bytes_schema(**kwargs))
+        schema = cast(dict[str, Any], bytes_schema(**kwargs))
         super().__init__(schema, mode=mode)
 
 
@@ -90,7 +91,7 @@ def get_hash_pattern(str_size: int) -> str:
     return f"^0x[a-fA-F0-9]{{{str_size}}}$"
 
 
-def get_hash_examples(str_size: int) -> Tuple[str, str, str, str]:
+def get_hash_examples(str_size: int) -> tuple[str, str, str, str]:
     zero_hash = f"0x{'0' * str_size}"
     leading_zero = f"0x01{'1e' * ((str_size - 1) // 2)}"
     trailing_zero = f"0x{'1e' * ((str_size - 1) // 2)}10"

pyproject.toml

@@ -21,7 +21,7 @@ write_to = "eth_pydantic_types/version.py"
 # character.
 [tool.black]
 line-length = 100
-target-version = ['py38', 'py39', 'py310']
+target-version = ['py39', 'py310', 'py311', 'py312']
 include = '\.pyi?$'
 
 [tool.pytest.ini_options]

setup.py

@@ -12,12 +12,13 @@
         "pytest-mock",  # For creating mocks
         "hypothesis>=6.2.0,<7.0",  # Strategy-based fuzzer
         "hypothesis-jsonschema==0.19.0",  # JSON Schema fuzzer extension
+        "eth-hash[pycryptodome]",  # For backends to work
     ],
     "lint": [
-        "black>=24.3.0,<25",  # Auto-formatter and linter
-        "mypy>=1.9.0,<2",  # Static type analyzer
+        "black>=24.8.0,<25",  # Auto-formatter and linter
+        "mypy>=1.11.1,<2",  # Static type analyzer
         "types-setuptools",  # Needed for mypy type shed
-        "flake8>=7.0.0,<8",  # Style linter
+        "flake8>=7.1.1,<8",  # Style linter
         "flake8-breakpoint>=1.1.0,<2",  # Detect breakpoints left in code
         "flake8-print>=5.0.0,<6",  # Detect print statements left in code
         "isort>=5.10.1,<6",  # Import sorting linter
@@ -74,13 +75,12 @@
     include_package_data=True,
     install_requires=[
         "hexbytes>=1.2.0,<2",
-        "eth-hash[pycryptodome]>=0.5.2,<1",
-        "eth-utils>=2.2.0,<5",
-        "eth-typing>=3.5.0,<5",
-        "pydantic>=2.4.2,<3",
+        "eth-utils>=2.3.1,<6",
+        "eth-typing>=3.5.2,<6",
+        "pydantic>=2.5.2,<3",
         "typing_extensions>=4.8.0,<5",
     ],
-    python_requires=">=3.8,<4",
+    python_requires=">=3.9,<4",
     extras_require=extras_require,
     py_modules=["eth_pydantic_types"],
     license="Apache-2.0",
@@ -97,7 +97,6 @@
         "Operating System :: POSIX",
         "Operating System :: Microsoft :: Windows",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",

tests/test_hex.py

@@ -1,4 +1,5 @@
 import pytest
+from eth_utils import to_hex
 from hexbytes import HexBytes as BaseHexBytes
 from pydantic import BaseModel, ValidationError
 
@@ -19,7 +20,7 @@ def test_hexbytes(value):
 
     # The end result, the value is a hexbytes.HexBytes
     assert actual.value == BaseHexBytes(value)
-    assert actual.value.hex() == "0a"
+    assert to_hex(actual.value) == "0x0a"
     assert isinstance(actual.value, bytes)
     assert isinstance(actual.value, BaseHexBytes)