From 6cc0e83d65f23be13d8118e09de134ba785374c2 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 27 Apr 2018 10:21:53 +0200 Subject: [PATCH] LIVE and BACKTEST mode working --- .vs/AACloud/v15/.suo | Bin 102912 -> 101376 bytes Assistant.js | 2 ++ Run.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.vs/AACloud/v15/.suo b/.vs/AACloud/v15/.suo index b3c983cd6b964ff01058aee6a512eb45c1d166a2..84d954d6aba2025620bc35bad41341d29f5815e0 100644 GIT binary patch delta 1464 zcma*mZA@EL7zgk^=k}Ji6w{8mIKWW4DULY`TZq#|tp&G+AZwj$(=dc#l*EZbDRy-) z9n%H}A81eF-HUGI%FxX@S&wk%oD|%$km$0gd@#l!(?t_wbRYJ`M2r868y3ytZt}}{ z?m6e4^E~I|Mh8sM{idO9%+&vIbB|$)x3e$Jw;2qEwZQv*MZAn<^RP5Y5Aw&1K{~_7 zjmz&W!k|9M3m#Yjufa;F<`%io@(7|DSi{TZCG;GxlPfFIGcz+S=zAUz&a|QZ2ws3z zcoANLc90R>!E}>Ogs5@^Ew*jS8T;>ebp?q zyWvm7_1F9K{v8>y{@#f9ws;_)pSReT=>0%+E>X zbXJ5G)RJX(+Z>EuKd&rtEq8LEm^kwQ@veNASX$yVnH?Bs8FP5Y*-IAE6VVf%`?8}v znlEodPe}Y;^Fv|9X@vT@InjO$9q7=RlmaSZXha02ubc@Iv)`|tq_K^2?=0Z+h(FbpGrbxt+kMTxS? zzb|k86_oXo;(DBFMeRh1jFS?Pi|v$iLNXX^_*QRM@S@Z)emH35jj7GtpS0>#a!<<1 z8@fSd#x@{+NZS&mgOuaD(QUYQETB2EX(_2cvqY@QY{bYqn19QEF!icc{e>la zi3v)tcacpCIO&jmei>SPCE=R9!+Dv>%eRm=ufBY*AO+6!9i5WHK zr?jLbR#CUs-9lkm@!n2(THaIiqoj2C$*1`ObeaYmiE&qRQcK3jFKO&qN)x{_YS--h zsK%t#_tF4y$4@1 zxDZ*4<(QN?VWeYh%sFSD?CF$JHr&vJ4I+P-ZMd2l{xH#)h>0^<^?RWOj4>Kd^2xdP z+z~K`1rYgTL3Uxh6TAdI2QPyNyE z$Ai7#cJykY8l&qmQ#IzhycKuxm}0r-bxdp^4Je=qyarmqT2KY{ffjE?hMJy`X;esr zC4p#I@id|~_CG?#WZ2|oc6BagI#nG%S44qqm%%8m7rBhNsSOtoQlM~dg}xTn9`%;{ zW`?&;-uNkI=fGz`WY7v71PverM!|V-0gQn!z(sHgM7-5E{j~{!W)Dftsod0ZfZHgD^!R_*PE>ml$iI1JtcJwQDC2y`Df1CE2EpdTCq17HxG0H?r7@IE*VJ^&vAafS=p z3RLho5J?;YXMrZlIPR?|wtb1&1c1Y$T*iDdYC~E_0^=UNl(155ny4q!$vB-Z35!DK zvTbC__f-Mi%lVxh%AGLp0o#O`J1*ClM62fjp`V6zkb`Oxw~f@toZ3y|DZ)``;rO6` zT4v|a3U-WGxhi1L9EB9pC-k7jQn1B{bYBh9J3KX0?F%PT5;xt*QoFAg5uFe=4qYo% zCui0Yy*0nZqL6{>u4i%YFJ|E>8+EQ;tQ7jcm)LtPkK4j&Y?;YYH-|aS|AXZJ9qmyn zm*A>cUDXD(hX3aT|3S(BlN5-Q+bLD6u+m}6e@@2Ib46vvbA^6#dHVjIiG>t8(S+hF z6*~JL6T4W2c9ZB8af8rH4i=Ql0*la@i^r^sT7?$YLEjx!RK(7yAP?*?izfbS88{Gh za*6Y9t;$7x6u9~y5BHP)>4Sb~UAKB7`(A_Ryozv1`7L+N473 zDEX<_y3QUF|I&0VyoI(>@@fRUAoh?0<7_S8L{9RxJWTrso*|j{MKXE#Rx$tBYG!j} z#@Zg+ugeL=Y9QJ;c8;&Hj5-IZNb)&T$e}shbUsd#o}&n{eLP3Y@zAv5E7Oz8owJAj zf84p^mohIoq4~-##H}IjZ^-s`Y!N|<&sxaxAZz)%*)_gRdfITdfhyCq${OmYKLHB| B5HtV) diff --git a/Assistant.js b/Assistant.js index 9dff2a13c..04e5dd757 100644 --- a/Assistant.js +++ b/Assistant.js @@ -111,6 +111,7 @@ if (bot.processDatetime.valueOf() >= candle.begin && bot.processDatetime.valueOf() < candle.end) { marketRate = (candle.open + candle.close) / 2; + marketRate = Number(marketRate.toFixed(8)); /* The Backtest Mode simulates that every trade posted is executed. In order to do this, we will take all open orders from the context and create a trades array similar to the one returned by the Exchange. */ @@ -141,6 +142,7 @@ }; marketRate = candle.close; + marketRate = Number(marketRate.toFixed(8)); /* Now we verify that this candle is not too old. Lets say no more than 2 minutes old. This could happen if the datasets for diff --git a/Run.js b/Run.js index a837572d7..838dd60f1 100644 --- a/Run.js +++ b/Run.js @@ -337,7 +337,7 @@ for (let p = 0; p < global.PLATFORM_CONFIG.executionList.length; p++) { processConfig.normalWaitTime = processConfig.startMode.timePeriod.waitTime; processConfig.retryWaitTime = processConfig.startMode.timePeriod.waitTime; - if (processConfig.startMode.noTime.resumeExecution === "true") { + if (processConfig.startMode.timePeriod.resumeExecution === "true") { botConfig.hasTheBotJustStarted = false; } else { botConfig.hasTheBotJustStarted = true;