jsir 1.1.6 → 1.2.0

package/cmd/ooa.js

@@ -108,14 +108,30 @@ const _mainCmdMap = {
     }
 }
 
+function getFileOpenExe(fileName) {
+    fileName = trim(fileName);
+    let strs = fileName.split('.')
+    let suffix = ''
+    if (strs.length > 1) {
+        suffix = strs[strs.length - 1]
+    }
+    if (!suffix) {
+        return 'idea'
+    }
+
+    let exe = getConfig(`${suffix}_exe`)
+    return exe || 'idea';
+}
+
 run(async () => {
     try {
         _fs.mkdirSync(_home)
     } catch (e) {}
 
     if (_args[0] === 'config') {
-        let configFile = getLibDataDir() + '/config.json';
-        e(`idea "${configFile}"`)
+        let fileName = 'config.json';
+        let configFile = getLibDataDir() + '/' + fileName;
+        e(`"${getFileOpenExe(fileName)}" "${configFile}"`)
         return
     }
 
@@ -204,7 +220,8 @@ async function fileLine(name) {
     }
     let tempDir = getLibDataDir() + "/ooa"
     mkdir(tempDir)
-    let workFile = `${tempDir}/f ${toJsirFileName(name)}`;
+    let fileName = `f ${toJsirFileName(name)}`
+    let workFile = `${tempDir}/${fileName}`;
     if (!_fs.existsSync(workFile)) {
         _fs.writeFileSync(workFile, '');
     }
@@ -212,26 +229,24 @@ async function fileLine(name) {
     _fs.unlinkSync(workFile)
     await sleep(1000)
     _fs.writeFileSync(workFile, text)
-    e(`idea "${workFile}"`)
+    e(`"${getFileOpenExe(fileName)}" "${workFile}"`)
     let watcher = _Chokidar.watch([workFile]);
 
     text = trim(text)
-    let lines = getLines(text)
-    let line = trim(lines[lines.length - 1])
+    let lines = getExeLines(text)
+    let line = trim(lines[0])
     watcher
         .on('change', async () => {
             let newText = trim(String(_fs.readFileSync(workFile)))
-            let newLines = getLines(newText)
-            let newLine = trim(newLines[newLines.length - 1])
+            let newLines = getExeLines(newText)
+            let newLine = trim(newLines[0])
 
             if (newLine
                 && newLines.length >= lines.length
                 && newLine !== line) {
                 let exeStrs
                 if (newLine.startsWith('/*')) {
-                    exeStrs = newLine.replace(/^\/\*|\*\/$/g, '').split('\n')
-                        .map(i => trim(trim(i).replace(/^\*/, '')))
-                        .filter(i => i)
+                    exeStrs = newLine.split('\n').slice(1, -1).map(trim).filter(i => i)
                 } else {
                     exeStrs = ["#" + newLine]
                 }
@@ -253,7 +268,7 @@ async function fileLine(name) {
     info("fileLine open " + workFile)
 }
 
-function getLines(text) {
+function getExeLines(text) {
     let lines = []
     let nLine = []
     let cLine = []
@@ -277,6 +292,8 @@ function getLines(text) {
 
             if (!line.endsWith('*/')) {
                 nLine.push(line)
+            } else {
+                lines.push("")
             }
             continue
         }
@@ -286,8 +303,7 @@ function getLines(text) {
     if (cLine.length > 0) {
         lines.push(cLine.join('\n'))
     }
-
-    return lines.slice(1).reverse()
+    return lines.slice(1)
 }
 
 async function dealInitData() {
@@ -410,7 +426,8 @@ function dealSourceCmds() {
 }
 
 async function save(args) {
-    let path = `${_home}/${toJsirFileName(args.join(' '))}`
+    let name = toJsirFileName(args.join(' '))
+    let path = `${_home}/${name}`
     if (_fs.existsSync(path)) {
         warn('already exist')
         return
@@ -433,8 +450,12 @@ console.log($args)`;
         resp = await getCbText();
     }
     _fs.writeFileSync(path, resp)
-    e(`idea "${path}"`)
+    e(`"${getFileOpenExe(name)}" "${path}"`)
     info(`${path} created`)
+
+    if (name.split(/\s+/)[0] === 'i') {
+        await dealInitData();
+    }
 }
 
 function rename(old, _new) {
@@ -466,10 +487,18 @@ function hisToCmdMap() {
     _cmdMap = cmdMap
 }
 
-function listCmd() {
+function listCmd(onlyRepo = false) {
+    let jsLibDir;
+    if (onlyRepo) {
+        jsLibDir = trim(getConfig("jsLibSource"))
+        if (!(jsLibDir && _fs.existsSync(jsLibDir))) {
+            jsLibDir = null;
+            warn('require config.jsLibSource')
+        }
+    }
     let newCmdMap = {}
     let items = Object.values(_cmdMap)
-        .filter(i => _fs.existsSync(_home + "/" + i))
+        .filter(i => _fs.existsSync(_home + "/" + i) && (!jsLibDir || _fs.existsSync(jsLibDir + "/" + i)))
         .sort((a,b) => {
             return String(_types[a.split(/\s+/)[0]]) >= String(_types[b.split(/\s+/)[0]]) ? 1:-1
         })
@@ -650,8 +679,8 @@ async function wrapperInput(str) {
         if (_cmdMap[strs[0]]) {
             putHis(_cmdMap[strs[0]])
             let path = _home + '/' + _cmdMap[strs[0]]
-            let fileName = trimJsirFileName(_cmdMap[strs[0]]);
-            let firstName = trim(fileName).split(/\s+/)[0]
+            let fileName = trim(_cmdMap[strs[0]]);
+            let firstName = fileName.split(/\s+/)[0]
             if (firstName === 'f') {
                 await fileLine(fileName.replace(/^\s*f\s*/, ''))
             } else if (firstName !== 'e') {
@@ -731,6 +760,9 @@ async function dealKeyword(str, strs, fstr, ostr) {
                 newName = toJsirFileName(newName)
                 if (rename(_home + '/' + name, _home + '/' + newName)) {
                     info(`${_home + '/' + newName} renamed`)
+                    if (newName.split(/\s+/)[0] === 'i') {
+                        await dealInitData()
+                    }
                 }
                 let jsLibDir = trim(getConfig("jsLibSource"))
                 if (jsLibDir && _fs.existsSync(jsLibDir)) {
@@ -775,6 +807,9 @@ async function dealKeyword(str, strs, fstr, ostr) {
                     }
                 }
                 info(`${name} pulled`)
+                if (name.split(/\s+/)[0] === 'i') {
+                    await dealInitData()
+                }
             } else {
                 warn('require config.jsLibSource')
             }
@@ -790,6 +825,9 @@ async function dealKeyword(str, strs, fstr, ostr) {
                 mkdir(cmdsDir)
                 _fs.writeFileSync(cmdsDir + "/" + name, String(_fs.readFileSync(_home + '/' + name)))
                 info(`${name} pushed`)
+                if (name.split(/\s+/)[0] === 'i') {
+                    await dealInitData()
+                }
             } else {
                 warn('require config.jsLibSource')
             }
@@ -800,7 +838,7 @@ async function dealKeyword(str, strs, fstr, ostr) {
             warn("no items")
         } else {
             let path = _home + '/' + name
-            e(`idea "${path}"`)
+            e(`"${getFileOpenExe(name)}" "${path}"`)
         }
     } else if (/^c\d*$/.test(fstr)) {
         let name = _cmdMap[trim(fstr.replace(/^c/, ''))]
@@ -826,6 +864,8 @@ async function dealKeyword(str, strs, fstr, ostr) {
         listCmd()
     } else if (fstr === 'f') {
         await fileLine(trim(ostr.join(' ')))
+    } else if (fstr === '%') {
+        listCmd(true)
     } else {
         await save(strs)
     }
@@ -836,16 +876,16 @@ function getComments(text, cols = [], col) {
     text = trim(text)
     if (text.startsWith("/*")) {
         for (let line of text.split("\n")) {
-            let aLine = line
-                .replace(/^\s*\/\*/, '')
-                .replace(/\*\/\s*/, '')
-                .replace(/^\s*\*/, '')
-            if (trim(aLine)) {
-                docLines.push(aLine)
+            let trimLine = trim(line)
+            if (trimLine.startsWith("/*")) {
+                continue
             }
-            if (trim(line).endsWith("*/")) {
+            if (trimLine.endsWith("*/")) {
                 break
             }
+            if (trimLine) {
+                docLines.push(line)
+            }
         }
     }
     let argDef = getArgDef(text)
@@ -907,8 +947,7 @@ function filterCmd(args){
         if (!isJsirFileName(file)) {
             continue
         }
-        let fileName = trimJsirFileName(file)
-        isArgsMatch(fileName, args, () => {
+        isArgsMatch(file, args, () => {
             if (Object.values(cmdMap).indexOf(file) === -1) {
                 cmdMap[i] = file
                 i ++

package/ethWeb.js

@@ -64,10 +64,10 @@ async function _ethBatchQuery(calls = [], web3) {
     return await Promise.all(pros);
 }
 
-async function ethBatchQuery(calls = [], web3, batchNum = 49, asyncNum = 33) {
+async function ethBatchQuery(calls = [], web3, batchNum = 49, asyncNum = 33, useWebReq = false) {
     web3 = web3 || global.web3;
     let chainId = global.chainId || await web3.eth.getChainId()
-    if (batchCallAddressMap[chainId]) {
+    if (batchCallAddressMap[chainId] && !useWebReq) {
         return await ethBatchQuery_(calls, web3, batchNum, asyncNum)
     } else {
         let transResult = result => {
@@ -113,7 +113,7 @@ async function ethBatchQuery(calls = [], web3, batchNum = 49, asyncNum = 33) {
     }
 }
 
-async function ethBatchQuery_(calls = [], web3, batchNum = 49, asyncNum = 33) {
+async function ethBatchQuery_(calls = [], web3, batchNum, asyncNum) {
     if (calls.length <= 0) {
         return []
     }
@@ -187,9 +187,24 @@ async function initSender(web3, wallet, froms, resetNum) {
         senderNonce[aIndex] = Number(await web3.eth.getTransactionCount(walletGet(wallet, aIndex).address)) -1
     }
 
-    let sender = (txObject) => {
+    let sender = async (txObject) => {
         let aIndex = froms[randomInt(froms.length) - 1]
         let adInfo = walletGet(wallet, aIndex)
+
+        if (!(txObject.gasLimit || txObject.gas)) {
+            try {
+                let gas = await web3.eth.estimateGas({
+                    from: adInfo.address,
+                    to: txObject.to,
+                    value: txObject.value,
+                    data: txObject.data
+                })
+                txObject.gasLimit = gas + 10000;
+            } catch (e) {
+                return [Promise.reject(e), {}, aIndex]
+            }
+        }
+
         if (senderBlock[aIndex]) {
             return []
         }
@@ -243,6 +258,21 @@ async function initSenderWithKeys(web3, privateKeys, resetNum) {
     let sender = async (txObject) => {
         let key = privateKeys[randomInt(privateKeys.length) - 1]
         let adds = keyMap[key]
+
+        if (!(txObject.gasLimit || txObject.gas)) {
+            try {
+                let gas = await web3.eth.estimateGas({
+                    from: adds,
+                    to: txObject.to,
+                    value: txObject.value,
+                    data: txObject.data
+                })
+                txObject.gasLimit = gas + 10000;
+            } catch (e) {
+                return [Promise.reject(e), {}, adds]
+            }
+        }
+
         if (senderBlock[adds]) {
             return []
         }
@@ -288,7 +318,7 @@ function txnSign(txObject, privateKey) {
     let params = {
         nonce: web3.utils.toHex(txObject.nonce),
         gasPrice: web3.utils.toHex(txObject.gasPrice),
-        gasLimit: web3.utils.toHex(txObject.gasLimit),
+        gasLimit: web3.utils.toHex(txObject.gasLimit || txObject.gas),
         to: txObject.to,
         value: web3.utils.toHex(txObject.value),
         data: txObject.data
@@ -485,7 +515,7 @@ function getPairAmtNoFee(a, b, baseAmt) {
 }
 
 let tokenMapLoaded = {}
-async function getTokenMap(tokens, web3) {
+async function getTokenMap(tokens, web3, batchNum, asyncNum) {
     web3 = web3 || global.web3;
     let chainId = global.chainId || await web3.getChainId()
     if (!tokenMapCache[chainId]) {
@@ -524,7 +554,7 @@ async function getTokenMap(tokens, web3) {
             name: 'decimals'
         })
     }
-    let results = await ethBatchQuery(calls, web3, 99)
+    let results = await ethBatchQuery(calls, web3, batchNum, asyncNum)
     for(let i = 0; i<results.length; i+=3) {
         let token = calls[i].address
         try {
@@ -785,7 +815,7 @@ async function ethWrite(sender, address, {data, abi, method, args, gasPrice, gas
     let avgGasPrice = await cacheFn('getGasPrice', async () => await web3.eth.getGasPrice(), 1000 * 5)
     let txObject = {
         gasPrice: gasPrice ? gasPrice * 1000000000 : avgGasPrice,
-        gasLimit: gasLimit || 1500000,
+        gasLimit: gasLimit,
         to: address,
         value
     }
@@ -804,16 +834,19 @@ async function ethWrite(sender, address, {data, abi, method, args, gasPrice, gas
         console.log("No address to used")
         return {}
     }
-    console.log(`${msg} send ${signedTx.hash} ${txObject.gasPrice/1000000000}g`)
+    msg = trim(msg)
+    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('\x1B[32m%s\x1B[39m', `${msg}${signedTx.hash} 交易成功`)
         return true
     }).catch(async e => {
-        console.log('\x1B[35m%s\x1B[39m', `${msg} ${signedTx.hash} 交易失败`)
+        console.log('\x1B[35m%s\x1B[39m', `${msg}${signedTx.hash} 交易失败`)
         if (onError) {
             return await onError(e)
         } else {
             console.error(e.toString().split("\n")[0])
+            $log(new Error(e.stack).stack);
             return false
         }
     })
@@ -991,7 +1024,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(to).startsWith('0x') ? to:global.$wallet.getAddress(from);
+            let fromAddress = String(from).startsWith('0x') ? from:global.$wallet.getAddress(from);
             let toAddress = String(to).startsWith('0x') ? to:global.$wallet.getAddress(to);
 
             if (token) {
@@ -1001,10 +1034,10 @@ async function batchTranfer(ethTranserWrite, token, froms, tos, min, max) {
                 if (Number(tb) >= min) {
                     continue
                 }
-                if (Number(fb) < max) {
+                let transferAmt = bMin(max, tb)
+                if (Number(fb) < Number(transferAmt)) {
                     continue
                 }
-                let transferAmt = bMin(max, tb)
                 let fmtTransferAmt = exDcmNum(transferAmt, -decimals).toString()
                 pros.push(ethTranserWrite(sender, token, {
                     abi: erc20Abi,
@@ -1019,10 +1052,10 @@ async function batchTranfer(ethTranserWrite, token, froms, tos, min, max) {
                 if (Number(tb) >= min) {
                     continue
                 }
-                if (Number(fb) < max) {
+                let transferAmt = bMin(max, tb)
+                if (Number(fb) < Number(transferAmt)) {
                     continue
                 }
-                let transferAmt = bMin(max, tb)
                 let fmtTransferAmt = exDcmNum(transferAmt, -decimals).toString()
                 pros.push(ethTranserWrite(sender, toAddress, {
                     value: transferAmt,
@@ -1048,7 +1081,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') ? to:global.$wallet.getAddress(from);
+        let fromAddress = String(from).startsWith('0x') ? from:global.$wallet.getAddress(from);
         let toAddress = String(to).startsWith('0x') ? to:global.$wallet.getAddress(to);
 
         if (token) {
@@ -1104,26 +1137,6 @@ async function getContractJson(address) {
             return JSON.parse(String(fs.readFileSync(obj[address]['abiPath'])))
         }
     }
-
-    const agent = new https.Agent({
-        rejectUnauthorized: false
-    });
-    let home = getLibDataDir() + '/abi'
-    mkdir(home)
-    let file = `${home}/${address}`
-    if (fs.existsSync(file)) {
-        let str = String(fs.readFileSync(file))
-        let strs = str.split('\n').map(item => trim(item)).filter(item => item)
-        return {abi: JSON.parse(strs[1])}
-    }
-    return got(`https://api-cn.etherscan.com/api?module=contract&action=getabi&address=${address}`,
-        { httpsAgent: agent }).then(resp => {
-        if (resp.data.status !== '1') {
-            return ''
-        }
-        fs.writeFileSync(file, `${Date.now()}\n${resp.data.result}`)
-        return {abi: JSON.parse(resp.data.result)}
-    })
 }
 
 async function transferToken(ethTranserWrite, sender, address, token, amt, msg) {
@@ -1229,5 +1242,6 @@ module.exports = {
     getTokenBal,
     transferToken,
     tokenApprove,
-    txnInputReplacer
+    txnInputReplacer,
+    abiDecoder
 }

package/index.js

@@ -129,7 +129,8 @@ const {
     getTokenBal,
     transferToken,
     tokenApprove,
-    txnInputReplacer
+    txnInputReplacer,
+    abiDecoder
 } = require('./ethWeb')
 
 module.exports = {
@@ -259,5 +260,6 @@ module.exports = {
     warn,
     error,
     txnInputReplacer,
-    parseSteps
+    parseSteps,
+    abiDecoder
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "1.1.6",
+  "version": "1.2.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -27,8 +27,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@ethersproject/abi": "latest",
-    "abi-decoder": "^2.3.0",
+    "@ethersproject/abi": "^5.5.0",
+    "abi-decoder": "^2.4.0",
     "address": "^1.1.2",
     "axios": "^0.20.0",
     "bignumber.js": "^9.0.0",
@@ -36,16 +36,16 @@
     "console.table": "^0.10.0",
     "dayjs": "^1.10.4",
     "ethereumjs-tx": "^1.3.7",
-    "ethereumjs-util": "latest",
+    "ethereumjs-util": "^7.1.3",
     "ethers": "^5.1.0",
     "global-dirs": "^3.0.0",
-    "keccak": "latest",
+    "keccak": "^3.0.2",
     "md5": "^2.3.0",
     "pad": "^3.2.0",
     "randomhex": "^0.1.5",
     "server": "^1.0.30",
     "urlencode": "^1.1.0",
-    "web3": "^1.3.0",
-    "web3-eth-contract": "latest"
+    "web3": "^1.6.1",
+    "web3-eth-contract": "^1.6.1"
   }
 }

package/sol.js

@@ -107,13 +107,13 @@ async function exeMethods(web3, deployInfo, sol, method, text) {
         deployInfo.address);
     text = text + '\n' + fs.readFileSync(deployInfo.abiPath.replace('.json', '.sol').replace('/bin', ''))
 
-    let args = reget(text, new RegExp(`@${method}.args[    :=]+(.*)`))
-    let sendArgs = reget(text, new RegExp(`@${method}.send.args[    :=]+(.*)`))
-    let callArgs = reget(text, new RegExp(`@${method}.call.args[    :=]+(.*)`))
-    let value = reget(text, new RegExp(`@${method}.value[    :=]+(.*)`));
-    let gas = reget(text, new RegExp(`@${method}.gas[    :=]+(.*)`));
-    let from = reget(text, new RegExp(`@${method}.from[    :=]+(.*)`));
-    let expect = reget(text, new RegExp(`@${method}.expect[    :=]+(.*)`));
+    let args = reget(text, new RegExp(`@${method}\.args[    :=]+(.*)`))
+    let sendArgs = reget(text, new RegExp(`@${method}(\.send)`))
+    let callArgs = reget(text, new RegExp(`@${method}(\.call)`))
+    let value = reget(text, new RegExp(`@${method}\.value[    :=]+(.*)`));
+    let gas = reget(text, new RegExp(`@${method}\.gas[    :=]+(.*)`));
+    let from = reget(text, new RegExp(`@${method}\.from[    :=]+(.*)`));
+    let expect = reget(text, new RegExp(`@${method}\.expect[    :=]+(.*)`));
     let action = 'call';
 
     let fnStr = reget(text, new RegExp(`\\s+(function\\s+${method}\\s*\\([\\s\\S]*?)\\{`));
@@ -121,11 +121,9 @@ async function exeMethods(web3, deployInfo, sol, method, text) {
         action = 'send'
     }
     if (callArgs) {
-        args = callArgs;
         action = 'call'
     }
     if (sendArgs) {
-        args = sendArgs;
         action = 'send'
     }
 

package/util.js

@@ -811,8 +811,27 @@ function parseSteps(str) {
     let result = []
     for (let item of items) {
         let ss = item.split('-').map(trim).filter(i => i)
+        let _len = result.length
+        let numReg = /^\d+$/
+        if (ss[0] && !numReg.test(ss[0])) {
+            result.push(ss[0]);
+        }
+        if (ss[1] && !numReg.test(ss[1])) {
+            result.push(ss[1]);
+        }
+        if (ss[2] && !numReg.test(ss[2])) {
+            result.push(ss[2]);
+        }
+        if (result.length > _len) {
+            continue
+        }
+
         if (ss.length > 1) {
-            result.push(...range(Number(ss[0]), Number(ss[1])))
+            if (Number(ss[0]) > Number(ss[1])) {
+                result.push(...range(Number(ss[1]), Number(ss[0]), ss[2] ? Number(ss[2]):null))
+            } else {
+                result.push(...range(Number(ss[0]), Number(ss[1]), ss[2] ? Number(ss[2]):null))
+            }
         } else {
             result.push(Number(ss[0]))
         }