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

wayfinder_paths/adapters/balance_adapter/adapter.py

@@ -116,6 +116,46 @@ class BalanceAdapter(BaseAdapter):
             skip_ledger=skip_ledger,
         )
 
+    async def send_to_address(
+        self,
+        token_id: str,
+        amount: float,
+        from_wallet: dict[str, Any] | None,
+        to_address: str,
+        skip_ledger: bool = True,
+    ) -> tuple[bool, Any]:
+        """Send tokens from a wallet to an arbitrary address (e.g., bridge contract)."""
+        if self.token_transactions is None:
+            return False, "Token transaction service not configured"
+
+        from_address = self._wallet_address(from_wallet)
+        if not from_address:
+            return False, "from_wallet missing or invalid"
+
+        if not to_address:
+            return False, "to_address is required"
+
+        token_info = await self.token_client.get_token_details(token_id)
+        if not token_info:
+            return False, f"Token not found: {token_id}"
+
+        build_success, tx_data = await self.token_transactions.build_send(
+            token_id=token_id,
+            amount=amount,
+            from_address=from_address,
+            to_address=to_address,
+            token_info=token_info,
+        )
+        if not build_success:
+            return False, tx_data
+
+        tx = tx_data
+        broadcast_result = await self.wallet_provider.broadcast_transaction(
+            tx, wait_for_receipt=True, timeout=DEFAULT_TRANSACTION_TIMEOUT
+        )
+
+        return broadcast_result
+
     async def _move_between_wallets(
         self,
         *,

wayfinder_paths/adapters/balance_adapter/test_adapter.py

@@ -79,7 +79,7 @@ class TestBalanceAdapter:
             wallet_address="0xWallet",
         )
 
-        assert success is True
+        assert success
         assert balance == 1000000
         mock_token_client.get_token_details.assert_called_once_with("usd-coin-base")
         mock_wallet_client.get_token_balance_for_address.assert_called_once_with(
@@ -108,7 +108,7 @@ class TestBalanceAdapter:
             query={"token_id": "wsteth-base"},
             wallet_address="0x123",
         )
-        assert success is True
+        assert success
         assert balance == 3000000
         mock_token_client.get_token_details.assert_called_once_with("wsteth-base")
         mock_wallet_client.get_token_balance_for_address.assert_called_once_with(
@@ -140,7 +140,7 @@ class TestBalanceAdapter:
             chain_id=8453,
         )
 
