Inherit from eth-utils CamelModel for pydantic types:

- The ``CustomPydanticModel`` used here inspired a more general
  class to be used across our libraries. That change was
  introduced in the latest ``eth-utils`` which we now use as a
  a bottom-pinned dependency.

Author: fselmo

eth_account/_utils/transaction_utils.py

@@ -2,6 +2,9 @@
     Any,
 )
 
+from eth_utils import (
+    CamelModel,
+)
 from toolz import (
     assoc,
     dissoc,
@@ -13,9 +16,6 @@
     is_rpc_structured_access_list,
     is_rpc_structured_authorization_list,
 )
-from eth_account.datastructures import (
-    CustomPydanticModel,
-)
 from eth_account.types import (
     AccessList,
     AuthorizationList,
@@ -82,7 +82,7 @@ def json_serialize_classes_in_transaction(val: Any) -> Any:
     - ``exclude=val._exclude:   Fields excluded for serialization are defined within a
                                 ``_exclude`` property on the pydantic model.
     """
-    if isinstance(val, CustomPydanticModel):
+    if isinstance(val, CamelModel):
         return val.model_dump(by_alias=True)
     elif isinstance(val, dict):
         return {k: json_serialize_classes_in_transaction(v) for k, v in val.items()}

eth_account/datastructures.py

@@ -4,7 +4,6 @@
     SupportsIndex,
     overload,
 )
-import warnings
 
 from eth_keys.datatypes import (
     Signature,
@@ -13,30 +12,16 @@
     ChecksumAddress,
 )
 from eth_utils import (
+    CamelModel,
     to_checksum_address,
 )
 from hexbytes import (
     HexBytes,
 )
 from pydantic import (
-    BaseModel,
-    ConfigDict,
     Field,
     field_serializer,
 )
-from pydantic.alias_generators import (
-    to_camel,
-)
-from pydantic.json_schema import (
-    DEFAULT_REF_TEMPLATE,
-    GenerateJsonSchema,
-    JsonSchemaMode,
-    JsonSchemaValue,
-)
-from pydantic_core import (
-    CoreSchema,
-    PydanticOmit,
-)
 
 
 class SignedTransaction(
@@ -105,64 +90,7 @@ def __getitem__(self, index: SupportsIndex | slice | str) -> Any:
             raise TypeError("Index must be an integer, slice, or string")
 
 
-class OmitJsonSchema(GenerateJsonSchema):
-    def handle_invalid_for_json_schema(
-        self, schema: CoreSchema, error_info: str
-    ) -> JsonSchemaValue:
-        raise PydanticOmit
-
-
-class CustomPydanticModel(BaseModel):
-    """
-    A base class for eth-account pydantic models that provides custom JSON-RPC
-    serialization configuration. JSON-RPC serialization is configured to use
-    camelCase keys and to exclude fields that are marked as ``exclude=True``. To
-    serialize a model to the expected JSON-RPC format, use
-    ``model_dump(by_alias=True)``.
-    """
-
-    model_config = ConfigDict(
-        arbitrary_types_allowed=True,
-        populate_by_name=True,  # populate by snake_case (python) args
-        alias_generator=to_camel,  # serialize by camelCase (json-rpc) keys
-    )
-
-    def recursive_model_dump(self) -> Any:
-        # TODO: Remove in next major release. This was introduced because of a bug with
-        #  a ``@field_serializer`` decorator not being applied correctly to nested
-        #  models. This is no longer necessary.
-        warnings.warn(
-            "recursive_model_dump() is deprecated. Please use "
-            "model_dump(by_alias=True) instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.model_dump(by_alias=True)
-
-    @classmethod
-    def model_json_schema(
-        cls,
-        by_alias: bool = True,
-        ref_template: str = DEFAULT_REF_TEMPLATE,
-        # default to ``OmitJsonSchema`` to prevent errors from excluded fields
-        schema_generator: type[GenerateJsonSchema] = OmitJsonSchema,
-        mode: JsonSchemaMode = "validation",
-        **kwargs: Any,
-    ) -> dict[str, Any]:
-        """
-        Omits excluded fields from the JSON schema, preventing errors that would
-        otherwise be raised by the default schema generator.
-        """
-        return super().model_json_schema(
-            by_alias=by_alias,
-            ref_template=ref_template,
-            schema_generator=schema_generator,
-            mode=mode,
-            **kwargs,
-        )
-
-
-class SignedSetCodeAuthorization(CustomPydanticModel):
+class SignedSetCodeAuthorization(CamelModel):
     chain_id: int
     address: bytes
     nonce: int

tests/core/_test_utils.py

@@ -1,6 +1,9 @@
 from eth_keys.datatypes import (
     Signature,
 )
+from eth_utils import (
+    CamelModel,
+)
 from hexbytes import (
     HexBytes,
 )
@@ -9,7 +12,6 @@
 )
 
 from eth_account.datastructures import (
-    CustomPydanticModel,
     SignedSetCodeAuthorization,
 )
 
@@ -41,15 +43,15 @@
 }
 
 
-class PydanticTestClassInner(CustomPydanticModel):
+class PydanticTestClassInner(CamelModel):
     int_value: int = 2
     str_value: str = "3"
     authorization_list: list[SignedSetCodeAuthorization] = [TEST_SIGNED_AUTHORIZATION]
     excluded_field1: str = Field(default="4", exclude=True)
     excluded_field2: int = Field(default=5, exclude=True)
 
 
-class PydanticTestClass(CustomPydanticModel):
+class PydanticTestClass(CamelModel):
     int_value: int = 1
     nested_model: PydanticTestClassInner = PydanticTestClassInner()
     excluded_field1: str = Field(default="6", exclude=True)