wayfinder-paths 0.1.11__py3-none-any.whl → 0.1.13__py3-none-any.whl

wayfinder_paths/adapters/balance_adapter/adapter.py

@@ -7,7 +7,6 @@ from wayfinder_paths.core.clients.TokenClient import TokenClient
 from wayfinder_paths.core.clients.WalletClient import WalletClient
 from wayfinder_paths.core.constants.base import DEFAULT_TRANSACTION_TIMEOUT
 from wayfinder_paths.core.services.base import Web3Service
-from wayfinder_paths.core.settings import settings
 from wayfinder_paths.core.utils.evm_helpers import resolve_chain_id
 
 
@@ -129,12 +128,9 @@ class BalanceAdapter(BaseAdapter):
             return False, tx_data
 
         tx = tx_data
-        if getattr(settings, "DRY_RUN", False):
-            broadcast_result = (True, {"dry_run": True, "transaction": tx})
-        else:
-            broadcast_result = await self.wallet_provider.broadcast_transaction(
-                tx, wait_for_receipt=True, timeout=DEFAULT_TRANSACTION_TIMEOUT
-            )
+        broadcast_result = await self.wallet_provider.broadcast_transaction(
+            tx, wait_for_receipt=True, timeout=DEFAULT_TRANSACTION_TIMEOUT
+        )
 
         if broadcast_result[0] and not skip_ledger and ledger_method is not None:
             wallet_for_ledger = from_address if ledger_wallet == "from" else to_address

wayfinder_paths/adapters/brap_adapter/adapter.py

@@ -14,7 +14,6 @@ from wayfinder_paths.core.clients.TokenClient import TokenClient
 from wayfinder_paths.core.constants import DEFAULT_SLIPPAGE, ZERO_ADDRESS
 from wayfinder_paths.core.constants.base import DEFAULT_TRANSACTION_TIMEOUT
 from wayfinder_paths.core.services.base import Web3Service
-from wayfinder_paths.core.settings import settings
 
 _NEEDS_CLEAR_APPROVAL = {
     (1, "0xdac17f958d2ee523a2206206994597c13d831ec7"),
@@ -339,16 +338,16 @@ class BRAPAdapter(BaseAdapter):
                 "all_routes": sorted_quotes,
                 "route_analysis": {
                     "highest_output": sorted_quotes[0] if sorted_quotes else None,
-                    "lowest_fees": min(
-                        all_quotes, key=lambda x: int(x.get("total_fee", 0))
-                    )
-                    if all_quotes
-                    else None,
-                    "fastest": min(
-                        all_quotes, key=lambda x: int(x.get("estimated_time", 0))
-                    )
-                    if all_quotes
-                    else None,
+                    "lowest_fees": (
+                        min(all_quotes, key=lambda x: int(x.get("total_fee", 0)))
+                        if all_quotes
+                        else None
+                    ),
+                    "fastest": (
+                        min(all_quotes, key=lambda x: int(x.get("estimated_time", 0)))
+                        if all_quotes
+                        else None
+                    ),
                 },
             }
 
@@ -698,8 +697,6 @@ class BRAPAdapter(BaseAdapter):
     async def _broadcast_transaction(
         self, transaction: dict[str, Any], confirmations: int = 0
     ) -> tuple[bool, Any]:
