wayfinder-paths 0.1.28__py3-none-any.whl → 0.1.30__py3-none-any.whl

wayfinder_paths/policies/util.py

@@ -6,7 +6,8 @@ async def allow_functions(
     abi_chain_id: int,
     address: str,
     function_names: list[str],
-    abi_address_override=None,
+    abi_address_override: str = None,
+    manual_abi: dict = None,
 ):
     # Note: ChainID is just for fetching ABI, doesn't appear in the final policy. Doesn't bind a strict chain.
     return {
@@ -23,7 +24,8 @@ async def allow_functions(
             {
                 "field_source": "ethereum_calldata",
                 "field": "function_name",
-                "abi": await get_abi_filtered(
+                "abi": manual_abi
+                or await get_abi_filtered(
                     abi_chain_id, abi_address_override or address, function_names
                 ),
                 "operator": "in",

wayfinder_paths/strategies/basis_trading_strategy/strategy.py

@@ -48,7 +48,7 @@ from wayfinder_paths.core.analytics import (
 from wayfinder_paths.core.analytics import (
     z_from_conf as analytics_z_from_conf,
 )
-from wayfinder_paths.core.constants.contracts import HYPERLIQUID_BRIDGE
+from wayfinder_paths.core.constants.contracts import HYPE_FEE_WALLET, HYPERLIQUID_BRIDGE
 from wayfinder_paths.core.strategies.descriptors import (
     Complexity,
     Directionality,
@@ -58,7 +58,6 @@ from wayfinder_paths.core.strategies.descriptors import (
     Volatility,
 )
 from wayfinder_paths.core.strategies.Strategy import StatusDict, StatusTuple, Strategy
-from wayfinder_paths.core.types import HyperliquidSignCallback
 from wayfinder_paths.policies.erc20 import any_erc20_function
 from wayfinder_paths.policies.hyperliquid import (
     any_hyperliquid_l1_payload,
@@ -111,7 +110,6 @@ class BasisTradingStrategy(BasisSnapshotMixin, Strategy):
     # Rotation cooldown
     ROTATION_MIN_INTERVAL_DAYS = 14
 
-    HYPE_FEE_WALLET: str = "0xaA1D89f333857eD78F8434CC4f896A9293EFE65c"
     HYPE_PRO_FEE: int = 30
     DEFAULT_BUILDER_FEE: dict[str, Any] = {"b": HYPE_FEE_WALLET, "f": HYPE_PRO_FEE}
 
@@ -183,7 +181,7 @@ class BasisTradingStrategy(BasisSnapshotMixin, Strategy):
         *,
         main_wallet: dict[str, Any] | None = None,
         strategy_wallet: dict[str, Any] | None = None,
-        strategy_sign_typed_data: HyperliquidSignCallback | None = None,
+        strategy_sign_typed_data: Callable[[dict], Awaitable[str]] | None = None,
         main_wallet_signing_callback: Callable[[dict], Awaitable[str]] | None = None,
         strategy_wallet_signing_callback: Callable[[dict], Awaitable[str]]
         | None = None,

wayfinder_paths/strategies/boros_hype_strategy/boros_ops_mixin.py

@@ -11,22 +11,18 @@ from datetime import datetime
 from typing import Any
 
 from loguru import logger
-from web3 import AsyncWeb3
 
 from wayfinder_paths.core.utils.transaction import encode_call, send_transaction
-from wayfinder_paths.core.utils.web3 import web3_from_chain_id
 
 from .constants import (
     BOROS_HYPE_MARKET_ID,
     BOROS_HYPE_TOKEN_ID,
     BOROS_MIN_DEPOSIT_HYPE,
     HYPE_NATIVE,
-    HYPE_OFT_ABI,
     HYPE_OFT_ADDRESS,
     HYPEREVM_CHAIN_ID,
     KHYPE_LST,
     LOOPED_HYPE,
-    LZ_EID_ARBITRUM,
     MIN_HYPE_GAS,
     USDC_ARB,
     USDT_ARB,
@@ -37,11 +33,6 @@ from .constants import (
 from .types import Inventory
 
 
-def _pad_address_bytes32(address: str) -> bytes:
-    checksum = AsyncWeb3.to_checksum_address(address)
-    return bytes.fromhex(checksum[2:]).rjust(32, b"\x00")
-
-
 class BorosHypeBorosOpsMixin:
     async def _fund_boros(
         self, params: dict[str, Any], inventory: Inventory
@@ -267,84 +258,21 @@ class BorosHypeBorosOpsMixin:
         bridge_amount_wei = min(target_wei, max_value_wei)
         if bridge_amount_wei <= 0:
             return True, "Boros funding: nothing to bridge"
-
-        to_bytes32 = _pad_address_bytes32(wallet_address)
-
-        async with web3_from_chain_id(HYPEREVM_CHAIN_ID) as w3:
-            contract = w3.eth.contract(
-                address=w3.to_checksum_address(HYPE_OFT_ADDRESS),
-                abi=HYPE_OFT_ABI,
-            )
-
-            conversion_rate = int(
-                await contract.functions.decimalConversionRate().call()
-            )  # OFT sharedDecimals rounding
-            if conversion_rate > 0:
-                bridge_amount_wei = (
-                    bridge_amount_wei // conversion_rate
-                ) * conversion_rate
-            if bridge_amount_wei <= 0:
-                return True, "Boros funding: amount too small after OFT rounding"
-
-            # Quote fee, then clamp amount to fit balance (amount + fee) while
-            # still leaving MIN_HYPE_GAS behind for future gas.
-            send_params = (
-                int(LZ_EID_ARBITRUM),
-                to_bytes32,
-                int(bridge_amount_wei),
-                0,
-                b"",
-                b"",
-                b"",
-            )
-            fee = await contract.functions.quoteSend(send_params, False).call()
-            native_fee = int(fee[0])
-            lz_token_fee = int(fee[1])
-
-            max_send_amount_wei = max(0, max_value_wei - native_fee)
-            if conversion_rate > 0:
-                max_send_amount_wei = (
-                    max_send_amount_wei // conversion_rate
-                ) * conversion_rate
-            if bridge_amount_wei > max_send_amount_wei:
-                bridge_amount_wei = max_send_amount_wei
-                if bridge_amount_wei <= 0:
-                    return False, "Insufficient HyperEVM HYPE to cover OFT bridge fee"
-
-                send_params = (
-                    int(LZ_EID_ARBITRUM),
-                    to_bytes32,
-                    int(bridge_amount_wei),
-                    0,
-                    b"",
-                    b"",
-                    b"",
-                )
-                fee = await contract.functions.quoteSend(send_params, False).call()
-                native_fee = int(fee[0])
-                lz_token_fee = int(fee[1])
-
-            total_value_wei = int(bridge_amount_wei) + int(native_fee)
-            if total_value_wei > max_value_wei:
-                return False, "Insufficient HyperEVM HYPE to bridge after fee quote"
-
-        tx = await encode_call(
-            target=HYPE_OFT_ADDRESS,
-            abi=HYPE_OFT_ABI,
-            fn_name="send",
-            args=[
-                send_params,
-                (int(native_fee), int(lz_token_fee)),
-                AsyncWeb3.to_checksum_address(wallet_address),
-            ],
-            from_address=wallet_address,
-            chain_id=HYPEREVM_CHAIN_ID,
-            value=total_value_wei,
+        (
+            ok_bridge,
+            bridge_res,
+        ) = await self.boros_adapter.bridge_hype_oft_hyperevm_to_arbitrum(
+            amount_wei=int(bridge_amount_wei),
+            max_value_wei=int(max_value_wei),
+            to_address=str(wallet_address),
+            from_address=str(wallet_address),
         )
+        if not ok_bridge:
+            return False, f"OFT bridge failed: {bridge_res}"
 
-        tx_hash = await send_transaction(tx, self._sign_callback, wait_for_receipt=True)
-
-        bridged_hype = float(bridge_amount_wei) / 1e18
+        tx_hash = str(bridge_res.get("tx_hash") or "")
+        bridged_wei = int(bridge_res.get("amount_wei") or 0)
+        bridged_hype = float(bridged_wei) / 1e18
         bridged_usd = bridged_hype * hype_price
 
         # Track in-flight amount so planner doesn't double-fund while the bridge settles.
@@ -360,7 +288,7 @@ class BorosHypeBorosOpsMixin:
 
         return True, (
             f"Bridging {bridged_hype:.6f} HYPE (≈${bridged_usd:.2f}) HyperEVM→Arbitrum via OFT; "
-            f"tx={tx_hash} (LayerZero: https://layerzeroscan.com/tx/{tx_hash}). "
+            f"tx={tx_hash} (LayerZero: {bridge_res.get('layerzeroscan')}). "
             "Once bridged HYPE lands on Arbitrum, the next tick will deposit it to Boros."
         )
 
@@ -431,41 +359,15 @@ class BorosHypeBorosOpsMixin:
                 f"({depositable_hype:.6f} HYPE)",
             )
 
-        # 0) Move any isolated collateral to cross margin (cleanup).
-        # Boros markets expire, so we need to get the actual market ID from isolated positions.
+        # 0) Cleanup: sweep any isolated collateral back to cross margin.
         try:
-            ok_bal, balances = await self.boros_adapter.get_account_balances(
+            ok_sweep, sweep_res = await self.boros_adapter.sweep_isolated_to_cross(
                 token_id=int(token_id)
             )
-            if ok_bal and isinstance(balances, dict):
-                isolated_positions = balances.get("isolated_positions", [])
-                logger.debug(
-                    f"Boros position check: isolated={balances.get('isolated', 0):.6f}, "
-                    f"cross={balances.get('cross', 0):.6f}, "
-                    f"total={balances.get('total', 0):.6f}, "
-                    f"isolated_positions={isolated_positions}"
-                )
-                for iso_pos in isolated_positions:
-                    iso_market_id = iso_pos.get("market_id")
-                    iso_balance = float(iso_pos.get("balance", 0) or 0.0)
-                    if iso_market_id and iso_balance > 0.001:
-                        iso_wei = int(iso_balance * 1e18)  # Boros cash units
-                        logger.info(
-                            f"Moving {iso_balance:.6f} collateral from isolated market {iso_market_id} to cross"
-                        )
-                        ok_xfer, res_xfer = await self.boros_adapter.cash_transfer(
-                            market_id=int(iso_market_id),
-                            amount_wei=iso_wei,
-                            is_deposit=False,  # isolated -> cross
-                        )
-                        if ok_xfer:
-                            await asyncio.sleep(2)
-                        else:
-                            logger.warning(
-                                f"Failed Boros isolated->cross transfer for market {iso_market_id}: {res_xfer}"
-                            )
+            if not ok_sweep:
+                logger.warning(f"Failed Boros isolated->cross sweep: {sweep_res}")
         except Exception as exc:  # noqa: BLE001
-            logger.warning(f"Failed Boros isolated->cross transfer: {exc}")
+            logger.warning(f"Failed Boros isolated->cross sweep: {exc}")
 
         # 1) Best-effort: if any OFT HYPE is sitting idle on Arbitrum, deposit it to cross margin.
         if inventory.hype_oft_arb_balance > 0.0:
@@ -491,104 +393,58 @@ class BorosHypeBorosOpsMixin:
             except Exception as exc:  # noqa: BLE001
                 logger.warning(f"Failed to deposit OFT HYPE to Boros: {exc}")
 
-        # Deposits can land as isolated cash for the given market_id; ensure we
-        # sweep isolated -> cross again before attempting to trade.
-        try:
-            ok_bal, balances = await self.boros_adapter.get_account_balances(
-                token_id=int(token_id)
-            )
-            if ok_bal and isinstance(balances, dict):
-                isolated_positions = balances.get("isolated_positions", [])
-                for iso_pos in isolated_positions:
-                    iso_market_id = iso_pos.get("market_id")
-                    iso_balance = float(iso_pos.get("balance", 0) or 0.0)
-                    if iso_market_id and iso_balance > 0.001:
-                        iso_wei = int(iso_balance * 1e18)  # Boros cash units
-                        logger.info(
-                            f"Moving {iso_balance:.6f} collateral from isolated market {iso_market_id} to cross"
-                        )
-                        ok_xfer, res_xfer = await self.boros_adapter.cash_transfer(
-                            market_id=int(iso_market_id),
-                            amount_wei=iso_wei,
-                            is_deposit=False,  # isolated -> cross
-                        )
-                        if ok_xfer:
-                            await asyncio.sleep(2)
-                        else:
-                            logger.warning(
-                                f"Failed Boros isolated->cross transfer for market {iso_market_id}: {res_xfer}"
-                            )
-        except Exception as exc:  # noqa: BLE001
-            logger.warning(
-                f"Failed Boros isolated->cross transfer after deposit: {exc}"
-            )
-
         # 2) Rollover: close positions in other markets (best effort).
         try:
-            for mid in inventory.boros_position_market_ids or []:
-                try:
-                    mid_int = int(mid)
-                except (TypeError, ValueError):
-                    continue
-                if mid_int <= 0 or mid_int == int(market_id):
-                    continue
-                try:
-                    await self.boros_adapter.close_positions_market(
-                        mid_int, token_id=int(token_id)
-                    )
-                    await asyncio.sleep(2)
-                except Exception as exc:  # noqa: BLE001
-                    logger.warning(f"Failed to close Boros market {mid_int}: {exc}")
+            ok_roll, roll_res = await self.boros_adapter.close_positions_except(
+                keep_market_id=int(market_id),
+                token_id=int(token_id),
+                market_ids=inventory.boros_position_market_ids or [],
+                best_effort=True,
+            )
+            if not ok_roll:
+                logger.warning(f"Failed Boros rollover close: {roll_res}")
         except Exception as exc:  # noqa: BLE001
             logger.warning(f"Failed Boros rollover close: {exc}")
 
-        success, positions = await self.boros_adapter.get_active_positions(
-            market_id=int(market_id)
+        yu_to_usd = (
+            float(inventory.hype_price_usd or 0.0)
+            if int(token_id) == BOROS_HYPE_TOKEN_ID
+            else 1.0
         )
-        if not success:
-            return False, "Failed to get Boros positions"
-
-        if positions:
-            pos = positions[0]
-            current_size_yu = abs(float(pos.get("size", 0) or 0.0))
-        else:
-            current_size_yu = 0.0
-
-        diff_yu = float(target_size_yu) - float(current_size_yu)
-        diff_usd_equiv = abs(diff_yu) * float(inventory.hype_price_usd or 0.0)
-        if diff_usd_equiv < self._planner_config.boros_resize_min_excess_usd:
-            return True, f"Boros position already at target ({current_size_yu:.4f} YU)"
-
-        size_yu_wei = int(abs(diff_yu) * 1e18)  # Boros YU wei
-
-        if diff_yu > 0:
-            # Open/increase SHORT side (receive fixed)
-            ok_open, open_res = await self.boros_adapter.place_rate_order(
-                market_id=int(market_id),
-                token_id=int(token_id),
-                size_yu_wei=size_yu_wei,
-                side="short",
-                tif="IOC",
+        ok_set, set_res = await self.boros_adapter.ensure_position_size_yu(
+            market_id=int(market_id),
+            token_id=int(token_id),
+            target_size_yu=float(target_size_yu),
+            tif="IOC",
+            min_resize_excess_usd=float(
+                self._planner_config.boros_resize_min_excess_usd
+            ),
+            yu_to_usd=float(yu_to_usd),
+        )
+        if not ok_set:
+            return False, f"Failed to ensure Boros position: {set_res}"
+
+        action = str(set_res.get("action") or "unknown")
+        diff_yu = float(set_res.get("diff_yu") or 0.0)
+        if action == "no_op":
+            return (
+                True,
+                f"Boros position already at target ({set_res.get('current_size_yu', 0.0):.4f} YU)",
             )
-            if not ok_open:
-                return False, f"Failed to open Boros position: {open_res}"
+        if action == "increase_short":
             return (
                 True,
                 f"Boros position increased by {diff_yu:.4f} YU on market {market_id}",
             )
-
-        # Close/decrease position
-        ok_close, close_res = await self.boros_adapter.close_positions_market(
-            market_id=int(market_id),
-            token_id=int(token_id),
-            size_yu_wei=size_yu_wei,
-        )
-        if not ok_close:
-            return False, f"Failed to close Boros position: {close_res}"
+        if action == "decrease":
+            return (
+                True,
+                f"Boros position decreased by {abs(diff_yu):.4f} YU on market {market_id}",
+            )
 
         return (
             True,
-            f"Boros position decreased by {abs(diff_yu):.4f} YU on market {market_id}",
+            f"Boros position adjusted ({action}) on market {market_id}: Δ={diff_yu:.4f} YU",
         )
 
     async def _complete_pending_withdrawal(

wayfinder_paths/strategies/boros_hype_strategy/constants.py

@@ -1,3 +1,24 @@
+from wayfinder_paths.core.constants.contracts import (
+    HYPE_OFT_ADDRESS,
+    KHYPE_ADDRESS,
+    KHYPE_STAKING_ACCOUNTANT,
+    LHYPE_ACCOUNTANT,
+    LOOPED_HYPE_ADDRESS,
+)
+from wayfinder_paths.core.constants.contracts import (
+    HYPEREVM_WHYPE as WHYPE_ADDRESS,
+)
+
+# Re-export addresses for use by strategy modules
+__all__ = [
+    "HYPE_OFT_ADDRESS",
+    "WHYPE_ADDRESS",
+    "KHYPE_ADDRESS",
+    "KHYPE_STAKING_ACCOUNTANT",
+    "LHYPE_ACCOUNTANT",
+    "LOOPED_HYPE_ADDRESS",
+]
+
 # ─────────────────────────────────────────────────────────────────────────────
 # TOKEN IDS (wayfinder token identifiers)
 # ─────────────────────────────────────────────────────────────────────────────
@@ -14,20 +35,6 @@ KHYPE_LST = "kinetic-staked-hype-hyperevm"
 LOOPED_HYPE = "looped-hype-hyperevm"
 USDC_HYPE = "usd-coin-hyperevm"
 
-
-# ─────────────────────────────────────────────────────────────────────────────
-# CONTRACT ADDRESSES
-# ─────────────────────────────────────────────────────────────────────────────
-
-# HyperEVM token addresses
-KHYPE_ADDRESS = "0xfD739d4e423301CE9385c1fb8850539D657C296D"
-LOOPED_HYPE_ADDRESS = "0x5748ae796AE46A4F1348a1693de4b50560485562"
-WHYPE_ADDRESS = "0x5555555555555555555555555555555555555555"
-
-# Accountant contracts for exchange rate calculations
-KHYPE_STAKING_ACCOUNTANT = "0x9209648Ec9D448EF57116B73A2f081835643dc7A"
-LHYPE_ACCOUNTANT = "0xcE621a3CA6F72706678cFF0572ae8d15e5F001c3"
-
 # Chain IDs
 HYPEREVM_CHAIN_ID = 999
 ARBITRUM_CHAIN_ID = 42161
@@ -100,160 +107,9 @@ BOROS_MIN_DEPOSIT_HYPE = 0.4
 BOROS_MIN_TENOR_DAYS = 3  # Roll to new market if < 3 days to expiry
 BOROS_ENABLE_MIN_TOTAL_USD = 80.0  # Skip Boros if capital below this
 
-# LayerZero OFT bridge (HyperEVM native HYPE → Arbitrum OFT HYPE)
-HYPE_OFT_ADDRESS = "0x007C26Ed5C33Fe6fEF62223d4c363A01F1b1dDc1"
-LZ_EID_ARBITRUM = 30110
-
-# Minimal IOFT ABI for quoting + sending.
-HYPE_OFT_ABI = [
-    {
-        "inputs": [
-            {
-                "components": [
-                    {"internalType": "uint32", "name": "dstEid", "type": "uint32"},
-                    {"internalType": "bytes32", "name": "to", "type": "bytes32"},
-                    {"internalType": "uint256", "name": "amountLD", "type": "uint256"},
-                    {
-                        "internalType": "uint256",
-                        "name": "minAmountLD",
-                        "type": "uint256",
-                    },
-                    {
-                        "internalType": "bytes",
-                        "name": "extraOptions",
-                        "type": "bytes",
-                    },
-                    {"internalType": "bytes", "name": "composeMsg", "type": "bytes"},
-                    {"internalType": "bytes", "name": "oftCmd", "type": "bytes"},
-                ],
-                "internalType": "struct SendParam",
-                "name": "_sendParam",
-                "type": "tuple",
-            },
-            {"internalType": "bool", "name": "_payInLzToken", "type": "bool"},
-        ],
-        "name": "quoteSend",
-        "outputs": [
-            {
-                "components": [
-                    {"internalType": "uint256", "name": "nativeFee", "type": "uint256"},
-                    {
-                        "internalType": "uint256",
-                        "name": "lzTokenFee",
-                        "type": "uint256",
-                    },
-                ],
-                "internalType": "struct MessagingFee",
-                "name": "",
-                "type": "tuple",
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function",
-    },
-    {
-        "inputs": [
-            {
-                "components": [
-                    {"internalType": "uint32", "name": "dstEid", "type": "uint32"},
-                    {"internalType": "bytes32", "name": "to", "type": "bytes32"},
-                    {"internalType": "uint256", "name": "amountLD", "type": "uint256"},
-                    {
-                        "internalType": "uint256",
-                        "name": "minAmountLD",
-                        "type": "uint256",
-                    },
-                    {
-                        "internalType": "bytes",
-                        "name": "extraOptions",
-                        "type": "bytes",
-                    },
-                    {"internalType": "bytes", "name": "composeMsg", "type": "bytes"},
-                    {"internalType": "bytes", "name": "oftCmd", "type": "bytes"},
-                ],
-                "internalType": "struct SendParam",
-                "name": "_sendParam",
-                "type": "tuple",
-            },
-            {
-                "components": [
-                    {"internalType": "uint256", "name": "nativeFee", "type": "uint256"},
-                    {
-                        "internalType": "uint256",
-                        "name": "lzTokenFee",
-                        "type": "uint256",
-                    },
-                ],
-                "internalType": "struct MessagingFee",
-                "name": "_fee",
-                "type": "tuple",
-            },
-            {"internalType": "address", "name": "_refundAddress", "type": "address"},
-        ],
-        "name": "send",
-        "outputs": [
-            {
-                "components": [
-                    {"internalType": "bytes32", "name": "guid", "type": "bytes32"},
-                    {"internalType": "uint64", "name": "nonce", "type": "uint64"},
-                    {
-                        "components": [
-                            {
-                                "internalType": "uint256",
-                                "name": "nativeFee",
-                                "type": "uint256",
-                            },
-                            {
-                                "internalType": "uint256",
-                                "name": "lzTokenFee",
-                                "type": "uint256",
-                            },
-                        ],
-                        "internalType": "struct MessagingFee",
-                        "name": "fee",
-                        "type": "tuple",
-                    },
-                ],
-                "internalType": "struct MessagingReceipt",
-                "name": "",
-                "type": "tuple",
-            },
-            {
-                "components": [
-                    {
-                        "internalType": "uint256",
-                        "name": "amountSentLD",
-                        "type": "uint256",
-                    },
-                    {
-                        "internalType": "uint256",
-                        "name": "amountReceivedLD",
-                        "type": "uint256",
-                    },
-                ],
-                "internalType": "struct OFTReceipt",
-                "name": "",
-                "type": "tuple",
-            },
-        ],
-        "stateMutability": "payable",
-        "type": "function",
-    },
-    {
-        "inputs": [],
-        "name": "sharedDecimals",
-        "outputs": [{"internalType": "uint8", "name": "", "type": "uint8"}],
-        "stateMutability": "view",
-        "type": "function",
-    },
-    {
-        "inputs": [],
-        "name": "decimalConversionRate",
-        "outputs": [{"internalType": "uint256", "name": "", "type": "uint256"}],
-        "stateMutability": "view",
-        "type": "function",
-    },
-]
+# LayerZero OFT bridge (HyperEVM native HYPE -> Arbitrum OFT HYPE)
+# HYPE_OFT_ADDRESS imported from contracts.py
+# ABI lives in `wayfinder_paths/core/constants/hype_oft_abi.py`.
 
 # ─────────────────────────────────────────────────────────────────────────────
 # GAS CONFIGURATION