dev to beta

.github/stale.yml

@@ -11,6 +11,11 @@ daysUntilClose: 14
 exemptLabels:
   - bug
   - "technical issues"
+  - "feature request"
+
+
+# Label to use when marking an issue as stale
+staleLabel: stale
 
 # Comment to post when marking as stale. Set to `false` to disable
 markComment: false
@@ -21,4 +26,4 @@ closeComment: >
   any recent activity. Please open a new issue for related bugs.
 
 # Limit the number of actions per hour, from 1-30. Default is 30
-limitPerRun: 30
+limitPerRun: 30

.travis.yml

@@ -5,3 +5,4 @@ install: npm ci
 cache:
     directories: 
         - node_modules
+script: travis_retry npm test

src/botPage/bot/Interface/MiscInterface.js

@@ -29,7 +29,8 @@ export default Interface =>
                 notifyTelegram: this.notifyTelegram,
                 getTotalRuns  : () => this.tradeEngine.getTotalRuns(),
                 getBalance    : type => this.tradeEngine.getBalance(type),
-                getTotalProfit: () => this.tradeEngine.getTotalProfit(),
+                getTotalProfit: toString =>
+                    this.tradeEngine.getTotalProfit(toString, this.tradeEngine.tradeOptions.currency),
             };
         }
     };

src/botPage/bot/Interface/index.js

