jsir 1.2.1 → 1.2.6

package/cmd/ooa.js

@@ -322,7 +322,7 @@ async function dealInitData() {
         try {
             $i[initDataName] = await evalText(text)
         } catch (e) {
-            $log(`$i.${initDataName} loading failed\n${e.stack}`);
+            $log(`$i.${initDataName} loading failed\n${e.stack || e}`);
         }
         if (!vl($i[initDataName])) {
             warn(`$i.${initDataName} loading failed`)
@@ -361,7 +361,11 @@ function _nextLine(callback, preStr, hidden, resolve) {
 
     _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);
         }
@@ -389,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) {
@@ -1030,9 +1033,10 @@ 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))
+        let pair = arg.indexOf('=') === -1 ? [] : arg.split('=', 2).map(i => trim(i))
         let argVal = argDef.hasOwnProperty(pair[0]) ? pair[1]:arg
         argVal = translateArgs(argVal)
 
@@ -1043,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("_")) {
@@ -1123,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

@@ -1,7 +1,7 @@
 const https = require('https');
 const BigNumber = require('bignumber.js');
-let {mkdir, getLibDataDir, trim, got, toBigNum, getConfig, objDataFile,
-    eFn, removeFirst, randomInt, splitArray, sleep, vl, cacheFn, isError, bMin} = require('./util')
+let {getLibDataDir, trim, toBigNum, getConfig, objDataFile,
+    eFn, removeFirst, randomInt, splitArray, sleep, vl, cacheFn, isError, bMin, getOr} = require('./util')
 const abiDecoder = require('abi-decoder');
 let fs = require('fs')
 let contractMapPath = getLibDataDir() + "/contractMap.json"
@@ -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]
         },
@@ -411,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
@@ -515,17 +511,31 @@ function getPairAmtNoFee(a, b, baseAmt) {
 }
 
 let tokenMapLoaded = {}
-async function getTokenMap(tokens, web3, batchNum, asyncNum) {
+let tokenMapLoadSize = {}
+async function saveTokenMap(web3) {
     web3 = web3 || global.web3;
     let chainId = global.chainId || await web3.getChainId()
-    if (!tokenMapCache[chainId]) {
-        tokenMapCache[chainId] = {}
+    let chainMap = getOr(tokenMapCache, chainId, {})
+    let tokenMapFile = `tokenMap_${chainId}`
+    if (!tokenMapLoaded[chainId]) {
+        let temp = objDataFile(tokenMapFile)
+        tokenMapLoadSize[chainId] = Object.keys(temp).length
+        Object.assign(chainMap, temp)
+        tokenMapLoaded[chainId] = true
     }
-    let chainMap = tokenMapCache[chainId]
-
+    if (Object.keys(chainMap).length > tokenMapLoadSize[chainId]) {
+        await objDataFile(tokenMapFile, () => chainMap);
+    }
+}
+async function getTokenMap(tokens, web3, batchNum, asyncNum) {
+    web3 = web3 || global.web3;
+    let chainId = global.chainId || await web3.getChainId()
+    let chainMap = getOr(tokenMapCache, chainId, {})
     if (!tokenMapLoaded[chainId]) {
         let tokenMapFile = `tokenMap_${chainId}`
-        Object.assign(chainMap, objDataFile(tokenMapFile))
+        let temp = objDataFile(tokenMapFile)
+        tokenMapLoadSize[chainId] = Object.keys(temp).length
+        Object.assign(chainMap, temp)
         tokenMapLoaded[chainId] = true
     }
 
@@ -1243,5 +1253,6 @@ module.exports = {
     transferToken,
     tokenApprove,
     txnInputReplacer,
-    abiDecoder
+    abiDecoder,
+    saveTokenMap
 }

package/index.js

@@ -130,7 +130,8 @@ const {
     transferToken,
     tokenApprove,
     txnInputReplacer,
-    abiDecoder
+    abiDecoder,
+    saveTokenMap
 } = require('./ethWeb')
 
 module.exports = {
@@ -261,5 +262,6 @@ module.exports = {
     error,
     txnInputReplacer,
     parseSteps,
-    abiDecoder
+    abiDecoder,
+    saveTokenMap
 }

package/package.json

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