From 854dbdbf74760d4a7eac7499fb769d07c39b660e Mon Sep 17 00:00:00 2001 From: Guillaume De Saint Martin Date: Mon, 25 Sep 2023 20:13:02 +0200 Subject: [PATCH 1/6] [Community] update password url --- octobot/community/authentication.py | 2 +- octobot/constants.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/octobot/community/authentication.py b/octobot/community/authentication.py index a3620a7ef..9acdc5c75 100644 --- a/octobot/community/authentication.py +++ b/octobot/community/authentication.py @@ -144,7 +144,7 @@ def get_is_signal_emitter(self): def get_signal_community_url(self, signal_identifier): try: slug = self.public_data.get_product_slug(signal_identifier) - return f"{identifiers_provider.IdentifiersProvider.COMMUNITY_URL}/product/{slug}" + return f"{identifiers_provider.IdentifiersProvider.COMMUNITY_URL}/strategies/{slug}" except KeyError: return identifiers_provider.IdentifiersProvider.COMMUNITY_URL diff --git a/octobot/constants.py b/octobot/constants.py index 35869557b..3b425c58c 100644 --- a/octobot/constants.py +++ b/octobot/constants.py @@ -61,16 +61,16 @@ COMMUNITY_FEED_DEFAULT_TYPE = octobot.enums.CommunityFeedType.SupabaseFeed # production env SHOULD ONLY BE USED THROUGH CommunityIdentifiersProvider -OCTOBOT_COMMUNITY_URL = os.getenv("COMMUNITY_SERVER_URL", "https://www.octobot.cloud") -OCTOBOT_COMMUNITY_RECOVER_PASSWORD_URL = f"{OCTOBOT_COMMUNITY_URL}/auth/forgot-password" +OCTOBOT_COMMUNITY_URL = os.getenv("COMMUNITY_SERVER_URL", "https://app.octobot.cloud") +OCTOBOT_COMMUNITY_RECOVER_PASSWORD_URL = OCTOBOT_COMMUNITY_URL # todo use real production db COMMUNITY_BACKEND_URL = os.getenv("COMMUNITY_BACKEND_URL", "https://nwhpvrguwcihhizrnyoe.supabase.co") COMMUNITY_BACKEND_KEY = os.getenv("COMMUNITY_BACKEND_KEY", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Im53aHB2cmd1d2NpaGhpenJueW9lIiwicm9sZSI6ImFub24iLCJpYXQiOjE2OTU2NDQxMDcsImV4cCI6MjAxMTIyMDEwN30.AILcgv0l6hl_0IUEPlWh1wiu9RIpgrkGZGERM5uXftE") # staging env SHOULD ONLY BE USED THROUGH CommunityIdentifiersProvider -STAGING_OCTOBOT_COMMUNITY_URL = os.getenv("COMMUNITY_SERVER_URL", "https://beta.octobot.cloud/") -STAGING_COMMUNITY_RECOVER_PASSWORD_URL = f"{STAGING_OCTOBOT_COMMUNITY_URL}/auth/forgot-password" +STAGING_OCTOBOT_COMMUNITY_URL = os.getenv("COMMUNITY_SERVER_URL", "https://app-beta.octobot.cloud/") +STAGING_COMMUNITY_RECOVER_PASSWORD_URL = STAGING_OCTOBOT_COMMUNITY_URL STAGING_COMMUNITY_BACKEND_URL = os.getenv("COMMUNITY_BACKEND_URL", "https://wmfkgvgzokyzhvxowbyg.supabase.co") STAGING_COMMUNITY_BACKEND_KEY = os.getenv("COMMUNITY_BACKEND_KEY", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6IndtZmtndmd6b2t5emh2eG93YnlnIiwicm9sZSI6ImFub24iLCJpYXQiOjE2OTE0NDA1MTEsImV4cCI6MjAwNzAxNjUxMX0.YZQl7LYgvnzO_Jizs0UKfPEaqPoV2EwhjunH8gime8o") From 80d582a7a940fed1618457ac031a5813d7ce636d Mon Sep 17 00:00:00 2001 From: Guillaume De Saint Martin Date: Mon, 25 Sep 2023 20:10:42 +0200 Subject: [PATCH 2/6] [ReadMe] remove beta --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 83393e88b..76dd2d7d2 100644 --- a/README.md +++ b/README.md @@ -21,11 +21,11 @@ Intro

