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

Added set_margin_mode to create_order

Browse Source
This commit is contained in:
Sam Germain
2021-09-13 00:09:55 -06:00
parent 2aaf60205e
commit 17a5cc96fe
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
freqtrade/exchange/binance.py
View File

@@ -152,6 +152,10 @@ class Binance(Exchange):
max_lev = 1/margin_req max_lev = 1/margin_req
return max_lev return max_lev
def lev_prep(self, pair: str, leverage: float):
self.set_margin_mode(pair, self.collateral)
self._set_leverage(leverage, pair, self.trading_mode)
@retrier @retrier
def _set_leverage( def _set_leverage(
self, self,

10
freqtrade/exchange/exchange.py
View File

@@ -150,7 +150,7 @@ class Exchange:
if config.get('trading_mode') if config.get('trading_mode')
else TradingMode.SPOT else TradingMode.SPOT
) )
collateral: Optional[Collateral] = ( self.collateral: Optional[Collateral] = (
Collateral(config.get('collateral')) Collateral(config.get('collateral'))
if config.get('collateral') if config.get('collateral')
else None else None
@@ -176,7 +176,7 @@ class Exchange:
self.validate_order_time_in_force(config.get('order_time_in_force', {})) self.validate_order_time_in_force(config.get('order_time_in_force', {}))
self.validate_required_startup_candles(config.get('startup_candle_count', 0), self.validate_required_startup_candles(config.get('startup_candle_count', 0),
config.get('timeframe', '')) config.get('timeframe', ''))
self.validate_trading_mode_and_collateral(self.trading_mode, collateral) self.validate_trading_mode_and_collateral(self.trading_mode, self.collateral)
# Converts the interval provided in minutes in config to seconds # Converts the interval provided in minutes in config to seconds
self.markets_refresh_interval: int = exchange_config.get( self.markets_refresh_interval: int = exchange_config.get(
"markets_refresh_interval", 60) * 60 "markets_refresh_interval", 60) * 60
@@ -770,6 +770,10 @@ class Exchange:
# Order handling # Order handling
def lev_prep(self, pair: str, leverage: float):
self.set_margin_mode(pair, self.collateral)
self._set_leverage(leverage, pair)
def create_order(self, pair: str, ordertype: str, side: str, amount: float, def create_order(self, pair: str, ordertype: str, side: str, amount: float,
rate: float, time_in_force: str = 'gtc', leverage=1.0) -> Dict: rate: float, time_in_force: str = 'gtc', leverage=1.0) -> Dict:
@@ -778,7 +782,7 @@ class Exchange:
return dry_order return dry_order
if self.trading_mode != TradingMode.SPOT: if self.trading_mode != TradingMode.SPOT:
self._set_leverage(leverage, pair) self.lev_prep(pair, leverage)
params = self._params.copy() params = self._params.copy()
if time_in_force != 'gtc' and ordertype != 'market': if time_in_force != 'gtc' and ordertype != 'market':
param = self._ft_has.get('time_in_force_parameter', '') param = self._ft_has.get('time_in_force_parameter', '')