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

add safe_remaining

Browse Source 
fixes #7757
This commit is contained in:
Matthias 2022-11-17 18:58:46 +00:00
parent 1975e942d6
commit 436b314c80
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
freqtrade/persistence/trade_model.py
View File

@ -90,6 +90,13 @@ class Order(_DECL_BASE):
def safe_filled(self) -> float: def safe_filled(self) -> float:
return self.filled if self.filled is not None else self.amount or 0.0 return self.filled if self.filled is not None else self.amount or 0.0
@property
def safe_remaining(self) -> float:
return (
self.remaining if self.remaining is not None else
self.amount - (self.filled or 0.0)
)
@property @property
def safe_fee_base(self) -> float: def safe_fee_base(self) -> float:
return self.ft_fee_base or 0.0 return self.ft_fee_base or 0.0

7
freqtrade/rpc/rpc.py
View File

@ -218,9 +218,10 @@ class RPC:
stoploss_current_dist_pct=round(stoploss_current_dist_ratio * 100, 2), stoploss_current_dist_pct=round(stoploss_current_dist_ratio * 100, 2),
stoploss_entry_dist=stoploss_entry_dist, stoploss_entry_dist=stoploss_entry_dist,
stoploss_entry_dist_ratio=round(stoploss_entry_dist_ratio, 8), stoploss_entry_dist_ratio=round(stoploss_entry_dist_ratio, 8),
open_order='({} {} rem={:.8f})'.format( open_order=(
order.order_type, order.side, order.remaining f'({order.order_type} {order.side} rem={order.safe_remaining:.8f})' if
) if order else None, order else None
),
)) ))
results.append(trade_dict) results.append(trade_dict)
return results return results