solver-multirpc 3.1.11__py3-none-any.whl → 3.1.13__py3-none-any.whl

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

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.dist-info → solver_multirpc-3.1.13.dist-info}/METADATA

@@ -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.dist-info → solver_multirpc-3.1.13.dist-info}/RECORD

@@ -1,12 +1,12 @@
 multirpc/__init__.py,sha256=f7h3txKkb_WQX6u-PzbgMpHt1VGqA0OjhrSe4Vdsk5I,100
 multirpc/async_multi_rpc_interface.py,sha256=NTwdOyMbghekredlYR64kr0eiPRxzvUirGBZpFzRgig,5699
-multirpc/base_multi_rpc_interface.py,sha256=9TPQABrutwe8yHu05Nt5Uv5_jZlMdlu8XyY1PIQoUiU,29238
+multirpc/base_multi_rpc_interface.py,sha256=CfpujqGLgb9RmqnHQYExzq1duShfstWRHNo1EoywrhM,29299
 multirpc/constants.py,sha256=B21pS85Vnm65vvjt25_9TTxviRHYCUlgpIDGOrs1rmg,1262
 multirpc/exceptions.py,sha256=Tfi4aHeOiH1OaYeNBEDX3fJNAUyPgs42VXrRG62IgJs,1937
 multirpc/gas_estimation.py,sha256=k0FVO9FgSRuRQhEkQ9YZZ-rSpW_zxaLLFdMAYOF3xco,7276
 multirpc/sync_multi_rpc_interface.py,sha256=Zs3FVSGNJDhrFBi3m9sn4pMuYGzLwaiz0qy_R9VIo04,5888
-multirpc/tx_trace.py,sha256=G7sTVMzALtTeC1F2JjxMSGRRFlmAAZG-Sdhd4UQtfw8,7885
+multirpc/tx_trace.py,sha256=aAx2AzjWsHgnqPtFCbBPPBOdeD-_qGDdEWrfP0HJc-Q,8135
 multirpc/utils.py,sha256=bhrP15IY_TOB1dK8HP35rRxs9FIIWKoSUY6EVOA4FEA,9073
-solver_multirpc-3.1.11.dist-info/METADATA,sha256=6AwwApO4kTI_q0SDqCKh4rb9wmi3IBj66oISHIwz2t4,8287
-solver_multirpc-3.1.11.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-solver_multirpc-3.1.11.dist-info/RECORD,,
+solver_multirpc-3.1.13.dist-info/METADATA,sha256=LTMz3PntqyL9CG7cRE7-Z2u_MOlBhAkojiYCVj3glog,8287
+solver_multirpc-3.1.13.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+solver_multirpc-3.1.13.dist-info/RECORD,,