From 207daf084e79c084e2dcd2c479473eee4f49eada Mon Sep 17 00:00:00 2001 From: misagh Date: Wed, 2 Jan 2019 14:18:34 +0100 Subject: [PATCH 1/6] change description --- README.md | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index dc34ebfb1..8cbed64aa 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# freqtrade +# Freqtrade [![Build Status](https://travis-ci.org/freqtrade/freqtrade.svg?branch=develop)](https://travis-ci.org/freqtrade/freqtrade) [![Coverage Status](https://coveralls.io/repos/github/freqtrade/freqtrade/badge.svg?branch=develop&service=github)](https://coveralls.io/github/freqtrade/freqtrade?branch=develop) @@ -11,15 +11,15 @@ Simple High frequency trading bot for crypto currencies designed to support mult ## Disclaimer -This software is for educational purposes only. Do not risk money which -you are afraid to lose. USE THE SOFTWARE AT YOUR OWN RISK. THE AUTHORS -AND ALL AFFILIATES ASSUME NO RESPONSIBILITY FOR YOUR TRADING RESULTS. +This software is for educational purposes only. Do not risk money which +you are afraid to lose. USE THE SOFTWARE AT YOUR OWN RISK. THE AUTHORS +AND ALL AFFILIATES ASSUME NO RESPONSIBILITY FOR YOUR TRADING RESULTS. Always start by running a trading bot in Dry-run and do not engage money before you understand how it works and what profit/loss you should expect. -We strongly recommend you to have coding and Python knowledge. Do not +We strongly recommend you to have coding and Python knowledge. Do not hesitate to read the source code and understand the mechanism of this bot. ## Exchange marketplaces supported @@ -68,7 +68,7 @@ hesitate to read the source code and understand the mechanism of this bot. - [Software requirements](#software-requirements) - [Wanna help?](https://github.com/freqtrade/freqtrade/blob/develop/CONTRIBUTING.md) - [Dev - getting started](https://github.com/freqtrade/freqtrade/blob/develop/docs/developer.md) (WIP) - + ## Quick start @@ -177,29 +177,29 @@ information about the bot, we encourage you to join our slack channel. ### [Bugs / Issues](https://github.com/freqtrade/freqtrade/issues?q=is%3Aissue) -If you discover a bug in the bot, please -[search our issue tracker](https://github.com/freqtrade/freqtrade/issues?q=is%3Aissue) -first. If it hasn't been reported, please -[create a new issue](https://github.com/freqtrade/freqtrade/issues/new) and -ensure you follow the template guide so that our team can assist you as +If you discover a bug in the bot, please +[search our issue tracker](https://github.com/freqtrade/freqtrade/issues?q=is%3Aissue) +first. If it hasn't been reported, please +[create a new issue](https://github.com/freqtrade/freqtrade/issues/new) and +ensure you follow the template guide so that our team can assist you as quickly as possible. ### [Feature Requests](https://github.com/freqtrade/freqtrade/labels/enhancement) Have you a great idea to improve the bot you want to share? Please, first search if this feature was not [already discussed](https://github.com/freqtrade/freqtrade/labels/enhancement). -If it hasn't been requested, please -[create a new request](https://github.com/freqtrade/freqtrade/issues/new) -and ensure you follow the template guide so that it does not get lost +If it hasn't been requested, please +[create a new request](https://github.com/freqtrade/freqtrade/issues/new) +and ensure you follow the template guide so that it does not get lost in the bug reports. ### [Pull Requests](https://github.com/freqtrade/freqtrade/pulls) Feel like our bot is missing a feature? We welcome your pull requests! -Please read our +Please read our [Contributing document](https://github.com/freqtrade/freqtrade/blob/develop/CONTRIBUTING.md) -to understand the requirements before sending your pull-requests. +to understand the requirements before sending your pull-requests. Coding is not a neccessity to contribute - maybe start with improving our documentation? Issues labeled [good first issue](https://github.com/freqtrade/freqtrade/labels/good%20first%20issue) can be good first contributions, and will help get you familiar with the codebase. @@ -222,10 +222,9 @@ To run this bot we recommend you a cloud instance with a minimum of: ### Software requirements -- [Python 3.6.x](http://docs.python-guide.org/en/latest/starting/installation/) +- [Python 3.6.x](http://docs.python-guide.org/en/latest/starting/installation/) - [pip](https://pip.pypa.io/en/stable/installing/) - [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) - [TA-Lib](https://mrjbq7.github.io/ta-lib/install.html) - [virtualenv](https://virtualenv.pypa.io/en/stable/installation/) (Recommended) - [Docker](https://www.docker.com/products/docker) (Recommended) - From 68a9d1b2b848d461305eb3c0c689cdb951199034 Mon Sep 17 00:00:00 2001 From: misagh Date: Wed, 2 Jan 2019 14:21:02 +0100 Subject: [PATCH 2/6] description --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8cbed64aa..708813f33 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Documentation](https://readthedocs.org/projects/freqtrade/badge/)](https://www.freqtrade.io) [![Maintainability](https://api.codeclimate.com/v1/badges/5737e6d668200b7518ff/maintainability)](https://codeclimate.com/github/freqtrade/freqtrade/maintainability) -Simple High frequency trading bot for crypto currencies designed to support multi exchanges and be controlled via Telegram. +Freqtrade is a free and open source crypto trading bot written in Python. It is designed to support multiple exchanges and be controlled via Telegram. ![freqtrade](https://raw.githubusercontent.com/freqtrade/freqtrade/develop/docs/assets/freqtrade-screenshot.png) From 05ce7787d69940be2850b812a473fe7220c5f676 Mon Sep 17 00:00:00 2001 From: misagh Date: Wed, 2 Jan 2019 14:41:27 +0100 Subject: [PATCH 3/6] readme enriched --- README.md | 107 +++--------------------------------------------------- 1 file changed, 5 insertions(+), 102 deletions(-) diff --git a/README.md b/README.md index 708813f33..50114a41c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Documentation](https://readthedocs.org/projects/freqtrade/badge/)](https://www.freqtrade.io) [![Maintainability](https://api.codeclimate.com/v1/badges/5737e6d668200b7518ff/maintainability)](https://codeclimate.com/github/freqtrade/freqtrade/maintainability) -Freqtrade is a free and open source crypto trading bot written in Python. It is designed to support multiple exchanges and be controlled via Telegram. +Freqtrade is a free and open source crypto trading bot written in Python. It is designed to support all major exchanges and be controlled via Telegram. It contains backtesting, plotting and money management tools as well as strategy optimization by machine learning. ![freqtrade](https://raw.githubusercontent.com/freqtrade/freqtrade/develop/docs/assets/freqtrade-screenshot.png) @@ -22,53 +22,9 @@ expect. We strongly recommend you to have coding and Python knowledge. Do not hesitate to read the source code and understand the mechanism of this bot. -## Exchange marketplaces supported - -- [X] [Bittrex](https://bittrex.com/) -- [X] [Binance](https://www.binance.com/) ([*Note for binance users](#a-note-on-binance)) -- [ ] [113 others to tests](https://github.com/ccxt/ccxt/). _(We cannot guarantee they will work)_ - -## Features - -- [x] **Based on Python 3.6+**: For botting on any operating system - Windows, macOS and Linux -- [x] **Persistence**: Persistence is achieved through sqlite -- [x] **Dry-run**: Run the bot without playing money. -- [x] **Backtesting**: Run a simulation of your buy/sell strategy. -- [x] **Strategy Optimization by machine learning**: Use machine learning to optimize your buy/sell strategy parameters with real exchange data. -- [x] **Edge position sizing** Calculate your win rate, risk reward ratio, the best stoploss and adjust your position size before taking a position for each specific market. [Learn more](https://github.com/freqtrade/freqtrade/blob/develop/docs/edge.md) -- [x] **Whitelist crypto-currencies**: Select which crypto-currency you want to trade or use dynamic whitelists. -- [x] **Blacklist crypto-currencies**: Select which crypto-currency you want to avoid. -- [x] **Manageable via Telegram**: Manage the bot with Telegram -- [x] **Display profit/loss in fiat**: Display your profit/loss in 33 fiat. -- [x] **Daily summary of profit/loss**: Provide a daily summary of your profit/loss. -- [x] **Performance status report**: Provide a performance status of your current trades. - - -## Table of Contents - -- [Quick start](#quick-start) -- [Documentations](https://github.com/freqtrade/freqtrade/blob/develop/docs/index.md) - - [Installation](https://github.com/freqtrade/freqtrade/blob/develop/docs/installation.md) - - [Configuration](https://github.com/freqtrade/freqtrade/blob/develop/docs/configuration.md) - - [Strategy Optimization](https://github.com/freqtrade/freqtrade/blob/develop/docs/bot-optimization.md) - - [Backtesting](https://github.com/freqtrade/freqtrade/blob/develop/docs/backtesting.md) - - [Hyperopt](https://github.com/freqtrade/freqtrade/blob/develop/docs/hyperopt.md) - - [Sandbox Testing](https://github.com/freqtrade/freqtrade/blob/develop/docs/sandbox-testing.md) - - [Edge](https://github.com/freqtrade/freqtrade/blob/develop/docs/edge.md) -- [Basic Usage](#basic-usage) - - [Bot commands](#bot-commands) - - [Telegram RPC commands](#telegram-rpc-commands) -- [Support](#support) - - [Help](#help--slack) - - [Bugs](#bugs--issues) - - [Feature Requests](#feature-requests) - - [Pull Requests](#pull-requests) -- [Requirements](#requirements) - - [Min hardware required](#min-hardware-required) - - [Software requirements](#software-requirements) -- [Wanna help?](https://github.com/freqtrade/freqtrade/blob/develop/CONTRIBUTING.md) - - [Dev - getting started](https://github.com/freqtrade/freqtrade/blob/develop/docs/developer.md) (WIP) +## Documentation +Please find the complete documentation on our [website](https://www.freqtrade.io). ## Quick start @@ -81,26 +37,11 @@ git checkout develop ./setup.sh --install ``` -_Windows installation is explained in [Installation doc](https://github.com/freqtrade/freqtrade/blob/develop/docs/installation.md)_ +For any other type of installation please refer to [Installation doc](https://www.freqtrade.io/en/latest/installation/). -## Documentation - -We invite you to read the bot documentation to ensure you understand how the bot is working. - -- [Index](https://github.com/freqtrade/freqtrade/blob/develop/docs/index.md) -- [Installation](https://github.com/freqtrade/freqtrade/blob/develop/docs/installation.md) -- [Configuration](https://github.com/freqtrade/freqtrade/blob/develop/docs/configuration.md) -- [Bot usage](https://github.com/freqtrade/freqtrade/blob/develop/docs/bot-usage.md) - - [How to run the bot](https://github.com/freqtrade/freqtrade/blob/develop/docs/bot-usage.md#bot-commands) - - [How to use Backtesting](https://github.com/freqtrade/freqtrade/blob/develop/docs/bot-usage.md#backtesting-commands) - - [How to use Hyperopt](https://github.com/freqtrade/freqtrade/blob/develop/docs/bot-usage.md#hyperopt-commands) -- [Strategy Optimization](https://github.com/freqtrade/freqtrade/blob/develop/docs/bot-optimization.md) -- [Backtesting](https://github.com/freqtrade/freqtrade/blob/develop/docs/backtesting.md) -- [Hyperopt](https://github.com/freqtrade/freqtrade/blob/develop/docs/hyperopt.md) ## Basic Usage -### Bot commands ```bash usage: main.py [-h] [-v] [--version] [-c PATH] [-d PATH] [-s NAME] @@ -135,23 +76,6 @@ optional arguments: only if dry_run is enabled. ``` -### Telegram RPC commands - -Telegram is not mandatory. However, this is a great way to control your bot. More details on our [documentation](https://github.com/freqtrade/freqtrade/blob/develop/docs/index.md) - -- `/start`: Starts the trader -- `/stop`: Stops the trader -- `/status [table]`: Lists all open trades -- `/count`: Displays number of open trades -- `/profit`: Lists cumulative profit from all finished trades -- `/forcesell |all`: Instantly sells the given trade (Ignoring `minimum_roi`). -- `/performance`: Show performance of each finished trade grouped by pair -- `/balance`: Show account balance per currency -- `/daily `: Shows profit or loss per day, over the last n days -- `/help`: Show help message -- `/version`: Show version - - ## Development branches The project is currently setup in two main branches: @@ -206,25 +130,4 @@ Issues labeled [good first issue](https://github.com/freqtrade/freqtrade/labels/ **Note** before starting any major new feature work, *please open an issue describing what you are planning to do* or talk to us on [Slack](https://join.slack.com/t/highfrequencybot/shared_invite/enQtMjQ5NTM0OTYzMzY3LWMxYzE3M2MxNDdjMGM3ZTYwNzFjMGIwZGRjNTc3ZGU3MGE3NzdmZGMwNmU3NDM5ZTNmM2Y3NjRiNzk4NmM4OGE). This will ensure that interested parties can give valuable feedback on the feature, and let others know that you are working on it. -**Important:** Always create your PR against the `develop` branch, not `master`. - -## Requirements - -### Uptodate clock - -The clock must be accurate, syncronized to a NTP server very frequently to avoid problems with communication to the exchanges. - -### Min hardware required - -To run this bot we recommend you a cloud instance with a minimum of: - -- Minimal (advised) system requirements: 2GB RAM, 1GB disk space, 2vCPU - -### Software requirements - -- [Python 3.6.x](http://docs.python-guide.org/en/latest/starting/installation/) -- [pip](https://pip.pypa.io/en/stable/installing/) -- [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) -- [TA-Lib](https://mrjbq7.github.io/ta-lib/install.html) -- [virtualenv](https://virtualenv.pypa.io/en/stable/installation/) (Recommended) -- [Docker](https://www.docker.com/products/docker) (Recommended) +**Important:** Always create your PR against the `develop` branch, not `master`. \ No newline at end of file From afffa2f313bcc3a15dcb7c770ff7b7429a5ff15b Mon Sep 17 00:00:00 2001 From: misagh Date: Thu, 3 Jan 2019 14:38:38 +0100 Subject: [PATCH 4/6] =?UTF-8?q?changed=20to=20=E2=80=9CFree,=20open=20sour?= =?UTF-8?q?ce=20=E2=80=A6=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 72 ++++++++++++++++++++++++++++++++++++++--------- docs/bot-usage.md | 2 +- freqtrade/main.py | 4 +-- setup.py | 2 +- 4 files changed, 62 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 50114a41c..e89edf76b 100644 --- a/README.md +++ b/README.md @@ -22,10 +22,33 @@ expect. We strongly recommend you to have coding and Python knowledge. Do not hesitate to read the source code and understand the mechanism of this bot. +## Exchange marketplaces supported + +- [X] [Bittrex](https://bittrex.com/) +- [X] [Binance](https://www.binance.com/) ([*Note for binance users](#a-note-on-binance)) +- [ ] [113 others to tests](https://github.com/ccxt/ccxt/). _(We cannot guarantee they will work)_ + ## Documentation +We invite you to read the bot documentation to ensure you understand how the bot is working. + Please find the complete documentation on our [website](https://www.freqtrade.io). +## Features + +- [x] **Based on Python 3.6+**: For botting on any operating system - Windows, macOS and Linux. +- [x] **Persistence**: Persistence is achieved through sqlite. +- [x] **Dry-run**: Run the bot without playing money. +- [x] **Backtesting**: Run a simulation of your buy/sell strategy. +- [x] **Strategy Optimization by machine learning**: Use machine learning to optimize your buy/sell strategy parameters with real exchange data. +- [x] **Edge position sizing** Calculate your win rate, risk reward ratio, the best stoploss and adjust your position size before taking a position for each specific market. [Learn more](https://www.freqtrade.io/en/latest/edge/). +- [x] **Whitelist crypto-currencies**: Select which crypto-currency you want to trade or use dynamic whitelists. +- [x] **Blacklist crypto-currencies**: Select which crypto-currency you want to avoid. +- [x] **Manageable via Telegram**: Manage the bot with Telegram. +- [x] **Display profit/loss in fiat**: Display your profit/loss in 33 fiat. +- [x] **Daily summary of profit/loss**: Provide a daily summary of your profit/loss. +- [x] **Performance status report**: Provide a performance status of your current trades. + ## Quick start Freqtrade provides a Linux/macOS script to install all dependencies and help you to configure the bot. @@ -42,40 +65,61 @@ For any other type of installation please refer to [Installation doc](https://ww ## Basic Usage +### Bot commands -```bash +``` usage: main.py [-h] [-v] [--version] [-c PATH] [-d PATH] [-s NAME] - [--strategy-path PATH] [--dynamic-whitelist [INT]] - [--dry-run-db] - {backtesting,hyperopt} ... + [--strategy-path PATH] [--customhyperopt NAME] + [--dynamic-whitelist [INT]] [--db-url PATH] + {backtesting,edge,hyperopt} ... -Simple High Frequency Trading Bot for crypto currencies +Free, open source crypto trading bot positional arguments: - {backtesting,hyperopt} + {backtesting,edge,hyperopt} backtesting backtesting module + edge edge module hyperopt hyperopt module optional arguments: -h, --help show this help message and exit - -v, --verbose be verbose - --version show program's version number and exit + -v, --verbose verbose mode (-vv for more, -vvv to get all messages) + --version show program\'s version number and exit -c PATH, --config PATH specify configuration file (default: config.json) -d PATH, --datadir PATH - path to backtest data (default: - freqtrade/tests/testdata + path to backtest data -s NAME, --strategy NAME specify strategy class name (default: DefaultStrategy) --strategy-path PATH specify additional strategy lookup path + --customhyperopt NAME + specify hyperopt class name (default: + DefaultHyperOpts) --dynamic-whitelist [INT] dynamically generate and update whitelist based on 24h - BaseVolume (Default 20 currencies) - --dry-run-db Force dry run to use a local DB - "tradesv3.dry_run.sqlite" instead of memory DB. Work - only if dry_run is enabled. + BaseVolume (default: 20) DEPRECATED. + --db-url PATH Override trades database URL, this is useful if + dry_run is enabled or in custom deployments (default: + None) ``` +### Telegram RPC commands + +Telegram is not mandatory. However, this is a great way to control your bot. More details on our [documentation](https://github.com/freqtrade/freqtrade/blob/develop/docs/index.md) + +- `/start`: Starts the trader +- `/stop`: Stops the trader +- `/status [table]`: Lists all open trades +- `/count`: Displays number of open trades +- `/profit`: Lists cumulative profit from all finished trades +- `/forcesell |all`: Instantly sells the given trade (Ignoring `minimum_roi`). +- `/performance`: Show performance of each finished trade grouped by pair +- `/balance`: Show account balance per currency +- `/daily `: Shows profit or loss per day, over the last n days +- `/help`: Show help message +- `/version`: Show version + + ## Development branches The project is currently setup in two main branches: diff --git a/docs/bot-usage.md b/docs/bot-usage.md index bc5e7f0b4..96b16b6b6 100644 --- a/docs/bot-usage.md +++ b/docs/bot-usage.md @@ -11,7 +11,7 @@ usage: main.py [-h] [-v] [--version] [-c PATH] [-d PATH] [-s NAME] [--dynamic-whitelist [INT]] [--db-url PATH] {backtesting,edge,hyperopt} ... -Simple High Frequency Trading Bot for crypto currencies +Free, open source crypto trading bot positional arguments: {backtesting,edge,hyperopt} diff --git a/freqtrade/main.py b/freqtrade/main.py index 3ed478ec3..f27145b45 100755 --- a/freqtrade/main.py +++ b/freqtrade/main.py @@ -25,7 +25,7 @@ def main(sysargv: List[str]) -> None: """ arguments = Arguments( sysargv, - 'Simple High Frequency Trading Bot for crypto currencies' + 'Free, open source crypto trading bot' ) args = arguments.get_parsed_arg() @@ -45,7 +45,7 @@ def main(sysargv: List[str]) -> None: freqtrade = FreqtradeBot(config) state = None - while 1: + while True: state = freqtrade.worker(old_state=state) if state == State.RELOAD_CONF: freqtrade = reconfigure(freqtrade, args) diff --git a/setup.py b/setup.py index 11f957e67..35fdb2938 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ from freqtrade import __version__ setup(name='freqtrade', version=__version__, - description='Simple High Frequency Trading Bot for crypto currencies', + description='Crypto Trading Bot', url='https://github.com/freqtrade/freqtrade', author='gcarq and contributors', author_email='michael.egger@tsn.at', From f1bb4233c9464abd07035ff580f86766b99d5242 Mon Sep 17 00:00:00 2001 From: misagh Date: Thu, 3 Jan 2019 14:40:27 +0100 Subject: [PATCH 5/6] telegram documentation link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e89edf76b..d2b7c7374 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ optional arguments: ### Telegram RPC commands -Telegram is not mandatory. However, this is a great way to control your bot. More details on our [documentation](https://github.com/freqtrade/freqtrade/blob/develop/docs/index.md) +Telegram is not mandatory. However, this is a great way to control your bot. More details on our [documentation](https://www.freqtrade.io/en/latest/telegram-usage/) - `/start`: Starts the trader - `/stop`: Stops the trader From 67cbd5d77f33a364c95ab5d8f1cf223fbca2543d Mon Sep 17 00:00:00 2001 From: misagh Date: Fri, 4 Jan 2019 22:39:44 +0100 Subject: [PATCH 6/6] putting back requirements --- README.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d2b7c7374..49b10e417 100644 --- a/README.md +++ b/README.md @@ -174,4 +174,25 @@ Issues labeled [good first issue](https://github.com/freqtrade/freqtrade/labels/ **Note** before starting any major new feature work, *please open an issue describing what you are planning to do* or talk to us on [Slack](https://join.slack.com/t/highfrequencybot/shared_invite/enQtMjQ5NTM0OTYzMzY3LWMxYzE3M2MxNDdjMGM3ZTYwNzFjMGIwZGRjNTc3ZGU3MGE3NzdmZGMwNmU3NDM5ZTNmM2Y3NjRiNzk4NmM4OGE). This will ensure that interested parties can give valuable feedback on the feature, and let others know that you are working on it. -**Important:** Always create your PR against the `develop` branch, not `master`. \ No newline at end of file +**Important:** Always create your PR against the `develop` branch, not `master`. + +## Requirements + +### Uptodate clock + +The clock must be accurate, syncronized to a NTP server very frequently to avoid problems with communication to the exchanges. + +### Min hardware required + +To run this bot we recommend you a cloud instance with a minimum of: + +- Minimal (advised) system requirements: 2GB RAM, 1GB disk space, 2vCPU + +### Software requirements + +- [Python 3.6.x](http://docs.python-guide.org/en/latest/starting/installation/) +- [pip](https://pip.pypa.io/en/stable/installing/) +- [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) +- [TA-Lib](https://mrjbq7.github.io/ta-lib/install.html) +- [virtualenv](https://virtualenv.pypa.io/en/stable/installation/) (Recommended) +- [Docker](https://www.docker.com/products/docker) (Recommended) \ No newline at end of file