Updated fixes (#43)

chrisleekr · Mar 18, 2021 · 64f93eb · 64f93eb
1 parent 2a81c7a
commit 64f93eb
Show file tree

Hide file tree

Showing 9 changed files with 143 additions and 120 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![GitHub package.json version](https://img.shields.io/github/package-json/v/chrisleekr/binance-trading-bot)](https://github.com/chrisleekr/binance-trading-bot/releases)
 [![Build](https://github.com/chrisleekr/binance-trading-bot/workflows/main/badge.svg)](https://github.com/chrisleekr/binance-trading-bot/actions?query=workflow%3Amain)
 [![CodeCov](https://codecov.io/gh/chrisleekr/binance-trading-bot/branch/master/graph/badge.svg)](https://codecov.io/gh/chrisleekr/binance-trading-bot)
-[![Docker pull](https://img.shields.io/docker/pulls/chrisleekr/binance-trading-bot)](https://hub.docker.com/repository/docker/chrisleekr/binance-trading-bot)
+[![Docker pull](https://img.shields.io/docker/pulls/chrisleekr/binance-trading-bot)](https://hub.docker.com/r/chrisleekr/binance-trading-bot)
 [![MIT License](https://img.shields.io/github/license/chrisleekr/binance-trading-bot)](https://github.com/chrisleekr/binance-trading-bot/blob/master/LICENSE)
 
 > Automated Binance trading bot with trailing buy/sell strategy
@@ -306,6 +306,8 @@ Or use the frontend to adjust configurations after launching the application.
 - [x] Added more candle periods - 1m, 3m and 5m
 - [x] Allow to disable local tunnel
 - [x] Fix the bug with handling open orders
+- [x] Fix the bug with limit step in the frontend
+- [x] Updated the frontend to display buy open orders with the buy signal
 - [ ] Allow browser notification in the frontend
 - [ ] Secure frontend with the password
 
@@ -314,3 +316,4 @@ Or use the frontend to adjust configurations after launching the application.
 - [@d0x2f](https://github.com/d0x2f)
 - [@Maxoos](https://github.com/Maxoos)
 - [@OOtta](https://github.com/OOtta)
+- [@thamlth](https://github.com/thamlth)
diff --git a/app/jobs/trailingTrade/step/__tests__/get-indicators.test.js b/app/jobs/trailingTrade/step/__tests__/get-indicators.test.js
@@ -30,11 +30,11 @@ describe('get-indicators.js', () => {
             candles: { interval: '1h', limit: 50 },
             buy: {
               triggerPercentage: 1.01,
-              limitPercentage: 1.011
+              limitPercentage: 1.021
             },
             sell: {
-              triggerPercentage: 0.99,
-              limitPercentage: 0.98
+              triggerPercentage: 1.06,
+              limitPercentage: 0.979
             }
           },
           baseAssetBalance: { total: 0.1 },
@@ -57,9 +57,10 @@ describe('get-indicators.js', () => {
           symbol: 'BTCUSDT',
           symbolConfiguration: {
             candles: { interval: '1h', limit: 50 },
-            buy: { triggerPercentage: 1.01, limitPercentage: 1.011 },
-            sell: { triggerPercentage: 0.99, limitPercentage: 0.98 }
+            buy: { triggerPercentage: 1.01, limitPercentage: 1.021 },
+            sell: { triggerPercentage: 1.06, limitPercentage: 0.979 }
           },
+          baseAssetBalance: { total: 0.1, estimatedValue: 1555.509 },
           openOrders: [],
           indicators: {
             lowestPrice: 8893.03,
@@ -77,13 +78,9 @@ describe('get-indicators.js', () => {
               quoteAssetVolume: '59899003.79417636'
             }
           },
-          baseAssetBalance: {
-            total: 0.1,
-            estimatedValue: 1555.509
-          },
           buy: {
             currentPrice: 15555.09,
-            limitPrice: 15726.195989999998,
+            limitPrice: 15881.746889999999,
             lowestPrice: 8893.03,
             triggerPrice: 8981.9603,
             difference: 73.18146017634923,
@@ -93,7 +90,7 @@ describe('get-indicators.js', () => {
           },
           sell: {
             currentPrice: 15555.09,
-            limitPrice: 15243.9882,
+            limitPrice: 15228.43311,
             lastBuyPrice: null,
             triggerPrice: null,
             difference: null,
@@ -123,11 +120,11 @@ describe('get-indicators.js', () => {
             candles: { interval: '1h', limit: 50 },
             buy: {
               triggerPercentage: 1.01,
-              limitPercentage: 1.011
+              limitPercentage: 1.021
             },
             sell: {
-              triggerPercentage: 0.99,
-              limitPercentage: 0.98
+              triggerPercentage: 1.06,
+              limitPercentage: 0.979
             }
           },
           baseAssetBalance: { total: 0.1 },
@@ -180,8 +177,8 @@ describe('get-indicators.js', () => {
           symbol: 'BTCUSDT',
           symbolConfiguration: {
             candles: { interval: '1h', limit: 50 },
-            buy: { triggerPercentage: 1.01, limitPercentage: 1.011 },
-            sell: { triggerPercentage: 0.99, limitPercentage: 0.98 }
+            buy: { triggerPercentage: 1.01, limitPercentage: 1.021 },
+            sell: { triggerPercentage: 1.06, limitPercentage: 0.979 }
           },
           baseAssetBalance: { total: 0.1, estimatedValue: 1555.509 },
           openOrders: [
@@ -206,9 +203,10 @@ describe('get-indicators.js', () => {
               stopPrice: '16100.000',
               time: 1615465601162,
               currentPrice: 15555.09,
-              limitPrice: 15726.195989999998,
-              limitPercentage: 1.011,
-              difference: 2.3769512362538103,
+              limitPrice: 15881.746889999999,
+              limitPercentage: 1.021,
+              differenceToExecute: -3.5030976998525976,
+              differenceToCancel: -1.37423868741684,
               updatedAt: expect.any(Object)
             },
             {
@@ -221,9 +219,10 @@ describe('get-indicators.js', () => {
               stopPrice: '15900.000',
               time: 1615465601162,
               currentPrice: 15555.09,
-              limitPrice: 15243.9882,
-              limitPercentage: 0.98,
-              difference: -4.303413197341621,
+              limitPrice: 15228.43311,
+              limitPercentage: 0.979,
+              differenceToExecute: -2.2173449333947826,
+              differenceToCancel: -4.40995396669539,
               minimumProfit: 35,
               minimumProfitPercentage: 43.75,
               updatedAt: expect.any(Object)
@@ -247,7 +246,7 @@ describe('get-indicators.js', () => {
           },
           buy: {
             currentPrice: 15555.09,
-            limitPrice: 15726.195989999998,
+            limitPrice: 15881.746889999999,
             lowestPrice: 8893.03,
             triggerPrice: 8981.9603,
             difference: 73.18146017634923,
@@ -273,9 +272,10 @@ describe('get-indicators.js', () => {
                 stopPrice: '16100.000',
                 time: 1615465601162,
                 currentPrice: 15555.09,
-                limitPrice: 15726.195989999998,
-                limitPercentage: 1.011,
-                difference: 2.3769512362538103,
+                limitPrice: 15881.746889999999,
+                limitPercentage: 1.021,
+                differenceToExecute: -3.5030976998525976,
+                differenceToCancel: -1.37423868741684,
                 updatedAt: expect.any(Object)
               }
             ],
@@ -284,10 +284,10 @@ describe('get-indicators.js', () => {
           },
           sell: {
             currentPrice: 15555.09,
-            limitPrice: 15243.9882,
+            limitPrice: 15228.43311,
             lastBuyPrice: 9000,
-            triggerPrice: 8910,
-            difference: 42.71971425430519,
+            triggerPrice: 9540,
+            difference: 38.669593039963125,
             currentProfit: 655.509,
             currentProfitPercentage: 42.14112550939918,
             openOrders: [
@@ -301,9 +301,10 @@ describe('get-indicators.js', () => {
                 stopPrice: '15900.000',
                 time: 1615465601162,
                 currentPrice: 15555.09,
-                limitPrice: 15243.9882,
-                limitPercentage: 0.98,
-                difference: -4.303413197341621,
+                limitPrice: 15228.43311,
+                limitPercentage: 0.979,
+                differenceToExecute: -2.2173449333947826,
+                differenceToCancel: -4.40995396669539,
                 minimumProfit: 35,
                 minimumProfitPercentage: 43.75,
                 updatedAt: expect.any(Object)
@@ -330,11 +331,11 @@ describe('get-indicators.js', () => {
             candles: { interval: '1h', limit: 50 },
             buy: {
               triggerPercentage: 1.01,
-              limitPercentage: 1.011
+              limitPercentage: 1.021
             },
             sell: {
-              triggerPercentage: 0.99,
-              limitPercentage: 0.98
+              triggerPercentage: 1.06,
+              limitPercentage: 0.979
             }
           },
           baseAssetBalance: {
@@ -381,13 +382,10 @@ describe('get-indicators.js', () => {
           symbol: 'BTCUSDT',
           symbolConfiguration: {
             candles: { interval: '1h', limit: 50 },
-            buy: { triggerPercentage: 1.01, limitPercentage: 1.011 },
-            sell: { triggerPercentage: 0.99, limitPercentage: 0.98 }
-          },
-          baseAssetBalance: {
-            total: 0.1,
-            estimatedValue: 1555.509
+            buy: { triggerPercentage: 1.01, limitPercentage: 1.021 },
+            sell: { triggerPercentage: 1.06, limitPercentage: 0.979 }
           },
+          baseAssetBalance: { total: 0.1, estimatedValue: 1555.509 },
           openOrders: [
             {
               orderId: 1,
@@ -410,9 +408,10 @@ describe('get-indicators.js', () => {
               stopPrice: '16100.000',
               time: 1615465601162,
               currentPrice: 15555.09,
-              limitPrice: 15726.195989999998,
-              limitPercentage: 1.011,
-              difference: 2.3769512362538103,
+              limitPrice: 15881.746889999999,
+              limitPercentage: 1.021,
+              differenceToExecute: -3.5030976998525976,
+              differenceToCancel: -1.37423868741684,
               updatedAt: expect.any(Object)
             },
             {
@@ -425,9 +424,10 @@ describe('get-indicators.js', () => {
               stopPrice: '15900.000',
               time: 1615465601162,
               currentPrice: 15555.09,
-              limitPrice: 15243.9882,
-              limitPercentage: 0.98,
-              difference: -4.303413197341621,
+              limitPrice: 15228.43311,
+              limitPercentage: 0.979,
+              differenceToExecute: -2.2173449333947826,
+              differenceToCancel: -4.40995396669539,
               minimumProfit: null,
               minimumProfitPercentage: null,
               updatedAt: expect.any(Object)
@@ -451,7 +451,7 @@ describe('get-indicators.js', () => {
           },
           buy: {
             currentPrice: 15555.09,
-            limitPrice: 15726.195989999998,
+            limitPrice: 15881.746889999999,
             lowestPrice: 8893.03,
             triggerPrice: 8981.9603,
             difference: 73.18146017634923,
@@ -477,9 +477,10 @@ describe('get-indicators.js', () => {
                 stopPrice: '16100.000',
                 time: 1615465601162,
                 currentPrice: 15555.09,
-                limitPrice: 15726.195989999998,
-                limitPercentage: 1.011,
-                difference: 2.3769512362538103,
+                limitPrice: 15881.746889999999,
+                limitPercentage: 1.021,
+                differenceToExecute: -3.5030976998525976,
+                differenceToCancel: -1.37423868741684,
                 updatedAt: expect.any(Object)
               }
             ],
@@ -488,7 +489,7 @@ describe('get-indicators.js', () => {
           },
           sell: {
             currentPrice: 15555.09,
-            limitPrice: 15243.9882,
+            limitPrice: 15228.43311,
             lastBuyPrice: null,
             triggerPrice: null,
             difference: null,
@@ -505,9 +506,10 @@ describe('get-indicators.js', () => {
                 stopPrice: '15900.000',
                 time: 1615465601162,
                 currentPrice: 15555.09,
-                limitPrice: 15243.9882,
-                limitPercentage: 0.98,
-                difference: -4.303413197341621,
+                limitPrice: 15228.43311,
+                limitPercentage: 0.979,
+                differenceToExecute: -2.2173449333947826,
+                differenceToCancel: -4.40995396669539,
                 minimumProfit: null,
                 minimumProfitPercentage: null,
                 updatedAt: expect.any(Object)

diff --git a/app/jobs/trailingTrade/step/get-indicators.js b/app/jobs/trailingTrade/step/get-indicators.js
@@ -127,14 +127,19 @@ const execute = async (logger, rawData) => {
     if (order.side.toLowerCase() === 'buy') {
       newOrder.limitPrice = buyLimitPrice;
       newOrder.limitPercentage = buyLimitPercentage;
-      newOrder.difference =
-        (1 - parseFloat(order.stopPrice / buyLimitPrice)) * -100;
+      newOrder.differenceToExecute =
+        (1 - parseFloat(order.stopPrice / currentPrice)) * 100;
+
+      newOrder.differenceToCancel =
+        (1 - parseFloat(order.stopPrice / buyLimitPrice)) * 100;
     }
 
     if (order.side.toLowerCase() === 'sell') {
       newOrder.limitPrice = sellLimitPrice;
       newOrder.limitPercentage = sellLimitPercentage;
-      newOrder.difference =
+      newOrder.differenceToExecute =
+        (1 - parseFloat(order.stopPrice / currentPrice)) * 100;
+      newOrder.differenceToCancel =
         (1 - parseFloat(order.stopPrice / sellLimitPrice)) * 100;
 
       newOrder.minimumProfit = null;

diff --git a/public/js/CoinWrapperBuyOrders.js b/public/js/CoinWrapperBuyOrders.js
@@ -73,12 +73,7 @@ class CoinWrapperBuyOrders extends React.Component {
             ''
           )}
           <div className='coin-info-column coin-info-column-price divider'></div>
-          <div className='coin-info-column coin-info-column-price'>
-            <span className='coin-info-label'>Current price:</span>
-            <HightlightChange className='coin-info-value'>
-              {openOrder.currentPrice.toFixed(precision)}
-            </HightlightChange>
-          </div>
+
           {openOrder.limitPrice ? (
             <div className='coin-info-column coin-info-column-order'>
               <span className='coin-info-label'>Current limit Price:</span>
@@ -89,11 +84,27 @@ class CoinWrapperBuyOrders extends React.Component {
           ) : (
             ''
           )}
-          {openOrder.difference ? (
+          {openOrder.differenceToCancel ? (
+            <div className='coin-info-column coin-info-column-order'>
+              <span className='coin-info-label'>Difference to cancel:</span>
+              <HightlightChange className='coin-info-value'>
+                {openOrder.differenceToCancel.toFixed(2)}%
+              </HightlightChange>
+            </div>
+          ) : (
+            ''
+          )}
+          <div className='coin-info-column coin-info-column-price'>
+            <span className='coin-info-label'>Current price:</span>
+            <HightlightChange className='coin-info-value'>
+              {openOrder.currentPrice.toFixed(precision)}
+            </HightlightChange>
+          </div>
+          {openOrder.differenceToExecute ? (
             <div className='coin-info-column coin-info-column-order'>
-              <span className='coin-info-label'>Difference to buy:</span>
+              <span className='coin-info-label'>Difference to execute:</span>
               <HightlightChange className='coin-info-value'>
-                {openOrder.difference.toFixed(2)}%
+                {openOrder.differenceToExecute.toFixed(2)}%
               </HightlightChange>
             </div>
           ) : (

diff --git a/public/js/CoinWrapperBuySignal.js b/public/js/CoinWrapperBuySignal.js
@@ -13,10 +13,6 @@ class CoinWrapperBuySignal extends React.Component {
       }
     } = this.props;
 
-    if (buy.openOrders.length > 0) {
-      return '';
-    }
-
     const precision = tickSize.indexOf(1) - 1;
 
     return (
@@ -97,9 +93,8 @@ class CoinWrapperBuySignal extends React.Component {
           ''
         )}
         {buy.processMessage ? (
-          <div>
+          <div className='d-flex flex-column flex-grow-1'>
             <div className='coin-info-column coin-info-column-price divider'></div>
-
             <div className='coin-info-column coin-info-column-message'>
               <HightlightChange className='coin-info-message'>
                 {buy.processMessage}