-        assert success is True
+        assert success
         assert balance == 5000000
         mock_wallet_client.get_token_balance_for_address.assert_called_once_with(
             wallet_address="0xWallet",

wayfinder_paths/adapters/brap_adapter/adapter.py

@@ -442,7 +442,31 @@ class BRAPAdapter(BaseAdapter):
         # (Calldata may include either "from" or "from_address" depending on provider.)
         transaction["from"] = to_checksum_address(from_address)
 
-        spender = transaction.get("to")
+        def _as_address(value: Any) -> str | None:
+            if not isinstance(value, str):
+                return None
+            v = value.strip()
+            if (
+                v.startswith("0x")
+                and len(v) == 42
+                and v.lower() != ZERO_ADDRESS.lower()
+            ):
+                return v
+            return None
+
+        spender = (
+            _as_address(transaction.get("allowanceTarget"))
+            or _as_address(transaction.get("allowance_target"))
+            or _as_address(transaction.get("approvalAddress"))
+            or _as_address(transaction.get("approval_address"))
+            or _as_address(transaction.get("spender"))
+            or _as_address(quote.get("allowanceTarget"))
+            or _as_address(quote.get("allowance_target"))
+            or _as_address(quote.get("approvalAddress"))
+            or _as_address(quote.get("approval_address"))
+            or _as_address(quote.get("spender"))
+            or _as_address(transaction.get("to"))
+        )
         approve_amount = (
             quote.get("input_amount")
             or quote.get("inputAmount")
@@ -469,13 +493,35 @@ class BRAPAdapter(BaseAdapter):
         broadcast_success, broadcast_response = await self._broadcast_transaction(
             transaction
         )
-        self.logger.info(
-            f"Swap broadcast result: success={broadcast_success}, "
-            f"response={broadcast_response}"
-        )
+        # Log only key fields to avoid spamming raw HexBytes logs
+        if isinstance(broadcast_response, dict):
+            tx_hash_log = broadcast_response.get("tx_hash", "unknown")
+            block_log = broadcast_response.get("block_number", "unknown")
+            status_log = (
+                broadcast_response.get("receipt", {}).get("status", "unknown")
+                if isinstance(broadcast_response.get("receipt"), dict)
+                else "unknown"
+            )
+            self.logger.info(
+                f"Swap broadcast: success={broadcast_success}, tx={tx_hash_log}, block={block_log}, status={status_log}"
+            )
+        else:
+            self.logger.info(f"Swap broadcast: success={broadcast_success}")
         if not broadcast_success:
             return (False, broadcast_response)
 
+        tx_hash = None
+        block_number = None
+        confirmations = None
+        confirmed_block_number = None
+        if isinstance(broadcast_response, dict):
+            tx_hash = broadcast_response.get("tx_hash") or broadcast_response.get(
+                "transaction_hash"
+            )
+            block_number = broadcast_response.get("block_number")
+            confirmations = broadcast_response.get("confirmations")
+            confirmed_block_number = broadcast_response.get("confirmed_block_number")
+
         # Record the swap operation in ledger - but don't let ledger errors fail the swap
         # since the on-chain transaction already succeeded
         try:
@@ -491,15 +537,20 @@ class BRAPAdapter(BaseAdapter):
             self.logger.warning(
                 f"Ledger recording failed (swap succeeded on-chain): {e}"
             )
-            # Return the quote with output amount so caller can proceed
-            ledger_record = {
-                "to_amount": quote.get("output_amount"),
-                "from_amount": quote.get("input_amount"),
-                "tx_hash": broadcast_response.get("tx_hash")
-                if isinstance(broadcast_response, dict)
-                else None,
-            }
-        return (True, ledger_record)
+            ledger_record = {}
+
+        result_payload: dict[str, Any] = {
+            "from_amount": quote.get("input_amount"),
+            "to_amount": quote.get("output_amount"),
+            "tx_hash": tx_hash,
+            "block_number": block_number,
+            "confirmations": confirmations,
+            "confirmed_block_number": confirmed_block_number,
+        }
+        if isinstance(ledger_record, dict):
+            result_payload.update(ledger_record)
+
+        return (True, result_payload)
 
     async def get_bridge_quote(
         self,
@@ -710,7 +761,7 @@ class BRAPAdapter(BaseAdapter):
         return await self._broadcast_transaction(approve_tx, confirmations=2)
 
     async def _broadcast_transaction(
-        self, transaction: dict[str, Any], confirmations: int = 0
+        self, transaction: dict[str, Any], confirmations: int | None = None
     ) -> tuple[bool, Any]:
         return await self.wallet_provider.broadcast_transaction(
             transaction,

wayfinder_paths/adapters/brap_adapter/test_adapter.py

@@ -83,7 +83,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 +125,7 @@ class TestBRAPAdapter:
             amount="1000000000000000000",
         )
 
-        assert success is True
+        assert success
         assert data["input_amount"] == 1000000000000000000
         assert data["output_amount"] == 995000000000000000
 
@@ -183,7 +183,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 +242,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 +254,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 +288,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

@@ -77,6 +77,20 @@ class HyperlendAdapter(BaseAdapter):
                 buffer_bps=buffer_bps,
                 min_buffer_tokens=min_buffer_tokens,
             )
+            # Strategies expect a dict with "markets" and "notes"; normalize if API returns a list
+            if isinstance(data, list):
+                markets: dict[str, Any] = {}
+                for i, item in enumerate(data):
+                    if isinstance(item, dict) and "address" in item:
+                        markets[item["address"]] = item
+                    elif isinstance(item, dict):
+                        markets[str(i)] = item
+                data = {"markets": markets, "notes": []}
+            elif isinstance(data, dict) and ("markets" not in data or "notes" not in data):
+                data = {
+                    "markets": data.get("markets", {}),
+                    "notes": data.get("notes", []),
+                }
             return True, data
         except Exception as exc:
             return False, str(exc)

wayfinder_paths/adapters/hyperlend_adapter/test_adapter.py

@@ -64,7 +64,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 +95,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 +115,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 +157,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 +203,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 +270,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 +321,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