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

Merge pull request #481 from jblestang/fix_buy_sell_order

Browse Source 
Fixing buy and sell order
This commit is contained in:
Janne Sinivirta
2018-01-31 16:37:55 +02:00
committed by GitHub
parent 529e4d0131 d53d4b808b
commit 613ad4c5d6
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
freqtrade/main.py
View File

@@ -55,7 +55,7 @@ def refresh_whitelist(whitelist: List[str]) -> List[str]:
return final_list return final_list
def process_maybe_execute_buy(interval): def process_maybe_execute_buy(interval: int) -> bool:
""" """
Tries to execute a buy trade in a safe way Tries to execute a buy trade in a safe way
:return: True if executed :return: True if executed
@@ -75,7 +75,7 @@ def process_maybe_execute_buy(interval):
return False return False
def process_maybe_execute_sell(trade, interval): def process_maybe_execute_sell(trade: Trade, interval: int) -> bool:
""" """
Tries to execute a sell trade Tries to execute a sell trade
:return: True if executed :return: True if executed
@@ -114,12 +114,15 @@ def _process(interval: int, nb_assets: Optional[int] = 0) -> bool:
# Query trades from persistence layer # Query trades from persistence layer
trades = Trade.query.filter(Trade.is_open.is_(True)).all() trades = Trade.query.filter(Trade.is_open.is_(True)).all()
if len(trades) < _CONF['max_open_trades']:
state_changed = process_maybe_execute_buy(interval)
# First process current opened trades
for trade in trades: for trade in trades:
state_changed |= process_maybe_execute_sell(trade, interval) state_changed |= process_maybe_execute_sell(trade, interval)
# Then looking for buy opportunities
if len(trades) < _CONF['max_open_trades']:
state_changed = process_maybe_execute_buy(interval)
if 'unfilledtimeout' in _CONF: if 'unfilledtimeout' in _CONF:
# Check and handle any timed out open orders # Check and handle any timed out open orders
check_handle_timedout(_CONF['unfilledtimeout']) check_handle_timedout(_CONF['unfilledtimeout'])