-        if getattr(settings, "DRY_RUN", False):
-            return True, {"dry_run": True, "transaction": transaction}
         return await self.wallet_provider.broadcast_transaction(
             transaction,
             wait_for_receipt=True,

wayfinder_paths/adapters/hyperlend_adapter/adapter.py

@@ -18,7 +18,6 @@ from wayfinder_paths.core.constants.hyperlend_abi import (
     WRAPPED_TOKEN_GATEWAY_ABI,
 )
 from wayfinder_paths.core.services.base import Web3Service
-from wayfinder_paths.core.settings import settings
 
 HYPERLEND_DEFAULTS = {
     "pool": "0x00A89d7a5A02160f20150EbEA7a2b5E4879A1A8b",
@@ -136,7 +135,7 @@ class HyperlendAdapter(BaseAdapter):
         chain_id = int(chain_id)
 
         if native:
-            tx = self._encode_call(
+            tx = await self._encode_call(
                 target=self.gateway_address,
                 abi=WRAPPED_TOKEN_GATEWAY_ABI,
                 fn_name="depositETH",
@@ -156,7 +155,7 @@ class HyperlendAdapter(BaseAdapter):
             )
             if not approved[0]:
                 return approved
-            tx = self._encode_call(
+            tx = await self._encode_call(
                 target=self.pool_address,
                 abi=POOL_ABI,
                 fn_name="supply",
@@ -181,7 +180,7 @@ class HyperlendAdapter(BaseAdapter):
         chain_id = int(chain_id)
 
         if native:
-            tx = self._encode_call(
+            tx = await self._encode_call(
                 target=self.gateway_address,
                 abi=WRAPPED_TOKEN_GATEWAY_ABI,
                 fn_name="withdrawETH",
@@ -191,7 +190,7 @@ class HyperlendAdapter(BaseAdapter):
             )
         else:
             token_addr = self._checksum(underlying_token)
-            tx = self._encode_call(
+            tx = await self._encode_call(
                 target=self.pool_address,
                 abi=POOL_ABI,
                 fn_name="withdraw",
@@ -237,13 +236,11 @@ class HyperlendAdapter(BaseAdapter):
         )
 
     async def _broadcast_transaction(self, tx: dict[str, Any]) -> tuple[bool, Any]:
-        if getattr(settings, "DRY_RUN", False):
-            return True, {"dry_run": True, "transaction": tx}
         return await self.web3.evm_transactions.broadcast_transaction(
             tx, wait_for_receipt=True, timeout=DEFAULT_TRANSACTION_TIMEOUT
         )
 
-    def _encode_call(
+    async def _encode_call(
         self,
         *,
         target: str,
@@ -258,7 +255,7 @@ class HyperlendAdapter(BaseAdapter):
         web3 = self.web3.get_web3(chain_id)
         contract = web3.eth.contract(address=target, abi=abi)
         try:
-            data = getattr(contract.functions, fn_name)(*args).build_transaction(
+            data = await getattr(contract.functions, fn_name)(*args).build_transaction(
                 {"from": from_address}
             )["data"]
         except ValueError as exc:

wayfinder_paths/adapters/hyperliquid_adapter/adapter.py

@@ -31,7 +31,7 @@ except ImportError:
 
 
 class SimpleCache:
-    """Simple in-memory cache with TTL to replace Django cache."""
+    """Simple in-memory cache with TTL for local caching."""
 
     def __init__(self):
         self._cache: dict[str, Any] = {}

wayfinder_paths/adapters/hyperliquid_adapter/executor.py

@@ -10,6 +10,7 @@ the protocol (for example, by delegating signing to a hosted signer).
 from __future__ import annotations
 
 import uuid
+from collections.abc import Mapping
 from typing import Any
 
 from loguru import logger
@@ -86,11 +87,49 @@ class LocalHyperliquidExecutor:
         )
         self.info = Info(base_url, skip_ws=True)
         self.exchange = Exchange(self._wallet, base_url)
+        self._asset_id_to_coin: dict[int, str] | None = None
 
         logger.info(
             f"LocalHyperliquidExecutor initialized for address: {self._wallet.address}"
         )
 
+    def _get_perp_coin(self, asset_id: int) -> str | None:
+        """
+        Resolve a perp coin name from a perp asset_id.
+
+        Note: newer versions of the hyperliquid SDK expose `coin_to_asset` but not
+        `asset_to_coin`, so we build the reverse mapping when needed.
+        """
+        if self._asset_id_to_coin is None:
+            mapping: dict[int, str] = {}
+
+            asset_to_coin = getattr(self.info, "asset_to_coin", None)
+            if isinstance(asset_to_coin, Mapping):
+                for k, v in asset_to_coin.items():
+                    try:
+                        asset_int = int(k)
+                    except (TypeError, ValueError):
+                        continue
+                    if v:
+                        mapping[asset_int] = str(v)
+
+            coin_to_asset = getattr(self.info, "coin_to_asset", None)
+            try:
+                coin_to_asset_dict = dict(coin_to_asset) if coin_to_asset else {}
+            except Exception:  # noqa: BLE001
+                coin_to_asset_dict = {}
+            for coin, aid in coin_to_asset_dict.items():
+                try:
+                    asset_int = int(aid)
+                except (TypeError, ValueError):
+                    continue
+                if coin and asset_int not in mapping:
+                    mapping[asset_int] = str(coin)
+
+            self._asset_id_to_coin = mapping
+
+        return self._asset_id_to_coin.get(asset_id) if self._asset_id_to_coin else None
+
     def _resolve_private_key(self, config: dict[str, Any]) -> str | None:
         """Extract private key from config."""
         # Try strategy_wallet first
@@ -172,7 +211,7 @@ class LocalHyperliquidExecutor:
                 )
             else:
                 # Perp market order
-                coin = self.info.asset_to_coin.get(asset_id)
+                coin = self._get_perp_coin(asset_id)
                 if not coin:
                     return {
                         "status": "err",
@@ -231,7 +270,7 @@ class LocalHyperliquidExecutor:
                 spot_index = asset_id - 10000
                 coin = f"@{spot_index}"
             else:
-                coin = self.info.asset_to_coin.get(asset_id)
+                coin = self._get_perp_coin(asset_id)
                 if not coin:
                     return {
                         "status": "err",
@@ -268,7 +307,7 @@ class LocalHyperliquidExecutor:
             }
 
         try:
-            coin = self.info.asset_to_coin.get(asset_id)
+            coin = self._get_perp_coin(asset_id)
             if not coin:
                 return {
                     "status": "err",
@@ -366,7 +405,7 @@ class LocalHyperliquidExecutor:
             }
 
         try:
-            coin = self.info.asset_to_coin.get(asset_id)
+            coin = self._get_perp_coin(asset_id)
             if not coin:
                 return {
                     "status": "err",
@@ -439,7 +478,7 @@ class LocalHyperliquidExecutor:
                 spot_index = asset_id - 10000
                 coin = f"@{spot_index}"
             else:
-                coin = self.info.asset_to_coin.get(asset_id)
+                coin = self._get_perp_coin(asset_id)
                 if not coin:
                     return {
                         "status": "err",

wayfinder_paths/adapters/hyperliquid_adapter/test_executor.py

@@ -0,0 +1,104 @@
+"""Tests for LocalHyperliquidExecutor."""
+
+from types import SimpleNamespace
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+
+class TestLocalHyperliquidExecutor:
+    """Tests for LocalHyperliquidExecutor."""
+
+    @pytest.fixture
+    def mock_info_without_asset_to_coin(self):
+        """Mock Info that only exposes coin_to_asset (no asset_to_coin)."""
+        return SimpleNamespace(coin_to_asset={"HYPE": 7})
+
+    @pytest.fixture
+    def mock_exchange(self):
+        """Mock Exchange client."""
+        mock = MagicMock()
+        mock.update_leverage.return_value = {"status": "ok"}
+        mock.market_open.return_value = {"status": "ok"}
+        return mock
+
+    @pytest.mark.asyncio
+    async def test_update_leverage_works_without_asset_to_coin(
+        self, mock_info_without_asset_to_coin, mock_exchange
+    ):
+        """update_leverage should map asset_id->coin via coin_to_asset inversion."""
+        dummy_wallet = SimpleNamespace(address="0xabc")
+
+        with patch(
+            "wayfinder_paths.adapters.hyperliquid_adapter.executor.Account"
+        ) as mock_account:
+            mock_account.from_key.return_value = dummy_wallet
+            with patch(
+                "wayfinder_paths.adapters.hyperliquid_adapter.executor.Info",
+                return_value=mock_info_without_asset_to_coin,
+            ):
+                with patch(
+                    "wayfinder_paths.adapters.hyperliquid_adapter.executor.Exchange",
+                    return_value=mock_exchange,
+                ):
+                    from wayfinder_paths.adapters.hyperliquid_adapter.executor import (
+                        LocalHyperliquidExecutor,
+                    )
+
+                    executor = LocalHyperliquidExecutor(
+                        config={"strategy_wallet": {"private_key": "0x" + "11" * 32}}
+                    )
+                    resp = await executor.update_leverage(
+                        asset_id=7,
+                        leverage=1,
+                        is_cross=True,
+                        address="0xabc",
+                    )
+
+                    assert resp.get("status") == "ok"
+                    mock_exchange.update_leverage.assert_called_once_with(
+                        leverage=1,
+                        name="HYPE",
+                        is_cross=True,
+                    )
+
+    @pytest.mark.asyncio
+    async def test_place_market_order_perp_works_without_asset_to_coin(
+        self, mock_info_without_asset_to_coin, mock_exchange
+    ):
+        """place_market_order should map asset_id->coin via coin_to_asset inversion."""
+        dummy_wallet = SimpleNamespace(address="0xabc")
+
+        with patch(
+            "wayfinder_paths.adapters.hyperliquid_adapter.executor.Account"
+        ) as mock_account:
+            mock_account.from_key.return_value = dummy_wallet
+            with patch(
+                "wayfinder_paths.adapters.hyperliquid_adapter.executor.Info",
+                return_value=mock_info_without_asset_to_coin,
+            ):
+                with patch(
+                    "wayfinder_paths.adapters.hyperliquid_adapter.executor.Exchange",
+                    return_value=mock_exchange,
+                ):
+                    from wayfinder_paths.adapters.hyperliquid_adapter.executor import (
+                        LocalHyperliquidExecutor,
+                    )
+
+                    executor = LocalHyperliquidExecutor(
+                        config={"strategy_wallet": {"private_key": "0x" + "11" * 32}}
+                    )
+                    resp = await executor.place_market_order(
+                        asset_id=7,
+                        is_buy=True,
+                        slippage=0.01,
+                        size=1.0,
+                        address="0xabc",
+                        reduce_only=False,
+                        cloid=MagicMock(),  # Avoid Cloid conversion
+                    )
+
+                    assert resp.get("status") == "ok"
+                    mock_exchange.market_open.assert_called_once()
+                    _, kwargs = mock_exchange.market_open.call_args
+                    assert kwargs["name"] == "HYPE"

wayfinder_paths/adapters/moonwell_adapter/adapter.py

@@ -23,7 +23,6 @@ from wayfinder_paths.core.constants.moonwell_abi import (
     WETH_ABI,
 )
 from wayfinder_paths.core.services.base import Web3Service
-from wayfinder_paths.core.settings import settings
 
 # Moonwell Base chain addresses
 MOONWELL_DEFAULTS = {
@@ -1149,8 +1148,6 @@ class MoonwellAdapter(BaseAdapter):
 
         Includes retry logic with exponential backoff for rate-limited RPCs.
         """
-        if getattr(settings, "DRY_RUN", False):
-            return True, {"dry_run": True, "transaction": tx}
         if not self.web3:
             return False, "web3 service not configured"
 

wayfinder_paths/adapters/pool_adapter/README.md

@@ -35,8 +35,7 @@ adapter = PoolAdapter()
 
 ```python
 success, data = await adapter.get_pools_by_ids(
-    pool_ids=["pool-123", "pool-456"],
-    merge_external=True
+    pool_ids=["pool-123", "pool-456"]
 )
 if success:
     pools = data.get("pools", [])
@@ -48,27 +47,13 @@ else:
 ### Get Llama Matches
 
 ```python
-success, data = await adapter.get_llama_matches()
+success, data = await adapter.get_pools()
 if success:
     matches = data.get("matches", [])
     print(f"Found {len(matches)} Llama matches")
     for match in matches:
-        if match.get("llama_stablecoin"):
-            print(f"Stablecoin pool: {match.get('id')} - APY: {match.get('llama_apy_pct')}%")
-else:
-    print(f"Error: {data}")
-```
-
-### Get Llama Reports
-
-```python
-success, data = await adapter.get_llama_reports(
-    identifiers=["pool-123", "usd-coin-base", "base_0x1234..."]
-)
-if success:
-    reports = data
-    for identifier, report in reports.items():
-        print(f"Report for {identifier}: APY {report.get('llama_apy_pct', 0)}%")
+        if match.get("stablecoin"):
+            print(f"Stablecoin pool: {match.get('id')} - APY: {match.get('apy')}%")
 else:
     print(f"Error: {data}")
 ```

wayfinder_paths/adapters/pool_adapter/adapter.py

@@ -3,7 +3,6 @@ from typing import Any
 from wayfinder_paths.core.adapters.BaseAdapter import BaseAdapter
 from wayfinder_paths.core.clients.PoolClient import (
     LlamaMatch,
-    LlamaReport,
     PoolClient,
     PoolList,
 )
@@ -31,29 +30,25 @@ class PoolAdapter(BaseAdapter):
         self.pool_client = pool_client or PoolClient()
 
     async def get_pools_by_ids(
-        self, pool_ids: list[str], merge_external: bool | None = None
+        self, pool_ids: list[str]
     ) -> tuple[bool, PoolList | str]:
         """
         Get pool information by pool IDs.
 
         Args:
             pool_ids: List of pool identifiers
-            merge_external: Whether to merge external data
 
         Returns:
             Tuple of (success, data) where data is pool information or error message
         """
         try:
-            pool_ids_str = ",".join(pool_ids)
-            data = await self.pool_client.get_pools_by_ids(
-                pool_ids=pool_ids_str, merge_external=merge_external
-            )
+            data = await self.pool_client.get_pools_by_ids(pool_ids=pool_ids)
             return (True, data)
         except Exception as e:
             self.logger.error(f"Error fetching pools by IDs: {e}")
             return (False, str(e))
 
-    async def get_llama_matches(self) -> tuple[bool, dict[str, LlamaMatch] | str]:
+    async def get_pools(self) -> tuple[bool, dict[str, LlamaMatch] | str]:
         """
         Get Llama protocol matches for pools.
 
@@ -61,28 +56,8 @@ class PoolAdapter(BaseAdapter):
             Tuple of (success, data) where data is Llama matches or error message
         """
         try:
-            data = await self.pool_client.get_llama_matches()
+            data = await self.pool_client.get_pools()
             return (True, data)
         except Exception as e:
             self.logger.error(f"Error fetching Llama matches: {e}")
             return (False, str(e))
-
-    async def get_llama_reports(
-        self, identifiers: list[str]
-    ) -> tuple[bool, dict[str, LlamaReport] | str]:
-        """
-        Get Llama reports for specific identifiers.
-
-        Args:
-            identifiers: List of identifiers (token IDs, addresses, pool IDs)
-
-        Returns:
-            Tuple of (success, data) where data is Llama reports or error message
-        """
-        try:
-            identifiers_str = ",".join(identifiers)
-            data = await self.pool_client.get_llama_reports(identifiers=identifiers_str)
-            return (True, data)
-        except Exception as e:
-            self.logger.error(f"Error fetching Llama reports: {e}")
-            return (False, str(e))

wayfinder_paths/adapters/pool_adapter/examples.json

@@ -2,8 +2,7 @@
   "get_pools_by_ids": {
     "description": "Get pool information by pool IDs",
     "input": {
-      "pool_ids": ["pool-123", "pool-456"],
-      "merge_external": true
+      "pool_ids": ["pool-123", "pool-456"]
     },
     "output": {
       "success": true,
@@ -21,7 +20,7 @@
       }
     }
   },
-  "get_llama_matches": {
+  "get_pools": {
     "description": "Get Llama protocol matches for pools",
     "input": {},
     "output": {
@@ -30,10 +29,10 @@
         "matches": [
           {
             "id": "pool-123",
-            "llama_apy_pct": 5.2,
-            "llama_tvl_usd": 1000000,
-            "llama_stablecoin": true,
-            "llama_il_risk": "no",
+            "apy": 5.2,
+            "tvlUsd": 1000000,
+            "stablecoin": true,
+            "ilRisk": "no",
             "network": "base"
           }
         ]

wayfinder_paths/adapters/pool_adapter/test_adapter.py

@@ -38,33 +38,33 @@ class TestPoolAdapter:
         mock_pool_client.get_pools_by_ids = AsyncMock(return_value=mock_response)
 
         success, data = await adapter.get_pools_by_ids(
-            pool_ids=["pool-123", "pool-456"], merge_external=True
+            pool_ids=["pool-123", "pool-456"]
         )
 
         assert success is True
         assert data == mock_response
         mock_pool_client.get_pools_by_ids.assert_called_once_with(
-            pool_ids="pool-123,pool-456", merge_external=True
+            pool_ids=["pool-123", "pool-456"]
         )
 
     @pytest.mark.asyncio
-    async def test_get_llama_matches_success(self, adapter, mock_pool_client):
+    async def test_get_pools_success(self, adapter, mock_pool_client):
         """Test successful Llama matches retrieval"""
         # Mock response
         mock_response = {
             "matches": [
                 {
                     "id": "pool-123",
-                    "llama_apy_pct": 5.2,
-                    "llama_tvl_usd": 1000000,
-                    "llama_stablecoin": True,
+                    "apy": 5.2,
+                    "tvlUsd": 1000000,
+                    "stablecoin": True,
                     "network": "base",
                 }
             ]
         }
-        mock_pool_client.get_llama_matches = AsyncMock(return_value=mock_response)
+        mock_pool_client.get_pools = AsyncMock(return_value=mock_response)
 
-        success, data = await adapter.get_llama_matches()
+        success, data = await adapter.get_pools()
 
         assert success is True
         assert data == mock_response

wayfinder_paths/core/clients/AuthClient.py

@@ -4,7 +4,7 @@ from typing import Any
 from loguru import logger
 
 from wayfinder_paths.core.clients.WayfinderClient import WayfinderClient
-from wayfinder_paths.core.settings import settings
+from wayfinder_paths.core.config import get_api_base_url
 
 
 class AuthClient(WayfinderClient):
@@ -18,7 +18,7 @@ class AuthClient(WayfinderClient):
         """
         super().__init__(api_key=api_key)
 
-        self.api_base_url = f"{settings.WAYFINDER_API_URL}"
+        self.api_base_url = get_api_base_url()
         self.logger = logger.bind(client="AuthClient")
 
     def _is_using_api_key(self) -> bool:

wayfinder_paths/core/clients/BRAPClient.py

@@ -12,7 +12,7 @@ from loguru import logger
 
 from wayfinder_paths.core.clients.AuthClient import AuthClient
 from wayfinder_paths.core.clients.WayfinderClient import WayfinderClient
-from wayfinder_paths.core.settings import settings
+from wayfinder_paths.core.config import get_api_base_url
 
 
 class BRAPQuote(TypedDict):
@@ -38,7 +38,7 @@ class BRAPClient(WayfinderClient):
 
     def __init__(self, api_key: str | None = None):
         super().__init__(api_key=api_key)
-        self.api_base_url = f"{settings.WAYFINDER_API_URL}"
+        self.api_base_url = get_api_base_url()
         self._auth_client: AuthClient | None = AuthClient(api_key=api_key)
 
     async def get_quote(

wayfinder_paths/core/clients/HyperlendClient.py

@@ -8,7 +8,7 @@ from __future__ import annotations
 from typing import Any, NotRequired, Required, TypedDict
 
 from wayfinder_paths.core.clients.WayfinderClient import WayfinderClient
-from wayfinder_paths.core.settings import settings
+from wayfinder_paths.core.config import get_api_base_url
 
 
 class StableMarket(TypedDict):
@@ -55,7 +55,7 @@ class HyperlendClient(WayfinderClient):
 
     def __init__(self, api_key: str | None = None):
         super().__init__(api_key=api_key)
-        self.api_base_url = f"{settings.WAYFINDER_API_URL}"
+        self.api_base_url = get_api_base_url()
 
     async def get_stable_markets(
         self,