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

wayfinder_paths/strategies/moonwell_wsteth_loop_strategy/test_strategy.py

@@ -523,7 +523,8 @@ async def test_atomic_deposit_iteration_swaps_from_eth_when_borrow_surfaces_as_e
         WSTETH_TOKEN_ID: 0,
     }
 
-    async def get_balance_side_effect(*, token_id: str, wallet_address: str, **_):
+    async def get_balance_side_effect(*, query: str, wallet_address: str, **_):
+        token_id = query if isinstance(query, str) else (query or {}).get("token_id")
         return (True, balances.get(token_id, 0))
 
     strategy.balance_adapter.get_balance = AsyncMock(
@@ -587,7 +588,8 @@ async def test_complete_unpaired_weth_borrow_uses_eth_inventory(
         WSTETH_TOKEN_ID: 0,
     }
 
-    async def get_balance_side_effect(*, token_id: str, wallet_address: str):
+    async def get_balance_side_effect(*, query: str, wallet_address: str):
+        token_id = query if isinstance(query, str) else (query or {}).get("token_id")
         return (True, balances.get(token_id, 0))
 
     strategy.balance_adapter.get_balance = AsyncMock(
@@ -631,8 +633,10 @@ async def test_sweep_token_balances_sweeps_tokens(strategy, mock_adapter_respons
     strategy.min_withdraw_usd = 1.0
 
     # Mock balance returns (has some WETH dust)
-    def balance_side_effect(token_id, wallet_address):
-        if "weth" in token_id.lower():
+    def balance_side_effect(*, query, wallet_address, **_):
+        token_id = query if isinstance(query, str) else (query or {}).get("token_id")
+        token_id_str = (token_id or "").lower()
+        if "weth" in token_id_str:
             return (True, 100 * 10**18)  # 100 WETH
         return (True, 0)
 
@@ -751,7 +755,8 @@ async def test_partial_liquidate_prefers_wsteth_when_excess(strategy):
     # Wallet balances (raw)
     balances: dict[str, int] = {USDC_TOKEN_ID: 0, WSTETH_TOKEN_ID: 0}
 
-    async def mock_get_balance(*, token_id: str, wallet_address: str):
+    async def mock_get_balance(*, query: str, wallet_address: str):
+        token_id = query if isinstance(query, str) else (query or {}).get("token_id")
         return (True, balances.get(token_id, 0))
 
     strategy.balance_adapter.get_balance = AsyncMock(side_effect=mock_get_balance)
@@ -839,7 +844,8 @@ async def test_partial_liquidate_uses_usdc_collateral_when_no_wsteth_excess(stra
 
     balances: dict[str, int] = {USDC_TOKEN_ID: 0}
 
-    async def mock_get_balance(*, token_id: str, wallet_address: str):
+    async def mock_get_balance(*, query: str, wallet_address: str):
+        token_id = query if isinstance(query, str) else (query or {}).get("token_id")
         return (True, balances.get(token_id, 0))
 
     strategy.balance_adapter.get_balance = AsyncMock(side_effect=mock_get_balance)

wayfinder_paths/strategies/stablecoin_yield_strategy/README.md

@@ -62,7 +62,7 @@ Transactions are scoped to the strategy wallet and Enso Router approval/swap cal
 ### Withdraw
 
 - Requires a prior deposit (the strategy tracks `self.DEPOSIT_USDC`).
-- Reads the pool balance via `BalanceAdapter.get_pool_balance`, unwinds via BRAP swaps back to USDC, and moves USDC from the strategy wallet to the main wallet via `BalanceAdapter.move_from_strategy_wallet_to_main_wallet`.
+- Reads the pool balance via `BalanceAdapter.get_balance` (with pool address and chain_id), unwinds via BRAP swaps back to USDC, and moves USDC from the strategy wallet to the main wallet via `BalanceAdapter.move_from_strategy_wallet_to_main_wallet`.
 - Updates the ledger and clears cached pool state.
 
 ## Running locally
@@ -71,7 +71,7 @@ Transactions are scoped to the strategy wallet and Enso Router approval/swap cal
 # Install dependencies
 poetry install
 
-# Generate main wallet (writes wallets.json)
+# Generate main wallet (writes config.json)
 # Creates a main wallet (or use 'just create-strategy' which auto-creates wallets)
 poetry run python wayfinder_paths/scripts/make_wallets.py -n 1
 
@@ -86,4 +86,4 @@ poetry run python wayfinder_paths/run_strategy.py stablecoin_yield_strategy --ac
 poetry run python wayfinder_paths/run_strategy.py stablecoin_yield_strategy --action update --config $(pwd)/config.json
 ```
 
-Wallet addresses are auto-populated from `wallets.json` when you run `wayfinder_paths/scripts/make_wallets.py`. Set `NETWORK=testnet` in `config.json` to dry-run operations against mocked services.
+Wallet addresses are auto-populated from `config.json` when you run `wayfinder_paths/scripts/make_wallets.py`. Set `NETWORK=testnet` in `config.json` to dry-run operations against mocked services.

wayfinder_paths/strategies/stablecoin_yield_strategy/strategy.py

@@ -65,6 +65,7 @@ class StablecoinYieldStrategy(Strategy):
             f"Continuously optimizes positions for maximum stable yield while avoiding impermanent loss. "
             f"Min: {MIN_AMOUNT_USDC} USDC + ETH gas. Filters for ${MIN_TVL:,}+ TVL protocols."
         ),
+        risk_description=f"Protocol risk is always present when engaging with DeFi strategies, this includes underlying DeFi protocols and Wayfinder itself. Additional risks include temporary yield fluctuations, gas costs during rebalancing, and potential brief capital lock-up during protocol transitions. Strategy filters for protocols with a minimum TVL of ${MIN_TVL:,} to ensure low-risk exposure.",
         gas_token_symbol="ETH",
         gas_token_id="ethereum-base",
         deposit_token_id="usd-coin-base",
@@ -156,9 +157,8 @@ class StablecoinYieldStrategy(Strategy):
         main_wallet: dict[str, Any] | None = None,
         strategy_wallet: dict[str, Any] | None = None,
         web3_service=None,
-        api_key: str | None = None,
     ):
-        super().__init__(api_key=api_key)
+        super().__init__()
         merged_config: dict[str, Any] = dict(config or {})
         if main_wallet is not None:
             merged_config["main_wallet"] = main_wallet
@@ -270,7 +270,7 @@ class StablecoinYieldStrategy(Strategy):
         for token_id in self.tracked_token_ids:
             try:
                 success, balance_wei = await self.balance_adapter.get_balance(
-                    token_id=token_id,
+                    query=token_id,
                     wallet_address=strategy_address,
                 )
                 if success and balance_wei:
@@ -303,8 +303,8 @@ class StablecoinYieldStrategy(Strategy):
             success, deposit_data = await self.ledger_adapter.get_strategy_net_deposit(
                 wallet_address=strategy_address,
             )
-            if success:
-                self.DEPOSIT_USDC = deposit_data.get("net_deposit", 0)
+            if success and deposit_data is not None:
+                self.DEPOSIT_USDC = float(deposit_data)
                 logger.info(f"Strategy net deposit: {self.DEPOSIT_USDC} USDC")
             else:
                 logger.error(f"Failed to fetch strategy net deposit: {deposit_data}")
@@ -359,8 +359,8 @@ class StablecoinYieldStrategy(Strategy):
                     f"Gas token loaded: {gas_token_data.get('symbol', 'Unknown')}"
                 )
                 # Track gas token (but don't count it as a strategy asset)
-                if self.gas_token.get("id"):
-                    self._track_token(self.gas_token.get("id"))
+                if self.gas_token.get("token_id"):
+                    self._track_token(self.gas_token.get("token_id"))
             else:
                 logger.warning("Failed to fetch gas token info, using empty dict")
                 self.gas_token = {}
@@ -427,35 +427,46 @@ class StablecoinYieldStrategy(Strategy):
                 self._track_token(token_info.get("token_id"))
 
             success, reports = await self.pool_adapter.get_pools_by_ids(
-                pool_ids=[self.current_pool.get("token_id")],
-                merge_external=False,
+                pool_ids=[self.current_pool.get("token_id")]
             )
             if success and reports.get("pools"):
                 self.current_pool_data = reports.get("pools", [])[0]
 
-        identifiers = []
+        pool_ids = []
         pool_id = self.current_pool.get("token_id", None)
         if isinstance(pool_id, str):
-            identifiers.append(pool_id)
+            pool_ids.append(pool_id)
 
         pool_address = self.current_pool.get("address", None)
         pool_chain = self.current_pool.get("chain", None)
         chain_code = ((pool_chain or {}).get("code")) or None
         if isinstance(pool_address, str) and isinstance(chain_code, str):
-            identifiers.append(f"{chain_code.lower()}_{pool_address.lower()}")
+            pool_ids.append(f"{chain_code.lower()}_{pool_address.lower()}")
 
         llama_report = None
-        if identifiers:
-            success, llama_reports = await self.pool_adapter.get_llama_reports(
-                identifiers=identifiers
+        if pool_ids:
+            success, pool_list_response = await self.pool_adapter.get_pools_by_ids(
+                pool_ids=pool_ids
             )
-            if success:
-                for identifier in identifiers:
+            if success and isinstance(pool_list_response, dict):
+                pools = pool_list_response.get("pools", [])
+                # Search for matching pool by id or constructed identifier
+                for identifier in pool_ids:
                     if not isinstance(identifier, str):
                         continue
-                    report = llama_reports.get(identifier.lower(), None)
-                    if report:
-                        llama_report = report
+                    identifier_lower = identifier.lower()
+                    for pool in pools:
+                        pool_id = pool.get("id", "").lower()
+                        pool_address = pool.get("address", "").lower()
+                        pool_chain_code = pool.get("chain_code", "").lower()
+                        constructed_id = f"{pool_chain_code}_{pool_address}"
+                        if (
+                            pool_id == identifier_lower
+                            or constructed_id == identifier_lower
+                        ):
+                            llama_report = pool
+                            break
+                    if llama_report:
                         break
 
         if self.current_pool_data is None and llama_report:
@@ -464,14 +475,21 @@ class StablecoinYieldStrategy(Strategy):
                 "llama_report": llama_report,
             }
 
-        if llama_report and llama_report.get("llama_combined_apy_pct") is not None:
+        if llama_report and llama_report.get("combined_apy_pct") is not None:
             self.current_combined_apy_pct = (
-                llama_report.get("llama_combined_apy_pct", 0) / 100
+                llama_report.get("combined_apy_pct", 0) / 100
             )
-        elif llama_report and llama_report.get("llama_apy_pct") is not None:
-            self.current_combined_apy_pct = llama_report.get("llama_apy_pct", 0) / 100
+        elif llama_report and llama_report.get("apy") is not None:
+            self.current_combined_apy_pct = llama_report.get("apy", 0) / 100
         elif self.current_pool_data:
-            self.current_combined_apy_pct = self.current_pool_data.get("apy", 0)
+            apy_pct = self.current_pool_data.get("combined_apy_pct")
+            if apy_pct is not None:
+                self.current_combined_apy_pct = float(apy_pct) / 100
+            else:
+                apy_val = self.current_pool_data.get("apy", 0)
+                self.current_combined_apy_pct = (
+                    float(apy_val) / 100 if apy_val is not None else 0
+                )
 
         pool_address = self.current_pool.get("address")
         chain_id = self.current_pool.get("chain", {}).get("id")
@@ -486,10 +504,10 @@ class StablecoinYieldStrategy(Strategy):
                 (
                     success,
                     current_pool_balance_raw,
-                ) = await self.balance_adapter.get_pool_balance(
-                    pool_address=pool_address,
+                ) = await self.balance_adapter.get_balance(
+                    query=pool_address,
+                    wallet_address=user_address,
                     chain_id=chain_id,
-                    user_address=user_address,
                 )
                 self.current_pool_balance = current_pool_balance_raw if success else 0
             except Exception as e:
@@ -525,8 +543,8 @@ class StablecoinYieldStrategy(Strategy):
             self.current_pool_balance = inferred_balance
             if inferred_entry:
                 self.current_pool_data = inferred_entry
-                llama_combined = inferred_entry.get("llama_combined_apy_pct")
-                llama_apy = inferred_entry.get("llama_apy_pct")
+                llama_combined = inferred_entry.get("combined_apy_pct")
+                llama_apy = inferred_entry.get("apy")
                 if llama_combined is not None:
                     self.current_combined_apy_pct = float(llama_combined) / 100
                 elif llama_apy is not None:
@@ -535,7 +553,7 @@ class StablecoinYieldStrategy(Strategy):
 
         if self.usdc_token_info:
             status, raw_balance = await self.balance_adapter.get_balance(
-                token_id=self.usdc_token_info.get("token_id"),
+                query=self.usdc_token_info.get("token_id"),
                 wallet_address=self._get_strategy_wallet_address(),
             )
             if not status or not raw_balance:
@@ -578,7 +596,7 @@ class StablecoinYieldStrategy(Strategy):
             await self._refresh_tracked_balances()
 
             usdc_token_id = self.usdc_token_info.get("token_id")
-            gas_token_id = self.gas_token.get("id") if self.gas_token else None
+            gas_token_id = self.gas_token.get("token_id") if self.gas_token else None
 
             best_token_id = None
             best_balance_wei = 0
@@ -609,7 +627,7 @@ class StablecoinYieldStrategy(Strategy):
             strategy_address = self._get_strategy_wallet_address()
             try:
                 success, onchain_balance = await self.balance_adapter.get_balance(
-                    token_id=token.get("token_id"),
+                    query=token.get("token_id"),
                     wallet_address=strategy_address,
                 )
                 if success and onchain_balance:
@@ -635,7 +653,7 @@ class StablecoinYieldStrategy(Strategy):
         token_id = balance.get("token_id")
         if (
             isinstance(token_id, str)
-            and token_id.lower() == self.gas_token.get("id", "").lower()
+            and token_id.lower() == self.gas_token.get("token_id", "").lower()
         ):
             return True
 
@@ -680,7 +698,7 @@ class StablecoinYieldStrategy(Strategy):
                 "address": token_info.get("address"),
                 "chain": token_info.get("chain"),
             }
-            gas_token_id = self.gas_token.get("id")
+            gas_token_id = self.gas_token.get("token_id")
             logger.info(
                 f"Current pool set to: {token_info.get('symbol')} on {token_info.get('chain', {}).get('name')}"
             )
@@ -692,7 +710,7 @@ class StablecoinYieldStrategy(Strategy):
                     main_usdc_status,
                     main_usdc_balance,
                 ) = await self.balance_adapter.get_balance(
-                    token_id=token_info.get("token_id"),
+                    query=token_info.get("token_id"),
                     wallet_address=self._get_main_wallet_address(),
                 )
                 if main_usdc_status and main_usdc_balance is not None:
@@ -737,7 +755,7 @@ class StablecoinYieldStrategy(Strategy):
                     _,
                     main_gas_raw,
                 ) = await self.balance_adapter.get_balance(
-                    token_id=gas_token_id,
+                    query=gas_token_id,
                     wallet_address=self._get_main_wallet_address(),
                 )
                 main_gas_int = (
@@ -762,14 +780,14 @@ class StablecoinYieldStrategy(Strategy):
                     _,
                     main_gas_raw,
                 ) = await self.balance_adapter.get_balance(
-                    token_id=gas_token_id,
+                    query=gas_token_id,
                     wallet_address=self._get_main_wallet_address(),
                 )
                 (
                     _,
                     strategy_gas_raw,
                 ) = await self.balance_adapter.get_balance(
-                    token_id=gas_token_id,
+                    query=gas_token_id,
                     wallet_address=self._get_strategy_wallet_address(),
                 )
                 main_gas_int = (
@@ -895,10 +913,10 @@ class StablecoinYieldStrategy(Strategy):
             (
                 _,
                 self.current_pool_balance,
-            ) = await self.balance_adapter.get_pool_balance(
-                pool_address=self.current_pool.get("address"),
+            ) = await self.balance_adapter.get_balance(
+                query=self.current_pool.get("address"),
+                wallet_address=self._get_strategy_wallet_address(),
                 chain_id=self.current_pool.get("chain").get("id"),
-                user_address=self._get_strategy_wallet_address(),
             )
             logger.info(f"Current pool balance: {self.current_pool_balance}")
         except Exception as e:
@@ -931,8 +949,8 @@ class StablecoinYieldStrategy(Strategy):
                     )
                     if (
                         success
-                        and quotes.get("quotes")
-                        and quotes.get("quotes").get("best_quote")
+                        and isinstance(quotes, dict)
+                        and quotes.get("best_quote")
                     ):
                         logger.info("Successfully obtained swap quote")
                         break
@@ -941,7 +959,7 @@ class StablecoinYieldStrategy(Strategy):
                     if attempt == 3:  # Last attempt
                         logger.error("All quote attempts failed")
 
-            best_quote = quotes.get("quotes").get("best_quote")
+            best_quote = quotes.get("best_quote") if isinstance(quotes, dict) else None
             if not best_quote:
                 return (
                     False,
@@ -998,7 +1016,7 @@ class StablecoinYieldStrategy(Strategy):
         if self.usdc_token_info.get("token_id") in withdrawn_token_ids:
             pass
         status, raw_balance = await self.balance_adapter.get_balance(
-            token_id=self.usdc_token_info.get("token_id"),
+            query=self.usdc_token_info.get("token_id"),
             wallet_address=self._get_strategy_wallet_address(),
         )
         if not status or not raw_balance:
@@ -1025,9 +1043,9 @@ class StablecoinYieldStrategy(Strategy):
         )
         withdrawn_token_ids.add(self.usdc_token_info.get("token_id"))
 
-        if self.gas_token and self.gas_token.get("id") not in withdrawn_token_ids:
+        if self.gas_token and self.gas_token.get("token_id") not in withdrawn_token_ids:
             status, raw_gas = await self.balance_adapter.get_balance(
-                token_id=self.gas_token.get("id"),
+                query=self.gas_token.get("token_id"),
                 wallet_address=self._get_strategy_wallet_address(),
             )
             if status and raw_gas:
@@ -1039,7 +1057,7 @@ class StablecoinYieldStrategy(Strategy):
                         move_gas_status,
                         move_gas_message,
                     ) = await self.balance_adapter.move_from_strategy_wallet_to_main_wallet(
-                        self.gas_token.get("id"),
+                        self.gas_token.get("token_id"),
                         gas_amount,
                         strategy_name=self.name,
                     )
@@ -1051,7 +1069,7 @@ class StablecoinYieldStrategy(Strategy):
                                 float(gas_amount),
                             )
                         )
-                        withdrawn_token_ids.add(self.gas_token.get("id"))
+                        withdrawn_token_ids.add(self.gas_token.get("token_id"))
 
         self.DEPOSIT_USDC = 0
         self.current_pool_balance = 0
@@ -1206,10 +1224,17 @@ class StablecoinYieldStrategy(Strategy):
         else:
             self.current_pool_data = None
         if self.current_pool_data:
-            self.current_combined_apy_pct = self.current_pool_data.get("apy", 0)
+            apy_pct = self.current_pool_data.get("combined_apy_pct")
+            if apy_pct is not None:
+                self.current_combined_apy_pct = float(apy_pct) / 100
+            else:
+                apy_val = self.current_pool_data.get("apy", 0)
+                self.current_combined_apy_pct = (
+                    float(apy_val) / 100 if apy_val is not None else 0
+                )
         else:
             self.current_combined_apy_pct = (
-                target_pool_data.get("llama_combined_apy_pct", 0) / 100
+                target_pool_data.get("combined_apy_pct", 0) / 100
                 if target_pool_data
                 else 0
             )
@@ -1242,10 +1267,10 @@ class StablecoinYieldStrategy(Strategy):
             (
                 _,
                 refreshed_pool_balance,
-            ) = await self.balance_adapter.get_pool_balance(
-                pool_address=pool.get("address"),
+            ) = await self.balance_adapter.get_balance(
+                query=pool.get("address"),
+                wallet_address=strategy_address,
                 chain_id=pool.get("chain").get("id"),
-                user_address=strategy_address,
             )
             self.current_pool_balance = int(refreshed_pool_balance)
         except Exception:
@@ -1259,7 +1284,7 @@ class StablecoinYieldStrategy(Strategy):
         target_token_id = target_token.get("token_id")
         target_chain = target_token.get("chain").get("code", "").lower()
         target_address = target_token.get("address", "").lower()
-        gas_token_id = self.gas_token.get("id") if self.gas_token else None
+        gas_token_id = self.gas_token.get("token_id") if self.gas_token else None
 
         # Swap all non-target, non-gas tokens to the target
         for token_id, balance_wei in list(self.tracked_balances.items()):
@@ -1278,7 +1303,7 @@ class StablecoinYieldStrategy(Strategy):
             # Get fresh balance to ensure accuracy
             try:
                 success, fresh_balance = await self.balance_adapter.get_balance(
-                    token_id=token_id,
+                    query=token_id,
                     wallet_address=self._get_strategy_wallet_address(),
                 )
                 if not success or not fresh_balance or int(fresh_balance) <= 0:
@@ -1318,7 +1343,7 @@ class StablecoinYieldStrategy(Strategy):
         # Refresh target token balance
         try:
             success, target_balance = await self.balance_adapter.get_balance(
-                token_id=target_token_id,
+                query=target_token_id,
                 wallet_address=self._get_strategy_wallet_address(),
             )
             if success and target_balance:
@@ -1335,7 +1360,7 @@ class StablecoinYieldStrategy(Strategy):
 
         required_gas = int(self.MIN_GAS * (10 ** self.gas_token.get("decimals")))
         _, current_gas = await self.balance_adapter.get_balance(
-            token_id=self.gas_token.get("id"),
+            query=self.gas_token.get("token_id"),
             wallet_address=strategy_address,
         )
         if current_gas >= required_gas:
@@ -1395,7 +1420,11 @@ class StablecoinYieldStrategy(Strategy):
         if not success:
             return 0.0
 
-        best_quote = exit_quotes.get("quotes").get("best_quote")
+        best_quote = (
+            exit_quotes.get("best_quote") if isinstance(exit_quotes, dict) else None
+        )
+        if not best_quote:
+            return None
         current_pool_usd_value = best_quote.get("output_amount")
 
         return float(
@@ -1407,7 +1436,7 @@ class StablecoinYieldStrategy(Strategy):
         # Refresh tracked balances
         await self._refresh_tracked_balances()
 
-        gas_token_id = self.gas_token.get("id") if self.gas_token else None
+        gas_token_id = self.gas_token.get("token_id") if self.gas_token else None
         results = []
 
         for token_id, balance_wei in self.tracked_balances.items():
@@ -1440,21 +1469,24 @@ class StablecoinYieldStrategy(Strategy):
         return results
 
     async def _find_best_pool(self) -> tuple[bool, dict[str, Any]]:
-        success, llama_data = await self.pool_adapter.get_llama_matches()
+        chain_id = (self.usdc_token_info or {}).get("chain", {}).get("id")
+        if chain_id is None:
+            chain_id = 8453
+        success, llama_data = await self.pool_adapter.get_pools(chain_id=chain_id)
         if not success:
             return False, {"message": f"Failed to fetch Llama data: {llama_data}"}
 
         llama_pools = [
             pool
             for pool in llama_data.get("matches", [])
-            if pool.get("llama_stablecoin")
-            and pool.get("llama_il_risk") == "no"
-            and pool.get("llama_tvl_usd") > self.MIN_TVL
-            and pool.get("llama_apy_pct") > self.DUST_APY
+            if pool.get("stablecoin")
+            and pool.get("ilRisk") == "no"
+            and pool.get("tvlUsd") > self.MIN_TVL
+            and pool.get("combined_apy_pct") > self.DUST_APY
             and pool.get("network", "").lower() in self.SUPPORTED_NETWORK_CODES
         ]
         llama_pools = sorted(
-            llama_pools, key=lambda pool: pool.get("llama_apy_pct"), reverse=True
+            llama_pools, key=lambda pool: pool.get("combined_apy_pct"), reverse=True
         )
         if not llama_pools:
             return False, {"message": "No suitable pools found."}
@@ -1469,11 +1501,11 @@ class StablecoinYieldStrategy(Strategy):
                 )
                 if not target_status and candidate.get("token_id"):
                     target_status, target_pool = await self.token_adapter.get_token(
-                        token_id=candidate.get("token_id")
+                        query=candidate.get("token_id")
                     )
                 if not target_status and candidate.get("pool_id"):
                     target_status, target_pool = await self.token_adapter.get_token(
-                        token_id=candidate.get("pool_id")
+                        query=candidate.get("pool_id")
                     )
                 if not target_status:
                     continue
@@ -1515,7 +1547,8 @@ class StablecoinYieldStrategy(Strategy):
             return None
 
         try:
-            combined_apy_pct = pool_data.get("llama_combined_apy_pct") / 100
+            apy_pct = pool_data.get("combined_apy_pct") or pool_data.get("apy") or 0
+            combined_apy_pct = float(apy_pct) / 100
             success, quotes = await self.brap_adapter.get_swap_quote(
                 from_token_address=current_token.get("address"),
                 to_token_address=token.get("address"),
@@ -1527,10 +1560,9 @@ class StablecoinYieldStrategy(Strategy):
             )
             if not success:
                 return None
-            quotes_data = quotes.get("quotes") if isinstance(quotes, dict) else None
-            if not isinstance(quotes_data, dict):
+            if not isinstance(quotes, dict):
                 return None
-            best_quote = quotes_data.get("best_quote")
+            best_quote = quotes.get("best_quote")
             if not best_quote:
                 return None
 
@@ -1582,7 +1614,7 @@ class StablecoinYieldStrategy(Strategy):
     async def _status(self) -> StatusDict:
         # Get ETH gas balance
         gas_success, gas_balance_wei = await self.balance_adapter.get_balance(
-            token_id=self.gas_token.get("id"),
+            query=self.gas_token.get("token_id"),
             wallet_address=self._get_strategy_wallet_address(),
         )
         gas_balance = (
@@ -1611,7 +1643,7 @@ class StablecoinYieldStrategy(Strategy):
 
         # Calculate total value from tracked non-gas balances
         total_value = 0.0
-        gas_token_id = self.gas_token.get("id") if self.gas_token else None
+        gas_token_id = self.gas_token.get("token_id") if self.gas_token else None
 
         for token_id, balance_wei in self.tracked_balances.items():
             if token_id == gas_token_id:
@@ -1680,7 +1712,7 @@ class StablecoinYieldStrategy(Strategy):
 
         usdc_token_id = self.usdc_token_info.get("token_id")
         usdc_decimals = self.usdc_token_info.get("decimals")
-        gas_token_id = self.gas_token.get("id") if self.gas_token else None
+        gas_token_id = self.gas_token.get("token_id") if self.gas_token else None
 
         # Check current USDC balance
         available_usdc_wei = self.tracked_balances.get(usdc_token_id, 0)
@@ -1745,7 +1777,7 @@ class StablecoinYieldStrategy(Strategy):
 
         # Refresh USDC balance after swaps
         success, usdc_wei = await self.balance_adapter.get_balance(
-            token_id=usdc_token_id,
+            query=usdc_token_id,
             wallet_address=self._get_strategy_wallet_address(),
         )
         if success and usdc_wei:
@@ -1790,7 +1822,7 @@ class StablecoinYieldStrategy(Strategy):
 
                 # Refresh USDC balance again
                 success, usdc_wei = await self.balance_adapter.get_balance(
-                    token_id=usdc_token_id,
+                    query=usdc_token_id,
                     wallet_address=self._get_strategy_wallet_address(),
                 )
                 if success and usdc_wei: