Skip to content

A
ai
Commit 331860ea authored by Ahmad Nemati's avatar Ahmad Nemati
Browse files
Options

git pu

parent a68383f6
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 30 deletions
change.js
View file @ 331860ea
...@@ -326,16 +326,16 @@ async function closer(sig, date, bigData, id, pair) { ...@@ -326,16 +326,16 @@ async function closer(sig, date, bigData, id, pair) {
} }
} }
} }
await sleep(60000) // await sleep(60000)
d = await exchange.fetchOrder(d.id, d.info.symbol) // d = await exchange.fetchOrder(d.id, d.info.symbol)
let profit = getCalculateProfit(newData.price, d.average) // let profit = getCalculateProfit(newData.price, d.average)
if (newData.side === 'sell') // if (newData.side === 'sell')
profit = profit * -1 // profit = profit * -1
//
let det = 'side:' + newData.side + ' bybit open price:' + newData.price + ' bybit close price:' + d.average // let det = 'side:' + newData.side + ' bybit open price:' + newData.price + ' bybit close price:' + d.average
//
let t = id + ' :' + det + ' bybit profit:' + ' ' + profit + ' yashil profit:' + bigData.profit + ' diff:' + (profit - bigData.profit) // let t = id + ' :' + det + ' bybit profit:' + ' ' + profit + ' yashil profit:' + bigData.profit + ' diff:' + (profit - bigData.profit)
appendDiffProfitLog(t) // appendDiffProfitLog(t)
} }
...@@ -364,29 +364,38 @@ async function adder(sig, qty, date, allData,pair) { ...@@ -364,29 +364,38 @@ async function adder(sig, qty, date, allData,pair) {
} }
console.log(d) if (typeof d.id !== "undefined") {
if (typeof d.id !== "undefined") { console.log('Add Suc With id', d.id, sig)
await sleep(60000) const [add] = await client
try { .multi()
d = await exchange.fetchOrder(d.id, d.info.symbol) .set(sig, JSON.stringify({pair: d.info.symbol, side: d.side, qty: d.amount, price: d.price}))
console.log('Add Suc With id', d.id, sig) .exec();
const [add] = await client
.multi()
.set(sig, JSON.stringify({pair: d.info.symbol, side: d.side, qty: d.amount, price: d.average}))
.exec();
}
catch (e)
{
console.log('Add Suc With id', d.id, sig)
console.log(sig,'Have Problem Reding Order so try offline')
const [add] = await client
.multi()
.set(sig, JSON.stringify({pair: d.info.symbol, side: d.side, qty: d.amount, price: d.price}))
.exec();
} }
} // console.log(d)
// if (typeof d.id !== "undefined") {
// await sleep(60000)
// try {
// d = await exchange.fetchOrder(d.id, d.info.symbol)
// console.log('Add Suc With id', d.id, sig)
// const [add] = await client
// .multi()
// .set(sig, JSON.stringify({pair: d.info.symbol, side: d.side, qty: d.amount, price: d.average}))
// .exec();
// }
// catch (e)
// {
//
// console.log('Add Suc With id', d.id, sig)
// console.log(sig,'Have Problem Reding Order so try offline')
// const [add] = await client
// .multi()
// .set(sig, JSON.stringify({pair: d.info.symbol, side: d.side, qty: d.amount, price: d.price}))
// .exec();
// }
//
// }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment