wayfinder-paths 0.1.3__py3-none-any.whl → 0.1.5__py3-none-any.whl

wayfinder_paths/CONFIG_GUIDE.md

@@ -1,12 +1,14 @@
 # Configuration Guide
 
-This guide explains how to configure your vault strategies for local testing.
+This guide explains how to configure your strategies for local testing.
 
 ## Quick Setup
 
 ```bash
 # 1. Generate test wallets (required!)
-poetry run python wayfinder_paths/scripts/make_wallets.py --default --vault
+# Creates a main wallet (or use 'just create-strategy' which auto-creates wallets)
+just create-wallets
+# Or manually: poetry run python wayfinder_paths/scripts/make_wallets.py -n 1
 
 # 2. Create your config file
 cp wayfinder_paths/config.example.json config.json
@@ -25,11 +27,11 @@ cp wayfinder_paths/config.example.json config.json
     "username": "your_username",      // OPTIONAL: For OAuth authentication
     "password": "your_password",      // OPTIONAL: For OAuth authentication
     "refresh_token": null,            // OPTIONAL: Alternative to username/password
-    "api_key": "sk_live_abc123..."    // OPTIONAL: For service account authentication
+    "api_key": "sk_live_abc123..."    // OPTIONAL: For service account authentication (loaded directly by clients, not stored in UserConfig)
   },
   "system": {
     "api_base_url": "https://wayfinder.ai/api/v1",
-    "api_key": "sk_live_abc123...",   // OPTIONAL: System-level API key (alternative to user.api_key)
+    "api_key": "sk_live_abc123...",   // OPTIONAL: System-level API key (alternative to user.api_key, loaded directly by clients)
     "wallets_path": "wallets.json"    // Path to your generated wallets.json
   },
   "strategy": {
@@ -48,11 +50,13 @@ cp wayfinder_paths/config.example.json config.json
 **Authentication (choose one method):**
 
 **Option 1: Service Account (API Key) - Recommended for Production**
-- `user.api_key` - Your Wayfinder API key for service account authentication
-- OR `system.api_key` - System-level API key (alternative location)
+- `user.api_key` - Your Wayfinder API key for service account authentication (loaded directly by clients from config.json)
+- OR `system.api_key` - System-level API key (alternative location, loaded directly by clients)
 - OR set `WAYFINDER_API_KEY` environment variable
 - OR pass `api_key` parameter to strategy constructor
 
+**Note:** API keys in `config.json` are loaded directly by `WayfinderClient` via `_load_config_credentials()`, not through the `UserConfig` or `SystemConfig` dataclasses. This is intentional to allow flexible credential loading.
+
 **Option 2: Personal Access (OAuth) - For Development**
 - `user.username` - Your Wayfinder backend username
 - `user.password` - Your Wayfinder backend password
@@ -60,7 +64,7 @@ cp wayfinder_paths/config.example.json config.json
 
 **Other Optional fields:**
 - `user.main_wallet_address` - Override auto-loaded main wallet
-- `user.vault_wallet_address` - Override auto-loaded vault wallet
+- `user.strategy_wallet_address` - Override auto-loaded strategy wallet
 
 **Security Note:** Never commit `config.json` to version control. Add it to `.gitignore`.
 
@@ -70,7 +74,7 @@ These are managed automatically by Wayfinder:
 - `api_base_url` - Wayfinder backend API endpoint
 - `wallets_path` - Location of generated wallets.json
 - `job_id` - Auto-generated by Wayfinder
-- `job_type` - Set to "vault"
+- `job_type` - Set to "strategy"
 
 ## Strategy Configuration
 
@@ -93,24 +97,24 @@ Individual strategies may have their own configuration parameters. Check the str
 Use the built-in script to generate test wallets for local development:
 
 ```bash
-# Generate default and vault wallets (recommended)
-poetry run python wayfinder_paths/scripts/make_wallets.py --default --vault
+# Generate main wallet (recommended for initial setup)
+poetry run python wayfinder_paths/scripts/make_wallets.py -n 1
 
 # Add additional wallets for multi-account testing
-poetry run python wayfinder_paths/scripts/make_wallets.py --default --vault -n 3
+poetry run python wayfinder_paths/scripts/make_wallets.py -n 3
 
-# Replace existing wallets
-poetry run python wayfinder_paths/scripts/make_wallets.py --default --vault --override
+# Create a wallet with a specific label (e.g., for a strategy)
+poetry run python wayfinder_paths/scripts/make_wallets.py --label "my_strategy_name"
 
 # Generate keystore files (for geth/web3 compatibility)
-poetry run python wayfinder_paths/scripts/make_wallets.py --default --vault --keystore-password "your-password"
+poetry run python wayfinder_paths/scripts/make_wallets.py -n 1 --keystore-password "your-password"
 ```
 
 This creates `wallets.json` in the repository root with:
-- **default** wallet - your main wallet for testing
-- Additional unlabeled wallets if specified
+- **main** wallet - your main wallet for testing (labeled "main")
+- Additional wallets with labels if specified
 
-**Note:** Generated wallets are for testing only. Wallet addresses are automatically loaded from `wallets.json` when not explicitly set in config.
+**Note:** Generated wallets are for testing only. Wallet addresses are automatically loaded from `wallets.json` when not explicitly set in config. Strategy-specific wallets are automatically created when you use `just create-strategy "Strategy Name"`.
 
 ## Per-Strategy Wallets
 
@@ -121,8 +125,8 @@ Each strategy should have its own dedicated wallet for isolation and security. T
 When you run a strategy:
 1. The system uses the strategy directory name (e.g., `hyperlend_stable_yield_strategy`) to look up a wallet
 2. It searches `wallets.json` for a wallet with a matching `label`
-3. If found, that wallet is used as the strategy's `vault_wallet`
-4. Falls back to `vault_wallet_address` from config if explicitly provided
+3. If found, that wallet is used as the strategy's dedicated wallet
+4. Falls back to `strategy_wallet_address` from config if explicitly provided
 
 ### Creating a Strategy with Wallet
 
@@ -147,7 +151,7 @@ Wallets in `wallets.json` are stored with labels that match strategy directory n
   {
     "address": "0x...",
     "private_key_hex": "...",
-    "label": "default"
+    "label": "main"
   },
   {
     "address": "0x...",
@@ -184,11 +188,11 @@ Strategies access wallets the same way as before:
 
 ```python
 # In strategy code
-vault_address = self.config.get("vault_wallet").get("address")
+strategy_address = self.config.get("strategy_wallet").get("address")
 main_address = self.config.get("main_wallet").get("address")
 ```
 
-The `vault_wallet` is automatically populated from the wallet with label matching the strategy directory name.
+The strategy wallet is automatically populated from the wallet with label matching the strategy directory name.
 
 ## Loading Configuration
 
@@ -202,14 +206,14 @@ For programmatic use:
 
 ```python
 from pathlib import Path
-from core.config import VaultConfig
+from core.config import StrategyJobConfig
 import json
 
 # Load from file
 with open("config.json") as f:
     config_data = json.load(f)
 
-config = VaultConfig.from_dict(config_data)
+config = StrategyJobConfig.from_dict(config_data)
 
 # Configuration now has:
 # - config.user.username & password (for Wayfinder backend)
@@ -219,13 +223,13 @@ config = VaultConfig.from_dict(config_data)
 
 ## Wallet Abstraction
 
-The vault system supports multiple wallet types through a wallet abstraction layer. By default, adapters use local private keys (self-custodial wallets), but you can inject custom wallet providers for custodial wallets like Privy or Turnkey.
+The strategy system supports multiple wallet types through a wallet abstraction layer. By default, adapters use local private keys (self-custodial wallets), but you can inject custom wallet providers for custodial wallets like Privy or Turnkey.
 
 ### Default Behavior (Local Wallets)
 
 By default, adapters use `LocalWalletProvider` which resolves private keys from:
 - `wallets.json` (matched by address)
-- Environment variables (`PRIVATE_KEY`, `PRIVATE_KEY_VAULT`)
+- Environment variables (`PRIVATE_KEY`, `PRIVATE_KEY_STRATEGY`)
 - Wallet config in `config.json`
 
 No code changes are required - existing strategies continue to work.
