v0.2.4 Making sure new get logs batch requests are not split neither stuck in infinite retry loops.

Author: simone1999

IceCreamSwapWeb3/BatchRetryMiddleware.py

@@ -46,7 +46,12 @@ def request_wrapper(method, params):
                     for method, params in requests_info
                 ]
 
-            no_splitting = len(requests_info) == 2 and requests_info[0][0] == "eth_getLogs" and requests_info[1][0] == "eth_getBlockByNumber"
+            if (
+                    (len(requests_info) == 2 and requests_info[0][0] == "eth_getLogs" and requests_info[1][0] == "eth_getBlockByNumber") or
+                    (len(requests_info) == 3 and requests_info[0][0] == "eth_getBlockByNumber" and requests_info[1][0] == "eth_getLogs" and requests_info[2][0] == "eth_getBlockByNumber")
+            ):
+                # not retrying or splitting when this request comes from our get_logs wrapper
+                return make_batch_request(requests_info)
 
             try:
                 response = make_batch_request(requests_info)
@@ -78,17 +83,12 @@ def request_wrapper(method, params):
 
                     print(f"{len(requests_retry)}/{len(requests_info)} requests in batch failed, retrying. Example response: {response[request_indexes[0][0]]}")
 
-                    if len(requests_retry) != len(requests_info) and not no_splitting:  # if some requests succeeded, retry failed requests
+                    if len(requests_retry) != len(requests_info):  # if some requests succeeded, retry failed requests
                         response_new = middleware(requests_retry)
                         for old_idx, new_idx in request_indexes:
                             response[old_idx] = response_new[new_idx]
                         return response
 
-            if no_splitting:
-                # retry request. This being recursive is not optimal, but should be ok
-                sleep(0.1)
-                return middleware(requests_info)
-
             assert len(requests_info) > 1
             middle = len(requests_info) // 2
             sleep(0.1)

IceCreamSwapWeb3/EthAdvanced.py

@@ -239,7 +239,11 @@ def get_logs(
 
         # getting logs for a single block, which is not at the chain head. No drama
         if num_blocks == 1:
-            return self.get_logs_inner(filter_params, no_retry=no_retry)
+            block_hash = self._get_block(from_block)["hash"].to_0x_hex()
+            single_hash_filter = {**filter_params, "blockHash": block_hash}
+            del single_hash_filter["fromBlock"]
+            del single_hash_filter["toBlock"]
+            return self.get_logs_inner(single_hash_filter, no_retry=no_retry)
 
         # if we already know that the filter range is too large, split it
         if num_blocks > filter_block_range:

setup.py

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