Merge branch 'develop' into feat/stop_loss

2018-07-01 20:01:02 +02:00
parent 937644a04b f91263c8ef
commit ed2a1becef
13 changed files with 267 additions and 153 deletions
--- a/freqtrade/constants.py
+++ b/freqtrade/constants.py
@@ -63,7 +63,13 @@ CONF_SCHEMA = {
        'stoploss': {'type': 'number', 'maximum': 0, 'exclusiveMaximum': True},
        'trailing_stop': {'type': 'boolean'},
        'trailing_stop_positive': {'type': 'number', 'minimum': 0, 'maximum': 1},
-        'unfilledtimeout': {'type': 'integer', 'minimum': 0},
+        'unfilledtimeout': {
+            'type': 'object',
+            'properties': {
+                'buy': {'type': 'number', 'minimum': 3},
+                'sell': {'type': 'number', 'minimum': 10}
+            }
+        },
        'bid_strategy': {
            'type': 'object',
            'properties': {