adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tried to add liquidation price to order object, caused a test to fail

Browse Source
This commit is contained in:
Sam Germain 2021-07-06 00:43:01 -06:00
parent 31fa6f9c25
commit f566d83839
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freqtrade/persistence/migrations.py
View File

@ -148,6 +148,7 @@ def migrate_orders_table(decl_base, inspector, engine, table_back_name: str, col
decl_base.metadata.create_all(engine) decl_base.metadata.create_all(engine)
leverage = get_column_def(cols, 'leverage', '1.0') leverage = get_column_def(cols, 'leverage', '1.0')
is_short = get_column_def(cols, 'is_short', 'False') is_short = get_column_def(cols, 'is_short', 'False')
liquidation_price = get_column_def(cols, 'liquidation_price', 'False')
with engine.begin() as connection: with engine.begin() as connection:
connection.execute(text(f""" connection.execute(text(f"""
insert into orders ( id, ft_trade_id, ft_order_side, ft_pair, ft_is_open, order_id, insert into orders ( id, ft_trade_id, ft_order_side, ft_pair, ft_is_open, order_id,
@ -156,7 +157,7 @@ def migrate_orders_table(decl_base, inspector, engine, table_back_name: str, col
select id, ft_trade_id, ft_order_side, ft_pair, ft_is_open, order_id, select id, ft_trade_id, ft_order_side, ft_pair, ft_is_open, order_id,
status, symbol, order_type, side, price, amount, filled, null average, remaining, cost, status, symbol, order_type, side, price, amount, filled, null average, remaining, cost,
order_date, order_filled_date, order_update_date, order_date, order_filled_date, order_update_date,
{leverage} leverage, {is_short} is_short {leverage} leverage, {is_short} is_short, {liquidation_price} liquidation_price
from {table_back_name} from {table_back_name}
""")) """))

2
freqtrade/persistence/models.py
View File

@ -134,6 +134,7 @@ class Order(_DECL_BASE):
leverage = Column(Float, nullable=True, default=1.0) leverage = Column(Float, nullable=True, default=1.0)
is_short = Column(Boolean, nullable=True, default=False) is_short = Column(Boolean, nullable=True, default=False)
# liquidation_price = Column(Float, nullable=True)
def __repr__(self): def __repr__(self):
@ -159,6 +160,7 @@ class Order(_DECL_BASE):
self.remaining = order.get('remaining', self.remaining) self.remaining = order.get('remaining', self.remaining)
self.cost = order.get('cost', self.cost) self.cost = order.get('cost', self.cost)
self.leverage = order.get('leverage', self.leverage) self.leverage = order.get('leverage', self.leverage)
# TODO-mg: liquidation price? is_short?
if 'timestamp' in order and order['timestamp'] is not None: if 'timestamp' in order and order['timestamp'] is not None:
self.order_date = datetime.fromtimestamp(order['timestamp'] / 1000, tz=timezone.utc) self.order_date = datetime.fromtimestamp(order['timestamp'] / 1000, tz=timezone.utc)