faster-eth-abi 5.2.13__cp38-cp38-win32.whl → 5.2.15__cp38-cp38-win32.whl

faster_eth_abi/decoding.py

@@ -163,10 +163,7 @@ class SingleDecoder(BaseDecoder):
     def decode(self, stream: ContextFramesBytesIO) -> Any:
         raw_data = self.read_data_from_stream(stream)
         data, padding_bytes = self.split_data_and_padding(raw_data)
-        decoder_fn = self.decoder_fn
-        if decoder_fn is None:
-            raise AssertionError("`decoder_fn` is None")
-        value = decoder_fn(data)
+        value = self.decoder_fn(data)  # type: ignore [misc]
         self.validate_padding_bytes(value, padding_bytes)
 
         return value
@@ -190,6 +187,7 @@ class BaseArrayDecoder(BaseDecoder):
         item_decoder = self.item_decoder
         if item_decoder.is_dynamic:
             self.item_decoder = HeadTailDecoder(tail_decoder=item_decoder)
+            self.validate_pointers = MethodType(validate_pointers_array, self)
         else:
 
             def noop(stream: ContextFramesBytesIO, array_size: int) -> None:
@@ -354,6 +352,13 @@ decode_uint_256 = UnsignedIntegerDecoder(value_bit_size=256)
 class SignedIntegerDecoder(Fixed32ByteSizeDecoder):
     is_big_endian = True
 
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+    
+        # Only assign validate_padding_bytes if not overridden in subclass
+        if type(self).validate_padding_bytes is SignedIntegerDecoder.validate_padding_bytes:
+            self.validate_padding_bytes = MethodType(validate_padding_bytes_signed_integer, self)
+
     @cached_property
     def neg_threshold(self) -> int:
         return int(2 ** (self.value_bit_size - 1))
@@ -394,6 +399,10 @@ class BytesDecoder(Fixed32ByteSizeDecoder):
 class BaseFixedDecoder(Fixed32ByteSizeDecoder):
     frac_places: int = None
     is_big_endian = True
+    
+    @cached_property
+    def denominator(self) -> decimal.Decimal:
+        return TEN**self.frac_places
 
     def validate(self) -> None:
         super().validate()
@@ -407,11 +416,12 @@ class BaseFixedDecoder(Fixed32ByteSizeDecoder):
 
 
 class UnsignedFixedDecoder(BaseFixedDecoder):
+    
     def decoder_fn(self, data: bytes) -> decimal.Decimal:
         value = big_endian_to_int(data)
 
         with decimal.localcontext(abi_decimal_context):
-            decimal_value = decimal.Decimal(value) / TEN**self.frac_places
+            decimal_value = decimal.Decimal(value) / self.denominator
 
         return decimal_value
 
@@ -423,27 +433,42 @@ class UnsignedFixedDecoder(BaseFixedDecoder):
 
 
 class SignedFixedDecoder(BaseFixedDecoder):
+    
+    @cached_property
+    def neg_threshold(self) -> int:
+        return int(2 ** (self.value_bit_size - 1))
+
+    @cached_property
+    def neg_offset(self) -> int:
+        return int(2**self.value_bit_size)
+
+    @cached_property
+    def expected_padding_pos(self) -> bytes:
+        value_byte_size = get_value_byte_size(self)
+        padding_size = self.data_byte_size - value_byte_size
+        return b"\x00" * padding_size
+
+    @cached_property
+    def expected_padding_neg(self) -> bytes:
+        value_byte_size = get_value_byte_size(self)
+        padding_size = self.data_byte_size - value_byte_size
+        return b"\xff" * padding_size
+
     def decoder_fn(self, data: bytes) -> decimal.Decimal:
         value = big_endian_to_int(data)
-        value_bit_size = self.value_bit_size
-        if value >= 2 ** (value_bit_size - 1):
-            signed_value = value - 2**value_bit_size
-        else:
-            signed_value = value
+        if value >= self.neg_threshold:
+            value -= self.neg_offset
 
         with decimal.localcontext(abi_decimal_context):
-            decimal_value = decimal.Decimal(signed_value) / TEN**self.frac_places
+            decimal_value = decimal.Decimal(value) / self.denominator
 
         return decimal_value
 
     def validate_padding_bytes(self, value: Any, padding_bytes: bytes) -> None:
-        value_byte_size = get_value_byte_size(self)
-        padding_size = self.data_byte_size - value_byte_size
-
         if value >= 0:
