From 3c8387ab611df10c8a327b5196f4798541f67b10 Mon Sep 17 00:00:00 2001 From: Stefano Ariestasia Date: Fri, 1 Apr 2022 20:48:13 +0900 Subject: [PATCH 1/4] Add exchange id for binance Futures --- docs/exchanges.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/exchanges.md b/docs/exchanges.md index b808096d2..420061050 100644 --- a/docs/exchanges.md +++ b/docs/exchanges.md @@ -87,7 +87,7 @@ When trading on Binance Futures market, orderbook must be used because there is Binance has been split into 2, and users must use the correct ccxt exchange ID for their exchange, otherwise API keys are not recognized. -* [binance.com](https://www.binance.com/) - International users. Use exchange id: `binance`. +* [binance.com](https://www.binance.com/) - International users. Use exchange id: `binance` for spot market, and use `binanceusdm` or `binancecoinm` for Futures market. * [binance.us](https://www.binance.us/) - US based users. Use exchange id: `binanceus`. ## Kraken From da0688b6aa26f6eee36acef9ede4186b48d876c6 Mon Sep 17 00:00:00 2001 From: Stefano Ariestasia Date: Sat, 2 Apr 2022 03:20:21 +0900 Subject: [PATCH 2/4] Revert "Add exchange id for binance Futures" This reverts commit 3c8387ab611df10c8a327b5196f4798541f67b10. --- docs/exchanges.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/exchanges.md b/docs/exchanges.md index 420061050..b808096d2 100644 --- a/docs/exchanges.md +++ b/docs/exchanges.md @@ -87,7 +87,7 @@ When trading on Binance Futures market, orderbook must be used because there is Binance has been split into 2, and users must use the correct ccxt exchange ID for their exchange, otherwise API keys are not recognized. -* [binance.com](https://www.binance.com/) - International users. Use exchange id: `binance` for spot market, and use `binanceusdm` or `binancecoinm` for Futures market. +* [binance.com](https://www.binance.com/) - International users. Use exchange id: `binance`. * [binance.us](https://www.binance.us/) - US based users. Use exchange id: `binanceus`. ## Kraken From e21f6a7787091e2c3831f872bf26aaed3df0184c Mon Sep 17 00:00:00 2001 From: Stefano Ariestasia Date: Mon, 16 May 2022 07:28:40 +0900 Subject: [PATCH 3/4] missing newline --- freqtrade/rpc/telegram.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index 1a9be4503..259d2c831 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -1417,7 +1417,7 @@ class Telegram(RPCHandler): "*/stopbuy:* `Stops buying, but handles open trades gracefully` \n" "*/forceexit |all:* `Instantly exits the given trade or all trades, " "regardless of profit`\n" - "*/fe |all:* `Alias to /forceexit`" + "*/fe |all:* `Alias to /forceexit`\n" f"{force_enter_text if self._config.get('force_entry_enable', False) else ''}" "*/delete :* `Instantly delete the given trade in the database`\n" "*/whitelist:* `Show current whitelist` \n" From 2cb8eecf18eed273df41ee2702e54def89831b03 Mon Sep 17 00:00:00 2001 From: Stefano Ariestasia Date: Mon, 16 May 2022 07:43:36 +0900 Subject: [PATCH 4/4] add space --- freqtrade/rpc/telegram.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index 259d2c831..f26de8b5c 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -1410,7 +1410,7 @@ class Telegram(RPCHandler): "Optionally takes a rate at which to sell " "(only applies to limit orders).` \n") message = ( - "_BotControl_\n" + "_Bot Control_\n" "------------\n" "*/start:* `Starts the trader`\n" "*/stop:* Stops the trader\n"