wayfinder-paths 0.1.21__py3-none-any.whl → 0.1.23__py3-none-any.whl

wayfinder_paths/adapters/moonwell_adapter/test_adapter.py

@@ -59,20 +59,24 @@ class TestMoonwellAdapter:
     async def test_lend(self, adapter):
         mock_tx_hash = {"tx_hash": "0xabc123", "status": "success"}
         with (
-            patch.object(
-                adapter, "_ensure_allowance", new_callable=AsyncMock
+            patch(
+                "wayfinder_paths.adapters.moonwell_adapter.adapter.ensure_allowance",
+                new_callable=AsyncMock,
             ) as mock_allowance,
             patch.object(
                 adapter, "_encode_call", new_callable=AsyncMock
             ) as mock_encode,
-            patch.object(adapter, "_send_tx", new_callable=AsyncMock) as mock_send,
+            patch(
+                "wayfinder_paths.adapters.moonwell_adapter.adapter.send_transaction",
+                new_callable=AsyncMock,
+            ) as mock_send,
         ):
             mock_allowance.return_value = (True, {})
             mock_encode.return_value = {
                 "data": "0x1234",
                 "to": MOONWELL_DEFAULTS["m_usdc"],
             }
-            mock_send.return_value = (True, mock_tx_hash)
+            mock_send.return_value = mock_tx_hash
 
             success, result = await adapter.lend(
                 mtoken=MOONWELL_DEFAULTS["m_usdc"],
@@ -117,9 +121,12 @@ class TestMoonwellAdapter:
                 "wayfinder_paths.adapters.moonwell_adapter.adapter.web3_from_chain_id",
                 mock_web3_ctx,
             ),
-            patch.object(adapter, "_send_tx", new_callable=AsyncMock) as mock_send,
+            patch(
+                "wayfinder_paths.adapters.moonwell_adapter.adapter.send_transaction",
+                new_callable=AsyncMock,
+            ) as mock_send,
         ):
-            mock_send.return_value = (True, mock_tx_hash)
+            mock_send.return_value = mock_tx_hash
             success, result = await adapter.unlend(
                 mtoken=MOONWELL_DEFAULTS["m_usdc"],
                 amount=10**8,
@@ -176,9 +183,12 @@ class TestMoonwellAdapter:
                 "wayfinder_paths.adapters.moonwell_adapter.adapter.web3_from_chain_id",
                 mock_web3_ctx,
             ),
-            patch.object(adapter, "_send_tx", new_callable=AsyncMock) as mock_send,
+            patch(
+                "wayfinder_paths.adapters.moonwell_adapter.adapter.send_transaction",
+                new_callable=AsyncMock,
+            ) as mock_send,
         ):
-            mock_send.return_value = (True, mock_tx_hash)
+            mock_send.return_value = mock_tx_hash
             success, result = await adapter.borrow(
                 mtoken=MOONWELL_DEFAULTS["m_usdc"],
                 amount=10**6,
@@ -191,20 +201,24 @@ class TestMoonwellAdapter:
     async def test_repay(self, adapter):
         mock_tx_hash = {"tx_hash": "0xabc123", "status": "success"}
         with (
-            patch.object(
-                adapter, "_ensure_allowance", new_callable=AsyncMock
+            patch(
+                "wayfinder_paths.adapters.moonwell_adapter.adapter.ensure_allowance",
+                new_callable=AsyncMock,
             ) as mock_allowance,
             patch.object(
                 adapter, "_encode_call", new_callable=AsyncMock
             ) as mock_encode,
-            patch.object(adapter, "_send_tx", new_callable=AsyncMock) as mock_send,
+            patch(
+                "wayfinder_paths.adapters.moonwell_adapter.adapter.send_transaction",
+                new_callable=AsyncMock,
+            ) as mock_send,
         ):
             mock_allowance.return_value = (True, {})
             mock_encode.return_value = {
                 "data": "0x1234",
                 "to": MOONWELL_DEFAULTS["m_usdc"],
             }
-            mock_send.return_value = (True, mock_tx_hash)
+            mock_send.return_value = mock_tx_hash
 
             success, result = await adapter.repay(
                 mtoken=MOONWELL_DEFAULTS["m_usdc"],
@@ -243,9 +257,12 @@ class TestMoonwellAdapter:
                 "wayfinder_paths.adapters.moonwell_adapter.adapter.web3_from_chain_id",
                 mock_web3_ctx,
             ),
-            patch.object(adapter, "_send_tx", new_callable=AsyncMock) as mock_send,
+            patch(
+                "wayfinder_paths.adapters.moonwell_adapter.adapter.send_transaction",
+                new_callable=AsyncMock,
+            ) as mock_send,
         ):
-            mock_send.return_value = (True, mock_tx_hash)
+            mock_send.return_value = mock_tx_hash
             success, result = await adapter.set_collateral(
                 mtoken=MOONWELL_DEFAULTS["m_wsteth"],
             )
@@ -652,23 +669,20 @@ class TestMoonwellAdapter:
                 "wayfinder_paths.adapters.moonwell_adapter.adapter.web3_from_chain_id",
                 mock_web3_ctx,
             ),