-## Launch of the new OctoBot Cloud beta -The OctoBot team is proud to announce the launch of the beta phase of [the new octobot.cloud](https://beta.octobot.cloud/?utm_source=github&utm_medium=dk&utm_campaign=beta_annoucements&utm_content=readme) +## Launch of the new OctoBot Cloud +The OctoBot team is proud to announce the launch of the [new octobot.cloud](https://octobot.cloud/?utm_source=github&utm_medium=dk&utm_campaign=production_annoucements&utm_content=readme) where 90% of trading strategies can be automated **in a very easy way** and **for free**. -[![try beta now](https://img.shields.io/static/v1?label=Try%20the%20new%20OctoBot%20cloud&message=now&color=007bff&style=for-the-badge)](https://beta.octobot.cloud/?utm_source=github&utm_medium=dk&utm_campaign=beta_annoucements&utm_content=readme_button) +[![try octobot cloud now](https://img.shields.io/static/v1?label=Try%20the%20new%20OctoBot%20cloud&message=now&color=007bff&style=for-the-badge)](https://octobot.cloud/?utm_source=github&utm_medium=dk&utm_campaign=production_annoucements&utm_content=readme_button) We are looking forward to receiving your feedback on our new OctoBot based system. From f0c7f7cf4b5ee9b552a3f24464a2c13dfb342ef2 Mon Sep 17 00:00:00 2001 From: Guillaume De Saint Martin Date: Mon, 25 Sep 2023 20:23:55 +0200 Subject: [PATCH 3/6] [Community] add landing links --- octobot/community/identifiers_provider.py | 3 +++ octobot/constants.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/octobot/community/identifiers_provider.py b/octobot/community/identifiers_provider.py index 7b64f54cd..3b406b92c 100644 --- a/octobot/community/identifiers_provider.py +++ b/octobot/community/identifiers_provider.py @@ -21,6 +21,7 @@ class IdentifiersProvider: ENABLED_ENVIRONMENT: str = None + COMMUNITY_LANDING_URL: str = None COMMUNITY_URL: str = None FRONTEND_PASSWORD_RECOVER_URL: str = None BACKEND_URL: str = None @@ -29,6 +30,7 @@ class IdentifiersProvider: @staticmethod def use_production(): IdentifiersProvider.COMMUNITY_URL = constants.OCTOBOT_COMMUNITY_URL + IdentifiersProvider.COMMUNITY_LANDING_URL = constants.OCTOBOT_COMMUNITY_LANDING_URL IdentifiersProvider.FRONTEND_PASSWORD_RECOVER_URL = constants.OCTOBOT_COMMUNITY_RECOVER_PASSWORD_URL IdentifiersProvider.BACKEND_URL = constants.COMMUNITY_BACKEND_URL IdentifiersProvider.BACKEND_KEY = constants.COMMUNITY_BACKEND_KEY @@ -37,6 +39,7 @@ def use_production(): @staticmethod def use_staging(): IdentifiersProvider.COMMUNITY_URL = constants.STAGING_OCTOBOT_COMMUNITY_URL + IdentifiersProvider.COMMUNITY_LANDING_URL = constants.STAGING_OCTOBOT_COMMUNITY_LANDING_URL IdentifiersProvider.FRONTEND_PASSWORD_RECOVER_URL = constants.STAGING_COMMUNITY_RECOVER_PASSWORD_URL IdentifiersProvider.BACKEND_URL = constants.STAGING_COMMUNITY_BACKEND_URL IdentifiersProvider.BACKEND_KEY = constants.STAGING_COMMUNITY_BACKEND_KEY diff --git a/octobot/constants.py b/octobot/constants.py index 3b425c58c..2bb67d590 100644 --- a/octobot/constants.py +++ b/octobot/constants.py @@ -61,6 +61,7 @@ COMMUNITY_FEED_DEFAULT_TYPE = octobot.enums.CommunityFeedType.SupabaseFeed # production env SHOULD ONLY BE USED THROUGH CommunityIdentifiersProvider +OCTOBOT_COMMUNITY_LANDING_URL = os.getenv("COMMUNITY_SERVER_URL", "https://octobot.cloud") OCTOBOT_COMMUNITY_URL = os.getenv("COMMUNITY_SERVER_URL", "https://app.octobot.cloud") OCTOBOT_COMMUNITY_RECOVER_PASSWORD_URL = OCTOBOT_COMMUNITY_URL # todo use real production db @@ -69,6 +70,7 @@ # staging env SHOULD ONLY BE USED THROUGH CommunityIdentifiersProvider +STAGING_OCTOBOT_COMMUNITY_LANDING_URL = os.getenv("COMMUNITY_SERVER_URL", "https://beta.octobot.cloud") STAGING_OCTOBOT_COMMUNITY_URL = os.getenv("COMMUNITY_SERVER_URL", "https://app-beta.octobot.cloud/") STAGING_COMMUNITY_RECOVER_PASSWORD_URL = STAGING_OCTOBOT_COMMUNITY_URL STAGING_COMMUNITY_BACKEND_URL = os.getenv("COMMUNITY_BACKEND_URL", "https://wmfkgvgzokyzhvxowbyg.supabase.co") From 2eb56a242141b3bb2873c73cbb19c805df05ef37 Mon Sep 17 00:00:00 2001 From: Guillaume De Saint Martin Date: Tue, 26 Sep 2023 00:57:31 +0200 Subject: [PATCH 4/6] [Constants] remove OCTOBOT_CLOUD_URL --- README.md | 6 +++--- octobot/constants.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 76dd2d7d2..6ead4c652 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ Intro

