cchecksum 0.0.13__tar.gz → 0.0.14__tar.gz

{cchecksum-0.0.13/cchecksum.egg-info → cchecksum-0.0.14}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: cchecksum
-Version: 0.0.13
-Summary: A ~4.5x faster drop-in replacement for eth_utils.to_checksum_address. Raises the exact same Exceptions. Implemented in C.
+Version: 0.0.14
+Summary: A ~5x faster drop-in replacement for eth_utils.to_checksum_address. Raises the exact same Exceptions. Implemented in C.
 Home-page: https://github.com/BobTheBuidler/cchecksum
 Author: BobTheBuidler
 Author-email: bobthebuidlerdefi@gmail.com

{cchecksum-0.0.13 → cchecksum-0.0.14}/README.md

@@ -1,6 +1,6 @@
 ## CChecksum
 
-CChecksum is a ~4.5x faster drop-in replacement for eth_utils.to_checksum_address, with the most cpu-intensive part implemented in c.
+CChecksum is a ~5x faster drop-in replacement for eth_utils.to_checksum_address, with the most cpu-intensive part implemented in c.
 
 It keeps the exact same API as the existing implementation, exceptions and all.
 

{cchecksum-0.0.13 → cchecksum-0.0.14}/cchecksum/checksum.py

@@ -1,10 +1,10 @@
 from binascii import hexlify
-from typing import Optional, Union
+from typing import AnyStr, Optional, Union
 
 from eth_hash.auto import keccak
 from eth_typing import AnyAddress, ChecksumAddress, HexAddress, HexStr
-from eth_utils import encode_hex, is_hexstr, remove_0x_prefix
 from eth_utils.address import _HEX_ADDRESS_REGEXP
+from eth_utils.hexadecimal import _HEX_REGEXP
 from eth_utils.toolz import compose
 
 from cchecksum._checksum import cchecksum
@@ -16,6 +16,7 @@ keccak(b"")
 hash_address = compose(hexlify, bytes, keccak.hasher, str.encode)
 
 hex_address_fullmatch = _HEX_ADDRESS_REGEXP.fullmatch
+hex_fullmatch = _HEX_REGEXP.fullmatch
 
 
 # this was ripped out of eth_utils and optimized a little bit
@@ -80,12 +81,23 @@ def to_normalized_address(value: Union[AnyAddress, str, bytes]) -> HexAddress:
         - :func:`eth_utils.to_normalized_address` for the standard implementation.
         - :func:`is_address` for checking if a string is a valid address.
     """
-    try:
-        hex_address = hexstr_if_str(value).lower()
-    except AttributeError as e:
+    if isinstance(value, str):
+        hex_address = (value if value.startswith(("0x", "0X")) else f"0x{value}").lower()
+
+        # if `value` has content and is not a hexstring
+        if hex_address[2:] and hex_fullmatch(hex_address) is None:
+            raise ValueError("when sending a str, it must be a hex string. " f"Got: {repr(value)}")
+
+    elif isinstance(value, (bytes, bytearray)):
+        hex_address = f"0x{hexlify(value).decode('ascii')}".lower()
+
+    elif isinstance(value, memoryview):
+        hex_address = f"0x{hexlify(bytes(value)).decode('ascii')}".lower()
+
+    else:
         raise TypeError(
-            f"Value must be any string, instead got type {type(value)}"
-        ) from e.__cause__
+            f"Unsupported type: '{repr(type(value))}'. Must be one of: bytes or bytearray."
+        )
 
     # if `hex_address` is not a valid address
     if hex_address_fullmatch(hex_address) is None:
@@ -96,39 +108,6 @@ def to_normalized_address(value: Union[AnyAddress, str, bytes]) -> HexAddress:
     return hex_address  # type: ignore [return-value]
 
 
-encode_memoryview = compose(encode_hex, bytes)
-
-
-def hexstr_if_str(hexstr_or_primitive: Union[bytes, int, str]) -> HexStr:
-    """
-    Convert to a type, assuming that strings can be only hexstr (not unicode text).
-
-    :param hexstr_or_primitive bytes, str, int: value to convert
-    """
-    if isinstance(hexstr_or_primitive, str):
-        if remove_0x_prefix(hexstr_or_primitive) and not is_hexstr(hexstr_or_primitive):
-            raise ValueError(
-                "when sending a str, it must be a hex string. " f"Got: {repr(hexstr_or_primitive)}"
-            )
-
-        return (
-            hexstr_or_primitive
-            if hexstr_or_primitive.startswith(("0x", "0X"))
-            else f"0x{hexstr_or_primitive}"
-        )
-
-    elif isinstance(address_bytes, (bytes, bytearray)):
-        return encode_hex(address_bytes)
-
-    elif isinstance(address_bytes, memoryview):
-        return encode_memoryview(address_bytes)
-
-    raise TypeError(
-        f"Unsupported type: '{repr(type(address_bytes))}'. Must be one of: bytes or bytearray."
-    )
-
-
-del hexlify
-del Optional, Union
+del AnyStr, Optional, Union
 del AnyAddress, ChecksumAddress, HexAddress, HexStr
-del _HEX_ADDRESS_REGEXP, compose, keccak
+del _HEX_ADDRESS_REGEXP, _HEX_REGEXP, compose, keccak

{cchecksum-0.0.13 → cchecksum-0.0.14/cchecksum.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: cchecksum
-Version: 0.0.13
-Summary: A ~4.5x faster drop-in replacement for eth_utils.to_checksum_address. Raises the exact same Exceptions. Implemented in C.
+Version: 0.0.14
+Summary: A ~5x faster drop-in replacement for eth_utils.to_checksum_address. Raises the exact same Exceptions. Implemented in C.
 Home-page: https://github.com/BobTheBuidler/cchecksum
 Author: BobTheBuidler
 Author-email: bobthebuidlerdefi@gmail.com

{cchecksum-0.0.13 → cchecksum-0.0.14}/setup.py

@@ -13,7 +13,7 @@ setup(
         "local_scheme": "no-local-version",
         "version_scheme": "python-simplified-semver",
     },
-    description="A ~4.5x faster drop-in replacement for eth_utils.to_checksum_address. Raises the exact same Exceptions. Implemented in C.",
+    description="A ~5x faster drop-in replacement for eth_utils.to_checksum_address. Raises the exact same Exceptions. Implemented in C.",
     author="BobTheBuidler",
     author_email="bobthebuidlerdefi@gmail.com",
     url="https://github.com/BobTheBuidler/cchecksum",