wayfinder-paths 0.1.8__py3-none-any.whl → 0.1.9__py3-none-any.whl

wayfinder_paths/strategies/basis_trading_strategy/strategy.py

@@ -208,7 +208,6 @@ class BasisTradingStrategy(BasisSnapshotMixin, Strategy):
         *,
         main_wallet: dict[str, Any] | None = None,
         strategy_wallet: dict[str, Any] | None = None,
-        simulation: bool = False,
         web3_service: Web3Service | None = None,
         hyperliquid_executor: HyperliquidExecutor | None = None,
         api_key: str | None = None,
@@ -221,7 +220,6 @@ class BasisTradingStrategy(BasisSnapshotMixin, Strategy):
         if strategy_wallet:
             merged_config["strategy_wallet"] = strategy_wallet
         self.config = merged_config
-        self.simulation = simulation
 
         # Position tracking
         self.current_position: BasisPosition | None = None
@@ -249,10 +247,10 @@ class BasisTradingStrategy(BasisSnapshotMixin, Strategy):
             "strategy": self.config,
         }
 
-        # Create Hyperliquid executor if not provided and not in simulation.
+        # Create Hyperliquid executor if not provided.
         # This is only required for placing/canceling orders (not market reads).
         hl_executor = hyperliquid_executor
-        if hl_executor is None and not self.simulation:
+        if hl_executor is None:
             try:
                 hl_executor = LocalHyperliquidExecutor(config=adapter_config)
                 self.logger.info("Created LocalHyperliquidExecutor for real execution")
@@ -267,7 +265,6 @@ class BasisTradingStrategy(BasisSnapshotMixin, Strategy):
         try:
             self.hyperliquid_adapter = HyperliquidAdapter(
                 config=adapter_config,
-                simulation=self.simulation,
                 executor=hl_executor,
             )
         except Exception as e:
