fix(Client): clean null params from Gateway response (#83)

NOTE: Only happens when a 0 conf (proposer-proposed) txn is in queue

Author: fubuloubu

ape_safe/client/__init__.py

@@ -24,6 +24,7 @@
     SafeTxID,
     SignatureType,
     UnexecutedTxData,
+    remove_null_params,
 )
 from ape_safe.exceptions import (
     ActionNotPerformedError,
@@ -140,7 +141,8 @@ def get_safe_tx(self, safe_tx_hash: SafeTxID) -> Optional[SafeApiTxData]:
         except ClientResponseError:
             return None
 
-        return TypeAdapter(SafeApiTxData).validate_json(response.text)
+        data = remove_null_params(response.json())
+        return TypeAdapter(SafeApiTxData).validate_python(data)
 
     def get_confirmations(self, safe_tx_hash: SafeTxID) -> Iterator[SafeTxConfirmation]:
         if safe_tx := self.get_safe_tx(safe_tx_hash):

ape_safe/client/types.py

@@ -21,6 +21,32 @@ def clean_api_address(data: Union[AddressType, dict]) -> AddressType:
     return data
 
 
+def remove_null_params(data):
+    if isinstance(data, dict):
+        return {
+            k: (remove_null_params(v) if isinstance(v, (dict, list, tuple)) else v)
+            for k, v in data.items()
+            if v is not None
+        }
+
+    elif isinstance(data, list):
+        return [
+            remove_null_params(v) if isinstance(v, (dict, list, tuple)) else v
+            for v in data
+            if v is not None
+        ]
+
+    elif isinstance(data, tuple):
+        return tuple(
+            remove_null_params(v) if isinstance(v, (dict, list, tuple)) else v
+            for v in data
+            if v is not None
+        )
+
+    else:
+        raise ValueError("Can only supply dict, list, or tuple type")
+
+
 Address = Annotated[AddressType, BeforeValidator(clean_api_address)]