fix: Improve decimal precision handling across all exchange clients
- Add strict_precision parameter to _dec_str methods - Modify quantity normalization methods to return (Decimal, precision) tuple - Infer precision from stepSize/lotSz/qtyStep for accurate formatting - Update all order placement methods to use precision information - Fix LOT_SIZE filter errors by strictly limiting decimal places Affected exchanges: - Binance Spot & Futures - OKX - Bybit - Bitget Spot & Futures - Deepcoin This ensures order quantities are formatted with correct precision matching exchange requirements.
This commit is contained in:
TIANHE
@@ -74,15 +74,35 @@ class DeepcoinClient(BaseRestClient):
|
||||
return Decimal("0")
|
||||
|
||||
@staticmethod
|
||||
def _dec_str(d: Decimal, max_decimals: int = 18) -> str:
|
||||
def _dec_str(d: Decimal, max_decimals: int = 18, strict_precision: Optional[int] = None) -> str:
|
||||
"""
|
||||
Convert Decimal to string with controlled precision.
|
||||
Deepcoin requires quantities to match lotSz/qtyStep precision.
|
||||
|
||||
Args:
|
||||
d: Decimal value to format
|
||||
max_decimals: Maximum decimal places (fallback if strict_precision not provided)
|
||||
strict_precision: If provided, strictly limit to this many decimal places
|
||||
"""
|
||||
try:
|
||||
if d == 0:
|
||||
return "0"
|
||||
normalized = d.normalize()
|
||||
|
||||
if strict_precision is not None:
|
||||
try:
|
||||
prec = int(strict_precision)
|
||||
if 0 <= prec <= 18:
|
||||
from decimal import ROUND_DOWN
|
||||
q = Decimal("1").scaleb(-prec)
|
||||
quantized = normalized.quantize(q, rounding=ROUND_DOWN)
|
||||
s = format(quantized, f".{prec}f")
|
||||
if '.' in s:
|
||||
s = s.rstrip('0').rstrip('.')
|
||||
return s if s else "0"
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
s = format(normalized, f".{max_decimals}f")
|
||||
if '.' in s:
|
||||
s = s.rstrip('0').rstrip('.')
|
||||
@@ -92,6 +112,16 @@ class DeepcoinClient(BaseRestClient):
|
||||
f = float(d)
|
||||
if f == 0:
|
||||
return "0"
|
||||
if strict_precision is not None:
|
||||
try:
|
||||
prec = int(strict_precision)
|
||||
if 0 <= prec <= 18:
|
||||
s = format(f, f".{prec}f")
|
||||
if '.' in s:
|
||||
s = s.rstrip('0').rstrip('.')
|
||||
return s if s else "0"
|
||||
except Exception:
|
||||
pass
|
||||
s = format(f, f".{max_decimals}f")
|
||||
if '.' in s:
|
||||
s = s.rstrip('0').rstrip('.')
|
||||
@@ -101,6 +131,16 @@ class DeepcoinClient(BaseRestClient):
|
||||
if 'e' in s.lower() or 'E' in s:
|
||||
try:
|
||||
f = float(s)
|
||||
if strict_precision is not None:
|
||||
try:
|
||||
prec = int(strict_precision)
|
||||
if 0 <= prec <= 18:
|
||||
s = format(f, f".{prec}f")
|
||||
if '.' in s:
|
||||
s = s.rstrip('0').rstrip('.')
|
||||
return s if s else "0"
|
||||
except Exception:
|
||||
pass
|
||||
s = format(f, f".{max_decimals}f")
|
||||
if '.' in s:
|
||||
s = s.rstrip('0').rstrip('.')
|
||||
@@ -366,13 +406,16 @@ class DeepcoinClient(BaseRestClient):
|
||||
except Exception:
|
||||
return {}
|
||||
|
||||
def _normalize_qty(self, *, symbol: str, qty: float) -> Decimal:
|
||||
def _normalize_qty(self, *, symbol: str, qty: float) -> Tuple[Decimal, Optional[int]]:
|
||||
"""
|
||||
Normalize order quantity to exchange requirements.
|
||||
|
||||
Returns:
|
||||
Tuple of (normalized_quantity, precision) where precision is the number of decimal places required.
|
||||
"""
|
||||
q = self._to_dec(qty)
|
||||
if q <= 0:
|
||||
return Decimal("0")
|
||||
return (Decimal("0"), None)
|
||||
|
||||
sym = to_deepcoin_symbol(symbol)
|
||||
try:
|
||||
@@ -386,9 +429,28 @@ class DeepcoinClient(BaseRestClient):
|
||||
|
||||
if step > 0:
|
||||
q = self._floor_to_step(q, step)
|
||||
|
||||
# Infer precision from step
|
||||
qty_precision = None
|
||||
if step > 0:
|
||||
try:
|
||||
step_normalized = step.normalize()
|
||||
step_str = str(step_normalized)
|
||||
if '.' in step_str:
|
||||
decimal_part = step_str.split('.')[1]
|
||||
qty_precision = len(decimal_part)
|
||||
if qty_precision < 0:
|
||||
qty_precision = 0
|
||||
if qty_precision > 18:
|
||||
qty_precision = 18
|
||||
else:
|
||||
qty_precision = 0
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
if mn > 0 and q < mn:
|
||||
return Decimal("0")
|
||||
return q
|
||||
return (Decimal("0"), qty_precision)
|
||||
return (q, qty_precision)
|
||||
|
||||
def place_market_order(
|
||||
self,
|
||||
@@ -419,7 +481,7 @@ class DeepcoinClient(BaseRestClient):
|
||||
raise LiveTradingError(f"Invalid side: {side}")
|
||||
|
||||
q_req = float(qty or 0.0)
|
||||
q_dec = self._normalize_qty(symbol=symbol, qty=q_req)
|
||||
q_dec, qty_precision = self._normalize_qty(symbol=symbol, qty=q_req)
|
||||
if float(q_dec or 0) <= 0:
|
||||
raise LiveTradingError(f"Invalid qty (below step/min): requested={q_req}")
|
||||
|
||||
@@ -428,7 +490,7 @@ class DeepcoinClient(BaseRestClient):
|
||||
"tdMode": "cash" if self.market_type == "spot" else "cross",
|
||||
"side": sd,
|
||||
"ordType": "market",
|
||||
"sz": self._dec_str(q_dec),
|
||||
"sz": self._dec_str(q_dec, strict_precision=qty_precision),
|
||||
}
|
||||
|
||||
if self.market_type != "spot":
|
||||
@@ -480,7 +542,7 @@ class DeepcoinClient(BaseRestClient):
|
||||
if q_req <= 0 or px <= 0:
|
||||
raise LiveTradingError("Invalid qty/price")
|
||||
|
||||
q_dec = self._normalize_qty(symbol=symbol, qty=q_req)
|
||||
q_dec, qty_precision = self._normalize_qty(symbol=symbol, qty=q_req)
|
||||
if float(q_dec or 0) <= 0:
|
||||
raise LiveTradingError(f"Invalid qty (below step/min): requested={q_req}")
|
||||
|
||||
@@ -489,7 +551,7 @@ class DeepcoinClient(BaseRestClient):
|
||||
"tdMode": "cash" if self.market_type == "spot" else "cross",
|
||||
"side": sd,
|
||||
"ordType": "limit",
|
||||
"sz": self._dec_str(q_dec),
|
||||
"sz": self._dec_str(q_dec, strict_precision=qty_precision),
|
||||
"px": str(px),
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user