Merge pull request #3353 from Drakkar-Software/dev

Master update

Author: GuillaumeDSM

.github/workflows/main.yml

@@ -38,14 +38,30 @@ jobs:
         with:
           node-version: 22
 
-      - name: Build wheel
-        run: pants package :OctoBot
+      - name: Install Rust toolchain
+        if: hashFiles('packages/*/crates/*/Cargo.toml') != ''
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy
+
+      - name: Rust lint & tests
+        if: hashFiles('packages/*/crates/*/Cargo.toml') != ''
+        run: |
+          cargo clippy --workspace -- -D warnings
+          cargo test --workspace
+
+      - name: Install maturin
+        if: hashFiles('packages/*/crates/*/pyproject.toml') != ''
+        run: pip install maturin
 
-      - name: Upload wheel artifact
+      - name: Build wheels
+        run: pants package :OctoBot $(pants list --filter-target-type=package_shell_command ::)
+
+      - name: Upload wheel artifacts
         uses: actions/upload-artifact@v7
         with:
           name: octobot-wheel
-          path: dist/octobot-*.whl
+          path: dist/*.whl
           if-no-files-found: error
 
   tests:
@@ -65,14 +81,28 @@ jobs:
           - packages/commons
           - packages/evaluators
           - packages/node
+          - packages/flow
           - packages/services
+          - packages/sync
           - packages/tentacles_manager
           - packages/trading
           - packages/trading_backend
 
+    env:
+      USES_TENTACLES: ${{ matrix.package == 'octobot' || matrix.package == 'packages/node' || matrix.package == 'packages/flow' }}
+
     steps:
     - uses: actions/checkout@v6
 
+    - name: Detect package features
+      id: detect
+      run: |
+        if ls ${{ matrix.package }}/crates/*/Cargo.toml 1>/dev/null 2>&1; then
+          echo "has_rust=true" >> $GITHUB_OUTPUT
+        else
+          echo "has_rust=false" >> $GITHUB_OUTPUT
+        fi
+
     - name: Set up Python ${{ matrix.version }}
       uses: actions/setup-python@v6
       with:
@@ -88,20 +118,34 @@ jobs:
     - name: Install OctoBot
       run: |
         pip3 install -r dev_requirements.txt
-        pip3 install dist/octobot-*.whl
+        pip3 install dist/*.whl
 
     - name: Lint package
       run: |
         if [ -f "${{ matrix.package }}/standard.rc" ]; then
           pylint --rcfile=${{ matrix.package }}/standard.rc ${{ matrix.package }}/
-          if [ $? -ne 1 ]; then exit 0; fi
+          rc=$?
         else
           pylint --rcfile=standard.rc ${{ matrix.package }}/
-          if [ $? -ne 1 ]; then exit 0; fi
+          rc=$?
         fi
+        if [ $rc -eq 1 ]; then exit 1; fi
+
+    - name: Install Rust toolchain
+      if: steps.detect.outputs.has_rust == 'true'
+      uses: dtolnay/rust-toolchain@stable
+      with:
+        components: clippy
+
+    - name: Lint Rust crates
+      if: steps.detect.outputs.has_rust == 'true'
+      run: |
+        for crate in ${{ matrix.package }}/crates/*/; do
+          cargo clippy --manifest-path "$crate/Cargo.toml" -- -D warnings
+        done
 
     - name: Install tentacles
-      if:  matrix.package == 'octobot'
+      if: env.USES_TENTACLES == 'true'
       run: |
         mkdir -p output
         OctoBot tentacles -d packages/tentacles -p any_platform.zip
@@ -113,16 +157,27 @@ jobs:
           pytest tests -n auto --dist loadfile
           pytest --ignore=tentacles/Trading/Exchange tentacles -n auto --dist loadfile
         else
-          cd ${{ matrix.package }}
-          if [ "${{ matrix.package }}" = "packages/tentacles_manager" ] || [ "${{ matrix.package }}" = "packages/node" ]; then
-            pytest tests
+          if [ "${{ matrix.package }}" = "packages/node" ] || [ "${{ matrix.package }}" = "packages/flow" ]; then
+            echo "Running tests from root dir to allow tentacles import"
+            PYTHONPATH=.:$PYTHONPATH pytest ${{ matrix.package }}/tests -n auto --dist loadfile
           else
