fix(Client): return None if SafeTx does not exist

Author: fubuloubu

ape_safe/client/__init__.py

@@ -134,12 +134,17 @@ def _all_transactions(self) -> Iterator[SafeApiTxData]:
 
             url = data.get("next")
 
-    def get_safe_tx(self, safe_tx_hash: SafeTxID) -> SafeApiTxData:
-        response = self._get(f"/multisig-transactions/{safe_tx_hash}", api_version="v2")
+    def get_safe_tx(self, safe_tx_hash: SafeTxID) -> SafeApiTxData | None:
+        try:
+            response = self._get(f"/multisig-transactions/{safe_tx_hash}", api_version="v2")
+        except ClientResponseError:
+            return None
+
         return TypeAdapter(SafeApiTxData).validate_json(response.text)
 
     def get_confirmations(self, safe_tx_hash: SafeTxID) -> Iterator[SafeTxConfirmation]:
-        yield from self.get_safe_tx(safe_tx_hash).confirmations
+        if safe_tx := self.get_safe_tx(safe_tx_hash):
+            yield from safe_tx.confirmations
 
     def post_transaction(
         self, safe_tx: SafeTx, signatures: dict[AddressType, MessageSignature], **kwargs

ape_safe/client/base.py

@@ -49,7 +49,7 @@ def get_next_nonce(self) -> int: ...
     def _all_transactions(self) -> Iterator[SafeApiTxData]: ...
 
     @abstractmethod
-    def get_safe_tx(self, safe_tx_hash: SafeTxID) -> SafeApiTxData: ...
+    def get_safe_tx(self, safe_tx_hash: SafeTxID) -> SafeApiTxData | None: ...
 
     @abstractmethod
     def get_confirmations(self, safe_tx_hash: SafeTxID) -> Iterator[SafeTxConfirmation]: ...

ape_safe/client/mock.py

@@ -72,7 +72,7 @@ def _all_transactions(
                 if tx:
                     yield tx
 
-    def get_safe_tx(self, safe_tx_hash: SafeTxID) -> SafeApiTxData:
+    def get_safe_tx(self, safe_tx_hash: SafeTxID) -> SafeApiTxData | None:
         tx_hash = cast(SafeTxID, to_hex(HexBytes(safe_tx_hash)))
 
         if safe_tx := self.transactions.get(tx_hash):
@@ -82,7 +82,7 @@ def get_safe_tx(self, safe_tx_hash: SafeTxID) -> SafeApiTxData:
             if safe_tx.safe_tx_hash == safe_tx_hash:
                 return safe_tx
 
-        raise SafeClientException(f"Unable to find SafeTx '{safe_tx_hash}'.")
+        return None
 
     def get_confirmations(self, safe_tx_hash: SafeTxID) -> Iterator[SafeTxConfirmation]:
         tx_hash = cast(SafeTxID, to_hex(HexBytes(safe_tx_hash)))