mirror of
https://github.com/freqtrade/freqtrade.git
synced 2024-09-20 09:31:12 +00:00
feat: Add precision_mode_price column
This commit is contained in:
parent
6fc2a604b4
commit
f8de46cea9
|
@ -147,6 +147,9 @@ def migrate_trades_and_orders_table(
|
||||||
price_precision = get_column_def(cols, "price_precision", "null")
|
price_precision = get_column_def(cols, "price_precision", "null")
|
||||||
precision_mode = get_column_def(cols, "precision_mode", "null")
|
precision_mode = get_column_def(cols, "precision_mode", "null")
|
||||||
contract_size = get_column_def(cols, "contract_size", "null")
|
contract_size = get_column_def(cols, "contract_size", "null")
|
||||||
|
precision_mode_price = get_column_def(
|
||||||
|
cols, "precision_mode_price", get_column_def(cols, "precision_mode", "null")
|
||||||
|
)
|
||||||
|
|
||||||
# Schema migration necessary
|
# Schema migration necessary
|
||||||
with engine.begin() as connection:
|
with engine.begin() as connection:
|
||||||
|
@ -177,7 +180,7 @@ def migrate_trades_and_orders_table(
|
||||||
timeframe, open_trade_value, close_profit_abs,
|
timeframe, open_trade_value, close_profit_abs,
|
||||||
trading_mode, leverage, liquidation_price, is_short,
|
trading_mode, leverage, liquidation_price, is_short,
|
||||||
interest_rate, funding_fees, funding_fee_running, realized_profit,
|
interest_rate, funding_fees, funding_fee_running, realized_profit,
|
||||||
amount_precision, price_precision, precision_mode, contract_size,
|
amount_precision, price_precision, precision_mode, precision_mode_price, contract_size,
|
||||||
max_stake_amount
|
max_stake_amount
|
||||||
)
|
)
|
||||||
select id, lower(exchange), pair, {base_currency} base_currency,
|
select id, lower(exchange), pair, {base_currency} base_currency,
|
||||||
|
@ -207,8 +210,8 @@ def migrate_trades_and_orders_table(
|
||||||
{funding_fees} funding_fees, {funding_fee_running} funding_fee_running,
|
{funding_fees} funding_fees, {funding_fee_running} funding_fee_running,
|
||||||
{realized_profit} realized_profit,
|
{realized_profit} realized_profit,
|
||||||
{amount_precision} amount_precision, {price_precision} price_precision,
|
{amount_precision} amount_precision, {price_precision} price_precision,
|
||||||
{precision_mode} precision_mode, {contract_size} contract_size,
|
{precision_mode} precision_mode, {precision_mode_price} precision_mode_price,
|
||||||
{max_stake_amount} max_stake_amount
|
{contract_size} contract_size, {max_stake_amount} max_stake_amount
|
||||||
from {trade_back_name}
|
from {trade_back_name}
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
|
@ -348,8 +351,8 @@ def check_migrate(engine, decl_base, previous_tables) -> None:
|
||||||
# if ('orders' not in previous_tables
|
# if ('orders' not in previous_tables
|
||||||
# or not has_column(cols_orders, 'funding_fee')):
|
# or not has_column(cols_orders, 'funding_fee')):
|
||||||
migrating = False
|
migrating = False
|
||||||
# if not has_column(cols_trades, 'funding_fee_running'):
|
if not has_column(cols_trades, "precision_mode_price"):
|
||||||
if not has_column(cols_orders, "ft_order_tag"):
|
# if not has_column(cols_orders, "ft_order_tag"):
|
||||||
migrating = True
|
migrating = True
|
||||||
logger.info(
|
logger.info(
|
||||||
f"Running database migration for trades - "
|
f"Running database migration for trades - "
|
||||||
|
|
|
@ -433,6 +433,7 @@ class LocalTrade:
|
||||||
amount_precision: Optional[float] = None
|
amount_precision: Optional[float] = None
|
||||||
price_precision: Optional[float] = None
|
price_precision: Optional[float] = None
|
||||||
precision_mode: Optional[int] = None
|
precision_mode: Optional[int] = None
|
||||||
|
precision_mode_price: Optional[int] = None
|
||||||
contract_size: Optional[float] = None
|
contract_size: Optional[float] = None
|
||||||
|
|
||||||
# Leverage trading properties
|
# Leverage trading properties
|
||||||
|
@ -730,6 +731,7 @@ class LocalTrade:
|
||||||
"amount_precision": self.amount_precision,
|
"amount_precision": self.amount_precision,
|
||||||
"price_precision": self.price_precision,
|
"price_precision": self.price_precision,
|
||||||
"precision_mode": self.precision_mode,
|
"precision_mode": self.precision_mode,
|
||||||
|
"precision_mode_price": self.precision_mode_price,
|
||||||
"contract_size": self.contract_size,
|
"contract_size": self.contract_size,
|
||||||
"has_open_orders": self.has_open_orders,
|
"has_open_orders": self.has_open_orders,
|
||||||
"orders": orders_json,
|
"orders": orders_json,
|
||||||
|
@ -810,7 +812,7 @@ class LocalTrade:
|
||||||
stop_loss_norm = price_to_precision(
|
stop_loss_norm = price_to_precision(
|
||||||
new_loss,
|
new_loss,
|
||||||
self.price_precision,
|
self.price_precision,
|
||||||
self.precision_mode,
|
self.precision_mode_price,
|
||||||
rounding_mode=ROUND_DOWN if self.is_short else ROUND_UP,
|
rounding_mode=ROUND_DOWN if self.is_short else ROUND_UP,
|
||||||
)
|
)
|
||||||
# no stop loss assigned yet
|
# no stop loss assigned yet
|
||||||
|
@ -819,7 +821,7 @@ class LocalTrade:
|
||||||
self.initial_stop_loss = price_to_precision(
|
self.initial_stop_loss = price_to_precision(
|
||||||
stop_loss_norm,
|
stop_loss_norm,
|
||||||
self.price_precision,
|
self.price_precision,
|
||||||
self.precision_mode,
|
self.precision_mode_price,
|
||||||
rounding_mode=ROUND_DOWN if self.is_short else ROUND_UP,
|
rounding_mode=ROUND_DOWN if self.is_short else ROUND_UP,
|
||||||
)
|
)
|
||||||
self.initial_stop_loss_pct = -1 * abs(stoploss)
|
self.initial_stop_loss_pct = -1 * abs(stoploss)
|
||||||
|
@ -1562,6 +1564,7 @@ class LocalTrade:
|
||||||
amount_precision=data.get("amount_precision", None),
|
amount_precision=data.get("amount_precision", None),
|
||||||
price_precision=data.get("price_precision", None),
|
price_precision=data.get("price_precision", None),
|
||||||
precision_mode=data.get("precision_mode", None),
|
precision_mode=data.get("precision_mode", None),
|
||||||
|
precision_mode_price=data.get("precision_mode_price", data.get("precision_mode", None)),
|
||||||
contract_size=data.get("contract_size", None),
|
contract_size=data.get("contract_size", None),
|
||||||
)
|
)
|
||||||
for order in data["orders"]:
|
for order in data["orders"]:
|
||||||
|
@ -1695,6 +1698,7 @@ class Trade(ModelBase, LocalTrade):
|
||||||
)
|
)
|
||||||
price_precision: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) # type: ignore
|
price_precision: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) # type: ignore
|
||||||
precision_mode: Mapped[Optional[int]] = mapped_column(Integer, nullable=True) # type: ignore
|
precision_mode: Mapped[Optional[int]] = mapped_column(Integer, nullable=True) # type: ignore
|
||||||
|
precision_mode_price: Mapped[Optional[int]] = mapped_column(Integer, nullable=True) # type: ignore
|
||||||
contract_size: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) # type: ignore
|
contract_size: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) # type: ignore
|
||||||
|
|
||||||
# Leverage trading properties
|
# Leverage trading properties
|
||||||
|
|
Loading…
Reference in New Issue
Block a user