-            pytest tests -n auto --dist loadfile
+            cd ${{ matrix.package }}
+            if [ "${{ matrix.package }}" = "packages/tentacles_manager" ]; then
+              pytest tests
+            else
+              pytest tests -n auto --dist loadfile
+            fi
           fi
         fi
       env:
         DISABLE_SENTRY: True
 
+    - name: Run Rust backend tests
+      if: steps.detect.outputs.has_rust == 'true'
+      run: |
+        cd ${{ matrix.package }}
+        pytest tests --backend=rust -v
+
   docker:
     name: Build & Push Docker images
     needs: [ build, tests ]
@@ -618,6 +673,42 @@ jobs:
           asset_name: OctoBot_macos_arm64
           asset_content_type: application/x-binary
 
+  sync:
+    name: Deploy Sync Server
+    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/')
+    needs: [docker]
+    environment:
+      name: ${{ startsWith(github.ref, 'refs/tags/') && 'Production - Sync Server' || github.ref == 'refs/heads/master' && 'Staging - Sync Server' || 'Development - Sync Server' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Install Ansible
+        run: pip install ansible
+
+      - name: Install Galaxy requirements
+        working-directory: infra/sync/ansible
+        run: ansible-galaxy install -r requirements.yml
+
+      - name: Set up SSH key
+        run: |
+          mkdir -p infra/sync/ansible/inventories/${{ vars.ANSIBLE_ENV }}/.ssh
+          echo "${{ secrets.ANSIBLE_SSH_KEY }}" > infra/sync/ansible/inventories/${{ vars.ANSIBLE_ENV }}/.ssh/id_ed25519
+          chmod 600 infra/sync/ansible/inventories/${{ vars.ANSIBLE_ENV }}/.ssh/id_ed25519
+
+      - name: Deploy to ${{ vars.ANSIBLE_ENV }}
+        working-directory: infra/sync/ansible
+        env:
+          ANSIBLE_VAULT_PASSWORD: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
+          ANSIBLE_HOST_KEY_CHECKING: "false"
+        run: |
+          ansible-playbook playbooks/deploy-octobot-sync.yml -i inventories/${{ vars.ANSIBLE_ENV }}
+
+      - name: Clean up SSH key
+        if: always()
+        run: rm -f infra/sync/ansible/inventories/${{ vars.ANSIBLE_ENV }}/.ssh/id_ed25519
+
   notify:
     if: ${{ failure() }}
     needs:
@@ -628,6 +719,7 @@ jobs:
       - tentacles
       - release
       - version
+      - sync
     uses: Drakkar-Software/.github/.github/workflows/failure_notify_workflow.yml@master
     secrets:
       DISCORD_GITHUB_WEBHOOK: ${{ secrets.DISCORD_GITHUB_WEBHOOK }}

.gitignore

@@ -120,7 +120,7 @@ downloaded_temp_tentacles
 !packages/tentacles
 
 # User config
-user/
+user
 temp_config.json
 
 *.csv
@@ -141,6 +141,13 @@ letsencrypt/
 # dev env
 .env
 
+# Ansible decrypted temp files, SSH keys, and production collections config
+infra/**/*.dec.yml
+infra/**/.ssh/
+
+# Ansible Galaxy installed roles (installed via requirements.yml)
+infra/**/roles/geerlingguy.*/
+
 # Pants build system
 /.pants.d/
 /dist/

BUILD

@@ -2,6 +2,11 @@ python_requirements(name="reqs")
 python_requirements(name="full_reqs", source="full_requirements.txt")
 python_requirements(name="dev_reqs", source="dev_requirements.txt")
 
+files(
+    name="cargo_workspace",
+    sources=["Cargo.toml", "Cargo.lock"],
+)
+
 python_sources(name="octobot", sources=["octobot/**/*.py"])
 
 files(
@@ -32,7 +37,9 @@ PACKAGE_SOURCES = [
     "packages/commons:octobot_commons",
     "packages/evaluators:octobot_evaluators",
     "packages/node:octobot_node",
+    "packages/flow:octobot_flow",
     "packages/services:octobot_services",
+    "packages/sync:octobot_sync",
     "packages/tentacles_manager:octobot_tentacles_manager",
     "packages/trading:octobot_trading",
     "packages/trading_backend:trading_backend",
@@ -43,6 +50,7 @@ PACKAGE_REQS = [
     "packages/commons:reqs",
     "packages/evaluators:reqs",
     "packages/node:reqs",
+    "packages/sync:reqs",
     "packages/tentacles_manager:reqs",
     "packages/trading:reqs",
     "packages/trading_backend:reqs",
@@ -51,6 +59,7 @@ PACKAGE_REQS = [
 PACKAGE_FULL_REQS = [
     "packages/commons:full_reqs",
     "packages/services:full_reqs",
+    "packages/sync:full_reqs",
     "packages/tentacles_manager:full_reqs",
     "packages/trading:full_reqs",
 ]
@@ -151,7 +160,7 @@ python_distribution(
     ] + PACKAGE_SOURCES + PACKAGE_REQS + PACKAGE_FULL_REQS,
     provides=python_artifact(
         name="octobot",
-        version="2.1.0",
+        version="2.1.1",
         url='https://github.com/Drakkar-Software/OctoBot',
         license='GPL-3.0',
         author="Drakkar-Software",

CHANGELOG.md

@@ -6,7 +6,20 @@ 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)*
 
-## [2.1.0] - 2025-03-17
+## [2.1.1] - 2026-03-28
+### Added
+- [GridTrading] Add reinvest_profits config option
+- [DSLTradingMode] Add DSLTradingMode
+### Updated
+- [CCXT] Update to ccxt 4.5.44
+- [Exchanges]: Improve exchange market status cache
+- [Polymarket]: Improve tickers fetching
+### Fixed
+- [Hyperliquid]: Fix assets valuation and websocket related issues
+- [WebInterface]: Fix GPT settings display
+- [Webinterface]: Improve redirect checks. Special thanks to zhangqy24
+
+## [2.1.0] - 2026-03-17
 ### Python version update
 **OctoBot now runs on Python 3.13 and 3.12. 3.10 and 3.11 are not supported anymore**
 ### Repositories structure change

Cargo.toml

@@ -0,0 +1,9 @@
+[workspace]
+members = ["packages/*/crates/*"]
+resolver = "2"
+
+[profile.release]
+opt-level = 3
+lto = true
+codegen-units = 1
+strip = true

additional_tests/exchanges_tests/abstract_authenticated_exchange_tester.py

@@ -35,7 +35,7 @@
 import octobot_trading.personal_data as personal_data
 import octobot_trading.personal_data.orders as personal_data_orders
 import octobot_trading.util.test_tools.exchanges_test_tools as exchanges_test_tools
-import octobot_trading.util.test_tools.exchange_data as exchange_data_import
+import octobot_trading.exchanges.util.exchange_data as exchange_data_import
 import trading_backend.enums
 import octobot_tentacles_manager.api as tentacles_manager_api
 from additional_tests.exchanges_tests import get_authenticated_exchange_manager, NoProvidedCredentialsError

additional_tests/exchanges_tests/test_binance_futures.py

@@ -42,6 +42,8 @@ class TestBinanceFuturesAuthenticatedExchange(
     MAX_TRADE_USD_VALUE = decimal.Decimal(450000)   # testnet portfolio
     ALLOW_0_MAKER_FEES = True
     SUPPORTS_GET_MAX_ORDERS_COUNT = True
+    # Set True when get_cancelled_order() can return outdated open orders
+    CAN_HAVE_DELAYED_CANCELLED_ORDERS = True
 
     SPECIAL_ORDER_TYPES_BY_EXCHANGE_ID: dict[
         str, (

additional_tests/exchanges_tests/test_bitget.py

@@ -23,6 +23,7 @@
 pytestmark = pytest.mark.asyncio
 
 
+# need non FR account to test this exchange (20 march 2026)
 class TestBitgetAuthenticatedExchange(
     abstract_authenticated_exchange_tester.AbstractAuthenticatedExchangeTester
 ):

docker/docker-entrypoint.sh

@@ -15,4 +15,4 @@ bash tunnel.sh
 set +e
 
 # Start OctoBot using the installed console script
-OctoBot
+OctoBot "$@"