mohammadian7/freqtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move funding fee assignment to update_trade

Browse Source
This commit is contained in:
Matthias
2023-10-11 18:07:34 +02:00
parent 5a0c15f377
commit e547da10de
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/persistence/trade_model.py
+2 -4
View File
@@ -174,10 +174,6 @@ class Order(ModelBase):
self.ft_is_open = True self.ft_is_open = True
if self.status in NON_OPEN_EXCHANGE_STATES: if self.status in NON_OPEN_EXCHANGE_STATES:
self.ft_is_open = False self.ft_is_open = False
if self.trade:
# Assign funding fee up to this point
# (represents the funding fee since the last order)
self.funding_fee = self.trade.funding_fees
if (order.get('filled', 0.0) or 0.0) > 0 and not self.order_filled_date: if (order.get('filled', 0.0) or 0.0) > 0 and not self.order_filled_date:
self.order_filled_date = dt_from_ts( self.order_filled_date = dt_from_ts(
safe_value_fallback(order, 'lastTradeTimestamp', default_value=dt_ts()) safe_value_fallback(order, 'lastTradeTimestamp', default_value=dt_ts())
@@ -742,6 +738,8 @@ class LocalTrade:
return return
logger.info(f'Updating trade (id={self.id}) ...') logger.info(f'Updating trade (id={self.id}) ...')
if order.ft_order_side != 'stoploss':
order.funding_fee = self.funding_fees
if order.ft_order_side == self.entry_side: if order.ft_order_side == self.entry_side:
# Update open rate and actual amount # Update open rate and actual amount