diff --git a/AppSchema.json b/AppSchema.json index 43e3d4217..e526e8e70 100644 --- a/AppSchema.json +++ b/AppSchema.json @@ -4485,7 +4485,6 @@ "actionFunction": "payload.onMenuItemClick" } ], - "isTitleAllwaysVisible": true, "initialValues": { "code": "{ \n\"text\": \"Write here what you want to announce when there is no Formula.\"\n}" }, @@ -4500,7 +4499,7 @@ "properties": [ { "name": "formula", - "type": "nide", + "type": "node", "childType": "Formula", "autoAdd": true } diff --git a/CanvasApp/DesignSpace/Workspace/FunctionLibraries/CCXTFunctions.js b/CanvasApp/DesignSpace/Workspace/FunctionLibraries/CCXTFunctions.js index ced087469..f02a1733a 100644 --- a/CanvasApp/DesignSpace/Workspace/FunctionLibraries/CCXTFunctions.js +++ b/CanvasApp/DesignSpace/Workspace/FunctionLibraries/CCXTFunctions.js @@ -191,6 +191,8 @@ function newCCXTFunctions () { newMarket.baseAsset.payload.referenceParent = baseAsset newMarket.quotedAsset.payload.referenceParent = quotedAsset + currentMarkets.set(name, newMarket) + let superActions = node.payload.parentNode.payload.parentNode.payload.parentNode.superActions for (let j = 0; j < superActions.superActions.length; j++) { diff --git a/CanvasApp/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js b/CanvasApp/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js index 7257e42ba..3d393d8ab 100644 --- a/CanvasApp/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js +++ b/CanvasApp/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js @@ -45,7 +45,7 @@ function newSessionFunctions () { 'Stop->Take Profit->' + 'Phase->Formula->Next Phase Event->' + 'Situation->Condition->Javascript Code->' + - 'Announcement->Telegram Bot->' + + 'Announcement->Telegram Bot->Formula->' + 'Close Stage->Close Execution->' let tradingSystem = functionLibraryProtocolNode.getProtocolNode(node.payload.referenceParent, false, true, true, false, false, lightingPath) @@ -54,7 +54,8 @@ function newSessionFunctions () { 'Backtesting Session->Paper Trading Session->Fordward Testing Session->Live Trading Session->' + 'Parameters->' + 'Base Asset->Quoted Asset->Time Range->Time Frame->Slippage->Fee Structure->' + - 'Exchange Account Asset->Asset->' + 'Exchange Account Asset->Asset->' + + 'Social Bots->Telegram Bot->' let session = functionLibraryProtocolNode.getProtocolNode(node, false, true, true, false, false, lightingPath) diff --git a/README.md b/README.md index 8a92b0834..98726d0f1 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ The current version opens up the door to working with multiple exchanges and mul | HitBTC | ☐ | ☐ | Not tested yet. | | Kraken | ☐ | ☐ | Historical data only accessed by id (not by date). Live trading not tested yet. | | Poloniex | ☐ | ☐ | At the moment we can not retrieve OHLCVs from Poloniex because we require 1 minute time frame while Poloniex only offers 5 minutes and above. | -| Bittrex | ☑ | ☐ | Only 6 Months of historical data is provided. Live trading not tested yet. | +| Bittrex | ☑ | ☐ | Only 6 Months of historical data is provided. Live trading not available because Bittrex allows limit orders only and Superalgos is placing only market orders for now. | | Gemini | ☑ | ☐ | Only a few hours of historical data is provided. Live trading not tested yet. | [*] The ability to fetch historic data for backtesting purposes has been verified. diff --git a/TaskServer/Session.js b/TaskServer/Session.js index 872258aad..87756700e 100644 --- a/TaskServer/Session.js +++ b/TaskServer/Session.js @@ -512,7 +512,7 @@ for (let i = 0; i < bot.SESSION.socialBots.bots.length; i++) { let socialBot = bot.SESSION.socialBots.bots[i] try { - let code = JSON.parse(announcement.code) + let code = announcement.code if (socialBot.id === announcement.referenceParent.id) { if (socialBot.type === "Telegram Bot") { if (announcement.formulaValue !== undefined) { diff --git a/TaskServer/TradingSimulation.js b/TaskServer/TradingSimulation.js index 9340b2126..f1c60b942 100644 --- a/TaskServer/TradingSimulation.js +++ b/TaskServer/TradingSimulation.js @@ -2746,7 +2746,9 @@ } announcement.formulaValue = formulaValue - bot.SESSION.socialBots.announce(announcement) + if (bot.SESSION.socialBots !== undefined) { + bot.SESSION.socialBots.announce(announcement) + } } } }