solver-multirpc 3.1.11__tar.gz → 3.1.13__tar.gz

{solver_multirpc-3.1.11 → solver_multirpc-3.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solver-multirpc
-Version: 3.1.11
+Version: 3.1.13
 Summary: A robust Python library for interacting with Ethereum smart contracts via multiple RPC endpoints, ensuring reliability, availability, and load distribution with automatic retries on failure.
 License: MIT
 Author: rorschach

{solver_multirpc-3.1.11 → solver_multirpc-3.1.13}/multirpc/base_multi_rpc_interface.py

@@ -351,7 +351,7 @@ class BaseMultiRpc(ABC):
             raise
 
     @staticmethod
-    def _handle_tx_trace(trace: TxTrace, func_name: str, func_args: Tuple, func_kwargs: Dict):
+    def _handle_tx_trace(trace: TxTrace, func_name: str, func_args: Tuple, func_kwargs: Dict) -> Exception | None:
         """
         You can override this method to customize handling failed transaction.
 
@@ -391,11 +391,12 @@ class BaseMultiRpc(ABC):
                 tx_err_count += 1
                 timeout *= 2
 
-    @staticmethod
-    async def __get_tx_trace(tx, provider_url, func_name=None, func_args=None, func_kwargs=None):
+    @classmethod
+    async def __get_tx_trace(cls, tx, provider_url, func_name=None, func_args=None, func_kwargs=None):
         tx_hash = Web3.to_hex(tx)
         trace = TxTrace(tx_hash, provider_url)
-        BaseMultiRpc._handle_tx_trace(trace, func_name, func_args, func_kwargs)
+        if exception := cls._handle_tx_trace(trace, func_name, func_args, func_kwargs):
+            return exception
         return TransactionFailedStatus(tx_hash, func_name, func_args, func_kwargs, trace)
 
     @staticmethod

{solver_multirpc-3.1.11 → solver_multirpc-3.1.13}/multirpc/tx_trace.py

@@ -1,3 +1,5 @@
+import json
+
 import requests
 
 from multirpc.constants import MultiRPCLogger
@@ -64,12 +66,17 @@ class TxTrace:
             }
 
             response = requests.post(self.rpc, json=data)
+            try:
+                json_response = response.json()
+            except json.decoder.JSONDecodeError:
+                MultiRPCLogger.error(f'tx_trace({self.tx_hash}) invalid JSON response: {response.text[:200]}')
+                return None
             if response.status_code == 200:
-                if error := response.json().get('error'):
+                if error := json_response.get('error'):
                     MultiRPCLogger.error(f'failed to get tx({self.tx_hash}) trace with error: {error}')
                     return None
                 return response
-            MultiRPCLogger.error(f'tx_trace({self.tx_hash}) status = {response.status_code}, \n {response.json()}')
+            MultiRPCLogger.error(f'tx_trace({self.tx_hash}) status = {response.status_code}, \n {json_response}')
 
         except requests.HTTPError:
             MultiRPCLogger.exception('Exception in debug_traceTransaction')
@@ -146,8 +153,8 @@ class TxTraceResult:
     def first_usable_error(self):
         for error in [self.error()] + self.all_revert_reasons():
             if error and \
-                    'execution reverted' not in error and \
-                    'MultiAccount: Error occurred' not in error and \
-                    'Execution reverted' not in error:
+                'execution reverted' not in error and \
+                'MultiAccount: Error occurred' not in error and \
+                'Execution reverted' not in error:
                 return error
         return ''

{solver_multirpc-3.1.11 → solver_multirpc-3.1.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "solver-multirpc"
-version = "3.1.11"
+version = "3.1.13"
 description = "A robust Python library for interacting with Ethereum smart contracts via multiple RPC endpoints, ensuring reliability, availability, and load distribution with automatic retries on failure."
 authors = ["rorschach <rorschach45001@gmail.com>"]
 license = "MIT"