change how close trade value calculated
This commit is contained in:
parent
06c81b5234
commit
fb184f594b
@ -529,9 +529,18 @@ class LocalTrade():
|
|||||||
if rate is None and not self.close_rate:
|
if rate is None and not self.close_rate:
|
||||||
return 0.0
|
return 0.0
|
||||||
|
|
||||||
sell_trade = Decimal(self.amount) * Decimal(rate or self.close_rate) # type: ignore
|
filled_exit_orders = self.select_filled_orders('sell')
|
||||||
fees = sell_trade * Decimal(fee or self.fee_close)
|
filled_amount = 0
|
||||||
return float(sell_trade - fees)
|
filled_exit_trade = 0
|
||||||
|
for order in filled_exit_orders:
|
||||||
|
filled_amount += order.filled
|
||||||
|
filled_exit_trade += (order.price * order.filled)
|
||||||
|
|
||||||
|
remaining_amount = self.amount - filled_amount
|
||||||
|
unfilled_exit_trade = Decimal(remaining_amount) * Decimal(rate or self.close_rate) # type: ignore
|
||||||
|
exit_trade = Decimal(filled_exit_trade) + unfilled_exit_trade
|
||||||
|
fees = exit_trade * Decimal(fee or self.fee_close)
|
||||||
|
return float(exit_trade - fees)
|
||||||
|
|
||||||
def calc_profit(self, rate: Optional[float] = None,
|
def calc_profit(self, rate: Optional[float] = None,
|
||||||
fee: Optional[float] = None) -> float:
|
fee: Optional[float] = None) -> float:
|
||||||
|
Loading…
Reference in New Issue
Block a user