@@ -37,7 +37,7 @@ export default class Interface extends ToolsInterface(TicksInterface(class {}))
         };
     }
     getBotInterface() {
-        const getDetail = i => createDetails(this.get('contract'))[i];
+        const getDetail = (i, pipSize) => createDetails(this.get('contract'), pipSize)[i];
 
         return {
             init           : (...args) => this.tradeEngine.init(...args),
@@ -50,7 +50,7 @@ export default class Interface extends ToolsInterface(TicksInterface(class {}))
             sellAtMarket   : () => this.tradeEngine.sellAtMarket(),
             getSellPrice   : () => this.getSellPrice(),
             isResult       : result => getDetail(10) === result,
-            readDetails    : i => getDetail(i - 1),
+            readDetails    : i => getDetail(i - 1, this.tradeEngine.getPipSize()),
         };
     }
     sleep(arg = 1) {

src/botPage/bot/Interpreter.js

@@ -149,8 +149,10 @@ export default class Interpreter {
     }
     terminateSession() {
         this.$scope.api.disconnect();
-        globalObserver.emit('bot.stop');
         this.stopped = true;
+
+        globalObserver.emit('bot.stop');
+        globalObserver.setState({ isRunning: false });
     }
     stop() {
         if (this.bot.tradeEngine.isSold === false && !this.isErrorTriggered) {

src/botPage/bot/TradeEngine/Ticks.js

@@ -31,18 +31,30 @@ export default Engine =>
                 tickListenerKey = key;
             }
         }
-        getTicks() {
-            return new Promise(resolve =>
-                this.$scope.ticksService
-                    .request({ symbol: this.symbol })
-                    .then(ticks => resolve(ticks.map(o => o.quote)))
-            );
+        getTicks(toString = false) {
+            return new Promise(resolve => {
+                this.$scope.ticksService.request({ symbol: this.symbol }).then(ticks => {
+                    const pipSize = this.getPipSize();
+                    const ticksList = ticks.map(o => {
+                        if (toString) {
+                            return o.quote.toFixed(pipSize);
+                        }
+                        return o.quote;
+                    });
+
+                    resolve(ticksList);
+                });
+            });
         }
-        getLastTick(raw) {
+        getLastTick(raw, toString = false) {
             return new Promise(resolve =>
-                this.$scope.ticksService
-                    .request({ symbol: this.symbol })
-                    .then(ticks => resolve(raw ? getLast(ticks) : getLast(ticks).quote))
+                this.$scope.ticksService.request({ symbol: this.symbol }).then(ticks => {
+                    let lastTick = raw ? getLast(ticks) : getLast(ticks).quote;
+                    if (toString && !raw) {
+                        lastTick = lastTick.toFixed(this.getPipSize());
+                    }
+                    resolve(lastTick);
+                })
             );
         }
         getLastDigit() {

src/botPage/bot/TradeEngine/Total.js

@@ -86,9 +86,14 @@ export default Engine =>
             const accountStat = this.getAccountStat();
             return accountStat.totalRuns;
         }
-        getTotalProfit() {
+        getTotalProfit(toString, currency) {
             const accountStat = this.getAccountStat();
-            return Number(accountStat.totalProfit);
+            return toString && accountStat.totalProfit !== 0
+                ? roundBalance({
+                    currency,
+                    balance: +accountStat.totalProfit,
+                })
+                : +accountStat.totalProfit;
         }
         /* eslint-enable */
         checkLimits(tradeOption) {

src/botPage/bot/TradeEngine/index.js

@@ -92,6 +92,7 @@ export default class TradeEngine extends Balance(Purchase(Sell(OpenContract(Prop
         }
 
         globalObserver.emit('bot.running');
+        globalObserver.setState({ isRunning: true });
 
         this.tradeOptions = expectTradeOptions(tradeOptions);
 

src/botPage/bot/__tests__/block-tests/tools-test/Misc.js

@@ -17,7 +17,7 @@ describe('Misc. tools', () => {
         Bot.notify({ message: 'Test', className: 'info'})
         watch('before')
         result.totalRuns = Bot.getTotalRuns();
-        result.totalProfit = Bot.getTotalProfit();
+        result.totalProfit = Bot.getTotalProfit(false, null);
         result.balance = Bot.getBalance('NUM')
         result.balanceStr = Bot.getBalance('STR')
     `
@@ -47,7 +47,9 @@ describe('Misc. tools', () => {
     });
 
     it('Notify', () => {
-        const { notify: { className, message } } = observed;
+        const {
+            notify: { className, message },
+        } = observed;
 
         expect(className).equal('info');
         expect(message).equal('Test');

src/botPage/bot/tools.js

@@ -134,7 +134,7 @@ export const doUntilDone = (f, types) => {
     });
 };
 
-export const createDetails = contract => {
+export const createDetails = (contract, pipSize) => {
     const { sell_price: sellPrice, buy_price: buyPrice, currency } = contract;
     const profit = Number(roundBalance({ currency, balance: sellPrice - buyPrice }));
     const result = profit < 0 ? 'loss' : 'win';
@@ -151,6 +151,8 @@ export const createDetails = contract => {
         +contract.exit_tick,
         +(contract.barrier ? contract.barrier : 0),
         result,
+        (+contract.entry_tick).toFixed(pipSize),
+        (+contract.exit_tick).toFixed(pipSize),
     ];
 };
 

src/botPage/common/const.js

@@ -21,8 +21,10 @@ const config = {
             [translate('contract type'), '5'],
             [translate('entry spot'), '6'],
             [translate('entry value'), '7'],
+            [translate('entry value string'), '12'],
             [translate('exit spot'), '8'],
             [translate('exit value'), '9'],
+            [translate('exit value string'), '13'],
             [translate('barrier'), '10'],
             [translate('result'), '11'],
         ],

src/botPage/view/TradeInfoPanel/TradeTable.js

@@ -50,8 +50,8 @@ export default class TradeTable extends Component {
             { key: 'timestamp', width: 192, resizable: true, name: translate('Timestamp') },
             { key: 'reference', width: 110, resizable: true, name: translate('Reference') },
             { key: 'contract_type', width: 70, resizable: true, name: translate('Trade type') },
-            { key: 'entry_tick', width: 75, resizable: true, name: translate('Entry spot') },
-            { key: 'exit_tick', width: 75, resizable: true, name: translate('Exit spot') },
+            { key: 'entry_tick', width: 82, resizable: true, name: translate('Entry spot') },
+            { key: 'exit_tick', width: 82, resizable: true, name: translate('Exit spot') },
             { key: 'buy_price', width: 80, resizable: true, name: translate('Buy price') },
             { key: 'profit', width: 80, resizable: true, name: translate('Profit/Loss'), formatter: ProfitColor },
             { key: 'contract_status', width: 70, resizable: true, name: translate('Status'), formatter: StatusFormat },

src/botPage/view/View.js

@@ -285,6 +285,7 @@ export default class View {
                     globalObserver.emit('ui.log.info', `${translate('File is not supported:')} ${file.name}`);
                 }
             });
+            $('#files').val('');
         };
 
         const handleDragOver = e => {
@@ -455,7 +456,9 @@ export default class View {
         };
 
         const showSummary = () => {
-            $('#summaryPanel').dialog('open');
+            $('#summaryPanel')
+                .dialog('option', 'minWidth', 770)
+                .dialog('open');
             addExportButtonToPanel('summaryPanel');
         };
 
@@ -511,11 +514,19 @@ export default class View {
         });
 
         const startBot = limitations => {
-            const $runButtons = $('#runButton, #summaryRunButton');
-            const $stopButtons = $('#stopButton, #summaryStopButton');
-            $stopButtons.show();
-            $runButtons.hide();
-            $runButtons.prop('disabled', true);
+            const elRunButtons = document.querySelectorAll('#runButton, #summaryRunButton');
+            const elStopButtons = document.querySelectorAll('#stopButton, #summaryStopButton');
+
+            elRunButtons.forEach(el => {
+                const elRunButton = el;
+                elRunButton.style.display = 'none';
+                elRunButton.setAttributeNode(document.createAttribute('disabled'));
+            });
+            elStopButtons.forEach(el => {
+                const elStopButton = el;
+                elStopButton.style.display = 'inline-block';
+            });
+
             globalObserver.emit('summary.disable_clear');
             showSummary();
             this.blockly.run(limitations);
@@ -627,31 +638,54 @@ export default class View {
         this.blockly.stop();
     }
     addEventHandlers() {
+        const getRunButtonElements = () => document.querySelectorAll('#runButton, #summaryRunButton');
+        const getStopButtonElements = () => document.querySelectorAll('#stopButton, #summaryStopButton');
+
         window.addEventListener('storage', e => {
             window.onbeforeunload = null;
             if (e.key === 'activeToken' && !e.newValue) window.location.reload();
             if (e.key === 'realityCheckTime') hideRealityCheck();
         });
 
         globalObserver.register('Error', error => {
-            $('#runButton, #summaryRunButton').prop('disabled', false);
+            getRunButtonElements().forEach(el => {
+                const elRunButton = el;
+                elRunButton.removeAttribute('disabled');
+            });
+
             if (error.error && error.error.error.code === 'InvalidToken') {
                 removeAllTokens();
                 updateTokenList();
                 this.stop();
             }
         });
 
+        globalObserver.register('bot.running', () => {
+            getRunButtonElements().forEach(el => {
+                const elRunButton = el;
+                elRunButton.style.display = 'none';
+                elRunButton.setAttributeNode(document.createAttribute('disabled'));
+            });
+            getStopButtonElements().forEach(el => {
+                const elStopButton = el;
+                elStopButton.style.display = 'inline-block';
+                elStopButton.removeAttribute('disabled');
+            });
+        });
+
         globalObserver.register('bot.stop', () => {
-            const $runButtons = $('#runButton, #summaryRunButton');
-            const $stopButtons = $('#stopButton, #summaryStopButton');
-            if ($runButtons.is(':visible') || $stopButtons.is(':visible')) {
-                $runButtons.show();
-                $stopButtons.hide();
-
-                $stopButtons.prop('disabled', false);
-                $runButtons.prop('disabled', false);
-            }
+            // Enable run button, this event is emitted after the interpreter
+            // killed the API connection.
+            getStopButtonElements().forEach(el => {
+                const elStopButton = el;
+                elStopButton.style.display = null;
+                elStopButton.removeAttribute('disabled');
+            });
+            getRunButtonElements().forEach(el => {
+                const elRunButton = el;
+                elRunButton.style.display = null;
+                elRunButton.removeAttribute('disabled');
+            });
         });
 
         globalObserver.register('bot.info', info => {

src/botPage/view/blockly/blocks/shared.js

@@ -410,6 +410,21 @@ export const getPredictionForContracts = (contracts, selectedContractType) => {
     return predictionRange;
 };
 
-export const disableRunButton = isDisabled => {
-    $('#runButton, #summaryRunButton').attr('disabled', isDisabled);
+export const disableRunButton = shouldDisable => {
+    const elRunButtons = document.querySelectorAll('#runButton, #summaryRunButton');
+    const isRunning = globalObserver.getState('isRunning');
+
+    elRunButtons.forEach(elRunButton => {
+        if (isRunning) {
+            if (shouldDisable) {
+                elRunButton.setAttributeNode(document.createAttribute('disabled'));
+            } else {
+                // Do not enable. The bot is running.
+            }
+        } else if (shouldDisable) {
+            elRunButton.setAttributeNode(document.createAttribute('disabled'));
+        } else {
+            elRunButton.removeAttribute('disabled');
+        }
+    });
 };

src/botPage/view/blockly/blocks/ticks/tick.js

@@ -14,4 +14,16 @@ Blockly.Blocks.tick = {
         mainScope(this, ev, 'Tick Value');
     },
 };
-Blockly.JavaScript.tick = () => ['Bot.getLastTick()', Blockly.JavaScript.ORDER_ATOMIC];
+Blockly.JavaScript.tick = () => ['Bot.getLastTick(false, false)', Blockly.JavaScript.ORDER_ATOMIC];
+
+Blockly.Blocks.tick_string = {
+    init: function init() {
+        this.appendDummyInput().appendField(translate('Last Tick String'));
+        this.setOutput(true, 'Number');
+        this.setColour('#f2f2f2');
+        this.setTooltip(translate('Returns the tick value received by a before purchase block (String)'));
+        this.setHelpUrl('https://github.com/binary-com/binary-bot/wiki');
+    },
+    onchange: Blockly.Blocks.tick.onchange,
+};
+Blockly.JavaScript.tick_string = () => ['Bot.getLastTick(false, true)', Blockly.JavaScript.ORDER_ATOMIC];

src/botPage/view/blockly/blocks/ticks/ticks.js

@@ -14,4 +14,16 @@ Blockly.Blocks.ticks = {
         mainScope(this, ev, 'Ticks List');
     },
 };
-Blockly.JavaScript.ticks = () => ['Bot.getTicks()', Blockly.JavaScript.ORDER_ATOMIC];
+Blockly.JavaScript.ticks = () => ['Bot.getTicks(false)', Blockly.JavaScript.ORDER_ATOMIC];
+
+Blockly.Blocks.ticks_string = {
+    init: function init() {
+        this.appendDummyInput().appendField(translate('Ticks String List'));
+        this.setOutput(true, 'Array');
+        this.setColour('#f2f2f2');
+        this.setTooltip(translate('Returns the list of tick values (String)'));
+        this.setHelpUrl('https://github.com/binary-com/binary-bot/wiki');
+    },
+    onchange: Blockly.Blocks.ticks.onchange,
+};
+Blockly.JavaScript.ticks_string = () => ['Bot.getTicks(true)', Blockly.JavaScript.ORDER_ATOMIC];

src/botPage/view/blockly/blocks/tools/total_profit.js

@@ -9,5 +9,29 @@ Blockly.Blocks.total_profit = {
         this.setTooltip(translate('Returns the total profit'));
         this.setHelpUrl('https://github.com/binary-com/binary-bot/wiki');
     },
+    onchange: function onchange(ev) {
+        if (!this.workspace || this.isInFlyout || this.workspace.isDragging()) {
+            return;
+        }
+
+        if (ev.type === Blockly.Events.MOVE) {
+            const inputStatement = this.getRootInputTargetBlock();
+
+            if (inputStatement === 'INITIALIZATION') {
+                this.unplug(true);
+            }
+        }
+    },
+};
+Blockly.JavaScript.total_profit = () => ['Bot.getTotalProfit(false)', Blockly.JavaScript.ORDER_ATOMIC];
+
+Blockly.Blocks.total_profit_string = {
+    init: function init() {
+        this.appendDummyInput().appendField(translate('Total Profit String'));
+        this.setOutput(true, 'String');
+        this.setColour('#dedede');
+        this.setTooltip(translate('Return the total profit (String)'));
+        this.setHelpUrl('https://github.com/binary-com/binary-bot/wiki');
+    },
 };
-Blockly.JavaScript.total_profit = () => ['Bot.getTotalProfit()', Blockly.JavaScript.ORDER_ATOMIC];
+Blockly.JavaScript.total_profit_string = () => ['Bot.getTotalProfit(true)', Blockly.JavaScript.ORDER_ATOMIC];