fix: hexint madness

src/ape/api/networks.py

@@ -12,7 +12,7 @@
 )
 from eth_pydantic_types import HexBytes
 from eth_utils import keccak, to_int
-from ethpm_types import BaseModel, ContractType
+from ethpm_types import ContractType
 from ethpm_types.abi import ABIType, ConstructorABI, EventABI, MethodABI
 from pydantic import model_validator
 
@@ -31,6 +31,7 @@
 from ape.types.gas import AutoGasLimit, GasLimit
 from ape.utils.basemodel import (
     BaseInterfaceModel,
+    BaseModel,
     ExtraAttributesMixin,
     ExtraModelAttributes,
     ManagerAccessMixin,

src/ape/types/basic.py

@@ -11,7 +11,7 @@ def _hex_int_validator(value, info):
     return convert(value, int)
 
 
-HexInt = Annotated[int, BeforeValidator(lambda v, info: None if v is None else _hex_int_validator)]
+HexInt = Annotated[int, BeforeValidator(_hex_int_validator)]
 """
 Validate any hex-str or bytes into an integer.
 To be used on pydantic-fields.

src/ape/types/gas.py

@@ -1,7 +1,6 @@
 from typing import Literal, Union
 
-from ethpm_types import BaseModel
-from pydantic import field_validator
+from pydantic import BaseModel, field_validator
 
 
 class AutoGasLimit(BaseModel):