wayfinder-paths 0.1.14__py3-none-any.whl → 0.1.16__py3-none-any.whl

wayfinder_paths/adapters/brap_adapter/test_adapter.py

@@ -1,4 +1,3 @@
-from types import SimpleNamespace
 from unittest.mock import AsyncMock
 
 import pytest
@@ -16,24 +15,9 @@ class TestBRAPAdapter:
         return mock_client
 
     @pytest.fixture
-    def mock_web3_service(self):
-        """Minimal Web3Service stub for adapter construction."""
-        wallet_provider = SimpleNamespace(
-            broadcast_transaction=AsyncMock(return_value=(True, {}))
-        )
-        token_txn = SimpleNamespace(
-            build_send=AsyncMock(return_value=(True, {})),
-            build_erc20_approve=AsyncMock(return_value=(True, {})),
-            read_erc20_allowance=AsyncMock(return_value={"allowance": 0}),
-        )
-        return SimpleNamespace(
-            evm_transactions=wallet_provider, token_transactions=token_txn
-        )
-
-    @pytest.fixture
-    def adapter(self, mock_brap_client, mock_web3_service):
+    def adapter(self, mock_brap_client):
         """Create a BRAPAdapter instance with mocked client for testing"""
-        adapter = BRAPAdapter(web3_service=mock_web3_service)
+        adapter = BRAPAdapter()
         adapter.brap_client = mock_brap_client
         return adapter
 
@@ -83,7 +67,7 @@ class TestBRAPAdapter:
             slippage=0.01,
         )
 
-        assert success is True
+        assert success
         assert data == mock_response
         mock_brap_client.get_quote.assert_called_once_with(
             from_token="0x" + "a" * 40,
@@ -125,7 +109,7 @@ class TestBRAPAdapter:
             amount="1000000000000000000",
         )
 
-        assert success is True
+        assert success
         assert data["input_amount"] == 1000000000000000000
         assert data["output_amount"] == 995000000000000000
 
@@ -183,7 +167,7 @@ class TestBRAPAdapter:
             slippage=0.01,
         )
 
-        assert success is True
+        assert success
         assert data["input_amount"] == 1000000000000000000
         assert data["output_amount"] == 995000000000000000
         assert data["gas_fee"] == 5000000000000000
@@ -242,7 +226,7 @@ class TestBRAPAdapter:
             amount="1000000000000000000",
         )
 
-        assert success is True
+        assert success
         assert data["total_routes"] == 2
         assert len(data["all_routes"]) == 2
         assert data["best_route"]["output_amount"] == 995000000000000000
@@ -254,7 +238,7 @@ class TestBRAPAdapter:
             from_chain_id=8453, to_chain_id=1, operation_type="swap"
         )
 
-        assert success is True
+        assert success
         assert data["from_chain"] == "base"
         assert data["to_chain"] == "ethereum"
         assert data["from_gas_estimate"] == 100000
@@ -288,7 +272,7 @@ class TestBRAPAdapter:
             amount="1000000000000000000",
         )
 
-        assert success is True
+        assert success
         assert data["valid"] is True
         assert data["quote_available"] is True
         assert data["estimated_output"] == "995000000000000000"

wayfinder_paths/adapters/hyperlend_adapter/adapter.py

@@ -12,12 +12,16 @@ from wayfinder_paths.core.clients.HyperlendClient import (
     MarketEntry,
     StableMarketsHeadroomResponse,
 )
-from wayfinder_paths.core.constants.base import DEFAULT_TRANSACTION_TIMEOUT
 from wayfinder_paths.core.constants.hyperlend_abi import (
     POOL_ABI,
     WRAPPED_TOKEN_GATEWAY_ABI,
 )