-            expected_padding_bytes = b"\x00" * padding_size
+            expected_padding_bytes = self.expected_padding_pos
         else:
-            expected_padding_bytes = b"\xff" * padding_size
+            expected_padding_bytes = self.expected_padding_neg
 
         if padding_bytes != expected_padding_bytes:
             raise NonEmptyPaddingBytes(

faster_eth_abi/encoding.py

@@ -1,15 +1,23 @@
 import abc
 import codecs
 import decimal
+from functools import (
+    cached_property,
+)
+from types import (
+    MethodType,
+)
 from typing import (
     Any,
     Callable,
     ClassVar,
+    Final,
     NoReturn,
     Optional,
     Sequence,
     Tuple,
     Type,
+    final,
 )
 
 from faster_eth_utils import (
@@ -32,7 +40,11 @@ from faster_eth_abi._encoding import (
     encode_fixed,
     encode_signed,
     encode_tuple,
+    encode_tuple_all_dynamic,
+    encode_tuple_no_dynamic,
+    encode_tuple_no_dynamic_funcs,
     int_to_big_endian,
+    validate_tuple,
 )
 from faster_eth_abi.base import (
     BaseCoder,
@@ -111,7 +123,33 @@ class TupleEncoder(BaseEncoder):
     def __init__(self, encoders: Tuple[BaseEncoder, ...], **kwargs: Any) -> None:
         super().__init__(encoders=encoders, **kwargs)
 
-        self.is_dynamic = any(getattr(e, "is_dynamic", False) for e in self.encoders)
+        self._is_dynamic: Final = tuple(getattr(e, "is_dynamic", False) for e in self.encoders)
+        self.is_dynamic = any(self._is_dynamic)
+
+        validators = []
+        for encoder in self.encoders:
+            try:
+                validator = encoder.validate_value
+            except AttributeError:
+                validators.append(encoder)
+            else:
+                validators.append(validator)
+        
+        self.validators: Final[Callable[[Any], None]] = tuple(validators)
+
+        if type(self).encode is TupleEncoder.encode:
+            encode_func = (
+                encode_tuple_all_dynamic
+                if all(self._is_dynamic)
+                else encode_tuple_no_dynamic_funcs.get(
+                    len(self.encoders),
+                    encode_tuple_no_dynamic,
+                )
+                if not self.is_dynamic
+                else encode_tuple
+            )
+                
+            self.encode = MethodType(encode_func, self)
 
     def validate(self) -> None:
         super().validate()
@@ -119,33 +157,15 @@ class TupleEncoder(BaseEncoder):
         if self.encoders is None:
             raise ValueError("`encoders` may not be none")
 
+    @final
     def validate_value(self, value: Sequence[Any]) -> None:
-        if not is_list_like(value):
-            self.invalidate_value(
-                value,
-                msg="must be list-like object such as array or tuple",
-            )
-
-        encoders = self.encoders
-        if len(value) != len(encoders):
-            self.invalidate_value(
-                value,
-                exc=ValueOutOfBounds,
-                msg=f"value has {len(value)} items when {len(encoders)} "
-                "were expected",
-            )
-
-        for item, encoder in zip(value, encoders):
-            try:
-                encoder.validate_value(item)
-            except AttributeError:
-                encoder(item)
+        validate_tuple(self, value)
 
     def encode(self, values: Sequence[Any]) -> bytes:
-        self.validate_value(values)
-        return encode_tuple(values, self.encoders)
+        return encode_tuple(self, values)
 
-    __call__: Callable[[Self, Sequence[Any]], bytes] = encode
+    def __call__(self, values: Sequence[Any]) -> bytes:
+        return self.encode(values)
 
     @parse_tuple_type_str
     def from_type_str(cls, abi_type, registry):
@@ -328,11 +348,19 @@ class BaseFixedEncoder(NumberEncoder):
 
         return False
 
+    @cached_property
+    def denominator(self) -> decimal.Decimal:
+        return TEN**self.frac_places
+
+    @cached_property
+    def precision(self) -> int:
+        return TEN**-self.frac_places
+
     def validate_value(self, value):
         super().validate_value(value)
 
         with decimal.localcontext(abi_decimal_context):
-            residue = value % (TEN**-self.frac_places)
+            residue = value % self.precision
 
         if residue > 0:
             self.invalidate_value(
@@ -359,7 +387,7 @@ class UnsignedFixedEncoder(BaseFixedEncoder):
 
     def encode_fn(self, value):
         with decimal.localcontext(abi_decimal_context):
-            scaled_value = value * TEN**self.frac_places
+            scaled_value = value * self.denominator
             integer_value = int(scaled_value)
 
         return int_to_big_endian(integer_value)
@@ -392,7 +420,7 @@ class SignedFixedEncoder(BaseFixedEncoder):
 
     def encode_fn(self, value):
         with decimal.localcontext(abi_decimal_context):
-            scaled_value = value * TEN**self.frac_places
+            scaled_value = value * self.denominator
             integer_value = int(scaled_value)
 
         unsigned_integer_value = integer_value % (2**self.value_bit_size)

faster_eth_abi/registry.py

@@ -1,12 +1,15 @@
 import abc
+from copy import (
+    copy,
+)
 import functools
-from copy import copy
 from typing import (
     Any,
     Callable,
     Dict,
     Final,
     Generic,
+    Iterator,
     Optional,
     Type,
     TypeVar,
@@ -17,6 +20,8 @@ from eth_typing import (
     TypeStr,
 )
 from typing_extensions import (
+    Concatenate,
+    ParamSpec,
     Self,
 )
 
@@ -38,6 +43,7 @@ from .io import (
 )
 
 T = TypeVar("T")
+P = ParamSpec("P")
 
 Lookup = Union[TypeStr, Callable[[TypeStr], bool]]
 
@@ -177,25 +183,25 @@ class Predicate:
     ``ABIRegistry``.
     """
 
-    __slots__ = tuple()
+    __slots__ = ()
 
     def __call__(self, *args, **kwargs):  # pragma: no cover
         raise NotImplementedError("Must implement `__call__`")
 
-    def __str__(self):  # pragma: no cover
+    def __str__(self) -> str:
         raise NotImplementedError("Must implement `__str__`")
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"<{type(self).__name__} {self}>"
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[Any]:
         for attr in self.__slots__:
             yield getattr(self, attr)
 
-    def __hash__(self):
+    def __hash__(self) -> int:
         return hash(tuple(self))
 
-    def __eq__(self, other):
+    def __eq__(self, other: Any) -> bool:
         return type(self) is type(other) and tuple(self) == tuple(other)
 
 
@@ -209,10 +215,10 @@ class Equals(Predicate):
     def __init__(self, value):
         self.value = value
 
-    def __call__(self, other):
+    def __call__(self, other: Any) -> bool:
         return self.value == other
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f"(== {self.value!r})"
 
 
@@ -231,7 +237,7 @@ class BaseEquals(Predicate):
         self.base = base
         self.with_sub = with_sub
 
-    def __call__(self, type_str):
+    def __call__(self, type_str: TypeStr) -> bool:
         try:
             abi_type = grammar.parse(type_str)
         except (exceptions.ParseError, ValueError):
@@ -253,7 +259,7 @@ class BaseEquals(Predicate):
         # e.g. if it contained a tuple type
         return False
 
-    def __str__(self):
+    def __str__(self) -> str:
         return (
             f"(base == {self.base!r}"
             + (
@@ -265,7 +271,7 @@ class BaseEquals(Predicate):
         )
 
 
-def has_arrlist(type_str):
+def has_arrlist(type_str: TypeStr) -> bool:
     """
     A predicate that matches a type string with an array dimension list.
     """
@@ -277,7 +283,7 @@ def has_arrlist(type_str):
     return abi_type.arrlist is not None
 
 
-def is_base_tuple(type_str):
+def is_base_tuple(type_str: TypeStr) -> bool:
     """
     A predicate that matches a tuple type with no array dimension list.
     """
@@ -289,9 +295,11 @@ def is_base_tuple(type_str):
     return isinstance(abi_type, grammar.TupleType) and abi_type.arrlist is None
 
 
-def _clear_encoder_cache(old_method: Callable[..., None]) -> Callable[..., None]:
+def _clear_encoder_cache(
+    old_method: Callable[Concatenate["ABIRegistry", P], T]
+) -> Callable[Concatenate["ABIRegistry", P], T]:
     @functools.wraps(old_method)
-    def new_method(self: "ABIRegistry", *args: Any, **kwargs: Any) -> None:
+    def new_method(self: "ABIRegistry", *args: P.args, **kwargs: P.kwargs) -> T:
         self.get_encoder.cache_clear()
         self.get_tuple_encoder.cache_clear()
         return old_method(self, *args, **kwargs)
@@ -299,9 +307,11 @@ def _clear_encoder_cache(old_method: Callable[..., None]) -> Callable[..., None]
     return new_method
 
 
-def _clear_decoder_cache(old_method: Callable[..., None]) -> Callable[..., None]:
+def _clear_decoder_cache(
+    old_method: Callable[Concatenate["ABIRegistry", P], T]
+) -> Callable[Concatenate["ABIRegistry", P], T]:
     @functools.wraps(old_method)
-    def new_method(self: "ABIRegistry", *args: Any, **kwargs: Any) -> None:
+    def new_method(self: "ABIRegistry", *args: P.args, **kwargs: P.kwargs) -> T:
         self.get_decoder.cache_clear()
         self.get_tuple_decoder.cache_clear()
         return old_method(self, *args, **kwargs)
@@ -311,7 +321,12 @@ def _clear_decoder_cache(old_method: Callable[..., None]) -> Callable[..., None]
 
 class BaseRegistry:
     @staticmethod
-    def _register(mapping, lookup, value, label=None):
+    def _register(
+        mapping: PredicateMapping[T],
+        lookup: Lookup,
+        value: T,
+        label: Optional[str] = None,
+    ) -> None:
         if callable(lookup):
             mapping.add(lookup, value, label)
             return
@@ -325,7 +340,7 @@ class BaseRegistry:
         )
 
     @staticmethod
-    def _unregister(mapping, lookup_or_label):
+    def _unregister(mapping: PredicateMapping[Any], lookup_or_label: Lookup) -> None:
         if callable(lookup_or_label):
             mapping.remove_by_equality(lookup_or_label)
             return
@@ -340,7 +355,7 @@ class BaseRegistry:
         )
 
     @staticmethod
-    def _get_registration(mapping, type_str):
+    def _get_registration(mapping: PredicateMapping[T], type_str: TypeStr) -> T:
         try:
             value = mapping.find(type_str)
         except ValueError as e:
@@ -473,16 +488,15 @@ class ABIRegistry(Copyable, BaseRegistry):
         self.unregister_encoder(label)
         self.unregister_decoder(label)
 
-    def _get_encoder_uncached(self, type_str: TypeStr):  # type: ignore [no-untyped-def]
+    def _get_encoder_uncached(self, type_str: TypeStr) -> Encoder:
         return self._get_registration(self._encoders, type_str)
 
     def _get_tuple_encoder_uncached(
-        self, 
+        self,
         *type_strs: TypeStr,
     ) -> encoding.TupleEncoder:
-        return encoding.TupleEncoder(
-            encoders=tuple(self.get_encoder(type_str) for type_str in type_strs)
-        )
+        encoders = tuple(map(self.get_encoder, type_strs))
+        return encoding.TupleEncoder(encoders=encoders)
 
     def has_encoder(self, type_str: TypeStr) -> bool:
         """
@@ -500,7 +514,7 @@ class ABIRegistry(Copyable, BaseRegistry):
 
         return True
 
-    def _get_decoder_uncached(self, type_str: TypeStr, strict: bool = True):  # type: ignore [no-untyped-def]
+    def _get_decoder_uncached(self, type_str: TypeStr, strict: bool = True) -> Decoder:
         decoder = self._get_registration(self._decoders, type_str)
 
         if hasattr(decoder, "is_dynamic") and decoder.is_dynamic:
@@ -512,15 +526,17 @@ class ABIRegistry(Copyable, BaseRegistry):
         return decoder
 
     def _get_tuple_decoder_uncached(
-        self, 
-        *type_strs: TypeStr, 
+        self,
+        *type_strs: TypeStr,
         strict: bool = True,
     ) -> decoding.TupleDecoder:
-        return decoding.TupleDecoder(
-            decoders=tuple(self.get_decoder(type_str, strict) for type_str in type_strs)
+        decoders = tuple(
+            self.get_decoder(type_str, strict)  # type: ignore [misc]
+            for type_str in type_strs
         )
+        return decoding.TupleDecoder(decoders=decoders)
 
-    def copy(self):
+    def copy(self) -> Self:
         """
         Copies a registry such that new registrations can be made or existing
         registrations can be unregistered without affecting any instance from