@@ -280,7 +277,6 @@ class BasisTradingStrategy(BasisSnapshotMixin, Strategy):
                 tx_adapter = LocalTokenTxnService(
                     adapter_config,
                     wallet_provider=wallet_provider,
-                    simulation=self.simulation,
                 )
                 web3_service = DefaultWeb3Service(
                     wallet_provider=wallet_provider, evm_transactions=tx_adapter
@@ -502,18 +498,6 @@ class BasisTradingStrategy(BasisSnapshotMixin, Strategy):
                 return (False, f"Failed to transfer ETH for gas: {gas_res}")
             self.logger.info(f"Gas transfer successful: {gas_res}")
 
-        # Simulation mode - just track the deposit
-        if self.simulation:
-            self.logger.info(
-                f"[SIMULATION] Would send {main_token_amount} USDC to Hyperliquid bridge"
-            )
-            self.deposit_amount = main_token_amount
-            return (
-                True,
-                f"[SIMULATION] Deposited {main_token_amount} USDC. "
-                f"Call update() to analyze and open positions.",
-            )
-
         # Real deposit: ensure funds are in the strategy wallet, then send USDC to bridge.
         try:
             main_address = self._get_main_wallet_address()
@@ -926,11 +910,6 @@ class BasisTradingStrategy(BasisSnapshotMixin, Strategy):
             if not close_success:
                 return (False, f"Failed to close position: {close_msg}")
 
-        if self.simulation:
-            withdrawn = self.deposit_amount
-            self.deposit_amount = 0
-            return (True, f"[SIMULATION] Withdrew {withdrawn} USDC to main wallet")
-
         # Step 1: Transfer any spot USDC to perp for withdrawal
         success, spot_state = await self.hyperliquid_adapter.get_spot_user_state(
             address
@@ -1168,9 +1147,6 @@ class BasisTradingStrategy(BasisSnapshotMixin, Strategy):
         if not self.builder_fee:
             return True, "No builder fee configured"
 
-        if self.simulation:
-            return True, "[SIMULATION] Builder fee approval skipped"
-
         address = self._get_strategy_wallet_address()
         builder = self.builder_fee.get("b", "")
         required_fee = self.builder_fee.get("f", 0)
@@ -1357,112 +1333,98 @@ class BasisTradingStrategy(BasisSnapshotMixin, Strategy):
                 Decimal(str(order_usd)).quantize(Decimal("0.01"), rounding=ROUND_UP)
             )
 
-            if self.simulation:
-                self.logger.info(
-                    f"[SIMULATION] Would open {target_qty} {coin} basis position"
-                )
-                spot_filled = target_qty
-                perp_filled = target_qty
-                spot_notional = order_usd
-                perp_notional = order_usd
-                entry_price = float(best.get("mark_price", 0.0) or 100.0)
-            else:
-                # Step 1: Ensure builder fee is approved
-                fee_success, fee_msg = await self.ensure_builder_fee_approved()
-                if not fee_success:
-                    return (False, f"Builder fee approval failed: {fee_msg}")
-
-                # Step 2: Update leverage for the perp asset
-                self.logger.info(f"Setting leverage to {leverage}x for {coin}")
-                success, lev_result = await self.hyperliquid_adapter.update_leverage(
-                    asset_id=perp_asset_id,
-                    leverage=leverage,
-                    is_cross=True,
-                    address=address,
-                )
-                if not success:
-                    self.logger.warning(f"Failed to set leverage: {lev_result}")
-                    # Continue anyway - leverage might already be set
+            # Step 1: Ensure builder fee is approved
+            fee_success, fee_msg = await self.ensure_builder_fee_approved()
+            if not fee_success:
+                return (False, f"Builder fee approval failed: {fee_msg}")
 
-                # Step 3: Transfer USDC from perp to spot for spot purchase
-                # We need approximately order_usd in spot to buy the asset
-                self.logger.info(
-                    f"Transferring ${order_usd:.2f} from perp to spot for {coin}"
-                )
-                (
-                    success,
-                    transfer_result,
-                ) = await self.hyperliquid_adapter.transfer_perp_to_spot(
-                    amount=order_usd,
-                    address=address,
-                )
-                if not success:
-                    self.logger.warning(
-                        f"Perp to spot transfer failed: {transfer_result}"
-                    )
-                    # May fail if already in spot, continue
+            # Step 2: Update leverage for the perp asset
+            self.logger.info(f"Setting leverage to {leverage}x for {coin}")
+            success, lev_result = await self.hyperliquid_adapter.update_leverage(
+                asset_id=perp_asset_id,
+                leverage=leverage,
+                is_cross=True,
+                address=address,
+            )
+            if not success:
+                self.logger.warning(f"Failed to set leverage: {lev_result}")
+                # Continue anyway - leverage might already be set
 
-                # Step 4: Execute paired fill
-                filler = PairedFiller(
-                    adapter=self.hyperliquid_adapter,
-                    address=address,
-                    cfg=FillConfig(max_slip_bps=35, max_chunk_usd=7500.0),
-                )
+            # Step 3: Transfer USDC from perp to spot for spot purchase
+            # We need approximately order_usd in spot to buy the asset
+            self.logger.info(
+                f"Transferring ${order_usd:.2f} from perp to spot for {coin}"
+            )
+            (
+                success,
+                transfer_result,
+            ) = await self.hyperliquid_adapter.transfer_perp_to_spot(
+                amount=order_usd,
+                address=address,
+            )
+            if not success:
+                self.logger.warning(f"Perp to spot transfer failed: {transfer_result}")
+                # May fail if already in spot, continue
 
-                (
-                    spot_filled,
-                    perp_filled,
-                    spot_notional,
-                    perp_notional,
-                    spot_pointers,
-                    perp_pointers,
-                ) = await filler.fill_pair_units(
-                    coin=coin,
-                    spot_asset_id=spot_asset_id,
-                    perp_asset_id=perp_asset_id,
-                    total_units=target_qty,
-                    direction="long_spot_short_perp",
-                    builder_fee=self.builder_fee,
-                )
+            # Step 4: Execute paired fill
+            filler = PairedFiller(
+                adapter=self.hyperliquid_adapter,
+                address=address,
+                cfg=FillConfig(max_slip_bps=35, max_chunk_usd=7500.0),
+            )
 
-                if spot_filled <= 0 or perp_filled <= 0:
-                    return (False, f"Failed to fill basis position on {coin}")
+            (
+                spot_filled,
+                perp_filled,
+                spot_notional,
+                perp_notional,
+                spot_pointers,
+                perp_pointers,
+            ) = await filler.fill_pair_units(
+                coin=coin,
+                spot_asset_id=spot_asset_id,
+                perp_asset_id=perp_asset_id,
+                total_units=target_qty,
+                direction="long_spot_short_perp",
+                builder_fee=self.builder_fee,
+            )
 
-                self.logger.info(
-                    f"Filled basis position: spot={spot_filled:.6f}, perp={perp_filled:.6f}, "
-                    f"notional=${spot_notional:.2f}/${perp_notional:.2f}"
-                )
+            if spot_filled <= 0 or perp_filled <= 0:
+                return (False, f"Failed to fill basis position on {coin}")
 
-                # Get entry price from current mid
-                success, mids = await self.hyperliquid_adapter.get_all_mid_prices()
-                entry_price = mids.get(coin, 0.0) if success else 0.0
+            self.logger.info(
+                f"Filled basis position: spot={spot_filled:.6f}, perp={perp_filled:.6f}, "
+                f"notional=${spot_notional:.2f}/${perp_notional:.2f}"
+            )
 
-                # Step 5: Get liquidation price and place stop-loss
-                success, user_state = await self.hyperliquid_adapter.get_user_state(
-                    address
-                )
-                liquidation_price = None
-                if success:
-                    for pos_wrapper in user_state.get("assetPositions", []):
-                        pos = pos_wrapper.get("position", {})
-                        if pos.get("coin") == coin:
-                            liquidation_price = float(pos.get("liquidationPx", 0))
-                            break
+            # Get entry price from current mid
+            success, mids = await self.hyperliquid_adapter.get_all_mid_prices()
+            entry_price = mids.get(coin, 0.0) if success else 0.0
 
-                if liquidation_price and liquidation_price > 0:
-                    sl_success, sl_msg = await self._place_stop_loss_orders(
-                        coin=coin,
-                        perp_asset_id=perp_asset_id,
-                        position_size=perp_filled,
-                        entry_price=entry_price,
-                        liquidation_price=liquidation_price,
-                        spot_asset_id=spot_asset_id,
-                        spot_position_size=spot_filled,
-                    )
-                    if not sl_success:
-                        self.logger.warning(f"Stop-loss placement failed: {sl_msg}")
-                else:
-                    self.logger.warning("Could not get liquidation price for stop-loss")
+            # Step 5: Get liquidation price and place stop-loss
+            success, user_state = await self.hyperliquid_adapter.get_user_state(address)
+            liquidation_price = None
+            if success:
+                for pos_wrapper in user_state.get("assetPositions", []):
+                    pos = pos_wrapper.get("position", {})
+                    if pos.get("coin") == coin:
+                        liquidation_price = float(pos.get("liquidationPx", 0))
+                        break
+
+            if liquidation_price and liquidation_price > 0:
+                sl_success, sl_msg = await self._place_stop_loss_orders(
+                    coin=coin,
+                    perp_asset_id=perp_asset_id,
+                    position_size=perp_filled,
+                    entry_price=entry_price,
+                    liquidation_price=liquidation_price,
+                    spot_asset_id=spot_asset_id,
+                    spot_position_size=spot_filled,
+                )
+                if not sl_success:
+                    self.logger.warning(f"Stop-loss placement failed: {sl_msg}")
+            else:
+                self.logger.warning("Could not get liquidation price for stop-loss")
 
             # Create position record
             self.current_position = BasisPosition(
@@ -1836,9 +1798,6 @@ class BasisTradingStrategy(BasisSnapshotMixin, Strategy):
         if self.current_position is None:
             return True, "No position"
 
-        if self.simulation:
-            return True, "[SIMULATION] Would repair leg imbalance"
-
         pos = self.current_position
         coin = pos.coin
         address = self._get_strategy_wallet_address()
@@ -1930,9 +1889,6 @@ class BasisTradingStrategy(BasisSnapshotMixin, Strategy):
         if self.current_position is None:
             return True, "No position"
 
-        if self.simulation:
-            return True, "[SIMULATION] Stop-loss check skipped"
-
         pos = self.current_position
         coin = pos.coin
 
@@ -2026,13 +1982,6 @@ class BasisTradingStrategy(BasisSnapshotMixin, Strategy):
         pos = self.current_position
         self.logger.info(f"Closing position on {pos.coin}")
 
-        if self.simulation:
-            self.logger.info(
-                f"[SIMULATION] Would close {pos.spot_amount} {pos.coin} basis position"
-            )
-            self.current_position = None
-            return (True, "Position closed (simulation)")
-
         # Cancel all stop-loss and limit orders first
         await self._cancel_all_position_orders()
 

wayfinder_paths/strategies/basis_trading_strategy/test_strategy.py

@@ -119,12 +119,32 @@ class TestBasisTradingStrategy:
             return_value=(
                 True,
                 {
-                    "marginSummary": {"accountValue": "0", "withdrawable": "0"},
+                    "marginSummary": {"accountValue": "0"},
+                    "withdrawable": "100.0",  # Top-level withdrawable for withdraw() method
                     "assetPositions": [],
                 },
             )
         )
         mock.get_spot_user_state = AsyncMock(return_value=(True, {"balances": []}))
+        mock.get_max_builder_fee = AsyncMock(return_value=(True, 0))
+        mock.approve_builder_fee = AsyncMock(return_value=(True, {"status": "ok"}))
+        mock.update_leverage = AsyncMock(return_value=(True, {"status": "ok"}))
+        mock.transfer_perp_to_spot = AsyncMock(return_value=(True, {"status": "ok"}))
+        mock.transfer_spot_to_perp = AsyncMock(return_value=(True, {"status": "ok"}))
+        mock.place_market_order = AsyncMock(return_value=(True, {"status": "ok"}))
+        mock.place_limit_order = AsyncMock(return_value=(True, {"status": "ok"}))
+        mock.place_stop_loss = AsyncMock(return_value=(True, {"status": "ok"}))
+        mock.cancel_order = AsyncMock(return_value=(True, {"status": "ok"}))
+        mock.withdraw = AsyncMock(return_value=(True, {"status": "ok"}))
+        mock.get_open_orders = AsyncMock(return_value=(True, []))
+        mock.get_frontend_open_orders = AsyncMock(return_value=(True, []))
+        mock.get_valid_order_size = MagicMock(side_effect=lambda _asset, size: size)
+        mock.wait_for_deposit = AsyncMock(
+            return_value=(True, 100.0)  # (deposit_confirmed, final_balance)
+        )
+        mock.wait_for_withdrawal = AsyncMock(
+            return_value=(True, {"0x123456": 100.0})  # tx_hash -> amount (float)
+        )
         return mock
 
     @pytest.fixture
@@ -162,7 +182,6 @@ class TestBasisTradingStrategy:
                                     "main_wallet": {"address": "0x1234"},
                                     "strategy_wallet": {"address": "0x5678"},
                                 },