-## Launch of the new OctoBot Cloud -The OctoBot team is proud to announce the launch of the [new octobot.cloud](https://octobot.cloud/?utm_source=github&utm_medium=dk&utm_campaign=production_annoucements&utm_content=readme) +## Launch of the new OctoBot cloud +The OctoBot team is proud to announce the launch of the [new octobot.cloud](https://octobot.cloud/?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=readme) where 90% of trading strategies can be automated **in a very easy way** and **for free**. [![try octobot cloud now](https://img.shields.io/static/v1?label=Try%20the%20new%20OctoBot%20cloud&message=now&color=007bff&style=for-the-badge)](https://octobot.cloud/?utm_source=github&utm_medium=dk&utm_campaign=production_annoucements&utm_content=readme_button) @@ -51,7 +51,7 @@ Octobot's main feature is **evolution**, you can : ## Installation OctoBot's installation is **very simple**, you can either: -- [Deploy your OctoBot on OctoBot Cloud](https://octobot.cloud/). With OctoBot Cloud, experience hassle-free installation, updates, and maintenance - leave it all to us! Your robot will also benefit from cloud only features. +- [Deploy your OctoBot on OctoBot Cloud](https://octobot.cloud/?utm_source=github&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=readme_deploy_on_cloud). With OctoBot cloud, experience hassle-free installation, updates, and maintenance - leave it all to us! Your robot will also benefit from cloud only features. - [Download and install](https://www.octobot.info/installation/local-installation) OctoBot on your computer or server and enjoy all features for free. - Install OctoBot [using docker](https://www.octobot.info/installation/local-installation#option-2-with-docker). diff --git a/octobot/constants.py b/octobot/constants.py index 2bb67d590..80516dcfc 100644 --- a/octobot/constants.py +++ b/octobot/constants.py @@ -41,7 +41,6 @@ DEVELOPER_DOCS_URL = os.getenv("DOCS_OCTOBOT_ONLINE_URL", "https://developer.octobot.info/") OCTOBOT_ONLINE = os.getenv("TENTACLES_OCTOBOT_ONLINE_URL", "https://static.octobot.online") OCTOBOT_FEEDBACK = os.getenv("FEEDBACK_OCTOBOT_ONLINE_URL", "https://feedback.octobot.online/") -OCTOBOT_CLOUD_URL = os.getenv("OCTOBOT_CLOUD_URL", "https://octobot.cloud/") TENTACLES_REPOSITORY = "tentacles" BETA_TENTACLES_REPOSITORY = "dev-tentacles" OFFICIALS = "officials" From 8c74a2577125b8672cdd6fbcae980704aa3588bf Mon Sep 17 00:00:00 2001 From: Guillaume De Saint Martin Date: Tue, 26 Sep 2023 01:11:05 +0200 Subject: [PATCH 5/6] [Version] v0.4.55 --- CHANGELOG.md | 8 ++++++++ README.md | 2 +- octobot/__init__.py | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c49c6310..c9bd85b3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 *It is strongly advised to perform an update of your tentacles after updating OctoBot. (start.py tentacles --install --all)* +## [0.4.55] - 2023-09-26 +### Updated +- [Community] Migrate to the updated octobot.cloud. Full details on https://blog.octobot.online/introducing-the-new-octobot-cloud +- [Logs] Improve debug logs +### Fixed +- [GridTrading] Mirror order rebalance issues +- [DCA & Dip Analyser] Sell order split issues + ## [0.4.54] - 2023-08-31 ### Added - [Kucoin] API Key permissions checks diff --git a/README.md b/README.md index 6ead4c652..31c15f30f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# OctoBot [0.4.54](https://octobot.click/gh-changelog) +# OctoBot [0.4.55](https://octobot.click/gh-changelog) [![PyPI](https://img.shields.io/pypi/v/OctoBot.svg?logo=pypi)](https://octobot.click/gh-pypi) [![Downloads](https://pepy.tech/badge/octobot/month)](https://pepy.tech/project/octobot) [![Dockerhub](https://img.shields.io/docker/pulls/drakkarsoftware/octobot.svg?logo=docker)](https://octobot.click/gh-dockerhub) diff --git a/octobot/__init__.py b/octobot/__init__.py index 6470e6058..085118e14 100644 --- a/octobot/__init__.py +++ b/octobot/__init__.py @@ -16,5 +16,5 @@ PROJECT_NAME = "OctoBot" AUTHOR = "Drakkar-Software" -VERSION = "0.4.54" # major.minor.revision +VERSION = "0.4.55" # major.minor.revision LONG_VERSION = f"{VERSION}" From ee9bbe180aad8401dce62486e9a36383d30598ba Mon Sep 17 00:00:00 2001 From: Guillaume De Saint Martin Date: Tue, 26 Sep 2023 10:26:35 +0200 Subject: [PATCH 6/6] [Version] v1.0.0 --- CHANGELOG.md | 2 +- README.md | 2 +- octobot/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9bd85b3c..00bbe7c86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 *It is strongly advised to perform an update of your tentacles after updating OctoBot. (start.py tentacles --install --all)* -## [0.4.55] - 2023-09-26 +## [1.0.0] - 2023-09-26 ### Updated - [Community] Migrate to the updated octobot.cloud. Full details on https://blog.octobot.online/introducing-the-new-octobot-cloud - [Logs] Improve debug logs diff --git a/README.md b/README.md index 31c15f30f..7761c4e7f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# OctoBot [0.4.55](https://octobot.click/gh-changelog) +# OctoBot [1.0.0](https://octobot.click/gh-changelog) [![PyPI](https://img.shields.io/pypi/v/OctoBot.svg?logo=pypi)](https://octobot.click/gh-pypi) [![Downloads](https://pepy.tech/badge/octobot/month)](https://pepy.tech/project/octobot) [![Dockerhub](https://img.shields.io/docker/pulls/drakkarsoftware/octobot.svg?logo=docker)](https://octobot.click/gh-dockerhub) diff --git a/octobot/__init__.py b/octobot/__init__.py index 085118e14..dc6c893fe 100644 --- a/octobot/__init__.py +++ b/octobot/__init__.py @@ -16,5 +16,5 @@ PROJECT_NAME = "OctoBot" AUTHOR = "Drakkar-Software" -VERSION = "0.4.55" # major.minor.revision +VERSION = "1.0.0" # major.minor.revision LONG_VERSION = f"{VERSION}"