made retry optional for entire Web3Advanced instance

Author: simone1999

IceCreamSwapWeb3/EthAdvanced.py

@@ -51,9 +51,6 @@ class EthAdvanced(Eth):
     ]
 
     FILTER_RANGES_TO_TRY = sorted([
-        100_000,
-        50_000,
-        20_000,
         10_000,
         5_000,
         2_000,
@@ -73,7 +70,8 @@ class EthAdvanced(Eth):
     def __init__(self, w3):
         super().__init__(w3=w3)
 
-        self._wrap_methods_with_retry()
+        if self.w3.should_retry:
+            self._wrap_methods_with_retry()
 
         self.filter_block_range = self._find_max_filter_range()
 
@@ -120,7 +118,9 @@ def get_logs(self, filter_params: FilterParams, show_progress_bar=False, p_bar=N
         try:
             events = self._get_logs(filter_params)
         except Exception:
-            pass
+            # if errors should not be retried, still do splitting but not retry if it can not be split further
+            if not self.w3.should_retry and num_blocks == 1:
+                raise
         else:
             if p_bar is not None:
                 p_bar.update(num_blocks)

IceCreamSwapWeb3/Web3Advanced.py

@@ -1,8 +1,8 @@
-from web3 import Web3, JSONBaseProvider
+from web3 import Web3
 from web3.main import get_default_modules
 from web3.middleware import geth_poa_middleware
 
-from EthAdvanced import EthAdvanced
+from .EthAdvanced import EthAdvanced
 
 
 class Web3Advanced(Web3):
@@ -11,7 +11,10 @@ class Web3Advanced(Web3):
     def __init__(
             self,
             node_url: str,
+            should_retry=True,
     ):
+        self.should_retry = should_retry
+
         provider = self._construct_provider(node_url=node_url)
 
         # use the EthAdvanced class instead of the Eth class for w3.eth
@@ -24,7 +27,7 @@ def __init__(
         self._chain_id = self.eth.chain_id  # avoids many RPC calls to get chain ID
 
     @staticmethod
-    def _construct_provider(node_url) -> JSONBaseProvider:
+    def _construct_provider(node_url):
         assert "://" in node_url
         protocol = node_url.split("://")[0]
         if protocol in ("https", "http"):