faster-eth-abi 5.2.9__tar.gz → 5.2.11__tar.gz

{faster_eth_abi-5.2.9 → faster_eth_abi-5.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: faster_eth_abi
-Version: 5.2.9
+Version: 5.2.11
 Summary: A faster fork of eth_abi: Python utilities for working with Ethereum ABI definitions, especially encoding and decoding. Implemented in C.
 Home-page: https://github.com/BobTheBuidler/faster-eth-abi
 Author: The Ethereum Foundation

{faster_eth_abi-5.2.9 → faster_eth_abi-5.2.11}/faster_eth_abi/_codec.py

@@ -39,8 +39,6 @@ def encode_c(
     :returns: The head-tail encoded binary representation of the python
         values in ``args`` as values of the ABI types in ``types``.
     """
-    # validate encode types and args
-    validate_list_like_param(types, "types")
     validate_list_like_param(args, "args")
 
     encoder = self._registry.get_tuple_encoder(*types)
@@ -71,8 +69,6 @@ def decode_c(
     :returns: A tuple of equivalent python values for the ABI values
         represented in ``data``.
     """
-    # validate decode types and data
-    validate_list_like_param(types, "types")
     validate_bytes_param(data, "data")
 
     decoder = self._registry.get_tuple_decoder(*types, strict=strict)

{faster_eth_abi-5.2.9 → faster_eth_abi-5.2.11}/faster_eth_abi/_decoding.py

@@ -10,6 +10,7 @@ from faster_eth_utils import (
 
 from faster_eth_abi.exceptions import (
     InsufficientDataBytes,
+    NonEmptyPaddingBytes,
 )
 from faster_eth_abi.io import (
     BytesIO,
@@ -26,6 +27,7 @@ if TYPE_CHECKING:
     )
 
 
+# Helpers
 def decode_uint_256(stream: ContextFramesBytesIO) -> int:
     """
     This function is a faster version of decode_uint_256 in decoding.py.
@@ -39,6 +41,10 @@ def decode_uint_256(stream: ContextFramesBytesIO) -> int:
     raise InsufficientDataBytes(f"Tried to read 32 bytes, only got {len(data)} bytes.")
 
 
+def get_value_byte_size(decoder: "FixedByteSizeDecoder") -> int:
+    return decoder.value_bit_size // 8
+
+
 # HeadTailDecoder
 def decode_head_tail(self: "HeadTailDecoder", stream: ContextFramesBytesIO) -> Any:
     # Decode the offset and move the stream cursor forward 32 bytes
@@ -107,3 +113,43 @@ def read_fixed_byte_size_data_from_stream(
     raise InsufficientDataBytes(
         f"Tried to read {data_byte_size} bytes, only got {len(data)} bytes."
     )
+
+
+def split_data_and_padding_fixed_byte_size(
+    self: "FixedByteSizeDecoder",
+    raw_data: bytes,
+) -> Tuple[bytes, bytes]:
+    value_byte_size = get_value_byte_size(self)
+    padding_size = self.data_byte_size - value_byte_size
+
+    if self.is_big_endian:
+        if padding_size == 0:
+            return raw_data, b""
+        padding_bytes = raw_data[:padding_size]
+        data = raw_data[padding_size:]
+    else:
+        data = raw_data[:value_byte_size]
+        padding_bytes = raw_data[value_byte_size:]
+
+    return data, padding_bytes
+
+
+def validate_padding_bytes_fixed_byte_size(
+    self: "FixedByteSizeDecoder",
+    value: Any,
+    padding_bytes: bytes,
+) -> None:
+    value_byte_size = get_value_byte_size(self)
+    padding_size = self.data_byte_size - value_byte_size
+
+    if padding_bytes != b"\x00" * padding_size:
+        raise NonEmptyPaddingBytes(f"Padding bytes were not empty: {padding_bytes!r}")
+
+
+# BooleanDecoder
+def decoder_fn_boolean(data: bytes) -> bool:
+    if data == b"\x00":
+        return False
+    elif data == b"\x01":
+        return True
+    raise NonEmptyPaddingBytes(f"Boolean must be either 0x0 or 0x1.  Got: {data!r}")

{faster_eth_abi-5.2.9 → faster_eth_abi-5.2.11}/faster_eth_abi/_encoding.py

@@ -1,6 +1,3 @@
-from itertools import (
-    accumulate,
-)
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -35,7 +32,12 @@ def encode_tuple(
             tail_chunks.append(b"")
 
     head_length = sum(32 if item is None else len(item) for item in raw_head_chunks)
-    tail_offsets = (0, *accumulate(len(item) for item in tail_chunks[:-1]))
+    tail_offsets = [0]
+    total_offset = 0
+    for item in tail_chunks[:-1]:
+        total_offset += len(item)
+        tail_offsets.append(total_offset)
+
     head_chunks = tuple(
         encode_uint_256(head_length + offset) if chunk is None else chunk
         for chunk, offset in zip(raw_head_chunks, tail_offsets)
@@ -77,7 +79,12 @@ def encode_elements(item_encoder: "BaseEncoder", value: Sequence[Any]) -> bytes:
         return b"".join(tail_chunks)
 
     head_length = 32 * len(value)
-    tail_offsets = (0, *accumulate(len(item) for item in tail_chunks[:-1]))
+    tail_offsets = [0]
+    total_offset = 0
+    for item in tail_chunks[:-1]:
+        total_offset += len(item)
+        tail_offsets.append(total_offset)
+
     head_chunks = tuple(
         encode_uint_256(head_length + offset) for offset in tail_offsets
     )

faster_eth_abi-5.2.9/faster_eth_abi/grammar.py → faster_eth_abi-5.2.11/faster_eth_abi/_grammar.py

@@ -1,22 +1,22 @@
-import functools
 import re
 from typing import (
     Any,
     Final,
+    NewType,
     NoReturn,
     Optional,
     Sequence,
     Tuple,
     TypeVar,
+    Union,
     final,
 )
 
-from eth_typing import (
+from eth_typing.abi import (
     TypeStr,
 )
-import parsimonious
-from parsimonious import (
-    expressions,
+from mypy_extensions import (
+    mypyc_attr,
 )
 from parsimonious.nodes import (
     Node,
@@ -27,136 +27,29 @@ from typing_extensions import (
 
 from faster_eth_abi.exceptions import (
     ABITypeError,
-    ParseError,
 )
 
-grammar: Final = parsimonious.Grammar(
-    r"""
-    type = tuple_type / basic_type
 
-    tuple_type = components arrlist?
-    components = non_zero_tuple
-
-    non_zero_tuple = "(" type next_type* ")"
-    next_type = "," type
-
-    basic_type = base sub? arrlist?
-
-    base = alphas
-
-    sub = two_size / digits
-    two_size = (digits "x" digits)
-
-    arrlist = (const_arr / dynam_arr)+
-    const_arr = "[" digits "]"
-    dynam_arr = "[]"
+TYPE_ALIASES: Final = {
+    "int": "int256",
+    "uint": "uint256",
+    "fixed": "fixed128x18",
+    "ufixed": "ufixed128x18",
+    "function": "bytes24",
+    "byte": "bytes1",
+}
 
-    alphas = ~"[A-Za-z]+"
-    digits = ~"[1-9][0-9]*"
-    """
+TYPE_ALIAS_RE: Final = re.compile(
+    rf"\b({'|'.join(map(re.escape, TYPE_ALIASES.keys()))})\b"
 )
 
 
-@final
-class NodeVisitor(parsimonious.NodeVisitor):  # type: ignore [misc]
-    """
-    Parsimonious node visitor which performs both parsing of type strings and
-    post-processing of parse trees.  Parsing operations are cached.
-    """
-
-    def __init__(self):
-        self.parse = functools.lru_cache(maxsize=None)(self._parse_uncached)
-
-    grammar = grammar
-
-    def visit_non_zero_tuple(self, node, visited_children):
-        # Ignore left and right parens
-        _, first, rest, _ = visited_children
-
-        return (first,) + rest
-
-    def visit_tuple_type(self, node, visited_children):
-        components, arrlist = visited_children
-
-        return TupleType(components, arrlist, node=node)
-
-    def visit_next_type(self, node, visited_children):
-        # Ignore comma
-        _, abi_type = visited_children
-
-        return abi_type
-
-    def visit_basic_type(self, node, visited_children):
-        base, sub, arrlist = visited_children
-
-        return BasicType(base, sub, arrlist, node=node)
-
-    def visit_two_size(self, node, visited_children):
-        # Ignore "x"
-        first, _, second = visited_children
-
-        return first, second
-
-    def visit_const_arr(self, node, visited_children):
-        # Ignore left and right brackets
-        _, int_value, _ = visited_children
-
-        return (int_value,)
-
-    def visit_dynam_arr(self, node, visited_children):
-        return ()
-
-    def visit_alphas(self, node, visited_children):
-        return node.text
-
-    def visit_digits(self, node, visited_children):
-        return int(node.text)
-
-    def generic_visit(self, node, visited_children):
-        expr = node.expr
-        if isinstance(expr, expressions.OneOf):
-            # Unwrap value chosen from alternatives
-            return visited_children[0]
-
-        if isinstance(expr, expressions.Quantifier) and expr.min == 0 and expr.max == 1:
-            # Unwrap optional value or return `None`
-            if len(visited_children) != 0:
-                return visited_children[0]
-
-            return None
-
-        return tuple(visited_children)
-
-    def _parse_uncached(self, type_str, **kwargs):
-        """
-        Parses a type string into an appropriate instance of
-        :class:`~faster_eth_abi.grammar.ABIType`.  If a type string cannot be parsed,
-        throws :class:`~faster_eth_abi.exceptions.ParseError`.
-
-        :param type_str: The type string to be parsed.
-        :returns: An instance of :class:`~faster_eth_abi.grammar.ABIType` containing
-            information about the parsed type string.
-        """
-        if not isinstance(type_str, str):
-            raise TypeError(f"Can only parse string values: got {type(type_str)}")
-
-        try:
-            return super().parse(type_str, **kwargs)
-        except parsimonious.ParseError as e:
-            # This is a good place to add some better messaging around the type string.
-            # If this logic grows any bigger, we should abstract it to its own function.
-            if "()" in type_str:
-                # validate against zero-sized tuple types
-                raise ValueError(
-                    'Zero-sized tuple types "()" are not supported.'
-                ) from None
-
-            raise ParseError(e.text, e.pos, e.expr) from e
-
-
-visitor: Final = NodeVisitor()
+IntSubtype = NewType("IntSubtype", int)
+FixedSubtype = NewType("FixedSubtype", Tuple[int, int])
+Subtype = Union[IntSubtype, FixedSubtype]
 
 
+@mypyc_attr(allow_interpreted_subclasses=True)
 class ABIType:
     """
     Base class for results of type string parsing operations.
@@ -165,7 +58,7 @@ class ABIType:
     __slots__ = ("arrlist", "node")
 
     def __init__(
-        self, arrlist: Optional[Sequence] = None, node: Optional[Node] = None
+        self, arrlist: Optional[Sequence[str]] = None, node: Optional[Node] = None
     ) -> None:
         self.arrlist: Final = arrlist
         """
@@ -211,6 +104,7 @@ class ABIType:
         """
         raise NotImplementedError("Must implement `validate`")
 
+    @final
     def invalidate(self, error_msg: str) -> NoReturn:
         # Invalidates an ABI type with the given error message.  Expects that a
         # parsimonious node was provided from the original parsing operation
@@ -222,6 +116,7 @@ class ABIType:
             f"in '{node.full_text}': {error_msg}"
         )
 
+    @final
     @property
     def is_array(self) -> bool:
         """
@@ -238,6 +133,7 @@ class ABIType:
         """
         raise NotImplementedError("Must implement `is_dynamic`")
 
+    @final
     @property
     def _has_dynamic_arrlist(self) -> bool:
         return self.is_array and any(len(dim) == 0 for dim in self.arrlist)
@@ -246,7 +142,7 @@ class ABIType:
 TComp = TypeVar("TComp", bound=ABIType)
 
 
-@final
+@mypyc_attr(allow_interpreted_subclasses=True)
 class TupleType(ABIType):
     """
     Represents the result of parsing a tuple type string e.g. "(int,bool)".
@@ -257,7 +153,7 @@ class TupleType(ABIType):
     def __init__(
         self,
         components: Tuple[TComp, ...],
-        arrlist: Optional[Sequence] = None,
+        arrlist: Optional[Sequence[str]] = None,
         *,
         node: Optional[Node] = None,
     ) -> None:
@@ -273,7 +169,7 @@ class TupleType(ABIType):
         arrlist = self.arrlist
 
         if isinstance(arrlist, tuple):
-            arrlist = "".join(repr(list(a)) for a in arrlist)
+            arrlist = "".join(map(repr, map(list, arrlist)))
         else:
             arrlist = ""
 
@@ -286,11 +182,12 @@ class TupleType(ABIType):
                 f"Cannot determine item type for non-array type '{self.to_type_str()}'"
             )
 
-        return type(self)(
-            self.components,
-            self.arrlist[:-1] or None,  # type: ignore [index]
-            node=self.node,
-        )
+        arrlist = self.arrlist[:-1] or None  # type: ignore [index]
+        cls = type(self)
+        if cls is TupleType:
+            return TupleType(self.components, arrlist, node=self.node)  # type: ignore [return-value]
+        else:
+            return cls(self.components, arrlist, node=self.node)
 
     def validate(self) -> None:
         for c in self.components:
@@ -304,7 +201,7 @@ class TupleType(ABIType):
         return any(c.is_dynamic for c in self.components)
 
 
-@final
+@mypyc_attr(allow_interpreted_subclasses=True)
 class BasicType(ABIType):
     """
     Represents the result of parsing a basic type string e.g. "uint", "address",
@@ -316,7 +213,7 @@ class BasicType(ABIType):
     def __init__(
         self,
         base: str,
-        sub: Any = None,
+        sub: Optional[Subtype] = None,
         arrlist: Optional[Sequence] = None,
         *,
         node: Optional[Node] = None,
@@ -339,12 +236,12 @@ class BasicType(ABIType):
         if isinstance(sub, int):
             substr = str(sub)
         elif isinstance(sub, tuple):
-            substr = "x".join(str(s) for s in sub)
+            substr = "x".join(map(str, sub))
         else:
             substr = ""
 
         if isinstance(arrlist, tuple):
-            return self.base + substr + "".join(repr(list(a)) for a in arrlist)
+            return self.base + substr + "".join(map(repr, map(list, arrlist)))
         else:
             return self.base + substr
 
@@ -355,22 +252,23 @@ class BasicType(ABIType):
                 f"Cannot determine item type for non-array type '{self.to_type_str()}'"
             )
 
-        return type(self)(
-            self.base,
-            self.sub,
-            self.arrlist[:-1] or None,  # type: ignore [index]
-            node=self.node,
-        )
+        cls = type(self)
+        arrlist = self.arrlist[:-1] or None  # type: ignore [index]
+        if cls is BasicType:
+            return BasicType(self.base, self.sub, arrlist, node=self.node)  # type: ignore [return-value]
+        else:
+            return cls(self.base, self.sub, arrlist, node=self.node)
 
     @property
     def is_dynamic(self) -> bool:
         if self._has_dynamic_arrlist:
             return True
 
-        if self.base == "string":
+        base = self.base
+        if base == "string":
             return True
 
-        if self.base == "bytes" and self.sub is None:
+        if base == "bytes" and self.sub is None:
             return True
 
         return False
@@ -436,20 +334,6 @@ class BasicType(ABIType):
                 self.invalidate("address cannot have suffix")
 
 
-TYPE_ALIASES: Final = {
-    "int": "int256",
-    "uint": "uint256",
-    "fixed": "fixed128x18",
-    "ufixed": "ufixed128x18",
-    "function": "bytes24",
-    "byte": "bytes1",
-}
-
-TYPE_ALIAS_RE: Final = re.compile(
-    rf"\b({'|'.join(re.escape(a) for a in TYPE_ALIASES.keys())})\b"
-)
-
-
 def normalize(type_str: TypeStr) -> TypeStr:
     """
     Normalizes a type string into its canonical version e.g. the type string
@@ -463,6 +347,3 @@ def normalize(type_str: TypeStr) -> TypeStr:
 
 def __normalize(match: "re.Match[str]") -> str:
     return TYPE_ALIASES[match.group(0)]
-
-
-parse: Final = visitor.parse

{faster_eth_abi-5.2.9 → faster_eth_abi-5.2.11}/faster_eth_abi/codec.py

@@ -18,6 +18,7 @@ from faster_eth_abi.decoding import (
 )
 from faster_eth_abi.exceptions import (
     EncodingError,
+    MultipleEntriesFound,
 )
 from faster_eth_abi.registry import (
     ABIRegistry,
@@ -74,20 +75,18 @@ class ABIEncoder(BaseABICoder):
         :returns: ``True`` if ``arg`` is encodable as a value of the ABI type
             ``typ``.  Otherwise, ``False``.
         """
-        if not self.is_encodable_type(typ):
+        try:
+            encoder = self._registry.get_encoder(typ)
+        except MultipleEntriesFound:
+            raise
+        except:
             return False
 
-        encoder = self._registry.get_encoder(typ)
-
+        validate = getattr(encoder, "validate_value", encoder)
         try:
-            encoder.validate_value(arg)
+            validate(arg)
         except EncodingError:
             return False
-        except AttributeError:
-            try:
-                encoder(arg)
-            except EncodingError:
-                return False
 
         return True
 

{faster_eth_abi-5.2.9 → faster_eth_abi-5.2.11}/faster_eth_abi/decoding.py

@@ -19,7 +19,11 @@ from faster_eth_abi._decoding import (
     decode_head_tail,
     decode_sized_array,
     decode_tuple,
+    decoder_fn_boolean,
+    get_value_byte_size,
     read_fixed_byte_size_data_from_stream,
+    split_data_and_padding_fixed_byte_size,
+    validate_padding_bytes_fixed_byte_size,
 )
 from faster_eth_abi.base import (
     BaseCoder,
@@ -303,29 +307,14 @@ class FixedByteSizeDecoder(SingleDecoder):
         return read_fixed_byte_size_data_from_stream(self, stream)
 
     def split_data_and_padding(self, raw_data: bytes) -> Tuple[bytes, bytes]:
-        value_byte_size = self._get_value_byte_size()
-        padding_size = self.data_byte_size - value_byte_size
-
-        if self.is_big_endian:
-            padding_bytes = raw_data[:padding_size]
-            data = raw_data[padding_size:]
-        else:
-            data = raw_data[:value_byte_size]
-            padding_bytes = raw_data[value_byte_size:]
-
-        return data, padding_bytes
+        return split_data_and_padding_fixed_byte_size(self, raw_data)
 
     def validate_padding_bytes(self, value: Any, padding_bytes: bytes) -> None:
-        value_byte_size = self._get_value_byte_size()
-        padding_size = self.data_byte_size - value_byte_size
-
-        if padding_bytes != b"\x00" * padding_size:
-            raise NonEmptyPaddingBytes(
-                f"Padding bytes were not empty: {padding_bytes!r}"
-            )
+        validate_padding_bytes_fixed_byte_size(self, value, padding_bytes)
 
     def _get_value_byte_size(self) -> int:
-        return self.value_bit_size // 8
+        # This is unused, but it is kept in to preserve the eth-abi api
+        return get_value_byte_size(self)
 
 
 class Fixed32ByteSizeDecoder(FixedByteSizeDecoder):
@@ -336,16 +325,7 @@ class BooleanDecoder(Fixed32ByteSizeDecoder):
     value_bit_size = 8
     is_big_endian = True
 
-    @staticmethod
-    def decoder_fn(data: bytes) -> bool:
-        if data == b"\x00":
-            return False
-        elif data == b"\x01":
-            return True
-        else:
-            raise NonEmptyPaddingBytes(
-                f"Boolean must be either 0x0 or 0x1.  Got: {data!r}"
-            )
+    decoder_fn = staticmethod(decoder_fn_boolean)
 
     @parse_type_str("bool")
     def from_type_str(cls, abi_type, registry):
@@ -392,7 +372,7 @@ class SignedIntegerDecoder(Fixed32ByteSizeDecoder):
             return value
 
     def validate_padding_bytes(self, value: Any, padding_bytes: bytes) -> None:
-        value_byte_size = self._get_value_byte_size()
+        value_byte_size = get_value_byte_size(self)
         padding_size = self.data_byte_size - value_byte_size
 
         if value >= 0:
@@ -471,7 +451,7 @@ class SignedFixedDecoder(BaseFixedDecoder):
         return decimal_value
 
     def validate_padding_bytes(self, value: Any, padding_bytes: bytes) -> None:
-        value_byte_size = self._get_value_byte_size()
+        value_byte_size = get_value_byte_size(self)
         padding_size = self.data_byte_size - value_byte_size
 
         if value >= 0:

{faster_eth_abi-5.2.9 → faster_eth_abi-5.2.11}/faster_eth_abi/from_type_str.py

@@ -12,11 +12,13 @@ from eth_typing import (
     TypeStr,
 )
 
-from .grammar import (
+from ._grammar import (
     ABIType,
     BasicType,
     TupleType,
     normalize,
+)
+from .grammar import (
     parse,
 )