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

used calculated current_rate

Browse Source
This commit is contained in:
Kavinkumar 2022-02-22 19:29:54 +05:30
parent b4dbf4a96c
commit 4dce0fa3f2
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freqtrade/freqtradebot.py
View File

@ -478,8 +478,7 @@ class FreqtradeBot(LoggingMixin):
if stake_amount is not None and stake_amount < 0.0: if stake_amount is not None and stake_amount < 0.0:
# We should decrease our position # We should decrease our position
proposed_exit_rate = self.exchange.get_rate(trade.pair, refresh=True, side="buy") self.execute_trade_exit(trade, current_rate, sell_reason=SellCheckTuple(
self.execute_trade_exit(trade, proposed_exit_rate, sell_reason=SellCheckTuple(
sell_type=SellType.CUSTOM_SELL), sub_trade_amt=stake_amount) sell_type=SellType.CUSTOM_SELL), sub_trade_amt=stake_amount)
def _check_depth_of_market_buy(self, pair: str, conf: Dict) -> bool: def _check_depth_of_market_buy(self, pair: str, conf: Dict) -> bool:

11
freqtrade/persistence/models.py
View File

@ -116,7 +116,7 @@ class Order(_DECL_BASE):
ft_order_side = Column(String(25), nullable=False) ft_order_side = Column(String(25), nullable=False)
ft_pair = Column(String(25), nullable=False) ft_pair = Column(String(25), nullable=False)
ft_is_open = Column(Boolean, nullable=False, default=True, index=True) ft_is_open = Column(Boolean, nullable=False, default=True, index=True)
is_realized = Column(Boolean, nullable=True, default=False) is_fully_realized = Column(Boolean, nullable=True, default=False)
order_id = Column(String(255), nullable=False, index=True) order_id = Column(String(255), nullable=False, index=True)
status = Column(String(255), nullable=True) status = Column(String(255), nullable=True)
@ -506,20 +506,19 @@ class LocalTrade():
buy_rate = b_order.average or b_order.price buy_rate = b_order.average or b_order.price
if sell_amount < buy_amount: if sell_amount < buy_amount:
amount = sell_amount amount = sell_amount
b_order.filled -= amount
else: else:
if len(orders) == 1 and sell_amount == self.amount: if len(orders) == 1 and sell_amount == self.amount:
self.close(safe_value_fallback(order, 'average', 'price')) self.close(safe_value_fallback(order, 'average', 'price'))
Trade.commit() Trade.commit()
return return
b_order.is_realized = True b_order.is_fully_realized = True
self.update_order(b_order) self.update_order(b_order)
idx -= 1 idx -= 1
amount = buy_amount amount = buy_amount
sell_amount -= amount sell_amount -= amount
profit += self.calc_profit2(buy_rate, sell_rate, amount) profit += self.calc_profit2(buy_rate, sell_rate, amount)
b_order2 = orders[idx] b_order2 = orders[idx]
if not b_order.is_realized:
b_order2.filled -= amount
amount2 = b_order2.filled or b_order2.amount amount2 = b_order2.filled or b_order2.amount
b_order2.average = (b_order2.average * amount2 - profit) / amount2 b_order2.average = (b_order2.average * amount2 - profit) / amount2
self.update_order(b_order2) self.update_order(b_order2)
@ -670,7 +669,7 @@ class LocalTrade():
for o in self.orders: for o in self.orders:
if (o.ft_is_open or if (o.ft_is_open or
(o.ft_order_side != 'buy') or (o.ft_order_side != 'buy') or
o.is_realized or o.is_fully_realized or
(o.status not in NON_OPEN_EXCHANGE_STATES)): (o.status not in NON_OPEN_EXCHANGE_STATES)):
continue continue
@ -728,7 +727,7 @@ class LocalTrade():
return [o for o in self.orders if ((o.ft_order_side == order_side) or (order_side is None)) return [o for o in self.orders if ((o.ft_order_side == order_side) or (order_side is None))
and o.ft_is_open is False and and o.ft_is_open is False and
(o.filled or 0) > 0 and (o.filled or 0) > 0 and
not o.is_realized and not o.is_fully_realized and
o.status in NON_OPEN_EXCHANGE_STATES] o.status in NON_OPEN_EXCHANGE_STATES]
@property @property