From d3e2baf4ae785cdeb2c5899edb6738ce08293ac2 Mon Sep 17 00:00:00 2001 From: baudbox Date: Tue, 21 Nov 2017 13:49:54 +0000 Subject: [PATCH 1/6] Reviewed virtual installation process --- README.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 398056079..00dca6e99 100644 --- a/README.md +++ b/README.md @@ -74,14 +74,20 @@ Use your favorite AUR helper and install `python-freqtrade-git`. `develop` branch has often new features, but might also cause breaking changes. To use it, you are encouraged to join our [slack channel](https://join.slack.com/t/highfrequencybot/shared_invite/enQtMjQ5NTM0OTYzMzY3LWMxYzE3M2MxNDdjMGM3ZTYwNzFjMGIwZGRjNTc3ZGU3MGE3NzdmZGMwNmU3NDM5ZTNmM2Y3NjRiNzk4NmM4OGE). -``` -$ cd freqtrade/ -# copy example config. Dont forget to insert your api keys +```bash +$ mkdir freqtrade && cd freqtrade/ +# Create an isolated Python virtual environment +$ pip install virtualenv +$ virtualenv ./virtualenv --python=$(which python3) +# Activate the virtualenv +$ . virtualenv/bin/activate +# Copy example config. Dont forget to insert your api keys $ cp config.json.example config.json -$ python -m venv .env -$ source .env/bin/activate +# Install requirements $ pip install -r requirements.txt +# Install Freqtrade $ pip install -e . +# Run Freqtrade $ ./freqtrade/main.py ``` From 3c4c5868309ec6e7014b814804bb126144294e34 Mon Sep 17 00:00:00 2001 From: baudbox Date: Tue, 21 Nov 2017 20:19:44 +0000 Subject: [PATCH 2/6] Add virtualenv into .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2d4af4dac..8f87d9945 100644 --- a/.gitignore +++ b/.gitignore @@ -72,6 +72,7 @@ target/ # pyenv .python-version +virtualenv config.json preprocessor.py From fe59f40210cdc495b84e63a99b04eae4fa92eabb Mon Sep 17 00:00:00 2001 From: baudbox Date: Thu, 23 Nov 2017 20:44:04 +0000 Subject: [PATCH 3/6] optimiz --- freqtrade/tests/conftest.py | 41 +++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/freqtrade/tests/conftest.py b/freqtrade/tests/conftest.py index e624e96c7..a903ae016 100644 --- a/freqtrade/tests/conftest.py +++ b/freqtrade/tests/conftest.py @@ -13,17 +13,20 @@ from freqtrade.misc import CONF_SCHEMA def default_conf(): """ Returns validated configuration suitable for most tests """ configuration = { - "max_open_trades": 1, + "max_open_trades": 3, "stake_currency": "BTC", - "stake_amount": 0.05, + "stake_amount": 0.004, "dry_run": True, "minimal_roi": { - "40": 0.0, - "30": 0.01, - "20": 0.02, - "0": 0.04 + "30": 0.0, + "25": 0.015, + "20": 0.020, + "15": 0.025, + "10": 0.030, + "5": 0.035, + "0": 0.045 }, - "stoploss": -0.10, + "stoploss": -0.03, "bid_strategy": { "ask_last_balance": 0.0 }, @@ -32,13 +35,8 @@ def default_conf(): "enabled": True, "key": "key", "secret": "secret", - "pair_whitelist": [ - "BTC_ETH", - "BTC_TKN", - "BTC_TRST", - "BTC_SWT", - "BTC_BCC" - ] + "pair_whitelist": ["BTC_EDG", "BTC_ETC", "BTC_MTL", "BTC_OK", "BTC_PAY", "BTC_PIVX", "BTC_SNT", "BTC_XZC", "BTC_VTC", "BTC_XLM", "BTC_SWT", + "BTC_MER", "BTC_FTC", "BTC_INCNT", "BTC_TIX", "BTC_RCN", "BTC_RLC", "BTC_TKN", "BTC_TRST", "BTC_MLN", "BTC_TIME", "BTC_LUN"] }, "telegram": { "enabled": True, @@ -56,14 +54,17 @@ def backtest_conf(): return { "max_open_trades": 3, "stake_currency": "BTC", - "stake_amount": 0.01, + "stake_amount": 0.004, "minimal_roi": { - "40": 0.0, - "30": 0.01, - "20": 0.02, - "0": 0.04 + "30": 0.0, + "25": 0.015, + "20": 0.020, + "15": 0.025, + "10": 0.030, + "5": 0.035, + "0": 0.045 }, - "stoploss": -0.10 + "stoploss": -0.03 } From fe415b40ca394df18c1cbf878eccfc3014a7644f Mon Sep 17 00:00:00 2001 From: baudbox Date: Thu, 23 Nov 2017 20:55:34 +0000 Subject: [PATCH 4/6] sync --- src/python-bittrex | 1 + 1 file changed, 1 insertion(+) create mode 160000 src/python-bittrex diff --git a/src/python-bittrex b/src/python-bittrex new file mode 160000 index 000000000..0373363e1 --- /dev/null +++ b/src/python-bittrex @@ -0,0 +1 @@ +Subproject commit 0373363e1a06ac1d4156cca97ff5f02946452a52 From 6be1c76d6b990b3c6316ceb9160cd85789b3f8e1 Mon Sep 17 00:00:00 2001 From: baudbox Date: Sat, 25 Nov 2017 18:28:15 +0000 Subject: [PATCH 5/6] sync --- config.json.baud | 37 +++++++++++++++++++++++++++++++++++++ freqtrade/analyze.py | 36 ++++++++++++++++++++++-------------- freqtrade/tests/conftest.py | 2 +- 3 files changed, 60 insertions(+), 15 deletions(-) create mode 100644 config.json.baud diff --git a/config.json.baud b/config.json.baud new file mode 100644 index 000000000..e097035e7 --- /dev/null +++ b/config.json.baud @@ -0,0 +1,37 @@ +{ + "max_open_trades": 5, + "stake_currency": "BTC", + "stake_amount": 0.0015, + "dry_run": false, + "minimal_roi": { + "35": 0.0, + "30": 0.05, + "25": 0.010, + "20": 0.015, + "15": 0.020, + "10": 0.025, + "5": 0.030, + "0": 0.035 + }, + "stoploss": -0.05, + "bid_strategy": { + "ask_last_balance": 0.0 + }, + "exchange": { + "name": "bittrex", + "key": "c7abd3e05621466f83c77dcc3c327cea", + "secret": "006ddad4d7b24c58861417b6a277a73c", + "pair_whitelist": ["BTC_EDG", "BTC_ETC", "BTC_MTL", "BTC_OK", "BTC_PAY", "BTC_PIVX", "BTC_SNT", "BTC_XZC", "BTC_VTC", "BTC_XLM", "BTC_SWT", + "BTC_MER", "BTC_FTC", "BTC_INCNT", "BTC_TIX", "BTC_RCN", "BTC_RLC", "BTC_TKN", "BTC_TRST", "BTC_MLN", "BTC_TIME", "BTC_LUN", + "BTC_ARDR"] + }, + "telegram": { + "enabled": true, + "token": "461094382:AAHJyxQbsarsQGrQgVf5RfFC5s1nHCTGzTc", + "chat_id": "309637645" + }, + "initial_state": "running", + "internals": { + "process_throttle_secs": 5 + } +} diff --git a/freqtrade/analyze.py b/freqtrade/analyze.py index ba57d66c5..3c870e081 100644 --- a/freqtrade/analyze.py +++ b/freqtrade/analyze.py @@ -77,14 +77,19 @@ def populate_buy_trend(dataframe: DataFrame) -> DataFrame: dataframe.loc[ ( (dataframe['rsi'] < 35) & + (dataframe['adx'] > 29) & (dataframe['fastd'] < 35) & - (dataframe['adx'] > 30) & - (dataframe['plus_di'] > 0.5) + (dataframe['fastd'] > 0) & + (dataframe['plus_di'] > 0.1) ) | ( (dataframe['adx'] > 65) & (dataframe['plus_di'] > 0.5) ), +# (dataframe['tema'] <= dataframe['blower']) & +# (dataframe['rsi'] < 35) & +# (dataframe['fastd'] < 48) & +# (dataframe['adx'] > 29), 'buy'] = 1 return dataframe @@ -97,18 +102,21 @@ def populate_sell_trend(dataframe: DataFrame) -> DataFrame: :return: DataFrame with buy column """ dataframe.loc[ - ( - ( - (crossed_above(dataframe['rsi'], 70)) | - (crossed_above(dataframe['fastd'], 70)) - ) & - (dataframe['adx'] > 10) & - (dataframe['minus_di'] > 0) - ) | - ( - (dataframe['adx'] > 70) & - (dataframe['minus_di'] > 0.5) - ), +# ( +# ( +# (crossed_above(dataframe['rsi'], 70)) | +# (crossed_above(dataframe['fastd'], 80)) +# ) & +# (dataframe['adx'] < 30) & +# (dataframe['minus_di'] > 0) +# ) | +# ( +# (dataframe['adx'] > 70) & +# (dataframe['minus_di'] > 0.5) +# ), + (crossed_above(dataframe['rsi'], 70))| + (crossed_above(dataframe['fastd'], 80)) & + (dataframe['adx'] > 31), 'sell'] = 1 return dataframe diff --git a/freqtrade/tests/conftest.py b/freqtrade/tests/conftest.py index a903ae016..35599b675 100644 --- a/freqtrade/tests/conftest.py +++ b/freqtrade/tests/conftest.py @@ -36,7 +36,7 @@ def default_conf(): "key": "key", "secret": "secret", "pair_whitelist": ["BTC_EDG", "BTC_ETC", "BTC_MTL", "BTC_OK", "BTC_PAY", "BTC_PIVX", "BTC_SNT", "BTC_XZC", "BTC_VTC", "BTC_XLM", "BTC_SWT", - "BTC_MER", "BTC_FTC", "BTC_INCNT", "BTC_TIX", "BTC_RCN", "BTC_RLC", "BTC_TKN", "BTC_TRST", "BTC_MLN", "BTC_TIME", "BTC_LUN"] + "BTC_MER", "BTC_FTC", "BTC_INCNT", "BTC_TIX", "BTC_RCN", "BTC_RLC", "BTC_TKN", "BTC_TRST", "BTC_MLN", "BTC_TIME", "BTC_LUN", "BTC_WAVES"] }, "telegram": { "enabled": True, From 7200bbada868aa3951bfc33d84aef5f5161e6ed8 Mon Sep 17 00:00:00 2001 From: Baudbox Date: Sat, 25 Nov 2017 19:29:23 +0100 Subject: [PATCH 6/6] deletion --- config.json.baud | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 config.json.baud diff --git a/config.json.baud b/config.json.baud deleted file mode 100644 index e097035e7..000000000 --- a/config.json.baud +++ /dev/null @@ -1,37 +0,0 @@ -{ - "max_open_trades": 5, - "stake_currency": "BTC", - "stake_amount": 0.0015, - "dry_run": false, - "minimal_roi": { - "35": 0.0, - "30": 0.05, - "25": 0.010, - "20": 0.015, - "15": 0.020, - "10": 0.025, - "5": 0.030, - "0": 0.035 - }, - "stoploss": -0.05, - "bid_strategy": { - "ask_last_balance": 0.0 - }, - "exchange": { - "name": "bittrex", - "key": "c7abd3e05621466f83c77dcc3c327cea", - "secret": "006ddad4d7b24c58861417b6a277a73c", - "pair_whitelist": ["BTC_EDG", "BTC_ETC", "BTC_MTL", "BTC_OK", "BTC_PAY", "BTC_PIVX", "BTC_SNT", "BTC_XZC", "BTC_VTC", "BTC_XLM", "BTC_SWT", - "BTC_MER", "BTC_FTC", "BTC_INCNT", "BTC_TIX", "BTC_RCN", "BTC_RLC", "BTC_TKN", "BTC_TRST", "BTC_MLN", "BTC_TIME", "BTC_LUN", - "BTC_ARDR"] - }, - "telegram": { - "enabled": true, - "token": "461094382:AAHJyxQbsarsQGrQgVf5RfFC5s1nHCTGzTc", - "chat_id": "309637645" - }, - "initial_state": "running", - "internals": { - "process_throttle_secs": 5 - } -}