diff --git a/Integrations/Projects/Superalgos/Spaces/Charting-Space/Plotting/NodesErrors.js b/Integrations/Projects/Superalgos/Spaces/Charting-Space/Plotting/NodesErrors.js index 92302a351..d1c475c93 100644 --- a/Integrations/Projects/Superalgos/Spaces/Charting-Space/Plotting/NodesErrors.js +++ b/Integrations/Projects/Superalgos/Spaces/Charting-Space/Plotting/NodesErrors.js @@ -41,7 +41,7 @@ function newNodesErrors() { if (value === '') { node.payload.uiObject.resetErrorMessage() } else { - node.payload.uiObject.setErrorMessage(value) + node.payload.uiObject.setErrorMessage(value, 10) } } } diff --git a/Integrations/Projects/Superalgos/Spaces/Charting-Space/Plotting/NodesInfos.js b/Integrations/Projects/Superalgos/Spaces/Charting-Space/Plotting/NodesInfos.js index 177b3c338..3ee2a3f14 100644 --- a/Integrations/Projects/Superalgos/Spaces/Charting-Space/Plotting/NodesInfos.js +++ b/Integrations/Projects/Superalgos/Spaces/Charting-Space/Plotting/NodesInfos.js @@ -41,7 +41,7 @@ function newNodesInfos() { if (value === '') { node.payload.uiObject.resetInfoMessage() } else { - node.payload.uiObject.setInfoMessage(value) + node.payload.uiObject.setInfoMessage(value, 10) } } } diff --git a/Integrations/Projects/Superalgos/Spaces/Charting-Space/Plotting/NodesWarnings.js b/Integrations/Projects/Superalgos/Spaces/Charting-Space/Plotting/NodesWarnings.js index bdffad3a8..9181cfdd8 100644 --- a/Integrations/Projects/Superalgos/Spaces/Charting-Space/Plotting/NodesWarnings.js +++ b/Integrations/Projects/Superalgos/Spaces/Charting-Space/Plotting/NodesWarnings.js @@ -41,7 +41,7 @@ function newNodesWarnings() { if (value === '') { node.payload.uiObject.resetWarningMessage() } else { - node.payload.uiObject.setWarningMessage(value) + node.payload.uiObject.setWarningMessage(value, 10) } } } diff --git a/TaskServer/LowFrequencyTrading/OrdersSimulations.js b/TaskServer/LowFrequencyTrading/OrdersSimulations.js index 29934ee88..693ede008 100644 --- a/TaskServer/LowFrequencyTrading/OrdersSimulations.js +++ b/TaskServer/LowFrequencyTrading/OrdersSimulations.js @@ -126,7 +126,7 @@ exports.newOrdersSimulations = function newOrdersSimulations(bot, logger) { tradingSystem.warnings.push( [ tradingSystemOrder.id, - 'Actual Rate (' + tradingEngineOrder.orderStatistics.actualRate.value + ') was adjusted to what it might be at the order book. Resulting value = ' + tradingEngine.current.episode.candle.max.value + 'Actual Rate (' + tradingEngineOrder.orderStatistics.actualRate.value + ') too hight. Changed to candle.max (' + tradingEngine.current.episode.candle.max.value + ')' ] ) tradingEngineOrder.orderStatistics.actualRate.value = tradingEngine.current.episode.candle.max.value @@ -138,7 +138,7 @@ exports.newOrdersSimulations = function newOrdersSimulations(bot, logger) { tradingSystem.warnings.push( [ tradingSystemOrder.id, - 'Actual Rate (' + tradingEngineOrder.orderStatistics.actualRate.value + ') was adjusted to what it might be at the order book. Resulting value = ' + tradingEngine.current.episode.candle.min.value + 'Actual Rate (' + tradingEngineOrder.orderStatistics.actualRate.value + ') too low. Changed to candle.min (' + tradingEngine.current.episode.candle.max.value + ')' ] ) tradingEngineOrder.orderStatistics.actualRate.value = tradingEngine.current.episode.candle.min.value diff --git a/TaskServer/LowFrequencyTrading/TradingOrders.js b/TaskServer/LowFrequencyTrading/TradingOrders.js index 5b8798a61..62eb4f1ba 100644 --- a/TaskServer/LowFrequencyTrading/TradingOrders.js +++ b/TaskServer/LowFrequencyTrading/TradingOrders.js @@ -318,8 +318,8 @@ exports.newTradingOrders = function newTradingOrders(bot, logger, tradingEngineM let algorithmSizeInQuotedAsset requiredConfigurationValidation() - notNegativeBalanceValidation() notPassingTargetSizeValidation() + notNegativeBalanceValidation() function requiredConfigurationValidation() { /* Validate that this config exists */ @@ -399,10 +399,10 @@ exports.newTradingOrders = function newTradingOrders(bot, logger, tradingEngineM if ( tradingEngine.current.episode.episodeQuotedAsset.balance.value - tradingEngineOrder.orderQuotedAsset.size.value < 0 ) { + tradingSystem.warnings.push([tradingSystemOrder.id, 'Order Size Quoted Asset ('+ tradingEngineOrder.orderQuotedAsset.size.value +') changed to Balance Quoted Asset (' + tradingEngine.current.episode.episodeQuotedAsset.balance.value + ') so that the Balance does not drop below zero.']) + tradingEngineOrder.orderQuotedAsset.size.value = tradingEngine.current.episode.episodeQuotedAsset.balance.value tradingEngineOrder.orderBaseAsset.size.value = tradingEngineOrder.orderQuotedAsset.size.value / tradingEngineOrder.rate.value - - tradingSystem.warnings.push([tradingSystemOrder.id, 'Order size shrinked so that the Balance does not drop below zero.']) } break } @@ -410,10 +410,10 @@ exports.newTradingOrders = function newTradingOrders(bot, logger, tradingEngineM if ( tradingEngine.current.episode.episodeBaseAsset.balance.value - tradingEngineOrder.orderBaseAsset.size.value < 0 ) { + tradingSystem.warnings.push([tradingSystemOrder.id, 'Order Size Base Asset ('+ tradingEngineOrder.orderBaseAsset.size.value +') changed to Balance Base Asset (' + tradingEngine.current.episode.episodeBaseAsset.balance.value + ') so that the Balance does not drop below zero.']) + tradingEngineOrder.orderBaseAsset.size.value = tradingEngine.current.episode.episodeBaseAsset.balance.value tradingEngineOrder.orderQuotedAsset.size.value = tradingEngineOrder.orderBaseAsset.size.value * tradingEngineOrder.rate.value - - tradingSystem.warnings.push([tradingSystemOrder.id, 'Order size shrinked so that the Balance does not drop below zero.']) } break }