Handle all subscription update failures

Author: thewhaleking

async_substrate_interface/async_substrate.py

@@ -3987,15 +3987,32 @@ async def result_handler(message: dict, subscription_id) -> tuple[dict, bool]:
                 message_result = {
                     k.lower(): v for k, v in message["params"]["result"].items()
                 }
+                # check for any subscription indicators of failure
+                failure_message = None
                 if "usurped" in message_result:
-                    logger.error(
+                    failure_message = (
                         f"Subscription {subscription_id} usurped: {message_result}"
                     )
+                if "retracted" in message_result:
+                    failure_message = (
+                        f"Subscription {subscription_id} retracted: {message_result}"
+                    )
+                if "finalitytimeout" in message_result:
+                    failure_message = f"Subscription {subscription_id} finalityTimeout: {message_result}"
+                if "dropped" in message_result:
+                    failure_message = (
+                        f"Subscription {subscription_id} dropped: {message_result}"
+                    )
+                if "invalid" in message_result:
+                    failure_message = (
+                        f"Subscription {subscription_id} invalid: {message_result}"
+                    )
+
+                if failure_message is not None:
                     async with self.ws as ws:
                         await ws.unsubscribe(subscription_id)
-                    raise SubstrateRequestException(
-                        f"Subscription {subscription_id} usurped: {message_result}"
-                    )
+                    logger.error(failure_message)
+                    raise SubstrateRequestException(failure_message)
 
                 if "finalized" in message_result and wait_for_finalization:
                     logger.debug("Extrinsic finalized. Unsubscribing.")

async_substrate_interface/sync_substrate.py

@@ -3170,14 +3170,31 @@ def result_handler(message: dict, subscription_id) -> tuple[dict, bool]:
                     k.lower(): v for k, v in message["params"]["result"].items()
                 }
 
+                # check for any subscription indicators of failure
+                failure_message = None
                 if "usurped" in message_result:
-                    logger.error(
+                    failure_message = (
                         f"Subscription {subscription_id} usurped: {message_result}"
                     )
-                    self.rpc_request("author_unwatchExtrinsic", [subscription_id])
-                    raise SubstrateRequestException(
-                        f"Subscription {subscription_id} usurped: {message_result}"
+                if "retracted" in message_result:
+                    failure_message = (
+                        f"Subscription {subscription_id} retracted: {message_result}"
+                    )
+                if "finalitytimeout" in message_result:
+                    failure_message = f"Subscription {subscription_id} finalityTimeout: {message_result}"
+                if "dropped" in message_result:
+                    failure_message = (
+                        f"Subscription {subscription_id} dropped: {message_result}"
                     )
+                if "invalid" in message_result:
+                    failure_message = (
+                        f"Subscription {subscription_id} invalid: {message_result}"
+                    )
+
+                if failure_message is not None:
+                    self.rpc_request("author_unwatchExtrinsic", [subscription_id])
+                    logger.error(failure_message)
+                    raise SubstrateRequestException(failure_message)
 
                 if "finalized" in message_result and wait_for_finalization:
                     # Created as a task because we don't actually care about the result