From 0d09841e3dfd66b27cfb97351cff3e83b825a8e8 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sun, 29 Apr 2018 08:05:39 +0200
Subject: [PATCH] New Information Added to newHistoryRecord

---
 .vs/AACloud/v15/.suo | Bin 102912 -> 101888 bytes
 Assistant.js         |  13 ++++++++++++-
 Context.js           |  12 +++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/.vs/AACloud/v15/.suo b/.vs/AACloud/v15/.suo
index 674c7d2482fb424b1921669877aa24e1d6eafcae..b25f21ba4b0ed9a0cbafe9d5b75f45cbfb59db01 100644
GIT binary patch
delta 1223
zcmdUuTSydP6vyYx&R(WgTgxQU*4=IfSs967L|H9m+GQoW(MC53(k@1BOgGnxpv+3=
zh-0QEi)^tk*$%W_$&7-ch^U8NqBOcdbR&z(YWt6+_11GA{P@oKpYwg+Ift3@7E5`9
zr7FWM3cr^_5N5zMgCDV2%ur1r?@U3mC^u*BOAI`|Plt5B_<`bXATR|?0!P>{<<oh-
zDizZ~eVln3$t5dYX-4)^_KSCI@kp8lxH;F&8Df7{tncUmueU9cw?oETv3Y#cwmf?w
zyzlUqV0VK8Ab~j`0v3buU=c7%oQ-_}n9D2VWGdqA^4P(KUJPvm*akL%&3s-?b{i2F
zJOyNf9bgyO4Mu@7{i7U^=#uV_4>-*YP#X0w>3L~<%`}mALY+@?PqA?b{qDu8cP)D0
z;CtQade=Iyi9PWdTw1h1CcG6hO7G3%u3pvpm#UW*SK6t9Nf|LL7y3+42@Zo{;3zl-
zs(HGSnqV|g5AQfQ2O4>cQry$93*H4_v~wL?=J!gfY~-JWCs!A|i0mlsPgS~qf52+q
z2o0@OTCHlxrMpU=kXn;sHnNeqnX78*s!JZKDG1deq<U<29GC!lo6$?vN{ZAg#LE7I
zIyJ>e^$q71M~Xi6Ks%{rvX&P|NqTCqgM!Us$U;&i>`jV#M^Y;V+Y>`sWa-zKAP9qS
zr%ljS7gDNraSNT`oToKfRzB5I6HkA-nm0Y0%Hbz<bgIWY9Z2BVs{z`rWi&<$CDKrC
z?ab9|`7~a;olmF!TqD^8Pi@Z;dq<W&`+2rVC!>2j6fmoAG6#qIKKOxcmtl`Y5gy}Z
ze)J}s;OmPD!aCS<v=xOkB8uu-$W@KhUn{+>2}T$gvoU@XV{ymcA?$r^*KVw&$<gku
zWEO+(q~K>!D_5vNZ}?Vd3Vs#2y}}uFmQklUB$CK$?&L&s?9@iaoX*CR&l2?=p%&BG
zBwFR<rpR#4xFYeYyDAU4|MLGE9bbH#7Rsa1?Ceyu6Gi0KTGx|9^KPUE|DI>#+qJ<@
WQs49_q>vceMUL7;@<n|Wn9@%g;ff^y

delta 1085
zcmcJNTTB#p6vpR_v+PcR&4NG(*zW9_DhY_|<)OqTg$7ds8X!tFiWkHO5iHO`vr^h!
z+tAQTTiBB_*rIGkGPcBc*?;1S(F7k<yd-F(_Q@5Bv1v@IO)ZTkxPFsjOL*@jzkKI^
z&Y3gko0(vLLU1sl+sD3hYNkt)(j-Z;f#>mf93l}|bGkBHR&V|={n@?PZR!%O@}HD^
z1%)@kD)0@rDrIzzFDmu)rC4Tri_{6@)P}q0-i+>p6msmLYh35pq<(~UjE=A4tB$P&
zGl(`Ivk8=gQlNl$K?Ha}KBxlLM(;q^gG%0}W>W+2S98<%;#@yl-v@mUwDGW-?fDSV
ze&7cMz?z^zKL)RZcJY@QQ0Rhabp~Fu9Y!V~p5~P<RVf*<3^-ikVV`WLPta3Njuhmq
z{a)t9ld5r-7|nTuB72Hu2j<6}bIUF5U1T&Q(LpBvV%GdgDPN)dHFy<tgYUS=?@l>{
z$lC6EXg?U{W`BM9+1acHJr6E{cK*ZfPQHxj7_jb9dn%_QZ7qq^BU(EGc3UIz@X=+r
zhk6&Ooj84Ab@tTMb9Zkaq5bF3B28#b6BMfU3U6PGBK>}nccpP#$LB^^Hjc=~psW|!
z$SvH)B!xo74m(CH2mcyx2^}Y)nZ7J?ipr6b=^T#c=-U%1KlucHnM|}=`T={!ZgK1<
z?|<cEvt>)`Q2tTux^sls+~MSk>q%TVrt!|v1W|Zr#P&)6?|UIeIVAQ?g*g=K<LbM;
zdd+TfbME8-*Zexfsek9Q7F(@1)zV7cOr<QnqKry7_#j`uQAST#o5;``Hd2N@R!%vJ
zLn`j&6;m~0`7e!fN*{Lk=Sm$JLYyH^-al%yXIY<ElFrmpkno(f#$$z>Cb#GVd&#4p
zsw0<Pu@932j}GW>H&S7=@O>ItU_6uAdoxeuO^+`y+etQMlKIn_5>fK}ESU+Uu(vi6
zjRa{(jaH|UqKTd3Vf+7Wk-ilJ_X9Swl$LPw!`1Vx4b1m+__qVb@3PrKvSqE9JEvXI
Rjea^#bG<puF8Fhi@&bhBY_<RZ

diff --git a/Assistant.js b/Assistant.js
index 141e5a458..2e8626eb4 100644
--- a/Assistant.js
+++ b/Assistant.js
@@ -110,6 +110,7 @@
 
                                         marketRate = candle.close;
                                         marketRate = Number(marketRate.toFixed(8));
+                                        context.newHistoryRecord.marketRate = marketRate;
 
                                         /*
                                         Now we verify that this candle is not too old. Lets say no more than 10 minutes old. This could happen if the datasets for
@@ -153,6 +154,7 @@
 
                                                 marketRate = (candle.open + candle.close) / 2;
                                                 marketRate = Number(marketRate.toFixed(8));
+                                                context.newHistoryRecord.marketRate = marketRate;
 
                                                 /* 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. */
@@ -185,6 +187,7 @@
 
                                         marketRate = candle.close;
                                         marketRate = Number(marketRate.toFixed(8));
+                                        context.newHistoryRecord.marketRate = marketRate;
 
                                         /*
                                         Now we verify that this candle is not too old. Lets say no more than 10 minutes old. This could happen if the datasets for
@@ -694,6 +697,12 @@
 
                             position.status = "executed";
 
+                            if (position.type === "sell") {
+                                context.newHistoryRecord.sellExecRate = position.rate;
+                            } else {
+                                context.newHistoryRecord.buyExecRate = position.rate;
+                            }
+
                             applyTradesToContext(pTrades);
 
                             let newTransaction = {
@@ -1001,11 +1010,13 @@
                             if (position.type === 'buy') {
 
                                 context.executionContext.availableBalance.assetA = context.executionContext.availableBalance.assetA - pAmountA;
-                            }
+                                context.newHistoryRecord.lastBuyRate = pRate;
+                            } 
 
                             if (position.type === 'sell') {
 
                                 context.executionContext.availableBalance.assetB = context.executionContext.availableBalance.assetB - pAmountB;
+                                context.newHistoryRecord.lastSellRate = pRate;
                             }
 
                             callBackFunction(global.DEFAULT_OK_RESPONSE);
diff --git a/Context.js b/Context.js
index d62e3513e..31bad9185 100644
--- a/Context.js
+++ b/Context.js
@@ -39,7 +39,11 @@
         newHistoryRecord : {
             date: undefined,
             buyAvgRate: 0,
-            sellAvgRate: 0,  
+            sellAvgRate: 0,
+            lastSellRate: 0,
+            sellExecRate: 0,
+            lastBuyRate: 0,
+            buyExecRate: 0,
             marketRate: 0,
             newPositions: 0,
             newTrades: 0,
@@ -607,6 +611,12 @@
                                 thisObject.newHistoryRecord.date.valueOf(),
                                 thisObject.newHistoryRecord.buyAvgRate,
                                 thisObject.newHistoryRecord.sellAvgRate,
+
+                                thisObject.newHistoryRecord.lastSellRate,
+                                thisObject.newHistoryRecord.sellExecRate,
+                                thisObject.newHistoryRecord.lastBuyRate,
+                                thisObject.newHistoryRecord.buyExecRate,
+
                                 thisObject.newHistoryRecord.marketRate,
                                 thisObject.newHistoryRecord.newPositions,
                                 thisObject.newHistoryRecord.newTrades,