Resolve "Kraken: 'Held balance cannot exceed total balance' not true for auto-earn enabled accounts" (#81)

Author: btschwertfeger

src/infinity_grid/adapters/exchanges/kraken.py

@@ -301,8 +301,8 @@ def get_pair_balance(self: Self) -> PairBalanceSchema:
 
         FIXME: Is there a way to get the balances of the asset pair directly?
 
-        On Kraken, crypto assets are prefixed with 'X' (e.g., 'XETH', 'XXBT'),
-        while fiat assets are prefixed with 'Z' (e.g., 'ZEUR', 'ZUSD').
+        On Kraken, crypto assets are often prefixed with 'X' (e.g., 'XETH',
+        'XXBT'), while fiat assets are prefixed with 'Z' (e.g., 'ZEUR', 'ZUSD').
 
         Tokenized assets have a '.T' suffix
         https://docs.kraken.com/api/docs/rest-api/get-extended-balance/.
@@ -323,11 +323,24 @@ def get_pair_balance(self: Self) -> PairBalanceSchema:
         quote_balance = Decimal(0)
         quote_hold_trade = Decimal(0)
 
+        # {XXBT, XBT.F} or {XETH, ETH.F} or {AVAX, AVAX.F} or {DOT, DOT.F}
+        base_options = {custom_base}
+        if custom_base.startswith(("X", "Z")):
+            base_options |= {f"{custom_base[1:]}.F"}
+        else:
+            base_options |= {f"{custom_base}.F"}
+
+        quote_options = {custom_quote}
+        if custom_quote.startswith(("X", "Z")):
+            quote_options |= {f"{custom_quote[1:]}.F"}
+        else:
+            quote_options |= {f"{custom_quote}.F"}
+
         for balance in self.get_balances():
-            if balance.asset in {custom_base, f"{custom_base}.F"}:
+            if balance.asset in base_options:
                 base_balance += Decimal(balance.balance)
                 base_hold_trade += Decimal(balance.hold_trade)
-            elif balance.asset in {custom_quote, f"{custom_quote}.F"}:
+            elif balance.asset in quote_options:
                 quote_balance += Decimal(balance.balance)
                 quote_hold_trade += Decimal(balance.hold_trade)
 

src/infinity_grid/models/exchange.py

@@ -44,13 +44,10 @@ class AssetPairInfoSchema(BaseModel):
 
     base: str  #: The base currency, e.g. "XXBT"
     quote: str  #: The quote currency, e.g. "ZUSD"
-    aclass_base: (
-        str  #: The asset class of the base (e.g. "currency", "tokenized_asset")
-    )
-    aclass_quote: (
-        str  #: The asset class of the quote (e.g. "currency", "tokenized_asset")
-    )
-
+    #: The asset class of the base (e.g. "currency", "tokenized_asset")
+    aclass_base: str
+    #: The asset class of the quote (e.g. "currency", "tokenized_asset")
+    aclass_quote: str
     lot_decimals: int  #: Number of decimals for lot/base size, e.g. 8
     cost_decimals: int  #: Number of decimals for cost/quote, e.g. 5
     #: Fees for maker orders, e.g. [[0, 0.25], [10000, 0.2], ...]
@@ -123,19 +120,6 @@ class PairBalanceSchema(BaseModel):
         description="Available quote asset balance",
     )
 
-    @model_validator(mode="after")
-    def validate_available_balances(self) -> Self:
-        """Validate that available balances don't exceed total balances"""
-        if self.base_available > self.base_balance:
-            raise ValueError(
-                f"Available base balance ({self.base_available}) cannot exceed total base balance ({self.base_balance})",
-            )
-        if self.quote_available > self.quote_balance:
-            raise ValueError(
-                f"Available quote balance ({self.quote_available}) cannot exceed total quote balance ({self.quote_balance})",
-            )
-        return self
-
 
 class AssetBalanceSchema(BaseModel):
     """Schema for a single asset balance."""

tests/unit/test_exchange_models.py

@@ -161,16 +161,6 @@ def test_valid_pair_balance(self) -> None:
         assert balance.base_balance == 1.5
         assert balance.quote_balance == 75000.0
 
-    def test_available_balance_validation(self) -> None:
-        """Test that available balance cannot exceed total balance"""
-        with pytest.raises(ValidationError, match=r"cannot exceed total.*balance"):
-            PairBalanceSchema(
-                base_balance=1.0,
-                quote_balance=50000.0,
-                base_available=1.5,  # Exceeds base_balance
-                quote_available=25000.0,
-            )
-
     def test_negative_balances_fail(self) -> None:
         """Test that negative balances fail validation"""
         with pytest.raises(ValidationError):