@@ -235,7 +239,7 @@ No code changes are required - existing strategies continue to work.
 To use a custodial wallet provider (e.g., Privy, Turnkey), inject it directly into adapters:
 
 ```python
-from vaults.adapters.evm_transaction_adapter.adapter import EvmTransactionAdapter
+from adapters.evm_transaction_adapter.adapter import EvmTransactionAdapter
 from my_privy_integration import PrivyWalletProvider
 
 # Create your custom wallet provider
@@ -260,7 +264,7 @@ See `core/wallets/README.md` for details on implementing custom wallet providers
 
 ## Authentication with Wayfinder Backend
 
-Wayfinder Vaults supports **dual authentication** for different use cases:
+Wayfinder Paths supports **dual authentication** for different use cases:
 
 ### 1. Service Account Authentication (API Key)
 
@@ -270,7 +274,7 @@ API keys provide service account authentication and are automatically discovered
 
 #### Option A: Strategy Constructor (Programmatic)
 ```python
-from wayfinder_paths.vaults.strategies.stablecoin_yield_strategy.strategy import StablecoinYieldStrategy
+from wayfinder_paths.strategies.stablecoin_yield_strategy.strategy import StablecoinYieldStrategy
 
 strategy = StablecoinYieldStrategy(
     config={...},
@@ -301,10 +305,11 @@ export WAYFINDER_API_KEY="sk_live_abc123..."
 - When a strategy receives an `api_key`, it sets `os.environ["WAYFINDER_API_KEY"]`
 - All clients created by adapters automatically discover the API key from:
   - Constructor parameter (if passed)
-  - `config.json` (via `_load_config_credentials()`)
+  - `config.json` (via `WayfinderClient._load_config_credentials()` which reads `user.api_key` or `system.api_key`)
   - `WAYFINDER_API_KEY` environment variable
 - API keys are included in **all** API requests (including public endpoints) for rate limiting
 - No need to pass API keys explicitly to adapters or clients—they auto-discover it
+- **Note:** API keys in `config.json` are loaded directly by clients, not stored in the `UserConfig` or `SystemConfig` dataclasses
 
 ### 2. Personal Access Authentication (OAuth)
 
@@ -313,7 +318,7 @@ export WAYFINDER_API_KEY="sk_live_abc123..."
 The `username` and `password` in your config authenticate with the Wayfinder backend to access:
 - Wallet management
 - Transaction signing services
-- Vault execution services
+- Strategy execution services
 
 ```json
 {
@@ -338,7 +343,7 @@ The `username` and `password` in your config authenticate with the Wayfinder bac
 
 ## Configuration in Strategies
 
-Strategies receive configuration automatically through VaultJob:
+Strategies receive configuration automatically through StrategyJob:
 
 ```python
 from core.strategies.Strategy import Strategy

wayfinder_paths/__init__.py

@@ -1,4 +1,4 @@
-"""Wayfinder Path - Trading strategies and adapters for automated vault management"""
+"""Wayfinder Path - Trading strategies and adapters for automated strategy management"""
 
 __version__ = "0.1.0"
 
@@ -8,7 +8,7 @@ from wayfinder_paths.core import (
     StatusDict,
     StatusTuple,
     Strategy,
-    VaultJob,
+    StrategyJob,
 )
 
 __all__ = [
@@ -17,5 +17,5 @@ __all__ = [
     "Strategy",
     "StatusDict",
     "StatusTuple",
-    "VaultJob",
+    "StrategyJob",
 ]

wayfinder_paths/{vaults/adapters → adapters}/balance_adapter/README.md

@@ -1,8 +1,8 @@
 # Balance Adapter
 
-Adapter that exposes wallet, token, and pool balances backed by `WalletClient`/`TokenClient` and now orchestrates transfers between the configured main/vault wallets (with ledger bookkeeping).
+Adapter that exposes wallet, token, and pool balances backed by `WalletClient`/`TokenClient` and now orchestrates transfers between the configured main/strategy wallets (with ledger bookkeeping).
 
-- Entrypoint: `vaults.adapters.balance_adapter.adapter.BalanceAdapter`
+- Entrypoint: `adapters.balance_adapter.adapter.BalanceAdapter`
 - Manifest: `manifest.yaml`
 - Tests: `test_adapter.py`
 
@@ -14,7 +14,7 @@ The adapter declares both `wallet_read` and `wallet_transfer` capabilities in it
 
 ```python
 from wayfinder_paths.core.services.web3_service import DefaultWeb3Service
-from wayfinder_paths.vaults.adapters.balance_adapter.adapter import BalanceAdapter
+from wayfinder_paths.adapters.balance_adapter.adapter import BalanceAdapter
 
 web3_service = DefaultWeb3Service(config)
 balance = BalanceAdapter(config, web3_service=web3_service)
@@ -41,7 +41,7 @@ Fetches the amount supplied to a specific pool, using the `/wallets/pool-balance
 success, amount = await balance.get_pool_balance(
     pool_address="0xPool",
     chain_id=8453,
-    user_address=config["vault_wallet"]["address"],
+    user_address=config["strategy_wallet"]["address"],
 )
 ```
 
@@ -50,27 +50,27 @@ Returns the enriched token balance payload Wayfinder exposes (including USD valu
 
 ```python
 success, snapshot = await balance.get_all_balances(
-    wallet_address=config["vault_wallet"]["address"],
+    wallet_address=config["strategy_wallet"]["address"],
     enrich=True,
 )
 ```
 
-### `move_from_main_wallet_to_vault_wallet(token_id: str, amount: float, strategy_name="unknown", skip_ledger=False)`
-Sends the specified token from the configured `main_wallet` to the `vault_wallet`, records the ledger deposit (unless `skip_ledger=True`), and returns the `(success, tx_result)` tuple from the underlying send helper.
+### `move_from_main_wallet_to_strategy_wallet(token_id: str, amount: float, strategy_name="unknown", skip_ledger=False)`
+Sends the specified token from the configured `main_wallet` to the strategy wallet, records the ledger deposit (unless `skip_ledger=True`), and returns the `(success, tx_result)` tuple from the underlying send helper.
 
 ```python
-success, tx = await balance.move_from_main_wallet_to_vault_wallet(
+success, tx = await balance.move_from_main_wallet_to_strategy_wallet(
     token_id="usd-coin-base",
     amount=1.5,
     strategy_name="MyStrategy",
 )
 ```
 
-### `move_from_vault_wallet_to_main_wallet(token_id: str, amount: float, strategy_name="unknown", skip_ledger=False)`
-Mirrors the previous method but withdraws from the vault wallet back to the main wallet while recording a ledger withdrawal entry.
+### `move_from_strategy_wallet_to_main_wallet(token_id: str, amount: float, strategy_name="unknown", skip_ledger=False)`
+Mirrors the previous method but withdraws from the strategy wallet back to the main wallet while recording a ledger withdrawal entry.
 
 ```python
-await balance.move_from_vault_wallet_to_main_wallet(
+await balance.move_from_strategy_wallet_to_main_wallet(
     token_id="usd-coin-base",
     amount=0.75,
     strategy_name="MyStrategy",
@@ -94,7 +94,7 @@ class MyStrategy(Strategy):
         success, pool_balance = await self.balance_adapter.get_pool_balance(
             pool_address=self.current_pool["address"],
             chain_id=self.current_pool["chain"]["id"],
-            user_address=self.config["vault_wallet"]["address"],
+            user_address=self.config["strategy_wallet"]["address"],
         )
         return {"portfolio_value": float(pool_balance or 0), ...}
 ```

wayfinder_paths/{vaults/adapters → adapters}/balance_adapter/adapter.py

@@ -1,13 +1,14 @@
 from typing import Any
 
+from wayfinder_paths.adapters.ledger_adapter.adapter import LedgerAdapter
+from wayfinder_paths.adapters.token_adapter.adapter import TokenAdapter
 from wayfinder_paths.core.adapters.BaseAdapter import BaseAdapter
 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
-from wayfinder_paths.vaults.adapters.ledger_adapter.adapter import LedgerAdapter
-from wayfinder_paths.vaults.adapters.token_adapter.adapter import TokenAdapter
 
 
 class BalanceAdapter(BaseAdapter):
@@ -44,7 +45,7 @@ class BalanceAdapter(BaseAdapter):
         *,
         token_id: str,
         wallet_address: str,
-    ) -> tuple[bool, Any]:
+    ) -> tuple[bool, str | int]:
         """Get token balance for a wallet."""
         try:
             data = await self.wallet_client.get_token_balance_for_wallet(
@@ -55,37 +56,37 @@ class BalanceAdapter(BaseAdapter):
         except Exception as e:
             return (False, str(e))
 
-    async def move_from_main_wallet_to_vault_wallet(
+    async def move_from_main_wallet_to_strategy_wallet(
         self,
         token_id: str,
         amount: float,
         strategy_name: str = "unknown",
         skip_ledger: bool = False,
     ) -> tuple[bool, Any]:
-        """Move funds from the configured main wallet into the vault wallet."""
+        """Move funds from the configured main wallet into the strategy wallet."""
         return await self._move_between_wallets(
             token_id=token_id,
             amount=amount,
             from_wallet=self.config.get("main_wallet"),
-            to_wallet=self.config.get("vault_wallet"),
+            to_wallet=self.config.get("strategy_wallet"),
             ledger_method=self.ledger_adapter.record_deposit,
             ledger_wallet="to",
             strategy_name=strategy_name,
             skip_ledger=skip_ledger,
         )
 
-    async def move_from_vault_wallet_to_main_wallet(
+    async def move_from_strategy_wallet_to_main_wallet(
         self,
         token_id: str,
         amount: float,
         strategy_name: str = "unknown",
         skip_ledger: bool = False,
     ) -> tuple[bool, Any]:
-        """Move funds from the vault wallet back into the main wallet."""
+        """Move funds from the strategy wallet back into the main wallet."""
         return await self._move_between_wallets(
             token_id=token_id,
             amount=amount,
-            from_wallet=self.config.get("vault_wallet"),
+            from_wallet=self.config.get("strategy_wallet"),
             to_wallet=self.config.get("main_wallet"),
             ledger_method=self.ledger_adapter.record_withdrawal,
             ledger_wallet="from",
@@ -111,7 +112,7 @@ class BalanceAdapter(BaseAdapter):
         from_address = self._wallet_address(from_wallet)
         to_address = self._wallet_address(to_wallet)
         if not from_address or not to_address:
-            return False, "main_wallet or vault_wallet missing"
+            return False, "main_wallet or strategy_wallet missing"
 
         token_info = await self.token_client.get_token_details(token_id)
         if not token_info:
@@ -132,7 +133,7 @@ class BalanceAdapter(BaseAdapter):
             broadcast_result = (True, {"dry_run": True, "transaction": tx})
         else:
             broadcast_result = await self.wallet_provider.broadcast_transaction(
-                tx, wait_for_receipt=True, timeout=120
+                tx, wait_for_receipt=True, timeout=DEFAULT_TRANSACTION_TIMEOUT
             )
 
         if broadcast_result[0] and not skip_ledger and ledger_method is not None:

wayfinder_paths/{vaults/adapters → adapters}/balance_adapter/examples.json

@@ -1,6 +1,6 @@
 {
   "smoke": {
-    "get_balance": {"asset": "base_0x0000000000000000000000000000000000000000", "wallet_type": "vault"}
+    "get_balance": {"asset": "base_0x0000000000000000000000000000000000000000", "wallet_type": "strategy"}
   }
 }
 

wayfinder_paths/{vaults/adapters → adapters}/balance_adapter/manifest.yaml

@@ -1,5 +1,5 @@
 schema_version: "0.1"
-entrypoint: "vaults.adapters.balance_adapter.adapter.BalanceAdapter"
+entrypoint: "adapters.balance_adapter.adapter.BalanceAdapter"
 capabilities:
   - "wallet_read"
   - "wallet_transfer"

wayfinder_paths/{vaults/adapters → adapters}/balance_adapter/test_adapter.py

@@ -2,7 +2,7 @@ from unittest.mock import AsyncMock, patch
 
 import pytest
 
-from wayfinder_paths.vaults.adapters.balance_adapter.adapter import BalanceAdapter
+from wayfinder_paths.adapters.balance_adapter.adapter import BalanceAdapter
 
 
 class TestBalanceAdapter:
@@ -21,19 +21,25 @@ class TestBalanceAdapter:
         return mock_client
 
     @pytest.fixture
-    def adapter(self, mock_wallet_client, mock_token_client):
+    def mock_web3_service(self):
+        """Mock TokenClient for testing"""
+        mock_client = AsyncMock()
+        return mock_client
+
+    @pytest.fixture
+    def adapter(self, mock_wallet_client, mock_token_client, mock_web3_service):
         """Create a BalanceAdapter instance with mocked clients for testing"""
         with (
             patch(
-                "wayfinder_paths.vaults.adapters.balance_adapter.adapter.WalletClient",
+                "wayfinder_paths.adapters.balance_adapter.adapter.WalletClient",
                 return_value=mock_wallet_client,
             ),
             patch(
-                "wayfinder_paths.vaults.adapters.balance_adapter.adapter.TokenClient",
+                "wayfinder_paths.adapters.balance_adapter.adapter.TokenClient",
                 return_value=mock_token_client,
             ),
         ):
-            return BalanceAdapter(config={})
+            return BalanceAdapter(config={}, web3_service=mock_web3_service)
 
     @pytest.mark.asyncio
     async def test_health_check(self, adapter):
@@ -68,7 +74,7 @@ class TestBalanceAdapter:
             return_value=(True, mock_response)
         )
 
-        success, data = await adapter.get_all_enriched_token_balances_for_wallet(
+        success, data = await adapter.get_all_balances(
             wallet_address="0x1234567890123456789012345678901234567890",
             enrich=True,
         )

wayfinder_paths/{vaults/adapters → adapters}/brap_adapter/README.md

@@ -26,7 +26,7 @@ The BRAPClient will automatically:
 
 ```python
 from wayfinder_paths.core.services.web3_service import DefaultWeb3Service
-from wayfinder_paths.vaults.adapters.brap_adapter.adapter import BRAPAdapter
+from wayfinder_paths.adapters.brap_adapter.adapter import BRAPAdapter
 
 web3_service = DefaultWeb3Service(config)
 adapter = BRAPAdapter(web3_service=web3_service)
@@ -240,7 +240,7 @@ All methods return a tuple of `(success: bool, data: Any)` where:
 Run the adapter tests:
 
 ```bash
-pytest wayfinder_paths/vaults/adapters/brap_adapter/test_adapter.py -v
+pytest wayfinder_paths/adapters/brap_adapter/test_adapter.py -v
 ```
 
 ## Dependencies

wayfinder_paths/{vaults/adapters → adapters}/brap_adapter/adapter.py

@@ -1,16 +1,24 @@
+from __future__ import annotations
+
 from typing import Any
 
 from eth_utils import to_checksum_address
 
+from wayfinder_paths.adapters.ledger_adapter.adapter import LedgerAdapter
+from wayfinder_paths.adapters.token_adapter.adapter import TokenAdapter
 from wayfinder_paths.core.adapters.BaseAdapter import BaseAdapter
-from wayfinder_paths.core.clients.BRAPClient import BRAPClient
-from wayfinder_paths.core.clients.SimulationClient import SimulationClient
+from wayfinder_paths.core.adapters.models import SWAP
+from wayfinder_paths.core.clients.BRAPClient import BRAPClient, BRAPQuote
+from wayfinder_paths.core.clients.LedgerClient import TransactionRecord
+from wayfinder_paths.core.clients.SimulationClient import (
+    SimulationClient,
+    SimulationResult,
+)
 from wayfinder_paths.core.clients.TokenClient import TokenClient
 from wayfinder_paths.core.constants import DEFAULT_SLIPPAGE
+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.vaults.adapters.ledger_adapter.adapter import LedgerAdapter
-from wayfinder_paths.vaults.adapters.token_adapter.adapter import TokenAdapter
 
 _NEEDS_CLEAR_APPROVAL = {
     (1, "0xdac17f958d2ee523a2206206994597c13d831ec7"),
@@ -61,7 +69,7 @@ class BRAPAdapter(BaseAdapter):
         amount: str,
         slippage: float | None = None,
         wayfinder_fee: float | None = None,
-    ) -> tuple[bool, Any]:
+    ) -> tuple[bool, BRAPQuote | str]:
         """
         Get a quote for a cross-chain swap operation.
 
@@ -107,7 +115,7 @@ class BRAPAdapter(BaseAdapter):
         amount: str,
         slippage: float | None = None,
         wayfinder_fee: float | None = None,
-    ) -> tuple[bool, Any]:
+    ) -> tuple[bool, dict[str, Any] | str]:
         """
         Get the best available quote for a swap operation.
 
@@ -597,7 +605,7 @@ class BRAPAdapter(BaseAdapter):
         return await self.wallet_provider.broadcast_transaction(
             transaction,
             wait_for_receipt=True,
-            timeout=120,
+            timeout=DEFAULT_TRANSACTION_TIMEOUT,
         )
 
     async def _record_swap_operation(
@@ -608,7 +616,7 @@ class BRAPAdapter(BaseAdapter):
         quote: dict[str, Any],
         broadcast_response: dict[str, Any] | Any,
         strategy_name: str | None = None,
-    ) -> Any:
+    ) -> TransactionRecord | dict[str, Any]:
         from_amount_usd = quote.get("from_amount_usd")
         if from_amount_usd is None:
             from_amount_usd = await self._token_amount_usd(
@@ -622,23 +630,22 @@ class BRAPAdapter(BaseAdapter):
             )
 
         response = broadcast_response if isinstance(broadcast_response, dict) else {}
-        operation_payload = {
-            "type": "SWAP",
-            "from_token_id": from_token.get("id"),
-            "to_token_id": to_token.get("id"),
-            "from_amount": quote.get("input_amount"),
-            "to_amount": quote.get("output_amount"),
-            "from_amount_usd": from_amount_usd or 0,
-            "to_amount_usd": to_amount_usd or 0,
-            "transaction_hash": response.get("transaction_hash"),
-            "transaction_status": response.get("transaction_status"),
-            "transaction_receipt": response.get("transaction_receipt"),
-        }
+        operation_data = SWAP(
+            from_token_id=from_token.get("id"),
+            to_token_id=to_token.get("id"),
+            from_amount=quote.get("input_amount"),
+            to_amount=quote.get("output_amount"),
+            from_amount_usd=from_amount_usd or 0,
+            to_amount_usd=to_amount_usd or 0,
+            transaction_hash=response.get("transaction_hash"),
+            transaction_status=response.get("transaction_status"),
+            transaction_receipt=response.get("transaction_receipt"),
+        )
 
         try:
             success, ledger_response = await self.ledger_adapter.record_operation(
                 wallet_address=wallet_address,
-                operation_data=operation_payload,
+                operation_data=operation_data,
                 usd_value=from_amount_usd or 0,
                 strategy_name=strategy_name,
             )
@@ -650,7 +657,7 @@ class BRAPAdapter(BaseAdapter):
         except Exception as exc:  # noqa: BLE001
             self.logger.warning(f"Ledger swap record raised: {exc}", quote=quote)
 
-        return operation_payload
+        return operation_data.model_dump(mode="json")
 
     async def _token_amount_usd(
         self, token_info: dict[str, Any], raw_amount: Any
@@ -676,7 +683,7 @@ class BRAPAdapter(BaseAdapter):
         from_address: str,
         chain_id: int,
         quote: dict[str, Any],
-    ) -> Any:
+    ) -> SimulationResult:
         client = await self._get_simulation_client()
         initial_balances = {"native": "5000000000000000000"}
         if from_token.get("address"):

wayfinder_paths/{vaults/adapters → adapters}/brap_adapter/manifest.yaml

@@ -1,5 +1,5 @@
 schema_version: "0.1"
-entrypoint: "vaults.adapters.brap_adapter.adapter.BRAPAdapter"
+entrypoint: "adapters.brap_adapter.adapter.BRAPAdapter"
 capabilities:
   - "swap.quote"
   - "swap.execute"

wayfinder_paths/{vaults/adapters → adapters}/brap_adapter/test_adapter.py

@@ -3,7 +3,7 @@ from unittest.mock import AsyncMock, patch
 
 import pytest
 
-from wayfinder_paths.vaults.adapters.brap_adapter.adapter import BRAPAdapter
+from wayfinder_paths.adapters.brap_adapter.adapter import BRAPAdapter
 
 
 class TestBRAPAdapter:
@@ -34,7 +34,7 @@ class TestBRAPAdapter:
     def adapter(self, mock_brap_client, mock_web3_service):
         """Create a BRAPAdapter instance with mocked client for testing"""
         with patch(
-            "vaults.adapters.brap_adapter.adapter.BRAPClient",
+            "adapters.brap_adapter.adapter.BRAPClient",
             return_value=mock_brap_client,
         ):
             return BRAPAdapter(web3_service=mock_web3_service)

wayfinder_paths/adapters/hyperlend_adapter/__init__.py

@@ -0,0 +1,7 @@
+"""
+Hyperlend Adapter
+"""
+
+from wayfinder_paths.adapters.hyperlend_adapter.adapter import HyperlendAdapter
+
+__all__ = ["HyperlendAdapter"]