v0.1.42 stop logging when SubSquid has not indexed to the requested block and get_logs falls back to RPC.

Author: simone1999

IceCreamSwapWeb3/EthAdvanced.py

@@ -195,7 +195,8 @@ def get_logs(
                     return results
                 return results + self.get_logs({**filter_params, "fromBlock": till_block + 1}, **kwargs)
             except Exception as e:
-                print(f"Getting logs from SubSquid threw exception {repr(e)}, falling back to RPC")
+                if not isinstance(e, ValueError) or "Subsquid only has indexed till block " not in str(e):
+                    print(f"Getting logs from SubSquid threw exception {repr(e)}, falling back to RPC")
 
         last_stable_block = self.w3.latest_seen_block - self.w3.unstable_blocks
         if get_logs_by_block_hash or to_block > last_stable_block:

IceCreamSwapWeb3/Subsquid.py

@@ -53,7 +53,7 @@ def get_filter(
     latest_block = get_latest_subsquid_block(gateway_url)
 
     if from_block > latest_block:
-        raise ValueError(f"Subsquid has only indexed till block {latest_block}")
+        raise ValueError(f"Subsquid only has indexed till block {latest_block}")
 
     if to_block > latest_block:
         if partial_allowed:

setup.py

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