From 52f4187129566deeed3121752d34e5131410a87e Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Sat, 8 Feb 2020 13:51:55 +0100
Subject: [PATCH] Allow exchange templates to configure outside-options too

---
 freqtrade/commands/build_config_commands.py   |  2 +-
 freqtrade/templates/base_config.json.j2       |  4 +-
 .../subtemplates/exchange_binance.j2          | 80 ++++++++++---------
 .../subtemplates/exchange_generic.j2          | 24 +++---
 .../templates/subtemplates/exchange_kraken.j2 | 67 ++++++++--------
 5 files changed, 91 insertions(+), 86 deletions(-)

diff --git a/freqtrade/commands/build_config_commands.py b/freqtrade/commands/build_config_commands.py
index 838fd510a..7dd1be607 100644
--- a/freqtrade/commands/build_config_commands.py
+++ b/freqtrade/commands/build_config_commands.py
@@ -90,10 +90,10 @@ def ask_user_config() -> Dict[str, Any]:
             "name": "exchange_name",
             "message": "Select exchange",
             "choices": [
-                "bittrex",
                 "binance",
                 "binanceje",
                 "binanceus",
+                "bittrex",
                 "kraken",
                 Separator(),
                 "other",
diff --git a/freqtrade/templates/base_config.json.j2 b/freqtrade/templates/base_config.json.j2
index 1370bfa80..0a4f92c4b 100644
--- a/freqtrade/templates/base_config.json.j2
+++ b/freqtrade/templates/base_config.json.j2
@@ -27,9 +27,7 @@
         "sell_profit_only": false,
         "ignore_roi_if_buy_signal": false
     },
-    "exchange": {
-        {{ exchange | indent(8) }}
-    },
+    {{ exchange | indent(4) }},
     "pairlists": [
         {"method": "StaticPairList"}
     ],
