From c995f0ad1a204cb90c3c4dc4b4be352150f35cdb Mon Sep 17 00:00:00 2001 From: Matias Date: Thu, 25 Apr 2019 18:00:39 -0300 Subject: [PATCH 1/2] Demo bots --- test/activeCloneListDemo.js | 400 ++++++++++++++++++++++++++++++++++++ 1 file changed, 400 insertions(+) create mode 100644 test/activeCloneListDemo.js diff --git a/test/activeCloneListDemo.js b/test/activeCloneListDemo.js new file mode 100644 index 000000000..c4be1249a --- /dev/null +++ b/test/activeCloneListDemo.js @@ -0,0 +1,400 @@ + +exports.activeCloneList = function (exchangeName) { + var activeCloneList = [] + + if(exchangeName === "Coss" && false){ + // Charly Live-Trades + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumqkwdd005d0737j715vdd7', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Sensor', + 'exchangeName': 'Coss', + 'processName': 'Live-Trades', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // Charly Hole-Fixing + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumqkwdd005d0737j715vdd7', + 'mode': 'allMonths', + 'resumeExecution': true, + 'botType': 'Sensor', + 'exchangeName': 'Coss', + 'processName': 'Hole-Fixing', + 'startYear': 2019, + 'endYear': 2021, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // Bruce Single-Period-Daily + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumqma3n005l0737us5ss1t8', + 'mode': 'allMonths', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Coss', + 'processName': 'Single-Period-Daily', + 'startYear': 2019, + 'endYear': 2021, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // Olivia Multi-Period-Daily + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumr98f3005q07376vx9dbmv', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Coss', + 'processName': 'Multi-Period-Daily', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // Olivia Multi-Period-Market + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumr98f3005q07376vx9dbmv', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Coss', + 'processName': 'Multi-Period-Market', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // AATom Multi-Period-Daily + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumr9mpd005v0737bcsixkv0', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Coss', + 'processName': 'Multi-Period-Daily', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // AATom Multi-Period-Market + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumr9mpd005v0737bcsixkv0', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Coss', + 'processName': 'Multi-Period-Market', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // Chris Multi-Period-Daily + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumra2fb00600737ycmz1anm', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Coss', + 'processName': 'Multi-Period-Daily', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // Chris Multi-Period-Market + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumra2fb00600737ycmz1anm', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Coss', + 'processName': 'Multi-Period-Market', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // AAPaula Multi-Period-Daily + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumrafn2006507377yaz7jri', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Coss', + 'processName': 'Multi-Period-Daily', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // AAPaula Multi-Period-Market + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumrafn2006507377yaz7jri', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Coss', + 'processName': 'Multi-Period-Market', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // Gauss Multi-Period-Daily + activeCloneList.push({ + 'teamId': 'cjumt5x3s00840737knglq0vu', + 'botId': 'cjumt5x41008a0737rad8n2eh', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Coss', + 'processName': 'Multi-Period-Daily', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // Gauss Multi-Period-Market + activeCloneList.push({ + 'teamId': 'cjumt5x3s00840737knglq0vu', + 'botId': 'cjumt5x41008a0737rad8n2eh', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Coss', + 'processName': 'Multi-Period-Market', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + + } else if(exchangeName === "Poloniex"){ + // Charly Live-Trades + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumqkwdd005d0737j715vdd7', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Sensor', + 'exchangeName': 'Poloniex', + 'processName': 'Live-Trades', + 'startYear': 2019, + 'endYear': 2021, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // Charly Hole-Fixing + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumqkwdd005d0737j715vdd7', + 'mode': 'allMonths', + 'resumeExecution': true, + 'botType': 'Sensor', + 'exchangeName': 'Poloniex', + 'processName': 'Hole-Fixing', + 'startYear': 2019, + 'endYear': 2021, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // Bruce Single-Period-Daily + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumqma3n005l0737us5ss1t8', + 'mode': 'allMonths', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Poloniex', + 'processName': 'Single-Period-Daily', + 'startYear': 2019, + 'endYear': 2021, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // Olivia Multi-Period-Daily + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumr98f3005q07376vx9dbmv', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Poloniex', + 'processName': 'Multi-Period-Daily', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // Olivia Multi-Period-Market + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumr98f3005q07376vx9dbmv', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Poloniex', + 'processName': 'Multi-Period-Market', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // AATom Multi-Period-Daily + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumr9mpd005v0737bcsixkv0', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Poloniex', + 'processName': 'Multi-Period-Daily', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // AATom Multi-Period-Market + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumr9mpd005v0737bcsixkv0', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Poloniex', + 'processName': 'Multi-Period-Market', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // Chris Multi-Period-Daily + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumra2fb00600737ycmz1anm', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Poloniex', + 'processName': 'Multi-Period-Daily', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // Chris Multi-Period-Market + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumra2fb00600737ycmz1anm', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Poloniex', + 'processName': 'Multi-Period-Market', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // AAPaula Multi-Period-Daily + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumrafn2006507377yaz7jri', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Poloniex', + 'processName': 'Multi-Period-Daily', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // AAPaula Multi-Period-Market + activeCloneList.push({ + 'teamId': 'cjumqkwd400570737f2poka9i', + 'botId': 'cjumrafn2006507377yaz7jri', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Poloniex', + 'processName': 'Multi-Period-Market', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // Gauss Multi-Period-Daily + activeCloneList.push({ + 'teamId': 'cjumt5x3s00840737knglq0vu', + 'botId': 'cjumt5x41008a0737rad8n2eh', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Poloniex', + 'processName': 'Multi-Period-Daily', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + // Gauss Multi-Period-Market + activeCloneList.push({ + 'teamId': 'cjumt5x3s00840737knglq0vu', + 'botId': 'cjumt5x41008a0737rad8n2eh', + 'mode': 'noTime', + 'resumeExecution': true, + 'botType': 'Indicator', + 'exchangeName': 'Poloniex', + 'processName': 'Multi-Period-Market', + 'startYear': 2019, + 'endYear': 2019, + 'month': 1, + 'runAsTeam': true, + 'beginDatetime': 1553641200 + }) + } + return activeCloneList +} From 9f60a9ffb82f1ce88e1e4ad412b4c5a6ef5479a2 Mon Sep 17 00:00:00 2001 From: Matias Date: Fri, 26 Apr 2019 13:27:01 -0300 Subject: [PATCH 2/2] Adding new minor version and audit fix --- server/package-lock.json | 8 ++++---- server/src/config/clone-deployment.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/package-lock.json b/server/package-lock.json index 71a693a20..60775e5ee 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -3256,9 +3256,9 @@ "dev": true }, "js-yaml": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", - "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -6054,7 +6054,7 @@ }, "sprintf-js": { "version": "1.0.3", - "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "sshpk": { diff --git a/server/src/config/clone-deployment.json b/server/src/config/clone-deployment.json index e350cc3c9..5b134ed0c 100644 --- a/server/src/config/clone-deployment.json +++ b/server/src/config/clone-deployment.json @@ -14,7 +14,7 @@ "containers": [ { "name": "clone-executor", - "image": "superalgos/clone-executor:v1.0", + "image": "superalgos/clone-executor:1.0.1", "command": ["node", "Run.js"], "env": [ ]