Init QuoteEnginer with default values

magic8bot · Nov 27, 2020 · ad0e9f7 · ad0e9f7
1 parent 3169b20
commit ad0e9f7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/src/core/core.ts b/src/core/core.ts
@@ -6,6 +6,7 @@ import { CoreHelpers } from './core.helpers'
 import * as Adapters from '../exchange/adapters'
 import { Strategies } from '../strategy/strategies/strategies'
 import { BaseStrategy } from '@strategy'
+import { logger } from '../util'
 
 class Core {
   private readonly exchangeProvider: ExchangeProvider
@@ -228,6 +229,7 @@ class Core {
 
     const exchangeCore = new ExchangeCore(this.exchangeProvider, exchangeConfig)
     await exchangeCore.init()
+    logger.debug(`Exchange core ${exchangeConfig.exchange} init.`)
     this.exchangeCores.set(exchangeConfig.exchange, exchangeCore)
 
     return true

diff --git a/src/engine/order.ts b/src/engine/order.ts
@@ -53,6 +53,8 @@ export class OrderEngine {
   public async executeBuy(quote?: number, strength = 1) {
     const { exchange, symbol } = this.opts
     const rawPrice = quote ? quote : await this.quoteEngine.getBuyPrice()
+    logger.debug(`Executing buy order on ${exchange}.${symbol} with: ${quote}, ${rawPrice}`)
+
     const price = this.exchangeProvider.priceToPrecision(exchange, symbol, rawPrice)
 
     const purchasingPower = this.exchangeProvider.priceToPrecision(exchange, symbol, this.wallet.currency * strength)
@@ -71,6 +73,9 @@ export class OrderEngine {
   public async executeSell(quote?: number, strength = 1) {
     const { exchange, symbol } = this.opts
     const rawPrice = quote ? quote : await this.quoteEngine.getSellPrice()
+
+    logger.debug(`Executing sell order on ${exchange}.${symbol} with: ${quote}, ${rawPrice}`)
+
     const price = this.exchangeProvider.priceToPrecision(exchange, symbol, rawPrice)
     const amount = this.exchangeProvider.amountToPrecision(this.wallet.asset * strength)
 

diff --git a/src/engine/quote.ts b/src/engine/quote.ts
@@ -1,12 +1,13 @@
 import { ExchangeProvider } from '@exchange'
+import { logger } from '../util'
 
 export class QuoteEngine {
   constructor(
     private readonly exchangeProvider: ExchangeProvider,
     private readonly exchange: string,
     private readonly symbol: string,
-    private readonly markUp: number,
-    private readonly markDn: number
+    private readonly markUp: number = 0,
+    private readonly markDn: number = 0
   ) {}
 
   public async getBuyPrice() {

diff --git a/src/strategy/strategies/macd/macd.ts b/src/strategy/strategies/macd/macd.ts
@@ -132,11 +132,6 @@ export class Macd extends BaseStrategy<MacdOptions, { rsi: number; signal: numbe
     // prettier-ignore
     const { periods: [{ signal, rsi }] } = this
 
-    if (!this.isPreroll) {
-      /* istanbul ignore next */
-      logger.debug(`calculated: ${JSON.stringify({ rsi: rsi !== null ? rsi.toPrecision(4) : null, signal: signal !== null ? signal.toPrecision(6) : null })}`)
-    }
-
     return { rsi, signal }
   }
 
@@ -198,7 +193,9 @@ export class Macd extends BaseStrategy<MacdOptions, { rsi: number; signal: numbe
 
       logger.verbose(`Period finished => Signal: ${signal === null ? 'no signal' : signal}`)
     }
+
     this.newPeriod()
+
     return signal
   }