From 00c934c944f380584eaadded3dae246fa139dde5 Mon Sep 17 00:00:00 2001 From: Marcelo Marczuk Date: Mon, 22 Feb 2021 16:41:43 -0300 Subject: [PATCH 1/7] fix on buy long --- src/trader.js | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/trader.js b/src/trader.js index dd6e54c..1bf86d6 100644 --- a/src/trader.js +++ b/src/trader.js @@ -107,11 +107,6 @@ socket.on("buy_signal", async (signal) => { //notify notifier.notifyEnterLongSignal(signal) - ////// - trading_pairs[signal.pair + signal.stratid] = true - trading_types[signal.pair + signal.stratid] = "LONG" - open_trades[signal.pair + signal.stratid] = true - ////// console.log( signal.pair, " ===> BUY", @@ -130,7 +125,6 @@ socket.on("buy_signal", async (signal) => { minimums[alt + "BTC"].stepSize ) console.log("Market Buy ==> " + qty + " - " + alt + "BTC") - trading_qty[signal.pair + signal.stratid] = Number(qty) //// const traded_buy_signal = { key: bva_key, @@ -152,6 +146,13 @@ socket.on("buy_signal", async (signal) => { return } + ////// + trading_pairs[signal.pair + signal.stratid] = true + trading_types[signal.pair + signal.stratid] = "LONG" + open_trades[signal.pair + signal.stratid] = true + trading_qty[signal.pair + signal.stratid] = Number(qty) + ////// + console.log("SUCCESS 222444222") socket.emit( "traded_buy_signal", @@ -175,6 +176,13 @@ socket.on("buy_signal", async (signal) => { return } + ////// + trading_pairs[signal.pair + signal.stratid] = true + trading_types[signal.pair + signal.stratid] = "LONG" + open_trades[signal.pair + signal.stratid] = true + trading_qty[signal.pair + signal.stratid] = Number(qty) + ////// + console.log( "SUCESS 99111 marketBuy", alt + "BTC", @@ -190,6 +198,14 @@ socket.on("buy_signal", async (signal) => { } } else { // VIRTUAL TRADE + + ////// + trading_pairs[signal.pair + signal.stratid] = true + trading_types[signal.pair + signal.stratid] = "LONG" + open_trades[signal.pair + signal.stratid] = true + trading_qty[signal.pair + signal.stratid] = Number(qty) + ////// + socket.emit("traded_buy_signal", traded_buy_signal) notifier.notifyEnterLongTraded(signal); } From fd1918e14b52034e2dc175215384cc8af6e22184 Mon Sep 17 00:00:00 2001 From: Marcelo Marczuk Date: Mon, 22 Feb 2021 17:08:08 -0300 Subject: [PATCH 2/7] fix on sell short --- src/trader.js | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/trader.js b/src/trader.js index 1bf86d6..352b8f9 100644 --- a/src/trader.js +++ b/src/trader.js @@ -205,7 +205,7 @@ socket.on("buy_signal", async (signal) => { open_trades[signal.pair + signal.stratid] = true trading_qty[signal.pair + signal.stratid] = Number(qty) ////// - + socket.emit("traded_buy_signal", traded_buy_signal) notifier.notifyEnterLongTraded(signal); } @@ -335,11 +335,7 @@ socket.on("sell_signal", async (signal) => { ) //notify notifier.notifyEnterShortSignal(signal) - ////// - trading_pairs[signal.pair + signal.stratid] = true - trading_types[signal.pair + signal.stratid] = "SHORT" - open_trades[signal.pair + signal.stratid] = true - ////// + console.log( signal.pair, " ===> SELL", @@ -358,7 +354,6 @@ socket.on("sell_signal", async (signal) => { btc_qty, minimums[alt + "BTC"].stepSize ) - trading_qty[signal.pair + signal.stratid] = Number(qty) console.log( "QTY ===mgBorrow===> " + qty + " - " + alt + "BTC" ) @@ -385,6 +380,7 @@ socket.on("sell_signal", async (signal) => { ) return } + console.log( "SUCESS 444444444 mgMarketSell 44444444" ) @@ -399,6 +395,14 @@ socket.on("sell_signal", async (signal) => { ) return } + + ////// + trading_pairs[signal.pair + signal.stratid] = true + trading_types[signal.pair + signal.stratid] = "SHORT" + open_trades[signal.pair + signal.stratid] = true + trading_qty[signal.pair + signal.stratid] = Number(qty) + ////// + console.log("SUCCESS 22222222") socket.emit( "traded_sell_signal", @@ -411,6 +415,14 @@ socket.on("sell_signal", async (signal) => { ) } else { // VIRTUAL TRADE + + ////// + trading_pairs[signal.pair + signal.stratid] = true + trading_types[signal.pair + signal.stratid] = "SHORT" + open_trades[signal.pair + signal.stratid] = true + trading_qty[signal.pair + signal.stratid] = Number(qty) + ////// + socket.emit("traded_sell_signal", traded_sell_signal) notifier.notifyEnterShortTraded(signal); } From e47f49ad32741ec686a98db8108b0ffc5acbbe64 Mon Sep 17 00:00:00 2001 From: Marcelo Marczuk Date: Mon, 22 Feb 2021 19:57:19 -0300 Subject: [PATCH 3/7] fix on close --- src/trader.js | 59 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 14 deletions(-) diff --git a/src/trader.js b/src/trader.js index 352b8f9..fa3e1db 100644 --- a/src/trader.js +++ b/src/trader.js @@ -625,6 +625,15 @@ socket.on("close_traded_signal", async (signal) => { ) return } + + ////// + delete trading_pairs[signal.pair + signal.stratid] + delete trading_types[signal.pair + signal.stratid] + delete sell_prices[signal.pair + signal.stratid] + delete trading_qty[signal.pair + signal.stratid] + delete open_trades[signal.pair + signal.stratid] + ////// + console.log("SUCESS44444", alt, Number(qty)) socket.emit( "traded_sell_signal", @@ -653,6 +662,15 @@ socket.on("close_traded_signal", async (signal) => { ) return } + + ////// + delete trading_pairs[signal.pair + signal.stratid] + delete trading_types[signal.pair + signal.stratid] + delete sell_prices[signal.pair + signal.stratid] + delete trading_qty[signal.pair + signal.stratid] + delete open_trades[signal.pair + signal.stratid] + ////// + console.log( "SUCESS 716611 marketSell", alt, @@ -672,15 +690,17 @@ socket.on("close_traded_signal", async (signal) => { } else { // VIRTUAL TRADE + + ////// + delete trading_pairs[signal.pair + signal.stratid] + delete trading_types[signal.pair + signal.stratid] + delete sell_prices[signal.pair + signal.stratid] + delete trading_qty[signal.pair + signal.stratid] + delete open_trades[signal.pair + signal.stratid] + ////// + socket.emit("traded_sell_signal", traded_sell_signal) } - ////// - delete trading_pairs[signal.pair + signal.stratid] - delete trading_types[signal.pair + signal.stratid] - delete sell_prices[signal.pair + signal.stratid] - delete trading_qty[signal.pair + signal.stratid] - delete open_trades[signal.pair + signal.stratid] - ////// } else if (trading_types[signal.pair + signal.stratid] === "SHORT") { console.log( colors.grey( @@ -722,6 +742,15 @@ socket.on("close_traded_signal", async (signal) => { ) return } + + ////// + delete trading_pairs[signal.pair + signal.stratid] + delete trading_types[signal.pair + signal.stratid] + delete buy_prices[signal.pair + signal.stratid] + delete trading_qty[signal.pair + signal.stratid] + delete open_trades[signal.pair + signal.stratid] + ////// + socket.emit( "traded_buy_signal", traded_buy_signal @@ -752,15 +781,17 @@ socket.on("close_traded_signal", async (signal) => { } else { // VIRTUAL TRADE + + ////// + delete trading_pairs[signal.pair + signal.stratid] + delete trading_types[signal.pair + signal.stratid] + delete buy_prices[signal.pair + signal.stratid] + delete trading_qty[signal.pair + signal.stratid] + delete open_trades[signal.pair + signal.stratid] + ////// + socket.emit("traded_buy_signal", traded_buy_signal) } - ////// - delete trading_pairs[signal.pair + signal.stratid] - delete trading_types[signal.pair + signal.stratid] - delete buy_prices[signal.pair + signal.stratid] - delete trading_qty[signal.pair + signal.stratid] - delete open_trades[signal.pair + signal.stratid] - ////// } } }) From 88d85b87e142a3ccd000773d905f84eb5b5cb27f Mon Sep 17 00:00:00 2001 From: Marcelo Marczuk Date: Mon, 22 Feb 2021 19:57:52 -0300 Subject: [PATCH 4/7] fix close log message --- src/trader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/trader.js b/src/trader.js index fa3e1db..bbb4a17 100644 --- a/src/trader.js +++ b/src/trader.js @@ -582,7 +582,7 @@ socket.on("close_traded_signal", async (signal) => { if (trading_types[signal.pair + signal.stratid] === "LONG") { console.log( colors.grey( - "BUY_SIGNAL :: SELL TO EXIT LONG TRADE ::", + "CLOSE_SIGNAL :: SELL TO EXIT LONG TRADE ::", signal.stratname, signal.stratid, signal.pair From 21685dd715e85e180dd41726904810453b1f1f16 Mon Sep 17 00:00:00 2001 From: Marcelo Marczuk Date: Mon, 22 Feb 2021 20:00:35 -0300 Subject: [PATCH 5/7] fix on sell long --- src/trader.js | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/src/trader.js b/src/trader.js index bbb4a17..39acede 100644 --- a/src/trader.js +++ b/src/trader.js @@ -489,6 +489,16 @@ socket.on("sell_signal", async (signal) => { ) return } + + ////// + delete trading_pairs[signal.pair + signal.stratid] + delete trading_types[signal.pair + signal.stratid] + delete sell_prices[signal.pair + signal.stratid] + delete buy_prices[signal.pair + signal.stratid] + delete trading_qty[signal.pair + signal.stratid] + delete open_trades[signal.pair + signal.stratid] + ////// + console.log( "SUCESS 71111111", alt, @@ -522,6 +532,16 @@ socket.on("sell_signal", async (signal) => { ) return } + + ////// + delete trading_pairs[signal.pair + signal.stratid] + delete trading_types[signal.pair + signal.stratid] + delete sell_prices[signal.pair + signal.stratid] + delete buy_prices[signal.pair + signal.stratid] + delete trading_qty[signal.pair + signal.stratid] + delete open_trades[signal.pair + signal.stratid] + ////// + console.log( "SUCESS 711000111 marketSell", alt + "BTC", @@ -537,6 +557,16 @@ socket.on("sell_signal", async (signal) => { } } else { // VIRTUAL TRADE + + ////// + delete trading_pairs[signal.pair + signal.stratid] + delete trading_types[signal.pair + signal.stratid] + delete sell_prices[signal.pair + signal.stratid] + delete buy_prices[signal.pair + signal.stratid] + delete trading_qty[signal.pair + signal.stratid] + delete open_trades[signal.pair + signal.stratid] + ////// + socket.emit("traded_sell_signal", traded_sell_signal) notifier.notifyExitLongTraded(signal) } @@ -544,15 +574,6 @@ socket.on("sell_signal", async (signal) => { } else { console.log("PAIR UNKNOWN", alt) } - - ////// - delete trading_pairs[signal.pair + signal.stratid] - delete trading_types[signal.pair + signal.stratid] - delete sell_prices[signal.pair + signal.stratid] - delete buy_prices[signal.pair + signal.stratid] - delete trading_qty[signal.pair + signal.stratid] - delete open_trades[signal.pair + signal.stratid] - ////// } else { console.log( "SELL AGAIN", From b6b0bb994992700400fe85d334b8268c268a5a7d Mon Sep 17 00:00:00 2001 From: Marcelo Marczuk Date: Mon, 22 Feb 2021 20:01:45 -0300 Subject: [PATCH 6/7] fix on buy short --- src/trader.js | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/trader.js b/src/trader.js index 39acede..0cb3db2 100644 --- a/src/trader.js +++ b/src/trader.js @@ -268,6 +268,16 @@ socket.on("buy_signal", async (signal) => { ) return } + + ////// + delete trading_pairs[signal.pair + signal.stratid] + delete trading_types[signal.pair + signal.stratid] + delete buy_prices[signal.pair + signal.stratid] + delete sell_prices[signal.pair + signal.stratid] + delete trading_qty[signal.pair + signal.stratid] + delete open_trades[signal.pair + signal.stratid] + ////// + socket.emit( "traded_buy_signal", traded_buy_signal @@ -295,20 +305,22 @@ socket.on("buy_signal", async (signal) => { ) } else { // VIRTUAL TRADE + + ////// + delete trading_pairs[signal.pair + signal.stratid] + delete trading_types[signal.pair + signal.stratid] + delete buy_prices[signal.pair + signal.stratid] + delete sell_prices[signal.pair + signal.stratid] + delete trading_qty[signal.pair + signal.stratid] + delete open_trades[signal.pair + signal.stratid] + ////// + socket.emit("traded_buy_signal", traded_buy_signal) notifier.notifyBuyToCoverTraded(signal); } } else { console.log("PAIR UNKNOWN", alt) } - ////// - delete trading_pairs[signal.pair + signal.stratid] - delete trading_types[signal.pair + signal.stratid] - delete buy_prices[signal.pair + signal.stratid] - delete sell_prices[signal.pair + signal.stratid] - delete trading_qty[signal.pair + signal.stratid] - delete open_trades[signal.pair + signal.stratid] - ////// } else { console.log( "BUY AGAIN", From 71b39f3d0ca8d994661014f9a92576292302043a Mon Sep 17 00:00:00 2001 From: Marcelo Marczuk Date: Mon, 22 Feb 2021 20:10:13 -0300 Subject: [PATCH 7/7] always delete all tracking on finish --- src/trader.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/trader.js b/src/trader.js index 0cb3db2..c4b50d3 100644 --- a/src/trader.js +++ b/src/trader.js @@ -663,6 +663,7 @@ socket.on("close_traded_signal", async (signal) => { delete trading_pairs[signal.pair + signal.stratid] delete trading_types[signal.pair + signal.stratid] delete sell_prices[signal.pair + signal.stratid] + delete buy_prices[signal.pair + signal.stratid] delete trading_qty[signal.pair + signal.stratid] delete open_trades[signal.pair + signal.stratid] ////// @@ -700,6 +701,7 @@ socket.on("close_traded_signal", async (signal) => { delete trading_pairs[signal.pair + signal.stratid] delete trading_types[signal.pair + signal.stratid] delete sell_prices[signal.pair + signal.stratid] + delete buy_prices[signal.pair + signal.stratid] delete trading_qty[signal.pair + signal.stratid] delete open_trades[signal.pair + signal.stratid] ////// @@ -728,6 +730,7 @@ socket.on("close_traded_signal", async (signal) => { delete trading_pairs[signal.pair + signal.stratid] delete trading_types[signal.pair + signal.stratid] delete sell_prices[signal.pair + signal.stratid] + delete buy_prices[signal.pair + signal.stratid] delete trading_qty[signal.pair + signal.stratid] delete open_trades[signal.pair + signal.stratid] ////// @@ -779,6 +782,7 @@ socket.on("close_traded_signal", async (signal) => { ////// delete trading_pairs[signal.pair + signal.stratid] delete trading_types[signal.pair + signal.stratid] + delete sell_prices[signal.pair + signal.stratid] delete buy_prices[signal.pair + signal.stratid] delete trading_qty[signal.pair + signal.stratid] delete open_trades[signal.pair + signal.stratid] @@ -818,6 +822,7 @@ socket.on("close_traded_signal", async (signal) => { ////// delete trading_pairs[signal.pair + signal.stratid] delete trading_types[signal.pair + signal.stratid] + delete sell_prices[signal.pair + signal.stratid] delete buy_prices[signal.pair + signal.stratid] delete trading_qty[signal.pair + signal.stratid] delete open_trades[signal.pair + signal.stratid]