-                                simulation=True,
                             )
                             s.hyperliquid_adapter = mock_hyperliquid_adapter
                             s.ledger_adapter = ledger_adapter
@@ -173,9 +192,45 @@ class TestBasisTradingStrategy:
                             s.balance_adapter.move_from_main_wallet_to_strategy_wallet = AsyncMock(
                                 return_value=(True, {})
                             )
+                            s.balance_adapter.move_from_strategy_wallet_to_main_wallet = AsyncMock(
+                                return_value=(True, {})
+                            )
                             s.balance_adapter.send_to_address = AsyncMock(
                                 return_value=(True, {"tx_hash": "0x123"})
                             )
+                            # Mock internal dependencies to prevent MagicMock await errors
+                            # These are needed if the real method somehow gets called
+                            s.balance_adapter.token_client = AsyncMock()
+                            s.balance_adapter.token_client.get_token_details = (
+                                AsyncMock(
+                                    return_value={
+                                        "id": "usdc",
+                                        "address": "0x1234",
+                                        "decimals": 6,
+                                    }
+                                )
+                            )
+                            s.balance_adapter.token_transactions = AsyncMock()
+                            s.balance_adapter.token_transactions.build_send = AsyncMock(
+                                return_value=(True, {"transaction": "0xMOCK"})
+                            )
+                            s.balance_adapter.wallet_provider = AsyncMock()
+                            s.balance_adapter.wallet_provider.broadcast_transaction = (
+                                AsyncMock(
+                                    return_value=(True, {"transaction_hash": "0x123"})
+                                )
+                            )
+                            s.balance_adapter.token_adapter = AsyncMock()
+                            s.balance_adapter.token_adapter.get_token_price = AsyncMock(
+                                return_value=(True, {"current_price": 1.0})
+                            )
+                            # ledger_adapter is real, but ensure its methods are async-mockable
+                            s.balance_adapter.ledger_adapter = ledger_adapter
+                            # Also ensure the balance_adapter's _move_between_wallets won't call real methods
+                            # by making sure all its dependencies return AsyncMock
+                            s.balance_adapter._move_between_wallets = AsyncMock(
+                                return_value=(True, {"transaction_hash": "0x123"})
+                            )
                             return s
 
     @pytest.mark.asyncio
