faster-eth-abi 5.2.15__cp38-cp38-macosx_11_0_arm64.whl → 5.2.16__cp38-cp38-macosx_11_0_arm64.whl

faster_eth_abi/registry.py

@@ -1,3 +1,7 @@
+"""Registry and predicate logic for ABI encoders and decoders.
+
+Implements registration, lookup, and matching of encoders and decoders for ABI type strings.
+"""
 import abc
 from copy import (
     copy,
@@ -14,6 +18,7 @@ from typing import (
     Type,
     TypeVar,
     Union,
+    final,
 )
 
 from eth_typing import (
@@ -177,15 +182,21 @@ class PredicateMapping(Copyable, Generic[T]):
         return cpy
 
 
-class Predicate:
+class Predicate(Generic[T]):
     """
     Represents a predicate function to be used for type matching in
     ``ABIRegistry``.
     """
 
-    __slots__ = ()
+    __slots__ = ("_string", "__hash")
+
+    _string: Optional[str]
 
-    def __call__(self, *args, **kwargs):  # pragma: no cover
+    def __init__(self) -> None:
+        self._string = None
+        self.__hash = None
+
+    def __call__(self, arg: TypeStr) -> None:
         raise NotImplementedError("Must implement `__call__`")
 
     def __str__(self) -> str:
@@ -194,35 +205,47 @@ class Predicate:
     def __repr__(self) -> str:
         return f"<{type(self).__name__} {self}>"
 
-    def __iter__(self) -> Iterator[Any]:
-        for attr in self.__slots__:
-            yield getattr(self, attr)
+    def __iter__(self) -> Iterator[T]:
+        raise NotImplementedError("must be implemented by subclass")
 
     def __hash__(self) -> int:
-        return hash(tuple(self))
+        hashval = self.__hash
+        if hashval is None:
+            self.__hash = hashval = hash(tuple(self))
+        return hashval
 
-    def __eq__(self, other: Any) -> bool:
+    def __eq__(self, other: "Predicate") -> bool:
         return type(self) is type(other) and tuple(self) == tuple(other)
 
 
-class Equals(Predicate):
+@final
+class Equals(Predicate[str]):
     """
     A predicate that matches any input equal to `value`.
     """
 
     __slots__ = ("value",)
 
-    def __init__(self, value):
-        self.value = value
+    def __init__(self, value: str) -> None:
+        super().__init__()
+        self.value: Final = value
 
-    def __call__(self, other: Any) -> bool:
+    def __call__(self, other: TypeStr) -> bool:
         return self.value == other
 
     def __str__(self) -> str:
-        return f"(== {self.value!r})"
+        # NOTE should this just be done at init time? is it always called?
+        string = self._string
+        if string is None:
+            self._string = string = f"(== {self.value!r})"
+        return string
+
+    def __iter__(self) -> Iterator[str]:
+        yield self.value
 
 
-class BaseEquals(Predicate):
+@final
+class BaseEquals(Predicate[Union[str, bool, None]]):
     """
     A predicate that matches a basic type string with a base component equal to
     `value` and no array component.  If `with_sub` is `True`, the type string
@@ -233,9 +256,10 @@ class BaseEquals(Predicate):
 
     __slots__ = ("base", "with_sub")
 
-    def __init__(self, base, *, with_sub=None):
-        self.base = base
-        self.with_sub = with_sub
+    def __init__(self, base: TypeStr, *, with_sub: Optional[bool] = None):
+        super().__init__()
+        self.base: Final = base
+        self.with_sub: Final = with_sub
 
     def __call__(self, type_str: TypeStr) -> bool:
         try:
@@ -247,10 +271,12 @@ class BaseEquals(Predicate):
             if abi_type.arrlist is not None:
                 return False
 
-            if self.with_sub is not None:
-                if self.with_sub and abi_type.sub is None:
+            with_sub = self.with_sub
+            if with_sub is not None:
+                abi_subtype = abi_type.sub
+                if with_sub and abi_subtype is None:
                     return False
-                if not self.with_sub and abi_type.sub is not None:
+                if not with_sub and abi_subtype is not None:
                     return False
 
             return abi_type.base == self.base
@@ -260,15 +286,21 @@ class BaseEquals(Predicate):
         return False
 
     def __str__(self) -> str:
-        return (
-            f"(base == {self.base!r}"
-            + (
-                ""
-                if self.with_sub is None
-                else (" and sub is not None" if self.with_sub else " and sub is None")
-            )
-            + ")"
-        )
+        # NOTE should this just be done at init time? is it always called?
+        string = self._string
+        if string is None:
+            if self.with_sub is None:
+                string = f"(base == {self.base!r})"
+            elif self.with_sub:
+                string = f"(base == {self.base!r} and sub is not None)"
+            else:
+                string = f"(base == {self.base!r} and sub is None)"
+            self._string = string
+        return string
+
+    def __iter__(self) -> Iterator[Union[str, bool, None]]:
+        yield self.base
+        yield self.with_sub
 
 
 def has_arrlist(type_str: TypeStr) -> bool:
@@ -555,14 +587,35 @@ class ABIRegistry(Copyable, BaseRegistry):
 
 registry = ABIRegistry()
 
+is_int = BaseEquals("int")
+is_int8 = Equals("int8")
+is_int16 = Equals("int16")
+is_uint = BaseEquals("uint")
+is_uint8 = Equals("uint8")
+is_uint16 = Equals("uint16")
+
+for size in (8, 16):
+    registry.register(
+        Equals(f"uint{size}"),
+        encoding.UnsignedIntegerEncoder,
+        decoding.UnsignedIntegerDecoder,
+        label=f"uint{size}",
+    )
+    registry.register(
+        Equals(f"int{size}"),
+        encoding.SignedIntegerEncoder,
+        decoding.SignedIntegerDecoder,
+        label=f"int{size}",
+    )
+
 registry.register(
-    BaseEquals("uint"),
+    lambda s: is_uint(s) and not is_uint8(s) and not is_uint16(s),
     encoding.UnsignedIntegerEncoder,
     decoding.UnsignedIntegerDecoder,
     label="uint",
 )
 registry.register(
-    BaseEquals("int"),
+    lambda s: is_int(s) and not is_int8(s) and not is_int16(s),
     encoding.SignedIntegerEncoder,
     decoding.SignedIntegerDecoder,
     label="int",
@@ -630,13 +683,25 @@ registry.register(
 
 registry_packed = ABIRegistry()
 
+for size in (8, 16):
+    registry_packed.register_encoder(
+        Equals(f"uint{size}"),
+        encoding.PackedUnsignedIntegerEncoderCached,
+        label=f"uint{size}",
+    )
+    registry_packed.register_encoder(
+        Equals(f"int{size}"),
+        encoding.PackedSignedIntegerEncoderCached,
+        label=f"int{size}",
+    )
+
 registry_packed.register_encoder(
-    BaseEquals("uint"),
+    lambda s: is_uint(s) and not is_uint8(s) and not is_uint16(s),
     encoding.PackedUnsignedIntegerEncoder,
     label="uint",
 )
 registry_packed.register_encoder(
-    BaseEquals("int"),
+    lambda s: is_int(s) and not is_int8(s) and not is_int16(s),
     encoding.PackedSignedIntegerEncoder,
     label="int",
 )

faster_eth_abi/typing.py

@@ -1,11 +1,22 @@
 # AUTOGENERATED FILE. DO NOT EDIT DIRECTLY.
 from typing import (
     Literal,
+    TypeVar,
     Union,
 )
 
+T = TypeVar("T")
+
 IntegerTypeStr = Union["IntTypeStr", "UintTypeStr"]
 
+AddressTypeStr = Literal["address"]
+BoolTypeStr = Literal["bool"]
+StringTypeStr = Literal["string"]
+
+AddressArrayTypeStr = Literal["address[]"]
+StringArrayTypeStr = Literal["string[]"]
+BoolArrayTypeStr = Literal["bool[]"]
+
 ArrayTypeStr = Union[
     "AddressArrayTypeStr",
     "BoolArrayTypeStr",
@@ -93,20 +104,42 @@ UintTypeStr = Literal[
     "uint256",
 ]
 
-BoolTypeStr = Literal["bool"]
-
 BytesTypeStr = Literal[
     "bytes",
-    # do we need more? probs
+    "bytes1",
+    "bytes2",
+    "bytes3",
+    "bytes4",
+    "bytes5",
+    "bytes6",
+    "bytes7",
+    "bytes8",
+    "bytes9",
+    "bytes10",
+    "bytes11",
+    "bytes12",
+    "bytes13",
+    "bytes14",
+    "bytes15",
+    "bytes16",
+    "bytes17",
+    "bytes18",
+    "bytes19",
+    "bytes20",
+    "bytes21",
+    "bytes22",
+    "bytes23",
+    "bytes24",
+    "bytes25",
+    "bytes26",
+    "bytes27",
+    "bytes28",
+    "bytes29",
+    "bytes30",
+    "bytes31",
+    "bytes32",
 ]
 
-StringTypeStr = Literal["string"]
-
-AddressArrayTypeStr = Literal["address[]"]
-BytesArrayTypeStr = Literal["bytes[]"]
-StringArrayTypeStr = Literal["string[]"]
-BoolArrayTypeStr = Literal["bool[]"]
-
 IntArrayTypeStr = Literal[
     "int8[]",
     "int16[]",
@@ -174,6 +207,42 @@ IntArrayTypeStr = Literal[
     "uint256[]",
 ]
 
+BytesArrayTypeStr = Literal[
+    "bytes[]",
+    "bytes1[]",
+    "bytes2[]",
+    "bytes3[]",
+    "bytes4[]",
+    "bytes5[]",
+    "bytes6[]",
+    "bytes7[]",
+    "bytes8[]",
+    "bytes9[]",
+    "bytes10[]",
+    "bytes11[]",
+    "bytes12[]",
+    "bytes13[]",
+    "bytes14[]",
+    "bytes15[]",
+    "bytes16[]",
+    "bytes17[]",
+    "bytes18[]",
+    "bytes19[]",
+    "bytes20[]",
+    "bytes21[]",
+    "bytes22[]",
+    "bytes23[]",
+    "bytes24[]",
+    "bytes25[]",
+    "bytes26[]",
+    "bytes27[]",
+    "bytes28[]",
+    "bytes29[]",
+    "bytes30[]",
+    "bytes31[]",
+    "bytes32[]",
+]
+
 # New tuple type strings
 TupleAddressIntTypeStr = Literal[
     "(address,int8)",
@@ -4541,3 +4610,18 @@ TupleStrIntTypeStr = Literal[
     "(string,uint248)",
     "(string,uint256)",
 ]
+
+AnyTypeStr = Union[
+    AddressTypeStr,
+    BoolTypeStr,
+    StringTypeStr,
+    AddressArrayTypeStr,
+    StringArrayTypeStr,
+    BoolArrayTypeStr,
+    ArrayTypeStr,
+    TupleTypeStr,
+    BytesTypeStr,
+    IntTypeStr,
+    UintTypeStr,
+    str,
+]

{faster_eth_abi-5.2.15.dist-info → faster_eth_abi-5.2.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: faster_eth_abi
-Version: 5.2.15
+Version: 5.2.16
 Summary: A ~2-6x 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
@@ -32,9 +32,9 @@ Requires-Python: >=3.8, <4
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: cchecksum<0.4,>=0.2.6
-Requires-Dist: faster-eth-utils>=2.0.0
-Requires-Dist: eth-abi<6,>=5.0.1
-Requires-Dist: eth-typing>=3.0.0
+Requires-Dist: faster-eth-utils==5.3.16
+Requires-Dist: eth-abi==5.2.0
+Requires-Dist: eth-typing==5.2.1
 Requires-Dist: mypy-extensions
 Requires-Dist: parsimonious<0.11.0,>=0.10.0
 Provides-Extra: codspeed
@@ -42,10 +42,11 @@ Requires-Dist: pytest>=7.0.0; extra == "codspeed"
 Requires-Dist: pytest-codspeed<4.3,>=4.2; extra == "codspeed"
 Requires-Dist: pytest-test-groups; extra == "codspeed"
 Provides-Extra: dev
+Requires-Dist: mypy<1.18.3,>=1.14.1; extra == "dev"
+Requires-Dist: tqdm; extra == "dev"
 Requires-Dist: build>=0.9.0; extra == "dev"
 Requires-Dist: bump-my-version>=0.19.0; extra == "dev"
 Requires-Dist: ipython; extra == "dev"
-Requires-Dist: mypy==1.14.1; extra == "dev"
 Requires-Dist: pre-commit>=3.4.0; extra == "dev"
 Requires-Dist: tox>=4.0.0; extra == "dev"
 Requires-Dist: twine; extra == "dev"
@@ -54,7 +55,7 @@ Requires-Dist: pytest-benchmark; extra == "dev"
 Requires-Dist: sphinx>=6.0.0; extra == "dev"
 Requires-Dist: sphinx-autobuild>=2021.3.14; extra == "dev"
 Requires-Dist: sphinx-rtd-theme>=1.0.0; extra == "dev"
-Requires-Dist: towncrier<26,>=25; extra == "dev"
+Requires-Dist: towncrier<26,>=24; extra == "dev"
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: pytest-timeout>=2.0.0; extra == "dev"
 Requires-Dist: pytest-xdist>=2.4.0; extra == "dev"
@@ -65,7 +66,10 @@ Provides-Extra: docs
 Requires-Dist: sphinx>=6.0.0; extra == "docs"
 Requires-Dist: sphinx-autobuild>=2021.3.14; extra == "docs"
 Requires-Dist: sphinx-rtd-theme>=1.0.0; extra == "docs"
-Requires-Dist: towncrier<26,>=25; extra == "docs"
+Requires-Dist: towncrier<26,>=24; extra == "docs"
+Provides-Extra: mypy
+Requires-Dist: mypy<1.18.3,>=1.14.1; extra == "mypy"
+Requires-Dist: tqdm; extra == "mypy"
 Provides-Extra: test
 Requires-Dist: pytest>=7.0.0; extra == "test"
 Requires-Dist: pytest-timeout>=2.0.0; extra == "test"
@@ -76,7 +80,7 @@ Requires-Dist: hypothesis<6.108.7,>=6.22.0; extra == "test"
 Provides-Extra: tools
 Requires-Dist: hypothesis<6.108.7,>=6.22.0; extra == "tools"
 
-### I forked eth-abi and compiled it to C. It does the same stuff, now ~2-6x faster
+### I forked eth-abi, added comprehensive type annotations, and compiled it to C. It does the same stuff, now ~2-6x faster.
 
 [![PyPI](https://img.shields.io/pypi/v/faster-eth-abi.svg?logo=Python&logoColor=white)](https://pypi.org/project/faster-eth-abi/)
 [![Monthly Downloads](https://img.shields.io/pypi/dm/faster-eth-abi)](https://pypistats.org/packages/faster-eth-abi)

faster_eth_abi-5.2.16.dist-info/RECORD

@@ -0,0 +1,47 @@
+29859a9e7da9d19bb98c__mypyc.cpython-38-darwin.so,sha256=wjwdNpB3dFX33-z67u7A3JewWHoOvC0R8NVSbH0ry74,694176
+faster_eth_abi/_codec.cpython-38-darwin.so,sha256=b11Z91HzH6qWkIEl7DcIEL4pbP8wCq1k9sLpYs1frLo,50536
+faster_eth_abi/_encoding.py,sha256=SCwXXe6bG1Ep47QfPQ0n9Bn4rNcfeIIdv_3hsQYIaok,8768
+faster_eth_abi/packed.py,sha256=YN1k8heenRMVQQsPEKAYfpd1XhWNF3mOn4sbaR4HiYE,418
+faster_eth_abi/encoding.py,sha256=e94bu4hXo3DCt5ovs8MnwU6pxPuJTqWhPNE4qVo-G4g,21252
+faster_eth_abi/abi.cpython-38-darwin.so,sha256=_yiFrm3azLTbaaYoavh7rnzM5v-ApLze-lLJSxBXEIg,50536
+faster_eth_abi/packed.cpython-38-darwin.so,sha256=HlvpKFrlmgdjwYyRJBgwS0jqbW8aODxWs68PZbyW1AA,50536
+faster_eth_abi/from_type_str.cpython-38-darwin.so,sha256=lyrVKssPQklIhkpKb046CcKcVFLGCkWpIIZiyxtL_gc,50576
+faster_eth_abi/registry.py,sha256=6vpfdnlnT8JfF5tUxXcfdhtXWFLxTo-T66dV8oXfeRY,23772
+faster_eth_abi/_decoding.py,sha256=S2T9KM0skNPdhQaaVTsZhHtIPdU0G5hjALFlZN1g7ZY,9945
+faster_eth_abi/constants.py,sha256=uJbuND1rFs_Pexuz58TKd-BJPuoA6hLqFEX6kkDS-dE,107
+faster_eth_abi/io.py,sha256=2_xCGFY_GiIAiQCEmDi1xp-bgmm-xhLxH9g66NYk9JU,3877
+faster_eth_abi/__init__.py,sha256=55jGpiVbsTGNu-c_rr-wwyH3eqEv9MELSTWa4AMiKvU,205
+faster_eth_abi/_grammar.py,sha256=hqHEJIkEIyz0Gezyfou4MBf1-75TjS_Ako5ZpeykO-Q,10566
+faster_eth_abi/decoding.py,sha256=cB7ED3DPkKJkTqDwquflUomQpEmqbcSxJPgF8cW24e4,17593
+faster_eth_abi/grammar.py,sha256=drkA5ahXOVmZA2IdsldIcVamoc6G8uC6_gFppMPuLFk,4455
+faster_eth_abi/from_type_str.py,sha256=U3Xl7zjRL4C7J0t1aGBpBzhEqGo7BS8sxLYnF5pBu4Y,4490
+faster_eth_abi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+faster_eth_abi/abi.py,sha256=HzkXy0EjHraNbbC5l-EhVqVcx5vy8tcykiKIO4Fp1xw,366
+faster_eth_abi/_decoding.cpython-38-darwin.so,sha256=pRrhIq2lzfLbfPzi8dQC0LQbAM1zBz86RYAEHY-1lC0,50560
+faster_eth_abi/exceptions.py,sha256=I_uWNRq8a1UcWNahYDBJd1rKbET1bYTiTbDf3R4eFOI,3646
+faster_eth_abi/_codec.py,sha256=D_Vn5gtUWZi2ltiqKfH5qm5xr1w8k9CAwDRWSnzOINE,2514
+faster_eth_abi/_grammar.cpython-38-darwin.so,sha256=B30-3_BzBqR6Gz_Si-Qhiuad3u7P28jrTyzoC3AAA0g,50560
+faster_eth_abi/constants.cpython-38-darwin.so,sha256=Nqw1bQvNffxTt9jgpqRL_cKco8lB0GG_NXfW2QBI4Fs,50560
+faster_eth_abi/typing.py,sha256=FIMFquzJeZrL6qslWhMlfdRbO95P851gt2lt3T5S16E,105020
+faster_eth_abi/codec.py,sha256=A04ZzXppz3QK0RzZcsDMoYxuH1eGx6fzOqGGGdNu62c,66624
+faster_eth_abi/_encoding.cpython-38-darwin.so,sha256=uOf4WePwP4ZYzPuReQOOrj7FJ0tPIR-kq1N5mRpUiWg,50560
+faster_eth_abi/base.py,sha256=HgqTDvzYb2tvarczhm94gRjdgVfrBmICPX5kCw25AJ4,1329
+faster_eth_abi/tools/__init__.cpython-38-darwin.so,sha256=UoQBXpcX6PNz3FXLBPHqecea6a95WydMbVRo8yS26_I,50544
+faster_eth_abi/tools/_strategies.py,sha256=XQhK8eG87W7LB5v6ibzEAB0BkhTr-oc7dIzPvZu6AE0,6089
+faster_eth_abi/tools/__init__.py,sha256=trtATEmgu4ctg04qkejbODDzvDSofgcVJ3rkzMP_hQE,51
+faster_eth_abi/tools/_strategies.cpython-38-darwin.so,sha256=fKAJ1oFw3meJiSY3BSoDXHicC8zc769YVfv7TLBDmw4,50592
+faster_eth_abi/utils/__init__.cpython-38-darwin.so,sha256=02jVcFtSEi46AaTY7pwisUdPdsmK2cut3sy0GCgc93k,50544
+faster_eth_abi/utils/validation.cpython-38-darwin.so,sha256=mfL_9vClseEYjqPgujJls6tJT5p2imAd6s-3qjA0XPQ,50576
+faster_eth_abi/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+faster_eth_abi/utils/padding.cpython-38-darwin.so,sha256=3Cmb27kUQJ_VJuIl9e2unhkGwfkfbD_CvcKIHCHRtUM,50560
+faster_eth_abi/utils/numeric.py,sha256=fkdazLcgd7FN0JGSSyb6Jsx555QdgRf2N0mxrm6rGB4,3278
+faster_eth_abi/utils/string.cpython-38-darwin.so,sha256=TbeUDLzJELBD_Rp2mA19D1LxCRXaMTHxA8LN05esgQI,50552
+faster_eth_abi/utils/numeric.cpython-38-darwin.so,sha256=TK2h0Ja6ygiWAt-iViGj2adnvI6qLNGgGXE3pLd0VhE,50560
+faster_eth_abi/utils/string.py,sha256=fjsAR2C7Xlu5bHomxx5l4rlADFtByzGTQfugMTo8TQk,436
+faster_eth_abi/utils/padding.py,sha256=JBuFhdrvKWLrmmJBZ-a6pqbHWydAuiUBt2aBjCwVcVE,493
+faster_eth_abi/utils/validation.py,sha256=NA2wRacYEBdkpQnZfmeDvzF-sHyy6NT2QzCFuBnYJVI,521
+faster_eth_abi-5.2.16.dist-info/RECORD,,
+faster_eth_abi-5.2.16.dist-info/LICENSE,sha256=P_zrhVa0OXK-_XuA0RF3d3gwMLXRSBkn2fWraC4CFLo,1106
+faster_eth_abi-5.2.16.dist-info/WHEEL,sha256=9FabR3Kab7Nb3lO5nBQWtZc544XJ0hYCmiQC2RH2bHM,107
+faster_eth_abi-5.2.16.dist-info/top_level.txt,sha256=VAQVriOsRsqhSQlZZtJw0zN50hc93HkAqPqL70TVuRU,43
+faster_eth_abi-5.2.16.dist-info/METADATA,sha256=M6fXsbwew90N6SgN8LfoPpwvCu4nnyQs4CI3vx0iaM4,6894

{faster_eth_abi-5.2.15.dist-info → faster_eth_abi-5.2.16.dist-info}/top_level.txt

@@ -1,3 +1,2 @@
 29859a9e7da9d19bb98c__mypyc
-benchmarks
 faster_eth_abi

benchmarks/__init__.py

@@ -1 +0,0 @@
-

benchmarks/batch.py

@@ -1,9 +0,0 @@
-from typing import (
-    Any,
-    Callable,
-)
-
-
-def batch(iterations: int, func: Callable[..., Any], *args: Any, **kwargs: Any) -> None:
-    for _ in range(iterations):
-        func(*args, **kwargs)