git pu

change.js

@@ -157,7 +157,7 @@ async function updateVars(name) {
 
 
     let data = grabData([lastData])
-    closer(sig, data[0].closeTime, data[0],allData.id)
+    closer(sig, data[0].closeTime, data[0], allData.id)
 
     let vars = ai.run(data, allData.avgRunup, allData.avgDrawdown, getVarsFromName(name))
 
@@ -253,7 +253,7 @@ function getVarFromUsage(vars, usage) {
 }
 
 
-async function closer(sig, date, bigData,id) {
+async function closer(sig, date, bigData, id) {
     let lastToken = sig + '_2' + date
     lastToken = lastToken.replace(/_/g, '').replace(/Lp/g, '').replace(/BTC/g, '').replace(/ /g, '')
     const [data, delStatus] = await client
@@ -304,14 +304,15 @@ async function closer(sig, date, bigData,id) {
             }
         }
     }
+    await sleep(30000)
+     d = await exchange.fetchOrder(d.id, d.info.symbol)
+    let profit = getCalculateProfit(newData.price, d.average)
+    if (newData.side === 'sell')
+        profit = profit * -1
 
-    let profit = getCalculateProfit(newData.price,d.price)
-    if (newData.side ==='sell')
-        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.price
-
-  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)
 
 
@@ -322,28 +323,31 @@ async function adder(sig, qty, date) {
     let lastToken = sig + '_' + date
     lastToken = lastToken.replace(/_/g, '').replace(/Lp/g, '').replace(/BTC/g, '').replace(/ /g, '')
     console.log('Add db and ex :', lastToken)
+    let d
     if (sig.includes('Buy')) {
 
-        let d = await exchange.createMarketOrder('BTCUSDT', 'Buy', qty, 0, {order_link_id: lastToken})
+        d = await exchange.createMarketOrder('BTCUSDT', 'Buy', qty, 0, {order_link_id: lastToken})
         //  console.log('Add Suc With id',sig)
         if (typeof d.id !== "undefined") {
-            console.log('Suc Exchange 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.price}))
-                .exec();
+
+
         }
     } else {
-        let d = await exchange.createMarketOrder('BTCUSDT', 'Sell', qty, 0, {order_link_id: lastToken})
+        d = await exchange.createMarketOrder('BTCUSDT', 'Sell', qty, 0, {order_link_id: lastToken})
         //  console.log('Add Suc With id',sig)
+
+    }
+
+
     if (typeof d.id !== "undefined") {
+        await sleep(30000)
+        let 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.price}))
+            .set(sig, JSON.stringify({pair: d.info.symbol, side: d.side, qty: d.amount, price: d.average}))
             .exec();
     }
-    }
 
 
 }
@@ -389,10 +393,8 @@ function getCalculateProfit(basePrice, value) {
 }
 
 
-
-function appendDiffProfitLog(log)
-{
-    fs.appendFile('C:\\Users\\Administrator\\.pm2\\logs\\change-profit-diff.txt', log+'\n', function (err) {
+function appendDiffProfitLog(log) {
+    fs.appendFile('C:\\Users\\Administrator\\.pm2\\logs\\change-profit-diff.txt', log + '\n', function (err) {
         if (err) throw err;
 
     });

test_ccxt.js

@@ -32,9 +32,18 @@ async function init() {
 
 async function test () {
 
-    let d = await exchange.createMarketOrder('ETHUSDT', 'Sell', 0.01, 0)
-    //  console.log('Add Suc With id',sig)
+    // let d = await exchange.createMarketOrder('BTCUSDT', 'Sell', 1, 0)
+    // //  console.log('Add Suc With id',sig)
+    // console.log(d)
+    //63d101c8-3169-473c-a7ee-53645599474d
+    let d=await exchange.fetchOrder('63d101c8-3169-473c-a7ee-53645599474d','BTCUSDT')
     console.log(d)
+// for (let i=0;i<d.length;i++)
+// {
+//     if (d[i].id ==='f61da7b9-574e-4728-9dd4-ebdec700fd89')
+//         console.log(d[i])
+// }
+   // console.log(d)
     // const [add] = await client
     //     .multi()
     //     .set(sig, JSON.stringify({qty: d.,price:d.price}))