only create trigger after init trade is completed

ref correct trailValue prop
pvdvreede-forked · Aug 27, 2018 · a63d927 · a63d927
1 parent 7a26284
commit a63d927
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 30 deletions.
diff --git a/plugins/eventLogger.js b/plugins/eventLogger.js
@@ -11,7 +11,7 @@ _.each(subscriptions, sub => {
   }
 
   EventLogger.prototype[sub.handler] = (event, next) => {
-    log.debug(`\t\t\t\t[EVENT ${sub.event}]\n`, event);
+    log.info(`\t\t\t\t[EVENT ${sub.event}]\n`, event);
     if(_.isFunction(next))
       next();
   }

diff --git a/plugins/trader/trader.js b/plugins/trader/trader.js
@@ -181,34 +181,6 @@ Trader.prototype.processAdvice = function(advice) {
       });
     }
 
-    const trigger = advice.trigger;
-
-    if(trigger && trigger.type === 'trailingStop') {
-      const triggerId = 'trigger-' + (++this.propogatedTriggers);
-
-      this.deferredEmit('triggerCreated', {
-        id: triggerId,
-        at: advice.date,
-        initialPrice: this.price,
-        type: 'trialingStop',
-        proprties: {
-          trail: trigger.trailValue
-        }
-      });
-
-      this.activeStopTrigger = {
-        id: triggerId,
-        adviceId: advice.id,
-        instance: this.broker.createTrigger({
-          type: trigger.type,
-          onTrigger: this.onStopTrigger,
-          props: {
-            trail: trigger.trailValue,
-          }
-        })
-      }
-    }
-
     amount = this.portfolio.currency / this.price * 0.95;
 
     log.info(
@@ -354,6 +326,37 @@ Trader.prototype.createOrder = function(side, amount, advice, id) {
           feePercent: summary.feePercent,
           effectivePrice
         });
+
+        if(
+          side === 'buy' &&
+          advice.trigger &&
+          advice.trigger.type === 'trailingStop'
+        ) {
+          const trigger = advice.trigger;
+          const triggerId = 'trigger-' + (++this.propogatedTriggers);
+
+          this.deferredEmit('triggerCreated', {
+            id: triggerId,
+            at: advice.date,
+            initialPrice: this.price,
+            type: 'trialingStop',
+            properties: {
+              trail: trigger.trailValue
+            }
+          });
+
+          this.activeStopTrigger = {
+            id: triggerId,
+            adviceId: advice.id,
+            instance: this.broker.createTrigger({
+              type: 'trailingStop',
+              onTrigger: this.onStopTrigger,
+              props: {
+                trail: trigger.trailValue,
+              }
+            })
+          }
+        }
       });
     })
   });

diff --git a/plugins/tradingAdvisor/baseTradingMethod.js b/plugins/tradingAdvisor/baseTradingMethod.js
@@ -236,7 +236,7 @@ Base.prototype.advice = function(newDirection) {
         trigger = newDirection.trigger;
 
         if(trigger.trailPercentage && !trigger.trailValue) {
-          trigger.trailValue = (1 - (trigger.trailPercentage / 100)) * this.candle.close;
+          trigger.trailValue = trigger.trailPercentage / 100 * this.candle.close;
           log.info('[StratRunner] Trailing stop trail value specified as percentage, setting to:', trigger.trailValue);
         }
       }