-            patch.object(adapter, "_send_tx", new_callable=AsyncMock) as mock_send,
+            patch(
+                "wayfinder_paths.adapters.moonwell_adapter.adapter.send_transaction",
+                new_callable=AsyncMock,
+            ) as mock_send,
         ):
-            mock_send.return_value = (True, mock_tx_hash)
+            mock_send.return_value = mock_tx_hash
             success, result = await adapter.wrap_eth(amount=10**18)
 
         assert success
         assert result == mock_tx_hash
 
     def test_strategy_address_missing(self):
-        adapter = MoonwellAdapter(config={})
-
         with pytest.raises(ValueError, match="strategy_wallet"):
-            adapter._strategy_address()
-
-    def test_checksum_missing_address(self, adapter):
-        with pytest.raises(ValueError, match="Missing required"):
-            adapter._checksum(None)
+            MoonwellAdapter(config={})
 
     def test_config_override(self):
         custom_comptroller = "0x1111111111111111111111111111111111111111"

wayfinder_paths/adapters/token_adapter/adapter.py

@@ -59,6 +59,20 @@ class TokenAdapter(BaseAdapter):
             self.logger.error(f"Error getting token price for {token_id}: {e}")
             return (False, str(e))
 
+    async def get_amount_usd(
+        self,
+        token_id: str | None,
+        raw_amount: int | str | None,
+        decimals: int = 18,
+    ) -> float | None:
+        if raw_amount is None or token_id is None:
+            return None
+        success, price_data = await self.get_token_price(token_id)
+        if not success or not isinstance(price_data, dict):
+            return None
+        price = price_data.get("current_price", 0.0)
+        return price * float(raw_amount) / 10 ** int(decimals)
+
     async def get_gas_token(self, chain_code: str) -> tuple[bool, GasToken | str]:
         try:
             data = await self.token_client.get_gas_token(chain_code)

wayfinder_paths/core/__init__.py

@@ -1,7 +1,5 @@
 from wayfinder_paths.core.adapters.BaseAdapter import BaseAdapter
-from wayfinder_paths.core.engine.StrategyJob import StrategyJob
 from wayfinder_paths.core.strategies.Strategy import (
-    LiquidationResult,
     StatusDict,
     StatusTuple,
     Strategy,
@@ -12,5 +10,4 @@ __all__ = [
     "StatusDict",
     "StatusTuple",
     "BaseAdapter",
-    "StrategyJob",
 ]

wayfinder_paths/core/clients/BRAPClient.py

@@ -83,6 +83,7 @@ class BRAPClient(WayfinderClient):
         to_chain: int,
         from_wallet: str,
         from_amount: str,
+        slippage: float | None = None,
     ) -> BRAPQuoteResponse:  # type: ignore # noqa: E501
         logger.info(
             f"Getting BRAP quote: {from_token} -> {to_token} (chain {from_chain} -> {to_chain})"
@@ -100,6 +101,8 @@ class BRAPClient(WayfinderClient):
             "from_wallet": from_wallet,
             "from_amount": from_amount,
         }
+        if slippage is not None:
+            params["slippage"] = slippage
 
         try:
             response = await self._authed_request("GET", url, params=params, headers={})

wayfinder_paths/core/clients/ClientManager.py

@@ -10,10 +10,8 @@ from wayfinder_paths.core.clients.protocols import (
     LedgerClientProtocol,
     PoolClientProtocol,
     TokenClientProtocol,
-    WalletClientProtocol,
 )
 from wayfinder_paths.core.clients.TokenClient import TokenClient
-from wayfinder_paths.core.clients.WalletClient import WalletClient
 
 
 class ClientManager:
@@ -26,7 +24,6 @@ class ClientManager:
         self._skip_auth = skip_auth
 
         self._token_client: TokenClientProtocol | None = None
-        self._wallet_client: WalletClientProtocol | None = None
         self._ledger_client: LedgerClientProtocol | None = None
         self._pool_client: PoolClientProtocol | None = None
         self._hyperlend_client: HyperlendClientProtocol | None = None
@@ -62,10 +59,6 @@ class ClientManager:
             "_hyperlend_client", "hyperlend", HyperlendClient
         )
 
-    @property
-    def wallet(self) -> WalletClientProtocol:
-        return self._get_or_create_client("_wallet_client", "wallet", WalletClient)
-
     @property
     def brap(self) -> BRAPClientProtocol:
         return self._get_or_create_client("_brap_client", "brap", BRAPClient)