@@ -185,22 +240,32 @@ class TestBasisTradingStrategy:
         examples = load_examples()
         smoke = examples["smoke"]
 
-        # Deposit
-        deposit_params = smoke.get("deposit", {})
-        success, msg = await strategy.deposit(**deposit_params)
-        assert success, f"Deposit failed: {msg}"
+        # Mock PairedFiller for update() and withdraw() to work
+        with patch(
+            "wayfinder_paths.strategies.basis_trading_strategy.strategy.PairedFiller"
+        ) as mock_filler_class:
+            mock_filler = MagicMock()
+            mock_filler.fill_pair_units = AsyncMock(
+                return_value=(0.5, 0.5, 1000.0, 1000.0, [], [])
+            )
+            mock_filler_class.return_value = mock_filler
+
+            # Deposit
+            deposit_params = smoke.get("deposit", {})
+            success, msg = await strategy.deposit(**deposit_params)
+            assert success, f"Deposit failed: {msg}"
 
-        # Update
-        success, msg = await strategy.update()
-        assert success, f"Update failed: {msg}"
+            # Update
+            success, msg = await strategy.update()
+            assert success, f"Update failed: {msg}"
 
-        # Status
-        status = await strategy.status()
-        assert "portfolio_value" in status
+            # Status
+            status = await strategy.status()
+            assert "portfolio_value" in status
 