diff --git a/freqtrade/templates/subtemplates/exchange_binance.j2 b/freqtrade/templates/subtemplates/exchange_binance.j2
index c527d296b..03aa0560c 100644
--- a/freqtrade/templates/subtemplates/exchange_binance.j2
+++ b/freqtrade/templates/subtemplates/exchange_binance.j2
@@ -1,39 +1,41 @@
-"name": "{{ exchange_name | lower }}",
-"key": "{{ exchange_key }}",
-"secret": "{{ exchange_secret }}",
-"ccxt_config": {"enableRateLimit": true},
-"ccxt_async_config": {
-    "enableRateLimit": true,
-    "rateLimit": 200
-},
-"pair_whitelist": [
-    "ALGO/BTC",
-    "ATOM/BTC",
-    "BAT/BTC",
-    "BCH/BTC",
-    "BRD/BTC",
-    "EOS/BTC",
-    "ETH/BTC",
-    "IOTA/BTC",
-    "LINK/BTC",
-    "LTC/BTC",
-    "NEO/BTC",
-    "NXS/BTC",
-    "XMR/BTC",
-    "XRP/BTC",
-    "XTZ/BTC"
-],
-"pair_blacklist": [
-    "BNB/BTC",
-    "BNB/BUSD",
-    "BNB/ETH",
-    "BNB/EUR",
-    "BNB/NGN",
-    "BNB/PAX",
-    "BNB/RUB",
-    "BNB/TRY",
-    "BNB/TUSD",
-    "BNB/USDC",
-    "BNB/USDS",
-    "BNB/USDT",
-]
+"exchange": {
+    "name": "{{ exchange_name | lower }}",
+    "key": "{{ exchange_key }}",
+    "secret": "{{ exchange_secret }}",
+    "ccxt_config": {"enableRateLimit": true},
+    "ccxt_async_config": {
+        "enableRateLimit": true,
+        "rateLimit": 200
+    },
+    "pair_whitelist": [
+        "ALGO/BTC",
+        "ATOM/BTC",
+        "BAT/BTC",
+        "BCH/BTC",
+        "BRD/BTC",
+        "EOS/BTC",
+        "ETH/BTC",
+        "IOTA/BTC",
+        "LINK/BTC",
+        "LTC/BTC",
+        "NEO/BTC",
+        "NXS/BTC",
+        "XMR/BTC",
+        "XRP/BTC",
+        "XTZ/BTC"
+    ],
+    "pair_blacklist": [
+        "BNB/BTC",
+        "BNB/BUSD",
+        "BNB/ETH",
+        "BNB/EUR",
+        "BNB/NGN",
+        "BNB/PAX",
+        "BNB/RUB",
+        "BNB/TRY",
+        "BNB/TUSD",
+        "BNB/USDC",
+        "BNB/USDS",
+        "BNB/USDT",
+    ]
+}
diff --git a/freqtrade/templates/subtemplates/exchange_generic.j2 b/freqtrade/templates/subtemplates/exchange_generic.j2
index 33309de3b..ade9c2f28 100644
--- a/freqtrade/templates/subtemplates/exchange_generic.j2
+++ b/freqtrade/templates/subtemplates/exchange_generic.j2
@@ -1,13 +1,15 @@
-"name": "{{ exchange_name | lower }}",
-"key": "{{ exchange_key }}",
-"secret": "{{ exchange_secret }}",
-"ccxt_config": {"enableRateLimit": true},
-"ccxt_async_config": {
-    "enableRateLimit": true
-},
-"pair_whitelist": [
+"exchange": {
+    "name": "{{ exchange_name | lower }}",
+    "key": "{{ exchange_key }}",
+    "secret": "{{ exchange_secret }}",
+    "ccxt_config": {"enableRateLimit": true},
+    "ccxt_async_config": {
+        "enableRateLimit": true
+    },
+    "pair_whitelist": [
 
-],
-"pair_blacklist": [
+    ],
+    "pair_blacklist": [
 
-]
+    ]
+}
diff --git a/freqtrade/templates/subtemplates/exchange_kraken.j2 b/freqtrade/templates/subtemplates/exchange_kraken.j2
index 690828887..7139a0830 100644
--- a/freqtrade/templates/subtemplates/exchange_kraken.j2
+++ b/freqtrade/templates/subtemplates/exchange_kraken.j2
@@ -1,33 +1,36 @@
-"name": "kraken",
-"key": "{{ exchange_key }}",
-"secret": "{{ exchange_secret }}",
-"ccxt_config": {"enableRateLimit": true},
-"ccxt_async_config": {
-    "enableRateLimit": true,
-    "rateLimit": 1000
-},
-"pair_whitelist": [
-    "ADA/EUR",
-    "ATOM/EUR",
-    "BAT/EUR",
-    "BCH/EUR",
-    "BTC/EUR",
-    "DAI/EUR",
-    "DASH/EUR",
-    "EOS/EUR",
-    "ETC/EUR",
-    "ETH/EUR",
-    "LINK/EUR",
-    "LTC/EUR",
-    "QTUM/EUR",
-    "REP/EUR",
-    "WAVES/EUR",
-    "XLM/EUR",
-    "XMR/EUR",
-    "XRP/EUR",
-    "XTZ/EUR",
-    "ZEC/EUR"
-],
-"pair_blacklist": [
+"download_trades": true,
+"exchange": {
+    "name": "kraken",
+    "key": "{{ exchange_key }}",
+    "secret": "{{ exchange_secret }}",
+    "ccxt_config": {"enableRateLimit": true},
+    "ccxt_async_config": {
+        "enableRateLimit": true,
+        "rateLimit": 1000
+    },
+    "pair_whitelist": [
+        "ADA/EUR",
+        "ATOM/EUR",
+        "BAT/EUR",
+        "BCH/EUR",
+        "BTC/EUR",
+        "DAI/EUR",
+        "DASH/EUR",
+        "EOS/EUR",
+        "ETC/EUR",
+        "ETH/EUR",
+        "LINK/EUR",
+        "LTC/EUR",
+        "QTUM/EUR",
+        "REP/EUR",
+        "WAVES/EUR",
+        "XLM/EUR",
+        "XMR/EUR",
+        "XRP/EUR",
+        "XTZ/EUR",
+        "ZEC/EUR"
+    ],
+    "pair_blacklist": [
 
-]
+    ]
+}