refactor(Client): standardize around pre-pending forward slash paths

Author: fubuloubu

ape_safe/client/__init__.py

@@ -67,7 +67,7 @@ def __init__(
 
     @property
     def safe_details(self) -> SafeDetails:
-        response = self._get(f"safes/{self.address}/")
+        response = self._get(f"/safes/{self.address}")
         return SafeDetails.model_validate(response.json())
 
     def get_next_nonce(self) -> int:
@@ -78,7 +78,7 @@ def _all_transactions(self) -> Iterator[SafeApiTxData]:
         Get all transactions from safe, both confirmed and unconfirmed
         """
 
-        url = f"safes/{self.address}/all-transactions/"
+        url = f"/safes/{self.address}/all-transactions"
         while url:
             response = self._get(url)
             data = response.json()
@@ -97,7 +97,7 @@ def _all_transactions(self) -> Iterator[SafeApiTxData]:
             url = data.get("next")
 
     def get_confirmations(self, safe_tx_hash: SafeTxID) -> Iterator[SafeTxConfirmation]:
-        url = f"multisig-transactions/{str(safe_tx_hash)}/confirmations/"
+        url = f"/multisig-transactions/{str(safe_tx_hash)}/confirmations"
         while url:
             response = self._get(url)
             data = response.json()
@@ -135,7 +135,7 @@ def post_transaction(
             # Signature handled above.
             post_dict.pop("signatures")
 
-        url = f"safes/{tx_data.safe}/multisig-transactions/"
+        url = f"/safes/{tx_data.safe}/multisig-transactions"
         response = self._post(url, json=post_dict)
         return response
 
@@ -151,7 +151,7 @@ def post_signatures(
             safe_tx_hash = safe_tx_or_hash
 
         safe_tx_hash = cast(SafeTxID, to_hex(HexBytes(safe_tx_hash)))
-        url = f"multisig-transactions/{safe_tx_hash}/confirmations/"
+        url = f"/multisig-transactions/{safe_tx_hash}/confirmations"
         signature = to_hex(
             HexBytes(b"".join([x.encode_rsv() for x in order_by_signer(signatures)]))
         )
@@ -166,7 +166,7 @@ def post_signatures(
     def estimate_gas_cost(
         self, receiver: AddressType, value: int, data: bytes, operation: int = 0
     ) -> Optional[int]:
-        url = f"safes/{self.address}/multisig-transactions/estimations/"
+        url = f"/safes/{self.address}/multisig-transactions/estimations"
         request: dict = {
             "to": receiver,
             "value": value,
@@ -178,7 +178,7 @@ def estimate_gas_cost(
         return int(to_hex(HexBytes(gas)), 16)
 
     def get_delegates(self) -> dict["AddressType", list["AddressType"]]:
-        url = "delegates/"
+        url = "/delegates"
         delegates: dict[AddressType, list[AddressType]] = {}
 
         while url:
@@ -209,7 +209,7 @@ def add_delegate(self, delegate: "AddressType", label: str, delegator: "AccountA
             "label": label,
             "signature": sig.encode_rsv().hex(),
         }
-        self._post("delegates/", json=payload)
+        self._post("/delegates", json=payload)
 
     def remove_delegate(self, delegate: "AddressType", delegator: "AccountAPI"):
         msg_hash = self.create_delegate_message(delegate)
@@ -222,7 +222,7 @@ def remove_delegate(self, delegate: "AddressType", delegator: "AccountAPI"):
             "delegator": delegator.address,
             "signature": sig.encode_rsv().hex(),
         }
-        self._delete(f"delegates/{delegate}/", json=payload)
+        self._delete(f"/delegates/{delegate}", json=payload)
 
 
 __all__ = [

ape_safe/client/base.py

@@ -163,19 +163,18 @@ def _request(self, method: str, url: str, json: Optional[dict] = None, **kwargs)
         api_version = kwargs.pop("api_version", "v1")
 
         # NOTE: paged requests include full url already
-        if url.startswith(f"{self.base_url}/"):
+        if url.startswith(self.base_url):
             api_url = url
+
+        elif (
+            hasattr(self, "use_client_gateway")
+            and self.use_client_gateway
+            and hasattr(self, "chain_id")
+        ):
+            api_url = f"{self.base_url}/{api_version}/chains/{self.chain_id}{url}"
+
         else:
-            if (
-                hasattr(self, "use_client_gateway")
-                and self.use_client_gateway
-                and hasattr(self, "chain_id")
-            ):
-                # **WARNING**: The trailing slash in the URL is CRITICAL!
-                # If you remove it, things will not work as expected.
-                api_url = f"{self.base_url}/{api_version}/chains/{self.chain_id}/{url}/"
-            else:
-                api_url = f"{self.base_url}/api/v1/{url}/"
+            api_url = f"{self.base_url}/{api_version}{url}"
 
         do_fail = not kwargs.pop("allow_failure", False)