-        # Withdraw
-        success, msg = await strategy.withdraw()
-        assert success, f"Withdraw failed: {msg}"
+            # Withdraw (needs PairedFiller mock for _close_position)
+            success, msg = await strategy.withdraw()
+            assert success, f"Withdraw failed: {msg}"
 
     @pytest.mark.asyncio
     async def test_deposit_minimum(self, strategy):
@@ -311,8 +376,23 @@ class TestBasisTradingStrategy:
         assert opps[0]["selection"]["net_apy"] is not None
 
     @pytest.mark.asyncio
-    async def test_get_undeployed_capital_empty(self, strategy):
+    async def test_get_undeployed_capital_empty(
+        self, strategy, mock_hyperliquid_adapter
+    ):
         """Test _get_undeployed_capital with no capital."""
+        mock_hyperliquid_adapter.get_user_state = AsyncMock(
+            return_value=(
+                True,
+                {
+                    "marginSummary": {"accountValue": "0", "withdrawable": "0"},
+                    "withdrawable": "0",
+                    "assetPositions": [],
+                },
+            )
+        )
+        mock_hyperliquid_adapter.get_spot_user_state = AsyncMock(
+            return_value=(True, {"balances": []})
+        )
         perp_margin, spot_usdc = await strategy._get_undeployed_capital()
         assert perp_margin == 0.0
         assert spot_usdc == 0.0
