jsir 1.2.7 → 1.2.8

package/cmd/staticServer.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 const server = require('server');
 let address = require('address');
-let {lisPid} = require('../index')
+let {lisPid} = require('../util')
 
 let port = process.argv[2] || 9527
 let dir = process.cwd()

package/cmd/stop.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 let fs = require('fs')
-let {getLisPidDir,trim} = require('../index')
+let {getLisPidDir,trim} = require('../util')
 const readline = require('readline')
 let home = getLisPidDir()
 

package/ethWeb.js

@@ -1,7 +1,5 @@
-const https = require('https');
-const BigNumber = require('bignumber.js');
-let {getLibDataDir, trim, toBigNum, getConfig, objDataFile,
-    eFn, removeFirst, randomInt, splitArray, sleep, vl, cacheFn, isError, bMin, getOr} = require('./util')
+let {BigNumber, getLibDataDir, trim, toBigNum, getConfig, objDataFile, infoStr, errorStr, batchAsync,
+    eFn, removeFirst, randomInt, splitArray, sleep, vl, cacheFn, isError, bMin, getOr, errorStack} = require('./util')
 const abiDecoder = require('abi-decoder');
 let fs = require('fs')
 let contractMapPath = getLibDataDir() + "/contractMap.json"
@@ -16,6 +14,7 @@ const batchCallAbi = [{"inputs":[{"internalType":"bool","name":"atom","type":"bo
 let Web3Contract = require('web3-eth-contract');
 
 let batchCallAddressMap = {
+    1: '0xf375451681f567bEB7AeAD101F7944C2574718Eb',
     128: '0x0817dC05EAb0A0C8aDBafDbE35883B5e5DD8a299',
     137: '0xa36e94d707ff68629F01f0886c4d790459b90fB4',
     66: '0x5a8138bF21BdCf8424A999069F24f6F7A065F6A0',
@@ -45,7 +44,7 @@ async function _ethBatchQuery(calls = [], web3) {
         try {
             result = itfs[i].decodeFunctionResult(calls[i].name || calls[i].method, data)
         } catch (e) {
-            $log(new Error(e.stack).stack)
+            $log(new Error(errorStack(e)).stack)
             error = e
         }
         pros.push(new Promise(async resolve => {
@@ -53,7 +52,7 @@ async function _ethBatchQuery(calls = [], web3) {
                 try {
                     await calls[i].callback(error, result)
                 } catch (e) {
-                    $log(new Error(e.stack).stack)
+                    $log(new Error(errorStack(e)).stack)
                     resolve(result || error);
                     throw e
                 }
@@ -90,7 +89,7 @@ async function ethBatchQuery(calls = [], web3, batchNum = 49, asyncNum = 33, use
         for (let call of calls) {
             let item = {
                 method: newContract(web3, call.abi, call.address)
-                    .methods[call.name || call.methods](...(call.args || call.params || []))
+                    .methods[call.name || call.method](...(call.args || call.params || []))
                     .call
             }
             if (call.callback) {
@@ -119,18 +118,8 @@ async function ethBatchQuery_(calls = [], web3, batchNum, asyncNum) {
     }
     if (batchNum) {
         let callBatchs = splitArray(calls, batchNum)
-        let pros = []
-        for(let i = 0; i< callBatchs.length; i++) {
-            let pro = _ethBatchQuery(callBatchs[i], web3)
-            pros.push(pro)
-
-            if (asyncNum === 1) {
-                await pro;
-            } else if (i > 0 && i % asyncNum === 0) {
-                await pro;
-            }
-        }
-        return (await Promise.all(pros)).reduce((a,b) => a.concat(b))
+        return (await batchAsync(callBatchs.map(item => () => _ethBatchQuery(item, web3)), asyncNum))
+            .reduce((a,b) => a.concat(b))
     }
     return _ethBatchQuery(calls, web3)
 }
@@ -176,7 +165,7 @@ async function erc20Query(address, method, ...args) {
         const contract = newContract(web3, erc20Abi, address);
         return await contract.methods[method](...args).call()
     } catch (e) {
-        $log(new Error(e.stack).stack)
+        $log(new Error(errorStack(e)).stack)
         return null;
     }
 }
@@ -369,7 +358,7 @@ async function sendTxn(privateKey, toAddress, value, contract, method, ...args)
         console.info(`发送成功：${signTxn.transactionHash}`)
     } catch (e) {
         console.error(`发送失败：${signTxn.transactionHash}`)
-        console.log(e.toString().split("\n")[0])
+        console.log(String(e))
     }
 }
 
@@ -385,7 +374,7 @@ function newContract(web3, abi, address) {
     if (address) {
         address = address.toLowerCase()
     }
-    let key = [JSON.stringify(abi), address].filter(i => i).join("-")
+    let key = [String(chainId), JSON.stringify(abi), address].filter(i => i).join("-")
 
     if (!global.$contracts[key]) {
         global.$contracts[key] = new web3.eth.Contract(abi, address);
@@ -579,7 +568,7 @@ async function getTokenMap(tokens, web3, batchNum, asyncNum) {
             }
         } catch (e) {
             $log(`${token} erc20 info error`)
-            $log(new Error(e.stack).stack)
+            $log(new Error(errorStack(e)).stack)
         }
     }
     return chainMap
@@ -784,7 +773,7 @@ async function ethQuery(web3, address, method, ...args) {
         const contract = newContract(web3, (await getContractJson(address)).abi, address);
         return await contract.methods[method](...args).call()
     } catch (e) {
-        $log(new Error(e.stack).stack)
+        $log(new Error(errorStack(e)).stack)
         return null;
     }
 }
@@ -794,7 +783,7 @@ async function ethQuery1(web3, address, abi, method, ...args) {
         const contract = newContract(web3, abi, address);
         return await contract.methods[method](...args).call()
     } catch (e) {
-        $log(new Error(e.stack).stack)
+        $log(new Error(errorStack(e)).stack)
         return null
     }
 }
@@ -805,7 +794,7 @@ async function ethRead(address, abi, method, args, web3) {
         const contract = newContract(web3, abi, address);
         return await contract.methods[method](...args).call()
     } catch (e) {
-        $log(new Error(e.stack).stack)
+        $log(new Error(errorStack(e)).stack)
         return null
     }
 }
@@ -816,15 +805,16 @@ function createEthWrite(config = {}) {
     }
 }
 
-async function ethWrite(sender, address, {data, abi, method, args, gasPrice, gasPriceAdd, gasLimit, value, waitConfirm, sleepSec, msg, onError} = {}) {
+async function ethWrite(sender, address,
+                        {data, abi, method, args, gasPrice, gasPriceAdd, gasLimit,
+                            value, waitConfirm, sleepSec, msg, onError} = {}) {
     if (!address) {
         throw 'address require for ethWrite'
     }
     let web3 = sender.web3 || global.web3
 
-    let avgGasPrice = await cacheFn('getGasPrice', async () => await web3.eth.getGasPrice(), 1000 * 5)
     let txObject = {
-        gasPrice: gasPrice ? gasPrice * 1000000000 : avgGasPrice,
+        gasPrice: gasPrice ? gasPrice * 1000000000 : await cacheFn('getGasPrice', async () => await web3.eth.getGasPrice(), 1000 * 5),
         gasLimit: gasLimit,
         to: address,
         value
@@ -848,15 +838,15 @@ async function ethWrite(sender, address, {data, abi, method, args, gasPrice, gas
     msg = msg ? msg + ' ':''
     console.log(`${msg}send ${signedTx.hash} ${txObject.gasPrice/1000000000}g`)
     result = result.then(resp => {
-        console.log('\x1B[32m%s\x1B[39m', `${msg}${signedTx.hash} 交易成功`)
+        console.log(infoStr(`${msg}${signedTx.hash} 交易成功`))
         return true
     }).catch(async e => {
-        console.log('\x1B[35m%s\x1B[39m', `${msg}${signedTx.hash} 交易失败`)
+        console.log(errorStr(`${msg}${signedTx.hash} 交易失败`))
         if (onError) {
             return await onError(e)
         } else {
-            console.error(e.toString().split("\n")[0])
-            $log(new Error(e.stack).stack);
+            console.error(String(e))
+            $log(new Error(errorStack(e)).stack)
             return false
         }
     })
@@ -895,17 +885,8 @@ async function web3BatchReq(items, batchNum = 49, asyncNum = 33, web3) {
     }
     if (batchNum) {
         let callBatchs = splitArray(items, batchNum)
-        let pros = []
-        for(let i = 0; i< callBatchs.length; i++) {
-            let pro = _web3BatchReq(callBatchs[i], web3)
-            pros.push(pro)
-            if (asyncNum === 1) {
-                await pro;
-            } else if (i > 0 && i % asyncNum === 0) {
-                await pro;
-            }
-        }
-        return (await Promise.all(pros)).reduce((a,b) => a.concat(b))
+        return (await batchAsync(callBatchs.map(item => () => _web3BatchReq(item, web3)), asyncNum))
+            .reduce((a,b) => a.concat(b))
     }
     return _web3BatchReq(items, web3)
 }
@@ -921,13 +902,13 @@ async function _web3BatchReq(items, web3) {
                         try {
                             await item.callback(error, result)
                         } catch (e) {
-                            $log(new Error(e.stack).stack)
+                            $log(new Error(errorStack(e)).stack)
                             resolve(result || error);
                             throw e
                         }
                     }
                     if (error) {
-                        $log(new Error(error.stack || String(error)).stack)
+                        $log(new Error(errorStack(error)).stack)
                     }
                     resolve(result || error);
                 }));
@@ -1034,7 +1015,7 @@ async function batchTranfer(ethTranserWrite, token, froms, tos, min, max) {
     for(let from of froms) {
         let sender = await newSender(from)
         for(let to of tos) {
-            let fromAddress = String(from).startsWith('0x') ? from:global.$wallet.getAddress(from);
+            let fromAddress = String(from).startsWith('0x') ? privateToAddress(from):global.$wallet.getAddress(from);
             let toAddress = String(to).startsWith('0x') ? to:global.$wallet.getAddress(to);
 
             if (token) {
@@ -1044,12 +1025,12 @@ async function batchTranfer(ethTranserWrite, token, froms, tos, min, max) {
                 if (Number(tb) >= min) {
                     continue
                 }
-                let transferAmt = bMin(max, tb)
+                let transferAmt = BigNumber(bMin(max, tb)).toFixed(0)
                 if (Number(fb) < Number(transferAmt)) {
                     continue
                 }
                 let fmtTransferAmt = exDcmNum(transferAmt, -decimals).toString()
-                pros.push(ethTranserWrite(sender, token, {
+                pros.push(await ethTranserWrite(sender, token, {
                     abi: erc20Abi,
                     method: 'transfer',
                     args: [toAddress, transferAmt],
@@ -1062,19 +1043,19 @@ async function batchTranfer(ethTranserWrite, token, froms, tos, min, max) {
                 if (Number(tb) >= min) {
                     continue
                 }
-                let transferAmt = bMin(max, tb)
+                let transferAmt = BigNumber(bMin(max, tb)).toFixed(0)
                 if (Number(fb) < Number(transferAmt)) {
                     continue
                 }
                 let fmtTransferAmt = exDcmNum(transferAmt, -decimals).toString()
-                pros.push(ethTranserWrite(sender, toAddress, {
+                pros.push(await ethTranserWrite(sender, toAddress, {
                     value: transferAmt,
                     msg: from + '转' + fmtTransferAmt + '本币给' + to
                 }))
             }
         }
     }
-    await Promise.all(pros)
+    await Promise.all(pros.map(i => i.promise))
 }
 
 async function batchCollect(ethTranserWrite, token, froms, to, remain) {
@@ -1091,7 +1072,7 @@ async function batchCollect(ethTranserWrite, token, froms, to, remain) {
     for(let from of froms) {
         let sender = await newSender(from)
 
-        let fromAddress = String(from).startsWith('0x') ? from:global.$wallet.getAddress(from);
+        let fromAddress = String(from).startsWith('0x') ? privateToAddress(from):global.$wallet.getAddress(from);
         let toAddress = String(to).startsWith('0x') ? to:global.$wallet.getAddress(to);
 
         if (token) {
@@ -1100,9 +1081,9 @@ async function batchCollect(ethTranserWrite, token, froms, to, remain) {
             if (Number(fb) <= remain) {
                 continue
             }
-            let transferAmt = bMin(fb, remain)
+            let transferAmt = BigNumber(bMin(fb, remain)).toFixed(0)
             let fmtTransferAmt = exDcmNum(transferAmt, -decimals).toString()
-            pros.push(ethTranserWrite(sender, token, {
+            pros.push(await ethTranserWrite(sender, token, {
                 abi: erc20Abi,
                 method: 'transfer',
                 args: [toAddress, transferAmt],
@@ -1114,15 +1095,15 @@ async function batchCollect(ethTranserWrite, token, froms, to, remain) {
             if (Number(fb) <= remain) {
                 continue
             }
-            let transferAmt = bMin(fb, remain)
+            let transferAmt = BigNumber(bMin(fb, remain)).toFixed(0)
             let fmtTransferAmt = exDcmNum(transferAmt, -decimals).toString()
-            pros.push(ethTranserWrite(sender, toAddress, {
+            pros.push(await ethTranserWrite(sender, toAddress, {
                 value: transferAmt,
                 msg: from + '转' + fmtTransferAmt + '本币给' + to
             }))
         }
     }
-    await Promise.all(pros)
+    await Promise.all(pros.map(i => i.promise))
 }
 
 function coinNum(num, decimals) {

package/index.js

@@ -1,267 +1,6 @@
-const {
-    run,
-    reget,
-    trim,
-    e,
-    ee,
-    regEach,
-    runSync,
-    linuxAskAndKill,
-    fanyi,
-    cleanFile,
-    fileCleaner,
-    getLibDataDir,
-    lisPid,
-    got,
-    timeLoop,
-    getLisPidDir,
-    mkdir,
-    bAdd,
-    bDiv,
-    bMin,
-    bMul,
-    getConfig,
-    getCbText,
-    aesDecipher,
-    aesCipher,
-    pad,
-    requireG,
-    toBigNum,
-    objDataFile,
-    appendLog,
-    createLimitLogger,
-    clearConsole,
-    fileLock,
-    globalLock,
-    globalUnLock,
-    rmDir,
-    eFn,
-    removeFirst,
-    sleep,
-    getUniConfig,
-    timeLimit,
-    dayJs,
-    setCbText,
-    randomInt,
-    vl,
-    getVl,
-    getFnVl,
-    $config,
-    timeStr,
-    splitArray,
-    BigNumber,
-    range,
-    Range,
-    getOr,
-    $log,
-    createLimitLogger2,
-    cacheFn,
-    isError,
-    getOrFn,
-    emptyFn,
-    setConfig,
-    axios,
-    textDataFile,
-    arrayDataFile,
-    dataFile,
-    strEq,
-    wrapRows,
-    info,
-    warn,
-    error,
-    parseSteps
-} = require('./util')
-const {
-    sc,
-    sd,
-    st,
-    sb,
-    ss
-} = require('./sol')
-const {
-    getContractJson,
-    coinNum,
-    forEachBlock,
-    parseInputData,
-    exDcm,
-    ethQuery,
-    ethQuery1,
-    exDcmNum,
-    encodeEthAddress,
-    gasPrice,
-    tokenMap,
-    getPrice,
-    getPriceNoFee,
-    getPriceByAmt,
-    getPriceByAmtNoFee,
-    getPairAmt,
-    getPairAmtNoFee,
-    getPoolAmt,
-    getLastBlockSecTime,
-    forEachBlockAsync,
-    newContract,
-    sendTxn,
-    walletGet,
-    txnSign,
-    initSender,
-    privateToAddress,
-    initSenderWithKeys,
-    erc20Query,
-    initRootWallet,
-    ethBatchQuery,
-    newAbiInterface,
-    newWeb3Contract,
-    getTokenMap,
-    getReserves,
-    swapExactFor,
-    swapForExact,
-    ethRead,
-    ethWrite,
-    fmtErc20Amt,
-    createEthWrite,
-    forEachBlockBatch,
-    forEachEvent,
-    batchTranfer,
-    batchCollect,
-    web3BatchReq,
-    fastSwapExactFor,
-    fastSwapForExact,
-    getTokenBal,
-    transferToken,
-    tokenApprove,
-    txnInputReplacer,
-    abiDecoder,
-    saveTokenMap
-} = require('./ethWeb')
 
 module.exports = {
-    run,
-    forEachBlock,
-    coinNum,
-    reget,
-    trim,
-    e,
-    ee,
-    regEach,
-    runSync,
-    linuxAskAndKill,
-    fanyi,
-    cleanFile,
-    fileCleaner,
-    getLibDataDir,
-    lisPid,
-    got,
-    timeLoop,
-    getLisPidDir,
-    getContractJson,
-    mkdir,
-    sc,
-    sd,
-    st,
-    sb,
-    parseInputData,
-    exDcm,
-    bAdd,
-    bDiv,
-    bMin,
-    bMul,
-    ss,
-    getConfig,
-    getCbText,
-    aesDecipher,
-    aesCipher,
-    pad,
-    requireG,
-    ethQuery,
-    ethQuery1,
-    exDcmNum,
-    toBigNum,
-    objDataFile,
-    appendLog,
-    createLimitLogger,
-    encodeEthAddress,
-    clearConsole,
-    fileLock,
-    globalLock,
-    globalUnLock,
-    rmDir,
-    gasPrice,
-    tokenMap,
-    getPrice,
-    getPriceNoFee,
-    getPriceByAmt,
-    getPriceByAmtNoFee,
-    getPairAmt,
-    getPairAmtNoFee,
-    getPoolAmt,
-    getLastBlockSecTime,
-    forEachBlockAsync,
-    eFn,
-    newContract,
-    sendTxn,
-    removeFirst,
-    sleep,
-    walletGet,
-    txnSign,
-    initSender,
-    getUniConfig,
-    privateToAddress,
-    initSenderWithKeys,
-    erc20Query,
-    timeLimit,
-    dayJs,
-    setCbText,
-    initRootWallet,
-    randomInt,
-    vl,
-    getVl,
-    getFnVl,
-    $config,
-    timeStr,
-    ethBatchQuery,
-    newAbiInterface,
-    newWeb3Contract,
-    splitArray,
-    BigNumber,
-    getTokenMap,
-    getReserves,
-    swapExactFor,
-    swapForExact,
-    ethRead,
-    ethWrite,
-    fmtErc20Amt,
-    createEthWrite,
-    forEachBlockBatch,
-    forEachEvent,
-    range,
-    Range,
-    batchTranfer,
-    batchCollect,
-    web3BatchReq,
-    getOr,
-    $log,
-    createLimitLogger2,
-    fastSwapExactFor,
-    fastSwapForExact,
-    cacheFn,
-    isError,
-    getTokenBal,
-    transferToken,
-    tokenApprove,
-    getOrFn,
-    emptyFn,
-    setConfig,
-    axios,
-    textDataFile,
-    arrayDataFile,
-    dataFile,
-    strEq,
-    wrapRows,
-    info,
-    warn,
-    error,
-    txnInputReplacer,
-    parseSteps,
-    abiDecoder,
-    saveTokenMap
+    ...require('util'),
+    ...require('ethWeb'),
+    ...require('sol')
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "",
   "main": "index.js",
   "scripts": {