[Sync] add auth, history and trading details collections

Author: GuillaumeDSM

packages/node/octobot_node/constants.py

@@ -42,6 +42,10 @@
 FAILURE_ERROR_DETAILS_MAX_LENGTH = 8_000
 
 EXCHANGE_ACCOUNTS_STATE_VERSION = "1.0.0"
+USER_ACCOUNTS_AUTH_DETAILS_STATE_VERSION = "1.0.0"
+USER_ACCOUNTS_TRADING_DETAILS_STATE_VERSION = "1.0.0"
 USER_STRATEGIES_STATE_VERSION = "1.0.0"
 USER_DATA_STATE_VERSION = "1.0.0"
 USER_ACTIONS_STATE_VERSION = "1.0.0"
+
+DEFAULT_PORTFOLIO_VALUATION_UNIT = "USDT"

packages/node/octobot_node/errors.py

@@ -62,6 +62,10 @@ class AccountNotFoundError(UserActionError):
     """Raised when fetching an account via AccountProvider fails."""
 
 
+class AccountAuthenticationDetailsNotFoundError(UserActionError):
+    """Raised when fetching account authentication details via AccountAuthenticationDetailsProvider fails."""
+
+
 class AutomationStrategyNotFoundError(UserActionError):
     """Raised when the referenced strategy does not exist in StrategyProvider."""
 

packages/node/octobot_node/protocol/accounts_authentication_details.py

@@ -0,0 +1,25 @@
+#  This file is part of OctoBot Node (https://github.com/Drakkar-Software/OctoBot-Node)
+#  Copyright (c) 2025 Drakkar-Software, All rights reserved.
+#
+#  OctoBot Node is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 3.0 of the License, or (at
+#  your option) any later version.
+#
+#  OctoBot is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along
+#  with OctoBot. If not, see <https://www.gnu.org/licenses/>.
+
+import octobot_sync.sync.collection_backend.errors as collection_errors
+import octobot_sync.sync.collection_providers.user_account_authentication_details_provider as auth_details_provider
+
+
+def get_accounts_authentication_details_state_encrypted(address: str) -> dict[str, str] | None:
+    try:
+        return auth_details_provider.AccountAuthenticationDetailsProvider.instance().list_items_encrypted(address)
+    except collection_errors.CollectionNoDataError:
+        return None

packages/node/octobot_node/protocol/accounts_trading_details.py

@@ -0,0 +1,31 @@
+#  This file is part of OctoBot Node (https://github.com/Drakkar-Software/OctoBot-Node)
+#  Copyright (c) 2025 Drakkar-Software, All rights reserved.
+#
+#  OctoBot Node is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 3.0 of the License, or (at
+#  your option) any later version.
+#
+#  OctoBot is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along
+#  with OctoBot. If not, see <https://www.gnu.org/licenses/>.
+
+import octobot_sync.sync.collection_backend.errors as collection_errors
+import octobot_sync.sync.collection_providers.user_account_trading_details_provider as trading_details_provider
+
+
+def get_account_trading_details_state_encrypted(
+    address: str,
+    account_id: str,
+) -> dict[str, str] | None:
+    try:
+        return trading_details_provider.AccountTradingDetailsProvider.instance().load_state_encrypted(
+            address,
+            account_id,
+        )
+    except collection_errors.CollectionNoDataError:
+        return None

packages/node/octobot_node/protocol/automations.py

@@ -27,7 +27,6 @@
 import octobot_trading.constants as octobot_trading_constants
 import octobot_trading.enums as octobot_trading_enums
 import octobot_trading.personal_data.portfolios.protocol as octobot_trading_portfolios_protocol
-import octobot_trading.exchanges.util.exchange_data as exchange_data_import
 
 
 logger = octobot_commons_logging.get_logger("AutomationsProtocol")
@@ -158,65 +157,6 @@ def _protocol_action_from_flow(
     )
 
 
