v0.1.36 added cached HexBytes wrapper and made all cache sizes configurable via env variables.

Author: simone1999

IceCreamSwapWeb3/AddressCalculator.py

@@ -1,16 +1,18 @@
+import os
 from functools import lru_cache
 
 import eth_utils
 import rlp
 from eth_utils import to_bytes
 from web3 import Web3
 
-@lru_cache(maxsize=1024)
+
+@lru_cache(maxsize=int(os.getenv("DICT_SLOT_CACHE_SIZE", 1024)))
 def get_dict_slot(slot: int, key: int) -> int:
     return int.from_bytes(Web3.solidity_keccak(["uint256", "uint256"], [key, slot]), byteorder='big')
 
 
-@lru_cache(maxsize=1024)
+@lru_cache(maxsize=int(os.getenv("CREATE_ADDRESS_CACHE_SIZE", 1024)))
 def calculate_create_address(sender: str, nonce: int) -> str:
     assert len(sender) == 42
     sender_bytes = to_bytes(hexstr=sender)

IceCreamSwapWeb3/FastChecksumAddress.py

@@ -1,27 +1,19 @@
 import os
+from functools import lru_cache
 from typing import cast
 from eth_hash.auto import keccak
 from eth_typing import ChecksumAddress
 
-CACHE_SIZE = int(os.getenv("CHECKSUM_CACHE_SIZE", 1000))
-CHECKSUM_CACHE = {}
-
+@lru_cache(maxsize=int(os.getenv("CHECKSUM_CACHE_SIZE", 16384)))
 def to_checksum_address(address: str) -> ChecksumAddress:
     """Fast checksum address with caching."""
     normalized_address = address.lower().replace("0x", "")
     assert len(normalized_address) == 40, "Address has incorrect length"
 
-    if normalized_address in CHECKSUM_CACHE:
-        return CHECKSUM_CACHE[normalized_address]
-
     hashed_address = keccak(normalized_address.encode()).hex()
     checksum_address = "0x" + "".join(
         char.upper() if int(hashed_address[i], 16) >= 8 else char
         for i, char in enumerate(normalized_address)
     )
 
-    if len(CHECKSUM_CACHE) >= CACHE_SIZE:
-        CHECKSUM_CACHE.pop(next(iter(CHECKSUM_CACHE)))
-
-    CHECKSUM_CACHE[normalized_address] = checksum_address
     return cast(ChecksumAddress, checksum_address)

IceCreamSwapWeb3/FastHexBytes.py

@@ -0,0 +1,12 @@
+import os
+from functools import lru_cache
+from typing import Type
+
+from hexbytes import HexBytes as _HexBytes
+from hexbytes.main import BytesLike
+
+
+class HexBytes(_HexBytes):
+    @lru_cache(maxsize=int(os.getenv("HEX_BYTES_CACHE_SIZE", 16384)))
+    def __new__(cls: Type[bytes], val: BytesLike) -> "_HexBytes":
+        return super().__new__(cls, val)

IceCreamSwapWeb3/__init__.py

@@ -1,3 +1,4 @@
 from .Web3Advanced import Web3Advanced
 from .FastChecksumAddress import to_checksum_address
-from .AddressCalculator import get_dict_slot, calculate_create_address
+from .AddressCalculator import get_dict_slot, calculate_create_address
+from .FastHexBytes import HexBytes

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-VERSION = '0.1.35'
+VERSION = '0.1.36'
 DESCRIPTION = 'IceCreamSwap Web3.py wrapper'
 LONG_DESCRIPTION = 'IceCreamSwap Web3.py wrapper with automatic retries, multicall and other advanced functionality'