@@ -508,7 +588,6 @@ class TestBasisTradingStrategy:
                                     "main_wallet": {"address": "0x1234"},
                                     "strategy_wallet": {"address": "0x5678"},
                                 },
-                                simulation=False,  # Not simulation mode
                             )
                             s.hyperliquid_adapter = mock_hyperliquid_adapter
                             s.ledger_adapter = ledger_adapter
@@ -561,7 +640,6 @@ class TestBasisTradingStrategy:
                                     "main_wallet": {"address": "0x1234"},
                                     "strategy_wallet": {"address": "0x5678"},
                                 },
-                                simulation=False,  # Not simulation mode
                             )
                             s.hyperliquid_adapter = mock_hyperliquid_adapter
                             s.ledger_adapter = ledger_adapter
@@ -580,46 +658,6 @@ class TestBasisTradingStrategy:
                             # Should have called approve_builder_fee
                             mock_hyperliquid_adapter.approve_builder_fee.assert_called_once()
 
-    @pytest.mark.asyncio
-    async def test_ensure_builder_fee_simulation_mode(
-        self, mock_hyperliquid_adapter, ledger_adapter
-    ):
-        """Test ensure_builder_fee_approved in simulation mode."""
-        with patch(
-            "wayfinder_paths.strategies.basis_trading_strategy.strategy.HyperliquidAdapter",
-            return_value=mock_hyperliquid_adapter,
-        ):
-            with patch(
-                "wayfinder_paths.strategies.basis_trading_strategy.strategy.BalanceAdapter"
-            ):
-                with patch(
-                    "wayfinder_paths.strategies.basis_trading_strategy.strategy.TokenAdapter"
-                ):
-                    with patch(
-                        "wayfinder_paths.strategies.basis_trading_strategy.strategy.LedgerAdapter",
-                        return_value=ledger_adapter,
-                    ):
-                        with patch(
-                            "wayfinder_paths.strategies.basis_trading_strategy.strategy.WalletManager"
-                        ):
-                            from wayfinder_paths.strategies.basis_trading_strategy.strategy import (
-                                BasisTradingStrategy,
-                            )
-
-                            s = BasisTradingStrategy(
-                                config={
-                                    "main_wallet": {"address": "0x1234"},
-                                    "strategy_wallet": {"address": "0x5678"},
-                                },
-                                simulation=True,  # Simulation mode
-                            )
-                            s.hyperliquid_adapter = mock_hyperliquid_adapter
-                            s.ledger_adapter = ledger_adapter
-
-                            success, msg = await s.ensure_builder_fee_approved()
-                            assert success is True
-                            assert "simulation" in msg.lower()
-
     @pytest.mark.asyncio
     async def test_portfolio_value_includes_spot_holdings(
         self, strategy, mock_hyperliquid_adapter

wayfinder_paths/strategies/hyperlend_stable_yield_strategy/README.md

@@ -1,4 +1,4 @@
-# Hyperlend Stable Yield Strategy
+# Hyperlend Stable Yield Strategy
 
 - Entrypoint: `strategies.hyperlend_stable_yield_strategy.strategy.HyperlendStableYieldStrategy`
 - Manifest: `manifest.yaml`
@@ -79,7 +79,7 @@ poetry install
 # Creates a main wallet (or use 'just create-strategy' which auto-creates wallets)
 poetry run python wayfinder_paths/scripts/make_wallets.py -n 1
 
-# Copy config and edit credentials (or rely on env vars)
+# Copy config and edit credentials
 cp wayfinder_paths/config.example.json config.json
 
 # Check status / health

wayfinder_paths/strategies/hyperlend_stable_yield_strategy/examples.json

@@ -1,6 +1,9 @@
 {
   "smoke": {
-    "deposit": {},
+    "deposit": {
+      "main_token_amount": 10.0,
+      "gas_token_amount": 0.01
+    },
     "update": {},
     "status": {},
     "withdraw": {}