From 2813661cf532b4ff503debabea619f24ea4cb7bc Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 20 Mar 2018 13:00:27 +0100 Subject: [PATCH] Configuration upgraded to Alpha --- .vs/AABruce-Indicator-Bot/v15/.suo | Bin 0 -> 23040 bytes .vs/AABruce/v15/.suo | Bin 39936 -> 39936 bytes AABruce.sln => AABruce-Indicator-Bot.sln | 2 +- One-Min-Daily-Candles-Volumes/Interval.js | 130 ---------------------- AABruce.njsproj => Project.njsproj | 1 + this.bot.config.json | 52 +++++++-- 6 files changed, 47 insertions(+), 138 deletions(-) create mode 100644 .vs/AABruce-Indicator-Bot/v15/.suo rename AABruce.sln => AABruce-Indicator-Bot.sln (88%) rename AABruce.njsproj => Project.njsproj (99%) diff --git a/.vs/AABruce-Indicator-Bot/v15/.suo b/.vs/AABruce-Indicator-Bot/v15/.suo new file mode 100644 index 0000000000000000000000000000000000000000..8432b339766f68d2e091481c21bfc73680c7e222 GIT binary patch literal 23040 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 literal 0 HcmV?d00001 diff --git a/.vs/AABruce/v15/.suo b/.vs/AABruce/v15/.suo index 93e15830db37f69214c15e08b6793b2d2a9486f2..c2166bdaf8ad6977b3b67595cfb9762411f1756b 100644 GIT binary patch delta 1608 zcmcIkU2Gdg5Z*nX6Wcu}RxfcK$Ha~s)F^clyMZ)KFUh%forW0yGyw$&$TS2AROPR> zA^joepcYZJq`8R%;qRrDc!QD?DDXh8N*^K+Y7yeOJOD39s7M$=9w@VC8<40fUf9*A z-T7v3W^QJ7m32;8=PpUK=EJ^Pj#fi6=dGD}r5M|ze@*>_5WNFVazhXiLiBAYa!Jb_ z983Yr69IV9bh^re!Uhl9CO>sSffs2Vg!o3uhqM>L&R2#VWp=y~AtL^$C~$S7+<;&d zD7*)*@MClk4SK<2{Z8fL<=}44{(86I-nn;h)$TrP**J5+9J62s%Um6<0)j{EEOYE! zFYbK^FZ;0;3+^hRGi_zuCG=5h!%uc=9&3tPnKuK==>hBeXygOLRcJPQt?Rh^1o0_K zx0W-KDnzW5MaCg8#jUg-azesNDa!Q~t`CaB0+k?VPg**V+*4Kv2XVvxfeqDm++6k= z`Cq-74X^Nf=R>ghU`Wdb1sWb96F5_3j!ct0d5%0oCUM_EMo>OZawLn~G?_vsj_cE? zkKmd^CTj%W4`HE;b=>X|z6%+a3dpu3&7_k_7bgN$tTqk;+bszuLiT=TM-Ztz%N!or zc;iPnHt%$>#If-}=*zFp55KnssY1~4eR1KV?y*(wZ*uACnroAT$j&}h%+f~4i3y|W z-B4^C;cL))uE#PNzGT^L+LIEJ4K#l8D^YEgi4`9?D%!3528*-N&8#VxaU!1 zA4iNK9z(FxPvAO^&}O`&HVZ3VD}uS&k;lzv2pn*yd5C8hr<4YN(g@83MgPn6HEq6Y znA5JeOT5~$dC&Y*mGT4Idq20_ht`_P7HI<%1K49`l-VsPd1)Wz*&Stq_Dj3Kscl<4 zGf*Ph1gZujrGod~G+WpWV)w()X8SKtRXW1E{vxCcbS)YcO^bM1X$YGS%v8 zKfEs%>p5`vKzA%0JhMTgy+NF(f|@=hQ&94v%1K(MvHa>NQ zYRVa%YWl3sY4UKz+jXx(*^>tZOR2IN$n{ko;b!Qw)x8dlVTXQe|(C{bs`|qCs delta 1597 zcmchXO>9(E6vywqeXpGk)0TeFcBaF$9ViT@+Np`PXu&u1QCfweA3`e3V$w2Vn^Bs| zL}E3(uoQ`%IVNrdWm-THMdksiLP8CVF)V;+cWzt|H*Q?C3Ah0Nhndj{vM?^Z$uIZZ zbMC$Gf9}2KS#!#oQ`242d0|t9lIy8iHI`3*|64G2<|o-CgfQCZZPiEJW$p4REvuc5 zayb2flB2D3sOX*I1`IlN`lHA%Jv88`mi5%GH9WH#?rQL$pfzIb1!bTH+(*ofo~Q6O z8+d&(x{_wK;j&OJumyc@HlXQ!7~D?|{G3wTb7F(x_?NFiENc>fi@owtEPv=9V*L#Tw0-!CM zjH4xpK|6RFbb!LIR^-M;cCyRcT`<9fy%qF;ZNT=H_RGT`!#WO5fKR}u;3Pnz_-~kz3B`kql+n5H(gil zaxW!Z;Zh+H^dxWQ=%;Uj#Mt-+69Bpo?FTp|6fzNf^R;W$^qxrWb}4E zmB?dK+50e+JxB#f^2PB}<0SRnFf_X7zM)Hh{%d+i>#+RM6 z;OXtGY+#ptcfg@&V#u(K=zIws88pa< zS}PWDyZnPw;u=lI4p4b)167O!=!4j~3cPyBFQ40(Q5g59M(3T+nj1HU-c`aZj0Eh& zK3!Jw9p>A1>@h?~V^KE^@}G{4`- zOj@dB_?DCRpyv20`enSF&c0qt##o>}B({i2kr1OICL&@GKar3y#SSrJjmgxcLDslM q)})bn%ThE_*I{?W-;*=Ol%m0=4%*gJW%nLEq|uM#9@}%|SNETU7xd@= diff --git a/AABruce.sln b/AABruce-Indicator-Bot.sln similarity index 88% rename from AABruce.sln rename to AABruce-Indicator-Bot.sln index 0f8bf8f28..913b8fd07 100644 --- a/AABruce.sln +++ b/AABruce-Indicator-Bot.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2027 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "AABruce", "AABruce.njsproj", "{045BBAEF-3C35-4017-8458-E46AEF438790}" +Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "Project", "Project.njsproj", "{045BBAEF-3C35-4017-8458-E46AEF438790}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/One-Min-Daily-Candles-Volumes/Interval.js b/One-Min-Daily-Candles-Volumes/Interval.js index 67341883e..598da0690 100644 --- a/One-Min-Daily-Candles-Volumes/Interval.js +++ b/One-Min-Daily-Candles-Volumes/Interval.js @@ -136,136 +136,6 @@ Read the trades from Charly's Output and pack them into daily files with candles marketsLoop(); - /* - - At every run, the process needs to loop through all the markets at this exchange. - The following functions marketsLoop(), openMarket(), closeMarket() and closeAndOpenMarket() controls the serialization of this processing. - - */ - - function marketsLoop() { - - try { - - if (LOG_INFO === true) { - logger.write("[INFO] Entering function 'marketsLoop'"); - } - - markets.getMarketsByExchange(EXCHANGE_ID, onMarketsReady); - - function onMarketsReady(marketsArray) { - - marketQueue = JSON.parse(marketsArray); - - openMarket(); // First execution and entering into the real loop. - - } - } - catch (err) { - const logText = "[ERROR] 'marketsLoop' - ERROR : " + err.message; - logger.write(logText); - } - } - - function openMarket() { - - // To open a Market means picking a new market from the queue. - - try { - - if (LOG_INFO === true) { - logger.write("[INFO] Entering function 'openMarket'"); - } - - - if (marketQueue.length === 0) { - - if (LOG_INFO === true) { - logger.write("[INFO] 'openMarket' - marketQueue.length === 0"); - } - - const logText = "[WARN] We processed all the markets."; - logger.write(logText); - - callBackFunction(nextIntervalExecution); - - return; - } - - if (GO_RANDOM === true) { - const index = parseInt(Math.random() * (marketQueue.length - 1)); - - market.id = marketQueue[index][0]; - market.assetA = marketQueue[index][1]; - market.assetB = marketQueue[index][2]; - market.status = marketQueue[index][3]; - - marketQueue.splice(index, 1); - } else { - let marketRecord = marketQueue.shift(); - - market.id = marketRecord[0]; - market.assetA = marketRecord[1]; - market.assetB = marketRecord[2]; - market.status = marketRecord[3]; - - if (FORCE_MARKET > 0) { - if (FORCE_MARKET !== market.id) { - closeAndOpenMarket(); - return; - } - } - } - - if (LOG_INFO === true) { - logger.write("[INFO] 'openMarket' - marketQueue.length = " + marketQueue.length); - logger.write("[INFO] 'openMarket' - market sucessfully opened : " + market.assetA + "_" + market.assetB); - } - - if (market.status === markets.ENABLED) { - - getStatusReport(); - - } else { - - logger.write("[INFO] 'openMarket' - market " + market.assetA + "_" + market.assetB + " skipped because its status is not valid. Status = " + market.status); - closeAndOpenMarket(); - return; - - } - - - } - catch (err) { - const logText = "[ERROR] 'openMarket' - ERROR : " + err.message; - logger.write(logText); - closeMarket(); - } - } - - function closeMarket() { - - if (LOG_INFO === true) { - logger.write("[INFO] Entering function 'closeMarket'"); - } - - } - - function closeAndOpenMarket() { - - if (LOG_INFO === true) { - logger.write("[INFO] Entering function 'closeAndOpenMarket'"); - } - - openMarket(); - } - - /* - - The following code executes for each market. - - */ - function getStatusReport() { try { diff --git a/AABruce.njsproj b/Project.njsproj similarity index 99% rename from AABruce.njsproj rename to Project.njsproj index 8b7ed3f48..8a269f3c9 100644 --- a/AABruce.njsproj +++ b/Project.njsproj @@ -13,6 +13,7 @@ {3AF33F2E-1136-4D97-BBB7-1795711AC8B8};{349c5851-65df-11da-9384-00065b846f21};{9092AA53-FB77-4645-B42D-1CCCA6BD08BD} 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + Project diff --git a/this.bot.config.json b/this.bot.config.json index 60c09ec97..93bbe382d 100644 --- a/this.bot.config.json +++ b/this.bot.config.json @@ -1,10 +1,14 @@ { - "bot": { - "name": "Bruce", - "type": "Indicator", - "version": "1.0.0", - "devTeam": "AA Masters" + "displayName": "Bruce", + "codeName": "AABruce", + "type": "Indicator", + "version": { + "major": 1, + "minor": 0, + "patch": 0 }, + "devTeam": "AAMasters", + "dataSetVersion": "dataSet.V1", "processes": [ { "name": "One-Min-Daily-Candles-Volumes", @@ -24,8 +28,42 @@ "run": "false" } }, - "intervalLapse": 10000, - "intervalMaxLoops": -1 + "normalWaitTime": 60000, + "retryWaitTime": 10000, + "sleepWaitTime": 3600000, + "comaWaitTime": 86400000, + "dependencies": [ + { + "devTeam": "AAMasters", + "bot": "AACharly", + "botVersion": { + "major": 1, + "minor": 0 + }, + "process": "Poloniex-Historic-Trades", + "dataSetVersion": "dataSet.V1" + }, + { + "devTeam": "AAMasters", + "bot": "AACharly", + "botVersion": { + "major": 1, + "minor": 0 + }, + "process": "Poloniex-Hole-Fixing", + "dataSetVersion": "dataSet.V1" + }, + { + "devTeam": "AAMasters", + "bot": "AABruce", + "botVersion": { + "major": 1, + "minor": 0 + }, + "process": "One-Min-Daily-Candles-Volumes", + "dataSetVersion": "dataSet.V1" + } + ] } ] }