-from wayfinder_paths.core.services.base import Web3Service
+from wayfinder_paths.core.utils.erc20_service import (
+    build_approve_transaction,
+    get_token_allowance,
+)
+from wayfinder_paths.core.utils.transaction import send_transaction
+from wayfinder_paths.core.utils.web3 import web3_from_chain_id
 
 HYPERLEND_DEFAULTS = {
     "pool": "0x00A89d7a5A02160f20150EbEA7a2b5E4879A1A8b",
@@ -34,15 +38,16 @@ class HyperlendAdapter(BaseAdapter):
     def __init__(
         self,
         config: dict[str, Any],
-        web3_service: Web3Service,
+        simulation: bool = False,
+        strategy_wallet_signing_callback=None,
     ) -> None:
         super().__init__("hyperlend_adapter", config)
         cfg = config or {}
         adapter_cfg = cfg.get("hyperlend_adapter") or {}
 
+        self.simulation = simulation
+        self.strategy_wallet_signing_callback = strategy_wallet_signing_callback
         self.hyperlend_client = HyperlendClient()
-        self.web3 = web3_service
-        self.token_txn_service = web3_service.token_transactions
 
         self.strategy_wallet = cfg.get("strategy_wallet") or {}
         self.pool_address = self._checksum(
@@ -165,7 +170,7 @@ class HyperlendAdapter(BaseAdapter):
                 from_address=strategy,
                 chain_id=chain_id,
             )
-        return await self._execute(tx)
+        return await self._send_tx(tx)
 
     async def unlend(
         self,
@@ -200,12 +205,19 @@ class HyperlendAdapter(BaseAdapter):
                 from_address=strategy,
                 chain_id=chain_id,
             )
-        return await self._execute(tx)
+        return await self._send_tx(tx)
 
     # ------------------------------------------------------------------ #
     # Helpers                                                            #
     # ------------------------------------------------------------------ #
 
+    async def _send_tx(self, tx: dict[str, Any]) -> tuple[bool, Any]:
+        """Send transaction with simulation check."""
+        if self.simulation:
+            return True, {"simulation": tx}
+        txn_hash = await send_transaction(tx, self.strategy_wallet_signing_callback)
+        return True, txn_hash
+
     async def _ensure_allowance(
         self,
         *,
@@ -215,32 +227,17 @@ class HyperlendAdapter(BaseAdapter):
         amount: int,
         chain_id: int,
     ) -> tuple[bool, Any]:
-        chain = {"id": chain_id}
-        allowance = await self.token_txn_service.read_erc20_allowance(
-            chain, token_address, owner, spender
-        )
+        allowance = await get_token_allowance(token_address, chain_id, owner, spender)
         if allowance.get("allowance", 0) >= amount:
             return True, {}
-        build_success, approve_tx = self.token_txn_service.build_erc20_approve(
+        approve_tx = await build_approve_transaction(
+            from_address=owner,
             chain_id=chain_id,
             token_address=token_address,
-            from_address=owner,
             spender=spender,
             amount=amount,
         )
-        if not build_success:
-            return False, approve_tx
-        return await self._broadcast_transaction(approve_tx)
-
-    async def _execute(self, tx: dict[str, Any]) -> tuple[bool, Any]:
-        return await self.web3.broadcast_transaction(
-            tx, wait_for_receipt=True, timeout=DEFAULT_TRANSACTION_TIMEOUT
-        )
-
-    async def _broadcast_transaction(self, tx: dict[str, Any]) -> tuple[bool, Any]:
-        return await self.web3.evm_transactions.broadcast_transaction(
-            tx, wait_for_receipt=True, timeout=DEFAULT_TRANSACTION_TIMEOUT
-        )
+        return await self._send_tx(approve_tx)
 
     async def _encode_call(
         self,
@@ -254,23 +251,24 @@ class HyperlendAdapter(BaseAdapter):
         value: int = 0,
     ) -> dict[str, Any]:
         """Encode calldata without touching network."""
-        web3 = self.web3.get_web3(chain_id)
-        contract = web3.eth.contract(address=target, abi=abi)
-        try:
-            data = await getattr(contract.functions, fn_name)(*args).build_transaction(
-                {"from": from_address}
-            )["data"]
-        except ValueError as exc:
-            raise ValueError(f"Failed to encode {fn_name}: {exc}") from exc
 
-        tx: dict[str, Any] = {
-            "chainId": int(chain_id),
-            "from": to_checksum_address(from_address),
-            "to": to_checksum_address(target),
-            "data": data,
-            "value": int(value),
-        }
-        return tx
+        async with web3_from_chain_id(chain_id) as web3:
+            contract = web3.eth.contract(address=target, abi=abi)
+            try:
+                data = await getattr(contract.functions, fn_name)(
+                    *args
+                ).build_transaction({"from": from_address})["data"]
+            except ValueError as exc:
+                raise ValueError(f"Failed to encode {fn_name}: {exc}") from exc
+
+            tx: dict[str, Any] = {
+                "chainId": int(chain_id),
+                "from": to_checksum_address(from_address),
+                "to": to_checksum_address(target),
+                "data": data,
+                "value": int(value),
+            }
+            return tx
 
     def _strategy_address(self) -> str:
         addr = None

wayfinder_paths/adapters/hyperlend_adapter/test_adapter.py

@@ -1,4 +1,3 @@
-from types import SimpleNamespace
 from unittest.mock import AsyncMock
 
 import pytest
@@ -16,16 +15,10 @@ class TestHyperlendAdapter:
         return mock_client
 
     @pytest.fixture
-    def mock_web3_service(self):
-        """Minimal Web3Service stub for adapter construction."""
-        return SimpleNamespace(token_transactions=SimpleNamespace())
-
-    @pytest.fixture
-    def adapter(self, mock_hyperlend_client, mock_web3_service):
+    def adapter(self, mock_hyperlend_client):
         """Create a HyperlendAdapter instance with mocked client for testing"""
         adapter = HyperlendAdapter(
             config={},
-            web3_service=mock_web3_service,
         )
         adapter.hyperlend_client = mock_hyperlend_client
         return adapter
@@ -64,7 +57,7 @@ class TestHyperlendAdapter:
             min_buffer_tokens=100.0,
         )
 
-        assert success is True
+        assert success
         assert data == mock_response
         mock_hyperlend_client.get_stable_markets.assert_called_once_with(
             required_underlying_tokens=1000.0,
@@ -95,7 +88,7 @@ class TestHyperlendAdapter:
 
         success, data = await adapter.get_stable_markets()
 
-        assert success is True
+        assert success
         assert data == mock_response
         mock_hyperlend_client.get_stable_markets.assert_called_once_with(
             required_underlying_tokens=None,
@@ -115,7 +108,7 @@ class TestHyperlendAdapter:
             required_underlying_tokens=500.0
         )
 
-        assert success is True
+        assert success
         assert data == mock_response
         mock_hyperlend_client.get_stable_markets.assert_called_once_with(
             required_underlying_tokens=500.0,
@@ -157,7 +150,7 @@ class TestHyperlendAdapter:
 
         success, data = await adapter.get_stable_markets()
 
-        assert success is True
+        assert success
         assert data == mock_response
         assert len(data.get("markets", {})) == 0
 
@@ -203,7 +196,7 @@ class TestHyperlendAdapter:
 
         success, data = await adapter.get_stable_markets()
 
-        assert success is True
+        assert success
         assert data == mock_response
         mock_hyperlend_client.get_stable_markets.assert_called_once_with(
             required_underlying_tokens=None,
@@ -270,7 +263,7 @@ class TestHyperlendAdapter:
             user_address="0x0c737cB5934afCb5B01965141F865F795B324080",
         )
 
-        assert success is True
+        assert success
         assert data == mock_response
         mock_hyperlend_client.get_assets_view.assert_called_once_with(
             user_address="0x0c737cB5934afCb5B01965141F865F795B324080",
@@ -321,7 +314,7 @@ class TestHyperlendAdapter:
             user_address="0x0c737cB5934afCb5B01965141F865F795B324080",
         )
 
-        assert success is True
+        assert success
         assert data == mock_response
         assert len(data.get("assets", [])) == 0
         # New API uses account_data; total_value may not be present

wayfinder_paths/adapters/hyperliquid_adapter/test_adapter.py

@@ -72,41 +72,41 @@ class TestHyperliquidAdapter:
     async def test_get_meta_and_asset_ctxs(self, adapter):
         """Test fetching market metadata."""
         success, data = await adapter.get_meta_and_asset_ctxs()
-        assert success is True
+        assert success
         assert "universe" in data[0]
 
     @pytest.mark.asyncio
     async def test_get_spot_meta(self, adapter):
         """Test fetching spot metadata."""
         success, data = await adapter.get_spot_meta()
-        assert success is True
+        assert success
 
     @pytest.mark.asyncio
     async def test_get_funding_history(self, adapter):
         """Test fetching funding history."""
         success, data = await adapter.get_funding_history("ETH", 1700000000000)
-        assert success is True
+        assert success
         assert isinstance(data, list)
 
     @pytest.mark.asyncio
     async def test_get_candles(self, adapter):
         """Test fetching candle data."""
         success, data = await adapter.get_candles("ETH", "1h", 1700000000000)
-        assert success is True
+        assert success
         assert isinstance(data, list)
 
     @pytest.mark.asyncio
     async def test_get_l2_book(self, adapter):
         """Test fetching order book."""
         success, data = await adapter.get_l2_book("ETH")
-        assert success is True
+        assert success
         assert "levels" in data
 
     @pytest.mark.asyncio
     async def test_get_user_state(self, adapter):
         """Test fetching user state."""
         success, data = await adapter.get_user_state("0x1234")
-        assert success is True
+        assert success
         assert "assetPositions" in data
 
     @pytest.mark.asyncio

wayfinder_paths/adapters/hyperliquid_adapter/test_adapter_live.py

@@ -28,7 +28,7 @@ class TestSpotAssetIDs:
         """Verify get_spot_assets returns a populated dict."""
         success, spot_assets = await live_adapter.get_spot_assets()
 
-        assert success is True
+        assert success
         assert isinstance(spot_assets, dict)
         assert len(spot_assets) > 0
 
@@ -37,7 +37,7 @@ class TestSpotAssetIDs:
         """PURR/USDC should be the first spot pair (index 0 + 10000 = 10000)."""
         success, spot_assets = await live_adapter.get_spot_assets()
 
-        assert success is True
+        assert success
         assert "PURR/USDC" in spot_assets
         assert spot_assets["PURR/USDC"] == 10000
 
@@ -46,7 +46,7 @@ class TestSpotAssetIDs:
         """HYPE/USDC should have asset ID 10107."""
         success, spot_assets = await live_adapter.get_spot_assets()
 
-        assert success is True
+        assert success
         assert "HYPE/USDC" in spot_assets
         # HYPE is index 107, so asset_id = 10107
         assert spot_assets["HYPE/USDC"] == 10107
@@ -56,7 +56,7 @@ class TestSpotAssetIDs:
         """ETH/USDC spot pair should exist."""
         success, spot_assets = await live_adapter.get_spot_assets()
 
-        assert success is True
+        assert success
         # ETH spot may have different naming, check common variants
         eth_pairs = [k for k in spot_assets if "ETH" in k and "USDC" in k]
         assert len(eth_pairs) > 0, (
@@ -68,7 +68,7 @@ class TestSpotAssetIDs:
         """BTC/USDC spot pair should exist."""
         success, spot_assets = await live_adapter.get_spot_assets()
 
-        assert success is True
+        assert success
         # BTC spot may have different naming
         btc_pairs = [k for k in spot_assets if "BTC" in k and "USDC" in k]
         assert len(btc_pairs) > 0, (
@@ -80,7 +80,7 @@ class TestSpotAssetIDs:
         """All spot asset IDs should be >= 10000."""
         success, spot_assets = await live_adapter.get_spot_assets()
 
-        assert success is True
+        assert success
         for name, asset_id in spot_assets.items():
             assert asset_id >= 10000, f"{name} has invalid asset_id {asset_id}"
 
@@ -89,7 +89,7 @@ class TestSpotAssetIDs:
         """Test synchronous helper after cache is populated."""
         # First populate cache
         success, _ = await live_adapter.get_spot_assets()
-        assert success is True
+        assert success
 
         # Now use sync helper
         purr_id = live_adapter.get_spot_asset_id("PURR", "USDC")
@@ -147,7 +147,7 @@ class TestSpotMetaStructure:
         """Spot meta should have tokens array."""
         success, spot_meta = await live_adapter.get_spot_meta()
 
-        assert success is True
+        assert success
         assert "tokens" in spot_meta
         assert isinstance(spot_meta["tokens"], list)
         assert len(spot_meta["tokens"]) > 0
@@ -157,7 +157,7 @@ class TestSpotMetaStructure:
         """Spot meta should have universe array with pairs."""
         success, spot_meta = await live_adapter.get_spot_meta()
 
-        assert success is True
+        assert success
         assert "universe" in spot_meta
         assert isinstance(spot_meta["universe"], list)
         assert len(spot_meta["universe"]) > 0
@@ -167,7 +167,7 @@ class TestSpotMetaStructure:
         """Each spot universe entry should have tokens and index."""
         success, spot_meta = await live_adapter.get_spot_meta()
 
-        assert success is True
+        assert success
         for pair in spot_meta["universe"][:5]:  # Check first 5
             assert "tokens" in pair, f"Missing tokens in {pair}"
             assert "index" in pair, f"Missing index in {pair}"
@@ -182,7 +182,7 @@ class TestL2BookResolution:
         """PURR/USDC (10000) should return valid L2 book."""
         success, book = await live_adapter.get_spot_l2_book(10000)
 
-        assert success is True
+        assert success
         assert "levels" in book
 
     @pytest.mark.asyncio
@@ -190,7 +190,7 @@ class TestL2BookResolution:
         """HYPE/USDC (10107) should return valid L2 book."""
         success, book = await live_adapter.get_spot_l2_book(10107)
 
-        assert success is True
+        assert success
         assert "levels" in book
 
 

wayfinder_paths/adapters/ledger_adapter/test_adapter.py

@@ -45,7 +45,7 @@ class TestLedgerAdapter:
             offset=0,
         )
 
-        assert success is True
+        assert success
         assert data == mock_response
         mock_ledger_client.get_strategy_transactions.assert_called_once_with(
             wallet_address="0x1234567890123456789012345678901234567890",
@@ -84,7 +84,7 @@ class TestLedgerAdapter:
             wallet_address="0x1234567890123456789012345678901234567890"
         )
 
-        assert success is True
+        assert success
         assert data == mock_response
         mock_ledger_client.get_strategy_net_deposit.assert_called_once_with(
             wallet_address="0x1234567890123456789012345678901234567890"
@@ -110,7 +110,7 @@ class TestLedgerAdapter:
             strategy_name="TestStrategy",
         )
 
-        assert success is True
+        assert success
         assert data == mock_response
         mock_ledger_client.add_strategy_deposit.assert_called_once_with(
             wallet_address="0x1234567890123456789012345678901234567890",
@@ -142,7 +142,7 @@ class TestLedgerAdapter:
             strategy_name="TestStrategy",
         )
 
-        assert success is True
+        assert success
         assert data == mock_response
 
     @pytest.mark.asyncio
@@ -177,7 +177,7 @@ class TestLedgerAdapter:
             strategy_name="TestStrategy",
         )
 
-        assert success is True
+        assert success
         assert data == mock_response
 
     @pytest.mark.asyncio
@@ -197,7 +197,7 @@ class TestLedgerAdapter:
             wallet_address="0x1234567890123456789012345678901234567890", limit=10
         )
 
-        assert success is True
+        assert success
         assert data["total_transactions"] == 3
         assert data["operations"]["deposits"] == 1
         assert data["operations"]["withdrawals"] == 1

wayfinder_paths/adapters/moonwell_adapter/README.md

@@ -8,6 +8,7 @@ Adapter for interacting with the [Moonwell](https://moonwell.fi/) lending protoc
 ## Capabilities
 
 The adapter provides the following capabilities:
+
 - Lending: Supply and withdraw tokens
 - Borrowing: Borrow and repay tokens
 - Collateral management: Enable/disable markets as collateral
@@ -17,6 +18,7 @@ The adapter provides the following capabilities:
 ## Overview
 
 The MoonwellAdapter provides functionality for:
+
 - **Lending**: Supply tokens to earn yield
 - **Borrowing**: Borrow against collateral
 - **Collateral Management**: Enable/disable markets as collateral
@@ -25,10 +27,10 @@ The MoonwellAdapter provides functionality for:
 
 ## Supported Markets (Base Chain)
 
-| Token | mToken Address | Underlying Address |
-|-------|----------------|-------------------|
-| USDC | `0xEdc817A28E8B93B03976FBd4a3dDBc9f7D176c22` | `0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913` |
-| WETH | `0x628ff693426583D9a7FB391E54366292F509D457` | `0x4200000000000000000000000000000000000006` |
+| Token  | mToken Address                               | Underlying Address                           |
+| ------ | -------------------------------------------- | -------------------------------------------- |
+| USDC   | `0xEdc817A28E8B93B03976FBd4a3dDBc9f7D176c22` | `0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913` |
+| WETH   | `0x628ff693426583D9a7FB391E54366292F509D457` | `0x4200000000000000000000000000000000000006` |
 | wstETH | `0x627Fe393Bc6EdDA28e99AE648fD6fF362514304b` | `0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452` |
 
 ## Protocol Addresses (Base Chain)
@@ -40,7 +42,6 @@ The MoonwellAdapter provides functionality for:
 ## Construction
 
 ```python
-from wayfinder_paths.core.services.web3_service import DefaultWeb3Service
 from wayfinder_paths.adapters.moonwell_adapter import MoonwellAdapter
 
 config = {
@@ -49,12 +50,9 @@ config = {
         "chain_id": 8453,  # Base chain (default)
     }
 }
-web3_service = DefaultWeb3Service(config)
-adapter = MoonwellAdapter(config=config, web3_service=web3_service)
+adapter = MoonwellAdapter(config=config)
 ```
 
-`web3_service` is required so the adapter can share the same wallet provider as the rest of the strategy.
-
 ## Usage
 
 ```python
@@ -102,45 +100,45 @@ await adapter.claim_rewards()
 
 ### Lending Operations
 
-| Method | Description |
-|--------|-------------|
-| `lend(mtoken, underlying_token, amount)` | Supply tokens to earn yield |
-| `unlend(mtoken, amount)` | Withdraw by redeeming mTokens |
+| Method                                   | Description                   |
+| ---------------------------------------- | ----------------------------- |
+| `lend(mtoken, underlying_token, amount)` | Supply tokens to earn yield   |
+| `unlend(mtoken, amount)`                 | Withdraw by redeeming mTokens |
 
 ### Borrowing Operations
 
-| Method | Description |
-|--------|-------------|
-| `borrow(mtoken, amount)` | Borrow underlying tokens |
-| `repay(mtoken, underlying_token, amount)` | Repay borrowed tokens |
+| Method                                    | Description              |
+| ----------------------------------------- | ------------------------ |
+| `borrow(mtoken, amount)`                  | Borrow underlying tokens |
+| `repay(mtoken, underlying_token, amount)` | Repay borrowed tokens    |
 
 ### Collateral Management
 
-| Method | Description |
-|--------|-------------|
-| `set_collateral(mtoken)` | Enable market as collateral (enterMarkets) |
-| `remove_collateral(mtoken)` | Disable market as collateral (exitMarket) |
+| Method                      | Description                                |
+| --------------------------- | ------------------------------------------ |
+| `set_collateral(mtoken)`    | Enable market as collateral (enterMarkets) |
+| `remove_collateral(mtoken)` | Disable market as collateral (exitMarket)  |
 
 ### Position & Market Data
 
-| Method | Description |
-|--------|-------------|
-| `get_pos(mtoken, account)` | Get position data (balances, debt, rewards) |
-| `get_collateral_factor(mtoken)` | Get collateral factor (LTV) |
-| `get_apy(mtoken, apy_type)` | Get supply or borrow APY |
-| `get_borrowable_amount(account)` | Get max borrowable in USD |
+| Method                                     | Description                                        |
+| ------------------------------------------ | -------------------------------------------------- |
+| `get_pos(mtoken, account)`                 | Get position data (balances, debt, rewards)        |
+| `get_collateral_factor(mtoken)`            | Get collateral factor (LTV)                        |
+| `get_apy(mtoken, apy_type)`                | Get supply or borrow APY                           |
+| `get_borrowable_amount(account)`           | Get max borrowable in USD                          |
 | `max_withdrawable_mtoken(mtoken, account)` | Calculate safe withdrawal amount via binary search |
 
 ### Rewards
 
-| Method | Description |
-|--------|-------------|
+| Method                           | Description                                   |
+| -------------------------------- | --------------------------------------------- |
 | `claim_rewards(min_rewards_usd)` | Claim WELL rewards (skips if below threshold) |
 
 ### Utilities
 
-| Method | Description |
-|--------|-------------|
+| Method             | Description      |
+| ------------------ | ---------------- |
 | `wrap_eth(amount)` | Wrap ETH to WETH |
 
 All methods return `(success: bool, payload: Any)` tuples. On failure the payload is an error string.