Skip to content

Commit

Permalink
Merge remote-tracking branch 'mmarczuk/do_after_binance'
Browse files Browse the repository at this point in the history
  • Loading branch information
@dargmuesli
dargmuesli committed Feb 23, 2021
2 parents 4d8b1a9 + 71b39f3 commit b271653
Showing 1 changed file with 141 additions and 44 deletions.
185 changes: 141 additions & 44 deletions src/trader.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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,
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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);
}
Expand Down Expand Up @@ -252,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
Expand Down Expand Up @@ -279,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",
Expand All @@ -319,11 +347,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",
Expand All @@ -342,7 +366,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"
)
Expand All @@ -369,6 +392,7 @@ socket.on("sell_signal", async (signal) => {
)
return
}

console.log(
"SUCESS 444444444 mgMarketSell 44444444"
)
Expand All @@ -383,6 +407,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",
Expand All @@ -395,6 +427,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);
}
Expand Down Expand Up @@ -461,6 +501,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,
Expand Down Expand Up @@ -494,6 +544,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",
Expand All @@ -509,22 +569,23 @@ 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)
}
///
} 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",
Expand Down Expand Up @@ -554,7 +615,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
Expand Down Expand Up @@ -597,6 +658,16 @@ 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 buy_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",
Expand Down Expand Up @@ -625,6 +696,16 @@ 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 buy_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,
Expand All @@ -644,15 +725,18 @@ 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 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)
}
//////
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(
Expand Down Expand Up @@ -694,6 +778,16 @@ 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 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
Expand Down Expand Up @@ -724,15 +818,18 @@ 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 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]
//////
}
}
})
Expand Down

0 comments on commit b271653

Please sign in to comment.