consolidate trading configuration and provide example

Haehnchen · Haehnchen · commit ed06bcee0199 · 2021-01-01T10:44:15.000+01:00
diff --git a/README.md b/README.md
@@ -293,6 +293,69 @@ You should only provide one of them, first wins.
     })
 ```
 
+### Live Strategy
+
+Every strategy stat should be live must be places inside `trade`. 
+
+```json
+  {
+    "trade": {
+      "strategies": [
+        {
+          "strategy": "dip_catcher",
+          "interval": "15m",
+          "options": {
+            "period": "15m"
+          }
+        }
+      ]
+    }
+  }
+```
+
+Inside logs, visible via browser ui, you can double check the strategies init process after the application started. 
+
+```
+[info] Starting strategy intervals
+[info] "binance_futures" - "ETHUSDT" - "trade" - init strategy "dip_catcher" (15m) in 11.628 minutes
+[info] "binance_futures" - "BTCUSDT" - "trade" first strategy run "dip_catcher" now every 15.00 minutes
+```
+
+### Full Trade Example
+
+An example `instance.js` which trades can be found inside `instance.js.dist_trade`. Rename it or move the content to you file.
+
+```js
+const c = (module.exports = {});
+
+c.symbols = [
+  {
+    symbol: 'ETHUSDT',
+    exchange: 'binance_futures',
+    periods: ['1m', '15m', '1h'],
+    trade: {
+      currency_capital: 10,
+      strategies: [
+        {
+          strategy: 'dip_catcher',
+          interval: '15m',
+          options: {
+            period: '15m'
+          }
+        }
+      ]
+    },
+    watchdogs: [
+      {
+        name: 'risk_reward_ratio',
+        target_percent: 3.1,
+        stop_percent: 2.1
+      }
+    ]
+  }
+];
+```
+
 ### Margin / Leverage
 
 Per pair you can set used margin before orders are created; depending on exchange
diff --git a/instance.js.dist_trade b/instance.js.dist_trade
@@ -0,0 +1,28 @@
+const c = (module.exports = {});
+
+c.symbols = [
+  {
+    symbol: 'ETHUSDT',
+    exchange: 'binance_futures',
+    periods: ['1m', '15m', '1h'],
+    trade: {
+      currency_capital: 10,
+      strategies: [
+        {
+          strategy: 'dip_catcher',
+          interval: '15m',
+          options: {
+            period: '15m'
+          }
+        }
+      ]
+    },
+    watchdogs: [
+      {
+        name: 'risk_reward_ratio',
+        target_percent: 3.1,
+        stop_percent: 2.1
+      }
+    ]
+  }
+];
diff --git a/src/modules/exchange/exchange_manager.js b/src/modules/exchange/exchange_manager.js
@@ -20,7 +20,7 @@ module.exports = class ExchangeManager {
       .map(exchange => exchange.getName())
       .forEach(exchangeName => {
         const pairs = this.instances.symbols.filter(symbol => {
-          return symbol.exchange === exchangeName && ['watch', 'trade'].includes(symbol.state);
+          return symbol.exchange === exchangeName;
         });
 
         if (pairs.length === 0) {
diff --git a/src/modules/listener/tick_listener.js b/src/modules/listener/tick_listener.js
@@ -179,7 +179,15 @@ module.exports = class TickListener {
       me.logger.info(`Strategy: "${type.name}" found "${type.items.length}" valid symbols`);
 
       type.items.forEach(symbol => {
-        symbol.strategies.forEach(strategy => {
+        // map strategies
+        let strategies = [];
+        if (type.name === 'watch') {
+          strategies = symbol.strategies;
+        } else if (type.name === 'trade') {
+          strategies = symbol.trade.strategies;
+        }
+
+        strategies.forEach(strategy => {
           let myInterval = '1m';
 
           if (strategy.interval) {
diff --git a/src/modules/pairs/pairs_http.js b/src/modules/pairs/pairs_http.js
@@ -16,14 +16,17 @@ module.exports = class PairsHttp {
           const position = await this.exchangeManager.getPosition(symbol.exchange, symbol.symbol);
           const state = await this.pairStateManager.get(symbol.exchange, symbol.symbol);
 
+          const strategiesTrade = symbol.trade && symbol.trade.strategies ? symbol.trade.strategies : [];
+
           const item = {
             exchange: symbol.exchange,
             symbol: symbol.symbol,
             watchdogs: symbol.watchdogs,
-            state: symbol.state,
+            is_trading: strategiesTrade.length > 0,
             has_position: position !== undefined,
             capital: `${_.get(symbol, 'trade.capital', 0)} / ${_.get(symbol, 'trade.currency_capital', 0)}`,
             strategies: symbol.strategies || [],
+            strategies_trade: strategiesTrade,
             weight: 0
           };
 
diff --git a/src/modules/trade.js b/src/modules/trade.js
@@ -52,13 +52,9 @@ module.exports = class Trade {
 
     const instanceId = crypto.randomBytes(4).toString('hex');
 
-    const notifyActivePairs = this.instances.symbols
-      .filter(symbol => {
-        return ['watch', 'trade'].includes(symbol.state);
-      })
-      .map(symbol => {
-        return `${symbol.exchange}.${symbol.symbol}`;
-      });
+    const notifyActivePairs = this.instances.symbols.map(symbol => {
+      return `${symbol.exchange}.${symbol.symbol}`;
+    });
 
     const message = `Start: ${instanceId} - ${os.hostname()} - ${os.platform()} - ${moment().format()} - ${notifyActivePairs.join(
       ', '
diff --git a/src/utils/instance_util.js b/src/utils/instance_util.js
@@ -30,8 +30,7 @@ module.exports = {
             let result = {
               symbol: pair.name,
               periods: ['1m', '15m', '1h'],
-              exchange: 'ftx',
-              state: 'watch'
+              exchange: 'ftx'
             };
 
             if (callback) {
@@ -84,8 +83,7 @@ module.exports = {
             let result = {
               symbol: pair.symbol,
               periods: ['1m', '15m', '1h'],
-              exchange: 'binance',
-              state: 'watch'
+              exchange: 'binance'
             };
 
             if (callback) {
@@ -181,8 +179,7 @@ module.exports = {
             let result = {
               symbol: pair.symbol,
               periods: ['1m', '15m', '1h'],
-              exchange: 'bitmex',
-              state: 'watch'
+              exchange: 'bitmex'
             };
 
             if (callback) {
@@ -217,8 +214,7 @@ module.exports = {
             let result = {
               symbol: pair.symbol,
               periods: ['1m', '15m', '1h'],
-              exchange: 'binance_futures',
-              state: 'watch'
+              exchange: 'binance_futures'
             };
 
             if (callback) {
@@ -248,8 +244,7 @@ module.exports = {
             let result = {
               symbol: pair.pair.toUpperCase(),
               periods: ['1m', '15m', '1h'],
-              exchange: 'bitfinex',
-              state: 'watch'
+              exchange: 'bitfinex'
             };
 
             if (callback) {
@@ -279,8 +274,7 @@ module.exports = {
             let result = {
               symbol: pair.name,
               periods: ['1m', '15m', '1h'],
-              exchange: 'bybit',
-              state: 'watch'
+              exchange: 'bybit'
             };
 
             if (callback) {
diff --git a/templates/pairs.html.twig b/templates/pairs.html.twig
@@ -38,7 +38,8 @@
                                             <th scope="col">Symbol</th>
                                             <th scope="col">State</th>
                                             <th scope="col">Capital</th>
-                                            <th scope="col">Strategies</th>
+                                            <th scope="col">Strategies Watch</th>
+                                            <th scope="col">Strategies Trade</th>
                                             <th scope="col">Options</th>
                                             <th scope="col">Process</th>
                                             <th scope="col">Action</th>
@@ -48,11 +49,12 @@
                                         <tbody>
                                         {% for pair in pairs %}
                                             <tr>
-                                                <td style="white-space: nowrap"><img src="/img/exchanges/{{ pair.exchange }}.png" title="{{ pair.exchange }}" alt="{{ pair.exchange }}" width="16px" height="16px"></td>
-                                                <td style="white-space: nowrap"><a target="blank" href="/tradingview/{{ pair.exchange }}:{{ pair.symbol }}">{{ pair.symbol }}</td>
-                                                <td>{{ pair.state }}</td>
-                                                <td><strong>{{ pair.capital }}</strong></td>
-                                                <td class="text-muted"><span class="span-md">{{ pair.strategies|json_encode }}</span></td>
+                                                <td class="no-wrap"><img src="/img/exchanges/{{ pair.exchange }}.png" title="{{ pair.exchange }}" alt="{{ pair.exchange }}" width="16px" height="16px"></td>
+                                                <td class="no-wrap"><a target="blank" href="/tradingview/{{ pair.exchange }}:{{ pair.symbol }}">{{ pair.symbol }}</td>
+                                                <td class="no-wrap">{{ pair.is_trading ? '<i class="fas fa-cart-plus font-weight-bold"></i>' : '<i class="fas fa-eye text-muted"></i>' }}</td>
+                                                <td class="no-wrap"><strong>{{ pair.capital }}</strong></td>
+                                                <td class="text-muted"><span class="span-md">{% if pair.strategies.length > 0 %}{{ pair.strategies|json_encode }}{% endif %}</span></td>
+                                                <td class="text-muted"><span class="span-md">{% if pair.strategies_trade.length > 0 %}{{ pair.strategies_trade|json_encode }}{% endif %}</span></td>
                                                 <td class="text-muted">
                             <span class="span-md">
                                 {% if pair.watchdogs %}