-def _enrich_protocol_assets(
-    base_assets: list[protocol_models.Asset],
-    portfolio: exchange_data_import.PortfolioDetails,
-    unit: typing.Optional[str],
-) -> list[protocol_models.Asset]:
-    enriched: list[protocol_models.Asset] = []
-    for asset in base_assets:
-        update_fields: dict[str, typing.Any] = {}
-        if asset.symbol in portfolio.asset_values:
-            update_fields["value"] = float(portfolio.asset_values[asset.symbol])
-        if unit:
-            update_fields["unit"] = unit
-        if update_fields:
-            enriched.append(asset.model_copy(update=update_fields))
-        else:
-            enriched.append(asset)
-    return enriched
-
-
-def _order_summaries_from_open_orders(open_orders: list[dict]) -> list[protocol_models.OrderSummary]:
-    order_columns = octobot_trading_enums.ExchangeConstantsOrderColumns
-    summaries: list[protocol_models.OrderSummary] = []
-    for order in open_orders:
-        inner = order.get(octobot_trading_constants.STORAGE_ORIGIN_VALUE, order)
-        if not isinstance(inner, dict):
-            inner = order
-        order_id = inner.get(order_columns.EXCHANGE_ID.value) or inner.get(order_columns.ID.value)
-        symbol = inner.get(order_columns.SYMBOL.value)
-        if order_id is None or symbol is None:
-            continue
-        summaries.append(protocol_models.OrderSummary(id=str(order_id), symbol=str(symbol)))
-    return summaries
-
-
-def _position_summaries(positions: list[typing.Any]) -> list[protocol_models.PositionSummary]:
-    position_columns = octobot_trading_enums.ExchangeConstantsPositionColumns
-    summaries: list[protocol_models.PositionSummary] = []
-    for position_details in positions:
-        position_dict = position_details.position
-        position_id = position_dict.get(position_columns.ID.value)
-        symbol = position_dict.get(position_columns.SYMBOL.value)
-        if position_id is None or symbol is None:
-            continue
-        summaries.append(protocol_models.PositionSummary(id=str(position_id), symbol=str(symbol)))
-    return summaries
-
-
-def _trade_summaries(trades: list[dict]) -> list[protocol_models.TradeSummary]:
-    order_columns = octobot_trading_enums.ExchangeConstantsOrderColumns
-    summaries: list[protocol_models.TradeSummary] = []
-    for trade in trades:
-        trade_id = trade.get(order_columns.EXCHANGE_TRADE_ID.value) or trade.get(order_columns.EXCHANGE_ID.value)
-        symbol = trade.get(order_columns.SYMBOL.value)
-        if trade_id is None or symbol is None:
-            continue
-        summaries.append(protocol_models.TradeSummary(id=str(trade_id), symbol=str(symbol)))
-    return summaries
-
-
 def _fill_protocol_automation_state(
     protocol_automation_state: protocol_models.AutomationState,
     flow_automation_state: flow_entities.AutomationState,
@@ -247,16 +187,14 @@ def _fill_protocol_automation_state(
             exchange_account_ids = [exchange_details.metadata.id]
     # Derive portfolio and trading summaries from automation exchange elements.
     exchange_elements = flow_automation_state.automation.exchange_account_elements
-    assets: typing.Optional[list[protocol_models.Asset]] = None
+    assets: typing.Optional[list[protocol_models.DetailedAsset]] = None
     orders: typing.Optional[list[protocol_models.OrderSummary]] = None
     trades: typing.Optional[list[protocol_models.TradeSummary]] = None
     positions: typing.Optional[list[protocol_models.PositionSummary]] = None
     if exchange_elements:
         portfolio = exchange_elements.portfolio
         if portfolio.content:
-            base_assets = octobot_trading_portfolios_protocol.to_protocol_assets(portfolio.content)
-            unit_for_assets = exchange_details.portfolio.unit if exchange_details else None
-            assets = _enrich_protocol_assets(base_assets, portfolio, unit_for_assets)
+            assets = octobot_trading_portfolios_protocol.to_protocol_assets(portfolio.content)
         orders = _order_summaries_from_open_orders(exchange_elements.orders.open_orders) or None
         positions = _position_summaries(exchange_elements.positions) or None
         trades = _trade_summaries(exchange_elements.trades) or None
@@ -273,3 +211,43 @@ def _fill_protocol_automation_state(
             "positions": positions,
         }
     )
+
+
+def _order_summaries_from_open_orders(open_orders: list[dict]) -> list[protocol_models.OrderSummary]:
+    order_columns = octobot_trading_enums.ExchangeConstantsOrderColumns
+    summaries: list[protocol_models.OrderSummary] = []
+    for order in open_orders:
+        inner = order.get(octobot_trading_constants.STORAGE_ORIGIN_VALUE, order)
+        if not isinstance(inner, dict):
+            inner = order
+        order_id = inner.get(order_columns.EXCHANGE_ID.value) or inner.get(order_columns.ID.value)
+        symbol = inner.get(order_columns.SYMBOL.value)
+        if order_id is None or symbol is None:
+            continue
+        summaries.append(protocol_models.OrderSummary(id=str(order_id), symbol=str(symbol)))
+    return summaries
+
+
+def _position_summaries(positions: list[typing.Any]) -> list[protocol_models.PositionSummary]:
+    position_columns = octobot_trading_enums.ExchangeConstantsPositionColumns
+    summaries: list[protocol_models.PositionSummary] = []
+    for position_details in positions:
+        position_dict = position_details.position
+        position_id = position_dict.get(position_columns.ID.value)
+        symbol = position_dict.get(position_columns.SYMBOL.value)
+        if position_id is None or symbol is None:
+            continue
+        summaries.append(protocol_models.PositionSummary(id=str(position_id), symbol=str(symbol)))
+    return summaries
+
+
+def _trade_summaries(trades: list[dict]) -> list[protocol_models.TradeSummary]:
+    order_columns = octobot_trading_enums.ExchangeConstantsOrderColumns
+    summaries: list[protocol_models.TradeSummary] = []
+    for trade in trades:
+        trade_id = trade.get(order_columns.EXCHANGE_TRADE_ID.value) or trade.get(order_columns.EXCHANGE_ID.value)
+        symbol = trade.get(order_columns.SYMBOL.value)
+        if trade_id is None or symbol is None:
+            continue
+        summaries.append(protocol_models.TradeSummary(id=str(trade_id), symbol=str(symbol)))
+    return summaries

packages/node/octobot_node/scheduler/user_actions/user_actions_executor/account_user_action_executor.py

@@ -49,6 +49,8 @@ def _build_failure_user_action_result(
     def _get_error_message(self, exc: BaseException) -> protocol_models.AccountActionResultErrorMessage:
         if isinstance(exc, (node_errors.AccountNotFoundError, collection_errors.ItemNotFoundError)):
             return protocol_models.AccountActionResultErrorMessage.ACCOUNT_NOT_FOUND
+        if isinstance(exc, node_errors.AccountAuthenticationDetailsNotFoundError):
+            return protocol_models.AccountActionResultErrorMessage.ACCOUNT_AUTHENTICATION_DETAILS_NOT_FOUND
         if isinstance(
             exc,
             (

packages/node/octobot_node/scheduler/user_actions/user_actions_executor/automation_user_action_executor.py

@@ -54,6 +54,8 @@ def _get_error_message(self, exc: BaseException) -> protocol_models.AutomationAc
             return protocol_models.AutomationActionResultErrorMessage.AUTOMATION_NOT_FOUND
         if isinstance(exc, node_errors.AccountNotFoundError):
             return protocol_models.AutomationActionResultErrorMessage.ACCOUNT_NOT_FOUND
+        if isinstance(exc, node_errors.AccountAuthenticationDetailsNotFoundError):
+            return protocol_models.AutomationActionResultErrorMessage.ACCOUNT_AUTHENTICATION_DETAILS_NOT_FOUND
         if isinstance(exc, node_errors.AutomationStrategyNotFoundError):
             return protocol_models.AutomationActionResultErrorMessage.STRATEGY_NOT_FOUND
         if isinstance(exc, node_errors.AutomationStrategyVersionMismatchError):

packages/node/octobot_node/scheduler/user_actions/user_actions_executor/create_account.py

@@ -44,7 +44,10 @@ async def _do_execute(
         user_action: protocol_models.UserAction,
     ) -> None:
         create_payload = _get_create_account_payload(user_action)
-        checked_account = await account_state_updater.update_account_state(create_payload.configuration)
+        checked_account = await account_state_updater.update_account_state(
+            create_payload.configuration,
+            self._wallet_address,
+        )
         collection_providers.AccountProvider.instance().create_item(
             self._wallet_address,
             checked_account,

packages/node/octobot_node/scheduler/user_actions/user_actions_executor/create_automation.py

@@ -132,6 +132,8 @@ def _create_automation_actions(self, user_action: protocol_models.UserAction) ->
             automation_id=user_action.id,
             protocol_account=protocol_account,
             strategy_reference=automation_configuration.strategy,
+            wallet_address=self._wallet_address,
+            reference_market=stored_strategy.reference_market,
         )
 
         match inner_configuration:
@@ -162,6 +164,8 @@ def _create_automation_actions(self, user_action: protocol_models.UserAction) ->
                         init_action,
                         market_making_configuration,
                         protocol_account,
+                        self._wallet_address,
+                        stored_strategy.reference_market,
                     ),
                 ]
             case _:

packages/node/octobot_node/scheduler/user_actions/user_actions_executor/edit_account.py

@@ -52,7 +52,10 @@ async def _do_execute(
             raise node_errors.InvalidUserActionPayloadError(
                 "EditAccountConfiguration.id must match configuration.id."
             )
-        checked_account = await account_state_updater.update_account_state(edit_payload.configuration)
+        checked_account = await account_state_updater.update_account_state(
+            edit_payload.configuration,
+            self._wallet_address,
+        )
         collection_providers.AccountProvider.instance().update_item(
             self._wallet_address,
             checked_account,