mirror of
https://github.com/freqtrade/freqtrade.git
synced 2024-11-14 04:03:55 +00:00
Small enhancements and notes
This commit is contained in:
parent
ee5f05208e
commit
2523c12c71
|
@ -499,7 +499,7 @@ class Exchange:
|
||||||
# Note: ccxt has BaseCurrency/QuoteCurrency format for pairs
|
# Note: ccxt has BaseCurrency/QuoteCurrency format for pairs
|
||||||
if self.markets and pair not in self.markets:
|
if self.markets and pair not in self.markets:
|
||||||
raise OperationalException(
|
raise OperationalException(
|
||||||
f'Pair {pair} is not available on {self.name}. '
|
f'Pair {pair} is not available on {self.name} {self.trading_mode.value}. '
|
||||||
f'Please remove {pair} from your whitelist.')
|
f'Please remove {pair} from your whitelist.')
|
||||||
|
|
||||||
# From ccxt Documentation:
|
# From ccxt Documentation:
|
||||||
|
|
|
@ -740,6 +740,9 @@ class FreqtradeBot(LoggingMixin):
|
||||||
|
|
||||||
# in case of FOK the order may be filled immediately and fully
|
# in case of FOK the order may be filled immediately and fully
|
||||||
elif order_status == 'closed':
|
elif order_status == 'closed':
|
||||||
|
# TODO-lev: Evaluate this. Why is setting stake_amount here necessary?
|
||||||
|
# it should never change in theory - and in case of leveraged orders,
|
||||||
|
# may be the leveraged amount.
|
||||||
stake_amount = order['cost']
|
stake_amount = order['cost']
|
||||||
amount = safe_value_fallback(order, 'filled', 'amount')
|
amount = safe_value_fallback(order, 'filled', 'amount')
|
||||||
enter_limit_filled_price = safe_value_fallback(order, 'average', 'price')
|
enter_limit_filled_price = safe_value_fallback(order, 'average', 'price')
|
||||||
|
@ -1288,6 +1291,7 @@ class FreqtradeBot(LoggingMixin):
|
||||||
# * Check edge cases, we don't want to make leverage > 1.0 if we don't have to
|
# * Check edge cases, we don't want to make leverage > 1.0 if we don't have to
|
||||||
# * (for leverage modes which aren't isolated futures)
|
# * (for leverage modes which aren't isolated futures)
|
||||||
|
|
||||||
|
# TODO-lev: The below calculation needs to include leverage ...
|
||||||
trade.stake_amount = trade.amount * trade.open_rate
|
trade.stake_amount = trade.amount * trade.open_rate
|
||||||
self.update_trade_state(trade, trade.open_order_id, corder)
|
self.update_trade_state(trade, trade.open_order_id, corder)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user