git pu

change.js

@@ -45,6 +45,7 @@ async function run() {
             continue
 
         let fl = files[i].split('_')
+        let pair = fl[fl.length - 1]
         let avgRunup = parseFloat(fl[5])
         let avgDrawDown = parseFloat(fl[6])
         let lastFile = await fs.readFileSync(path + files[i], 'utf8')
@@ -65,6 +66,7 @@ async function run() {
         datas.push({
             name: files[i],
             size: stats.size,
+            pair: pair + 'USDT',
             vars: vars,
             id: id,
             usage: usage,
@@ -157,7 +159,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, allData.pair)
 
     let vars = ai.run(data, allData.avgRunup, allData.avgDrawdown, getVarsFromName(name))
 
@@ -169,7 +171,7 @@ async function updateVars(name) {
             sig = allData.id + '_Sell'
         else
             sig = allData.id + '_Buy'
-        adder(sig, allData.qty, data[0].closeTime)
+        adder(sig, allData.qty, data[0].closeTime, data[0], allData.pair)
     }
     // console.log(name,vars)
     updateVarsFromName(name, vars)
@@ -253,7 +255,7 @@ function getVarFromUsage(vars, usage) {
 }
 
 
-async function closer(sig, date, bigData, id) {
+async function closer(sig, date, bigData, id, pair) {
     let lastToken = sig + '_2' + date
     lastToken = lastToken.replace(/_/g, '').replace(/Lp/g, '').replace(/BTC/g, '').replace(/ /g, '')
     const [data, delStatus] = await client
@@ -276,13 +278,13 @@ async function closer(sig, date, bigData, id) {
     console.log('try reduce', sig, qty)
     if (sig.includes('Buy')) {
         try {
-            d = await exchange.createMarketOrder('BTCUSDT', 'Sell', qty, 0, {
+            d = await exchange.createMarketOrder(pair, 'Sell', qty, 0, {
                 reduceOnly: true,
                 order_link_id: lastToken
             })
         } catch (e) {
             try {
-                d = await exchange.createMarketOrder('BTCUSDT', 'Sell', qty, 0, {
+                d = await exchange.createMarketOrder(pair, 'Sell', qty, 0, {
                     reduceOnly: true,
                     order_link_id: lastToken
                 })
@@ -292,10 +294,10 @@ async function closer(sig, date, bigData, id) {
         }
     } else {
         try {
-            d = await exchange.createMarketOrder('BTCUSDT', 'Buy', qty, 0, {reduceOnly: true, order_link_id: lastToken})
+            d = await exchange.createMarketOrder(pair, 'Buy', qty, 0, {reduceOnly: true, order_link_id: lastToken})
         } catch (e) {
             try {
-                d = await exchange.createMarketOrder('BTCUSDT', 'Buy', qty, 0, {
+                d = await exchange.createMarketOrder(pair, 'Buy', qty, 0, {
                     reduceOnly: true,
                     order_link_id: lastToken
                 })
@@ -305,7 +307,7 @@ async function closer(sig, date, bigData, id) {
         }
     }
     await sleep(30000)
-     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)
     if (newData.side === 'sell')
         profit = profit * -1
@@ -319,21 +321,24 @@ async function closer(sig, date, bigData, id) {
 }
 
 
-async function adder(sig, qty, date) {
+async function adder(sig, qty, date, pair) {
     let lastToken = sig + '_' + date
+    if (pair === 'BNBUSDT')
+        qty = 0.06
+    else if (pair === 'BTCUSDT')
+        qty = 0.001
+    else if (pair === 'ETHUSDT')
+        qty = 0.01
     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')) {
 
-        d = await exchange.createMarketOrder('BTCUSDT', 'Buy', qty, 0, {order_link_id: lastToken})
+        d = await exchange.createMarketOrder(pair, 'Buy', qty, 0, {order_link_id: lastToken})
         //  console.log('Add Suc With id',sig)
-        if (typeof d.id !== "undefined") {
 
-
-        }
     } else {
-        d = await exchange.createMarketOrder('BTCUSDT', 'Sell', qty, 0, {order_link_id: lastToken})
+        d = await exchange.createMarketOrder(pair, 'Sell', qty, 0, {order_link_id: lastToken})
         //  console.log('Add Suc With id',sig)
 
     }
@@ -341,7 +346,7 @@ async function adder(sig, qty, date) {
 
     if (typeof d.id !== "undefined") {
         await sleep(30000)
-         d = await exchange.fetchOrder(d.id, d.info.symbol)
+        d = await exchange.fetchOrder(d.id, d.info.symbol)
         console.log('Add Suc With id', d.id, sig)
         const [add] = await client
             .multi()

test_json2.js

-let t='last.json-220212212600_O1_BNC_BNBUSDT_Lp1481_1Bnb12.csv'
-t=t.toLowerCase()
-t = t.split('_')
-let pair = t[3].replace('usdt', '').replace('usd', '')
-let p=t[t.length-1].split('.')
+let t='220601111131_O1_ETHUSDT_Lp92_ethLp45101RZDD5_6.332963350785343_-2.4975497382198952_RunupZeroDrawDown_0.5_0.096_ETH'
+t=t.split('_')
+let pair=t[t.length-1]
+console.log(pair)
\ No newline at end of file
-console.log(p)
-p=p[0].toLowerCase().split(pair)[1]
-console.log(p)
\ No newline at end of file