Skip to content

Commit

Permalink
Merge pull request #1228 from Drakkar-Software/dev
Browse files Browse the repository at this point in the history
Dev merge
  • Loading branch information
GuillaumeDSM authored Apr 18, 2024
2 parents 9d491d7 + 6e9ce36 commit 1b146b9
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 6 deletions.
9 changes: 7 additions & 2 deletions Services/Interfaces/web_interface/templates/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,14 @@ <h2>Running your OctoBot on the cloud</h2>
easily host your OctoBot on the cloud using DigitalOcean</a>.
</p>
<p>
Running your OctoBot on the <a target="_blank" rel="noopener" href="https://m.do.co/c/40c9737100b1">DigitalOcean cloud</a> enables you to have
your OctoBot executing your trading strategies 24/7 without having to leave a computer on.
OctoBot is available from on the <a target="_blank" rel="noopener" href="https://digitalocean.pxf.io/octobot-app">DigitalOcean marketplace</a>.
It enables you to have your OctoBot executing your trading strategies 24/7 without having to leave a computer on.
</p>
<div>
<a href="https://digitalocean.pxf.io/start-octobot">
<img src="https://mp-assets1.sfo2.digitaloceanspaces.com/deploy-to-do/do-btn-blue.svg" alt="Deploy on DO"/>
</a>
</div>
</div>
</div>
<br>
Expand Down
2 changes: 1 addition & 1 deletion Trading/Mode/index_trading_mode/index_trading.py
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ def _update_coins_distribution(self):
distribution = index_distribution.get_uniform_distribution([
symbol.base
for symbol in self.exchange_manager.exchange_config.traded_symbols
])
]) if self.exchange_manager else []
self.ratio_per_asset = {
asset[index_distribution.DISTRIBUTION_NAME]: asset
for asset in distribution
Expand Down
4 changes: 4 additions & 0 deletions Trading/Mode/index_trading_mode/resources/IndexTradingMode.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
The Index trading mode splits and maintains your portfolio distributed between the traded currencies. It enables
to maintain a crypto index based on your choice of coins.

To know more, checkout the
<a target="_blank" rel="noopener" href="https://www.octobot.cloud/en/guides/octobot-trading-modes/index-trading-mode?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=IndexTradingModeDocs">
full Index trading mode guide</a>.

### Content of the Index
The Index is defined by the selected traded pairs against your reference market in the
profile configuration section.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,12 @@ Where:
a % of the total portfolio value (ex: `2%`), a % of the available holdings (ex: `12a%`), a % of available holdings associated to the current traded symbol assets (`10s%`)
or a % of available holdings associated to all configured trading pairs assets (`10t%`). It follows the <a target="_blank" rel="noopener" href="https://www.octobot.cloud/en/guides/octobot-trading-modes/order-amount-syntax?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=TradingViewSignalsTradingModeDocs">
orders amount syntax</a>.
- `PRICE` is the price of the limit order in quote asset (USDT for BTC/USDT). Can also be a delta value from the current price by adding `d` (ex: `10d` or `-0.55d`) or a delta percent from the price (ex: `-5%` or `25.4%`)
- `STOP_PRICE` is the price of the stop order to create. Can also be a delta or % delta like `PRICE`. When increasing the position or buying in spot trading, the stop loss will automatically be created once the initial order is filled. When decreasing the position (or selling in spot) using a LIMIT `ORDER_TYPE`, the stop loss will be created instantly. *Orders crated this way are compatible with PNL history.*
- `TAKE_PROFIT_PRICE` is the price of the take profit order to create. Can also be a delta or % delta like `PRICE`. When increasing the position or buying in spot trading, the take profit will automatically be created once the initial order is filled. When decreasing the position (or selling in spot) using a LIMIT `ORDER_TYPE`, the take profit will be created instantly. *Orders crated this way are compatible with PNL history.*
- `PRICE` is the price of the limit order in quote asset (USDT for BTC/USDT). Can also be a delta value from the current price by adding `d` (ex: `10d` or `-0.55d`) or a delta percent from the price (ex: `-5%` or `25.4%`). It follows the <a target="_blank" rel="noopener" href="https://www.octobot.cloud/en/guides/octobot-trading-modes/order-price-syntax?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=TradingViewSignalsTradingModeDocs">
orders price syntax</a>.
- `STOP_PRICE` is the price of the stop order to create. Can also be a delta or % delta like `PRICE`. When increasing the position or buying in spot trading, the stop loss will automatically be created once the initial order is filled. When decreasing the position (or selling in spot) using a LIMIT `ORDER_TYPE`, the stop loss will be created instantly. *Orders crated this way are compatible with PNL history.* It follows the <a target="_blank" rel="noopener" href="https://www.octobot.cloud/en/guides/octobot-trading-modes/order-price-syntax?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=TradingViewSignalsTradingModeDocs">
orders price syntax</a>.
- `TAKE_PROFIT_PRICE` is the price of the take profit order to create. Can also be a delta or % delta like `PRICE`. When increasing the position or buying in spot trading, the take profit will automatically be created once the initial order is filled. When decreasing the position (or selling in spot) using a LIMIT `ORDER_TYPE`, the take profit will be created instantly. *Orders crated this way are compatible with PNL history.* It follows the <a target="_blank" rel="noopener" href="https://www.octobot.cloud/en/guides/octobot-trading-modes/order-price-syntax?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=TradingViewSignalsTradingModeDocs">
orders price syntax</a>.
- `REDUCE_ONLY` when true, only reduce the current position (avoid accidental short position opening when reducing a long position). **Only used in futures trading**. Default is false
- `TAG` is an identifier to give to the orders to create.

Expand Down

0 comments on commit 1b146b9

Please sign in to comment.