jsir 1.1.9 → 1.2.4

package/cmd/ooa.js

@@ -346,13 +346,26 @@ function _nextLine(callback, preStr, hidden, resolve) {
             input: process.stdin,
             output: process.stdout
         })
+        _rl.on("SIGINT", async () => {
+            if (_noAppendNextLine) {
+                process.exit(0);
+            } else {
+                _haveWrapperInput = true;
+                _rl.clearLine(0)
+                nextLine();
+            }
+        });
     }
     _haveStartRead = true
     _haveWrapperInput = false
 
     _rl._writeToOutput = function _writeToOutput(stringToWrite){
         if(hidden && stringToWrite.indexOf("\n") === -1 && stringToWrite !== promitStr){
-            _rl.output.write("*");
+            if (stringToWrite.indexOf(promitStr) === -1) {
+                _rl.output.write("*");
+            } else {
+                _rl.output.write(promitStr + stringToWrite.replace(promitStr, '').replace(/[\s\S]/g, '*'));
+            }
         } else {
             _rl.output.write(stringToWrite);
         }
@@ -380,10 +393,9 @@ function _nextLine(callback, preStr, hidden, resolve) {
     let promitStr = (preStr
         || ((callback && callback !== wrapperInput) ? "-> ":"")
         || [Object.values(global.$tips).filter(i => String(i)).join(','), repoTip].filter(i => i).join('-') + `> `)
-    _rl.setPrompt(promitStr)
-    process.stdout.write('\x1B[32m')
+    promitStr = '\x1B[32m' + promitStr + '\x1B[39m'
+    _rl.setPrompt(promitStr);
     _rl.prompt()
-    process.stdout.write('\x1B[39m')
 }
 
 async function nextText(callback, preStr, hidden) {
@@ -487,10 +499,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
         })
@@ -856,6 +876,11 @@ async function dealKeyword(str, strs, fstr, ostr) {
         listCmd()
     } else if (fstr === 'f') {
         await fileLine(trim(ostr.join(' ')))
+    } else if (fstr === '%') {
+        listCmd(true)
+    } else if (fstr === 'q') {
+        console.log("Bye!")
+        process.exit(0)
     } else {
         await save(strs)
     }
@@ -1008,6 +1033,7 @@ async function runCmd(str) {
     let args = enrichArgs(str, text)
     let argDef = getArgDef(text)
     let argNames = Object.keys(argDef)
+    let exactArg = {}
     for (let i = 0; i<args.length; i++) {
         let arg = args[i]
         let pair = arg.split('=', 2).map(i => trim(i))
@@ -1021,10 +1047,14 @@ async function runCmd(str) {
         if (argDef.hasOwnProperty(pair[0])) {
             args[i] = argVal
             delete args[argNames[i]]
-            args[pair[0]] = argVal
+            exactArg[pair[0]] = argVal
         }
     }
+    for (let key of Object.keys(exactArg)) {
+        args[key] = exactArg[key]
+    }
 
+    delete args['[ParseError]']
     let exit = false
     for(let name of argNames) {
         if (name.startsWith("_")) {
@@ -1101,6 +1131,7 @@ function getArgDef(text) {
         argDef = eval(`(${exeStr || '{}'})`) || {}
     } catch (e) {
         $log(e.stack)
+        argDef['[ParseError]'] = e.stack.split('\n')[0]
     }
     if (typeof argDef !== 'object') {
         argDef = {}

package/ethWeb.js

@@ -154,7 +154,11 @@ function initRootWallet(mnemonic) {
         getWallet(i) {
             i = String(i)
             if (!wallets[i]) {
-                wallets[i] = ethers.Wallet.fromMnemonic(mnemonic, `m/44\'/60\'/0\'/0/${i}`)
+                if (/^\d+$/.test(i)) {
+                    wallets[i] = ethers.Wallet.fromMnemonic(mnemonic, `m/44\'/60\'/0\'/0/${i}`)
+                } else {
+                    wallets[i] = new ethers.Wallet(i);
+                }
             }
             return wallets[i]
         },
@@ -187,9 +191,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 +262,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 +322,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
@@ -381,16 +415,8 @@ async function tokenMap(address, web3) {
     if (!address) {
         return {name: '本币', decimals: 18, symbol: '本币'}
     }
-    web3 = web3 || global.web3;
-    let chainId = global.chainId || await web3.getChainId()
-    if (!tokenMapCache[chainId]) {
-        tokenMapCache[chainId] = {}
-    }
-    let chainMap = tokenMapCache[chainId]
     address = '0x' + address.toLowerCase().replace(/^0x/, '')
-    if (!chainMap[address]) {
-        await getTokenMap([address], web3)
-    }
+    let chainMap = await getTokenMap([address], web3)
 
     if (chainMap[address]) {
         let decimals = chainMap[address].decimals
@@ -485,6 +511,20 @@ function getPairAmtNoFee(a, b, baseAmt) {
 }
 
 let tokenMapLoaded = {}
+async function saveTokenMap(web3) {
+    web3 = web3 || global.web3;
+    let chainId = global.chainId || await web3.getChainId()
+    if (!tokenMapCache[chainId]) {
+        tokenMapCache[chainId] = {}
+    }
+    let chainMap = tokenMapCache[chainId]
+    let tokenMapFile = `tokenMap_${chainId}`
+    if (!tokenMapLoaded[chainId]) {
+        Object.assign(chainMap, objDataFile(tokenMapFile))
+        tokenMapLoaded[chainId] = true
+    }
+    objDataFile(tokenMapFile, () => chainMap);
+}
 async function getTokenMap(tokens, web3, batchNum, asyncNum) {
     web3 = web3 || global.web3;
     let chainId = global.chainId || await web3.getChainId()
@@ -785,7 +825,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 +844,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
         }
     })
@@ -1104,26 +1147,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 +1252,7 @@ module.exports = {
     getTokenBal,
     transferToken,
     tokenApprove,
-    txnInputReplacer
+    txnInputReplacer,
+    abiDecoder,
+    saveTokenMap
 }

package/index.js

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

package/package.json

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

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'
     }