jcc_wallet 1.0.5 → 1.1.1

package/README.md

@@ -3,10 +3,8 @@
 # jcc_wallet
 
 ![npm](https://img.shields.io/npm/v/jcc_wallet.svg)
-[![Build Status](https://travis-ci.com/JCCDex/jcc_wallet.svg?branch=master)](https://travis-ci.com/JCCDex/jcc_wallet)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/14616fffd838456c8aaaef650be43dde)](https://www.codacy.com/app/GinMu/jcc_wallet?utm_source=github.com&utm_medium=referral&utm_content=JCCDex/jcc_wallet&utm_campaign=Badge_Grade)
+[![build](https://github.com/JCCDex/jcc_wallet/actions/workflows/node.js.yml/badge.svg)](https://github.com/JCCDex/jcc_wallet/actions/workflows/node.js.yml)
 [![Coverage Status](https://coveralls.io/repos/github/JCCDex/jcc_wallet/badge.svg?branch=master)](https://coveralls.io/github/JCCDex/jcc_wallet?branch=master)
-[![Dependencies](https://img.shields.io/david/JCCDex/jcc_wallet.svg?style=flat-square)](https://david-dm.org/JCCDex/jcc_wallet)
 [![npm downloads](https://img.shields.io/npm/dm/jcc_wallet.svg)](http://npm-stat.com/charts.html?package=jcc_wallet)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
 
@@ -14,9 +12,9 @@
 
 [jcc_wallet](https://github.com/JCCDex/jcc_wallet) is a wallet toolkit of JCCDex. At present, it can handle the creation and verification of [jingtum](http://swtc.top/index.html), [moac](https://www.moac.io/), [ethereum](https://ethereum.org/), [stm](https://labs.stream/en/), [call](http://www.callchain.live/) & [bizain](https://bizain.net/) wallet, import and export wallet with keystore file, and set password for wallet.
 
-[jcc_wallet](https://github.com/JCCDex/jcc_wallet)是井畅交换平台的钱包处理工具，目前可以处理[jingtum](http://swtc.top/index.html), [moac](https://www.moac.io/), [ethereum](https://ethereum.org/), [stm](https://labs.stream/en/), [call](http://www.callchain.live/)以及[bizain](https://bizain.net/)钱包的创建和校验，以keystore形式导入和导出钱包，设置钱包交易密码。
+[jcc_wallet](https://github.com/JCCDex/jcc_wallet)是井畅交换平台的钱包处理工具，目前可以处理[jingtum](http://swtc.top/index.html), [moac](https://www.moac.io/), [ethereum](https://ethereum.org/), [stm](https://labs.stream/en/), [call](http://www.callchain.live/)以及[bizain](https://bizain.net/)钱包的创建和校验，以 keystore 形式导入和导出钱包，设置钱包交易密码。
 
-***[jcc_wallet](https://github.com/JCCDex/jcc_walle) Support running in browsers***
+**_[jcc_wallet](https://github.com/JCCDex/jcc_walle) Support running in browsers_**
 
 井畅应用交流群: 557524730
 
@@ -63,7 +61,7 @@ Support multiple wallet keystore for each type.
 ### Usage
 
 ```javascript
-const JingchangWallet = require('jcc_wallet').JingchangWallet
+const JingchangWallet = require("jcc_wallet").JingchangWallet;
 // import { JingchangWallet } from 'jcc_wallet'
 ```
 
@@ -78,7 +76,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {boolean} [samePassword=true] if the value is true, use the default swt keystore's password
  * which be generated in the beginning as password for other type.
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### generate
@@ -92,7 +90,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {string} [secret] swtc chain's secret
  * @returns {Promise<IJingchangWalletModel>} resolve jingchang wallet if success.
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### isValid
@@ -105,7 +103,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {*} wallet
  * @returns {boolean} return true if valid.
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### get
@@ -117,7 +115,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @static
  * @returns {(IJingchangWalletModel | null)} return jingchang wallet or null.
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### clear
@@ -128,7 +126,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  *
  * @static
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### save
@@ -140,7 +138,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @static
  * @param {IJingchangWalletModel} wallet
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### deriveKeyPair
@@ -196,7 +194,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {IJingchangWalletModel} jcWallet
  * @returns {Array<IKeystoreModel>} return wallets if valid, otherwise return empty array.
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### setJingchangWallet
@@ -207,7 +205,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  *
  * @param {IJingchangWalletModel} wallet
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### getAddress
@@ -219,7 +217,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {string} [type="swt"]
  * @returns {Promise<string>} resolve address if success
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### getWalletWithType
@@ -231,7 +229,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {string} [type="swt"]
  * @returns {Promise<IKeystoreModel>} resolve default wallet keystore if success.
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### getWalletWithAddress
@@ -243,7 +241,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {string} address
  * @returns {Promise<IKeystoreModel>} resolve wallet keystore if success.
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### hasDefault
@@ -255,7 +253,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {string} [type="swt"]
  * @returns {boolean} return true if has default.
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### getSecretWithType
@@ -268,7 +266,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {string} [type="swt"]
  * @returns {Promise<string>} resolve secret if success.
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### getSecretWithAddress
@@ -281,7 +279,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {string} address
  * @returns {Promise<string>} resolve secret if success.
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### changeWholePassword
@@ -295,7 +293,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {string} newPassword
  * @returns {Promise<IJingchangWalletModel>} resolve new jingchang wallet if success
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### changePasswordWithAddress
@@ -310,7 +308,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {string} newPassword
  * @returns {Promise<IJingchangWalletModel>} resolve new jingchang wallet if success
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### removeWalletWithType
@@ -321,7 +319,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {string} [type="swt"]
  * @returns {Promise<IJingchangWalletModel>} resolve new jingchang wallet if success
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### removeWalletWithAddress
@@ -333,7 +331,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {string} address
  * @returns {Promise<IJingchangWalletModel>} resolve new jingchang wallet if success
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### setDefaultWallet
@@ -345,7 +343,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {string} address
  * @returns {Promise<IJingchangWalletModel>} resolve new jingchang wallet if success
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### importSecret
@@ -360,7 +358,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {(secret: string) => string} retriveSecret
  * @returns {Promise<IJingchangWalletModel>} resolve new jingchang wallet if success
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### findWallet
@@ -374,7 +372,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @returns {IKeystoreModel} return wallet keystore if existent, otherwise throw `keystore is invalid`
  * if the jingchang wallet is invalid or throw `wallet is empty` if the wallet isn't existent
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### getEncryptData
@@ -388,7 +386,7 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {IKeypairsModel} keypairs
  * @returns {IKeystoreModel}
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ### saveWallet
@@ -402,11 +400,11 @@ const JingchangWallet = require('jcc_wallet').JingchangWallet
  * @param {IKeypairsModel} keypairs
  * @returns {Promise<IJingchangWalletModel>} resolve new jingchang wallet if success
  * @memberof JingchangWallet
-*/
+ */
 ```
 
 ## Deprecated API
 
-***Deprecated api will be removed after 2020.1.1, please update asap.***
+**_Deprecated api will be removed after 2020.1.1, please update asap._**
 
 For more see [deprecatedAPI](https://github.com/JCCDex/jcc_wallet/blob/master/deprecatedAPI.md).

package/lib/constant/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/constant/index.ts"],"names":[],"mappings":";;AAAA,IAAM,oBAAoB,GAAG,sBAAsB,CAAC;AAQsB,oDAAoB;AAP9F,IAAM,eAAe,GAAG,iBAAiB,CAAC;AAO4F,0CAAe;AANrJ,IAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAMkD,8CAAiB;AALjH,IAAM,mBAAmB,GAAG,qBAAqB,CAAC;AAKG,kDAAmB;AAJxE,IAAM,qBAAqB,GAAG,cAAY,iBAAmB,CAAC;AAIhC,sDAAqB;AAHnD,IAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAGqE,8CAAiB;AAFpI,IAAM,mBAAmB,GAAG,qBAAqB,CAAC;AAEzC,kDAAmB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/constant/index.ts"],"names":[],"mappings":";;AAAA,IAAM,oBAAoB,GAAG,sBAAsB,CAAC;AAYlD,oDAAoB;AAXtB,IAAM,eAAe,GAAG,iBAAiB,CAAC;AAcxC,0CAAe;AAbjB,IAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAW5C,8CAAiB;AAVnB,IAAM,mBAAmB,GAAG,qBAAqB,CAAC;AAQhD,kDAAmB;AAPrB,IAAM,qBAAqB,GAAG,cAAY,iBAAmB,CAAC;AAM5D,sDAAqB;AALvB,IAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAS5C,8CAAiB;AARnB,IAAM,mBAAmB,GAAG,qBAAqB,CAAC;AAGhD,kDAAmB"}

package/lib/eth/index.d.ts

@@ -1,4 +1,3 @@
-import { IWalletModel } from "../types";
 /**
  * check eth secret is valid or not
  *

package/lib/eth/index.js

@@ -1,11 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var crypto = require("crypto");
-var ethereumjsUtil = require("ethereumjs-util");
-var Wallet = require("ethereumjs-wallet");
+var crypto_1 = __importDefault(require("crypto"));
+var ethereumjs_util_1 = require("ethereumjs-util");
+var ethereumjs_wallet_1 = __importDefault(require("ethereumjs-wallet"));
 var jcc_common_1 = require("jcc_common");
-var createKeccakHash = require("keccak");
-var scrypt = require("scryptsy");
+var keccak_1 = __importDefault(require("keccak"));
+var scryptsy_1 = __importDefault(require("scryptsy"));
 var constant_1 = require("../constant");
 var isObject = function (obj) {
     return Object.prototype.toString.call(obj) === "[object Object]";
@@ -19,7 +22,7 @@ var isObject = function (obj) {
 var isValidSecret = function (secret) {
     secret = jcc_common_1.filterOx(secret);
     try {
-        return ethereumjsUtil.isValidPrivate(Buffer.from(secret, "hex"));
+        return ethereumjs_util_1.isValidPrivate(Buffer.from(secret, "hex"));
     }
     catch (error) {
         return false;
@@ -33,7 +36,7 @@ exports.isValidSecret = isValidSecret;
  * @returns {boolean} return true if valid
  */
 var isValidAddress = function (address) {
-    return ethereumjsUtil.isValidAddress(address);
+    return ethereumjs_util_1.isValidAddress(address);
 };
 exports.isValidAddress = isValidAddress;
 /**
@@ -46,8 +49,8 @@ var getAddress = function (secret) {
     if (!isValidSecret(secret)) {
         return null;
     }
-    var buffer = ethereumjsUtil.privateToAddress(Buffer.from(secret, "hex"));
-    var decodeAddress = ethereumjsUtil.bufferToHex(buffer);
+    var buffer = ethereumjs_util_1.privateToAddress(Buffer.from(secret, "hex"));
+    var decodeAddress = ethereumjs_util_1.bufferToHex(buffer);
     return decodeAddress;
 };
 exports.getAddress = getAddress;
@@ -69,15 +72,15 @@ var decryptKeystore = function (password, encryptData) {
     }
     var iv = Buffer.from(cryptoData.cipherparams.iv, "hex");
     var kdfparams = cryptoData.kdfparams;
-    var derivedKey = scrypt(Buffer.from(password), Buffer.from(kdfparams.salt, "hex"), kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen);
+    var derivedKey = scryptsy_1.default(Buffer.from(password), Buffer.from(kdfparams.salt, "hex"), kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen);
     var ciphertext = Buffer.from(cryptoData.ciphertext, "hex");
-    var mac = createKeccakHash("keccak256")
+    var mac = keccak_1.default("keccak256")
         .update(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))
         .digest();
     if (mac.toString("hex") !== cryptoData.mac) {
         throw new Error(constant_1.ETH_PASSWORD_IS_WRONG);
     }
-    var decipher = crypto.createDecipheriv("aes-128-ctr", derivedKey.slice(0, 16), iv);
+    var decipher = crypto_1.default.createDecipheriv("aes-128-ctr", derivedKey.slice(0, 16), iv);
     var seed = Buffer.concat([decipher.update(ciphertext), decipher.final()]);
     return seed.toString("hex");
 };
@@ -88,7 +91,7 @@ exports.decryptKeystore = decryptKeystore;
  * @returns {IWalletModel}
  */
 var createWallet = function () {
-    var _w = Wallet.generate();
+    var _w = ethereumjs_wallet_1.default.generate();
     return { address: _w.getAddressString(), secret: _w.getPrivateKeyString() };
 };
 exports.createWallet = createWallet;

package/lib/eth/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":"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"}

package/lib/index.d.ts

@@ -18,12 +18,8 @@
  * SOFTWARE.
  * @author https://github.com/GinMu
  */
-import * as bvcadtWallet from "./bvcadt";
-import * as callWallet from "./call";
 import * as ethWallet from "./eth";
 import JingchangWallet from "./jingchangWallet";
-import * as jtWallet from "./jingtum";
 import * as moacWallet from "./moac";
-import * as rippleWallet from "./ripple";
-import * as stmWallet from "./stm";
-export { bvcadtWallet, callWallet, ethWallet, JingchangWallet, jtWallet, moacWallet, rippleWallet, stmWallet };
+export * from "./x-wallet";
+export { ethWallet, JingchangWallet, moacWallet };

package/lib/index.js

@@ -19,21 +19,25 @@
  * SOFTWARE.
  * @author https://github.com/GinMu
  */
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var bvcadtWallet = require("./bvcadt");
-exports.bvcadtWallet = bvcadtWallet;
-var callWallet = require("./call");
-exports.callWallet = callWallet;
-var ethWallet = require("./eth");
+var ethWallet = __importStar(require("./eth"));
 exports.ethWallet = ethWallet;
-var jingchangWallet_1 = require("./jingchangWallet");
+var jingchangWallet_1 = __importDefault(require("./jingchangWallet"));
 exports.JingchangWallet = jingchangWallet_1.default;
-var jtWallet = require("./jingtum");
-exports.jtWallet = jtWallet;
-var moacWallet = require("./moac");
+var moacWallet = __importStar(require("./moac"));
 exports.moacWallet = moacWallet;
-var rippleWallet = require("./ripple");
-exports.rippleWallet = rippleWallet;
-var stmWallet = require("./stm");
-exports.stmWallet = stmWallet;
+__export(require("./x-wallet"));
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;AAEH,uCAAyC;AAUrC,oCAAY;AAThB,mCAAqC;AAUjC,gCAAU;AATd,iCAAmC;AAU/B,8BAAS;AATb,qDAAgD;AAU5C,0BAVG,yBAAe,CAUH;AATnB,oCAAsC;AAUlC,4BAAQ;AATZ,mCAAqC;AAUjC,gCAAU;AATd,uCAAyC;AAUrC,oCAAY;AAThB,iCAAmC;AAU/B,8BAAS"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;;;;;;AAEH,+CAAmC;AAK1B,8BAAS;AAJlB,sEAAgD;AAI5B,0BAJb,yBAAe,CAIa;AAHnC,iDAAqC;AAGA,gCAAU;AAF/C,gCAA2B"}

package/lib/jingchangWallet/index.d.ts

@@ -1,4 +1,3 @@
-import { IEncrypt, IJingchangWalletModel, IKeyPair, IKeypairsModel, IKeystoreModel } from "../types";
 /**
  * api of jingchang wallet
  *
@@ -50,10 +49,11 @@ export default class JingchangWallet {
      * @static
      * @param {string} password password for keystore
      * @param {string} [secret] swtc chain's secret
+     * @param {string} [alias] wallet name
      * @returns {Promise<IJingchangWalletModel>} resolve jingchang wallet if success.
      * @memberof JingchangWallet
      */
-    static generate(password: string, secret?: string): Promise<IJingchangWalletModel>;
+    static generate(password: string, secret?: string, alias?: string): Promise<IJingchangWalletModel>;
     /**
      * get jingchang wallet from local storage
      *
@@ -224,10 +224,11 @@ export default class JingchangWallet {
      * @param {string} password
      * @param {string} type
      * @param {(secret: string) => string} retriveSecret
+     * @param {string} [alias] wallet name
      * @returns {Promise<IJingchangWalletModel>} resolve new jingchang wallet if success
      * @memberof JingchangWallet
      */
-    importSecret(secret: string, password: string, type: string, retriveSecret: (secret: string) => string): Promise<IJingchangWalletModel>;
+    importSecret(secret: string, password: string, type: string, retriveSecret: (secret: string) => string, alias?: string): Promise<IJingchangWalletModel>;
     /**
      * find wallet keystore according to filter function
      *

package/lib/jingchangWallet/index.js

@@ -35,18 +35,21 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var assert = require("assert");
-var cloneDeep = require("clone-deep");
-var crypto = require("crypto");
-var eccrypto = require("eccrypto");
+var assert_1 = __importDefault(require("assert"));
+var clone_deep_1 = __importDefault(require("clone-deep"));
+var crypto_1 = __importDefault(require("crypto"));
+var eccrypto_1 = __importDefault(require("eccrypto"));
 var jcc_common_1 = require("jcc_common");
-var Lockr = require("lockr");
+var lockr_1 = __importDefault(require("lockr"));
 var keypairs_1 = require("@swtc/keypairs");
 var constant_1 = require("../constant");
-var jingtum_1 = require("../jingtum");
+var x_wallet_1 = require("../x-wallet");
 var util_1 = require("../util");
-Lockr.prefix = "jingchang_";
+lockr_1.default.prefix = "jingchang_";
 /**
  * api of jingchang wallet
  *
@@ -95,27 +98,28 @@ var JingchangWallet = /** @class */ (function () {
      * @static
      * @param {string} password password for keystore
      * @param {string} [secret] swtc chain's secret
+     * @param {string} [alias] wallet name
      * @returns {Promise<IJingchangWalletModel>} resolve jingchang wallet if success.
      * @memberof JingchangWallet
      */
-    JingchangWallet.generate = function (password, secret) {
+    JingchangWallet.generate = function (password, secret, alias) {
         return new Promise(function (resolve, reject) {
             var keypairs = {};
             if (secret === undefined) {
-                var wallet = jingtum_1.createWallet();
+                var wallet = x_wallet_1.jtWallet.createWallet();
                 secret = wallet.secret;
                 keypairs.address = wallet.address;
             }
             else {
-                if (!jingtum_1.isValidSecret(secret)) {
+                if (!x_wallet_1.jtWallet.isValidSecret(secret)) {
                     return reject(new Error(constant_1.SECRET_IS_INVALID));
                 }
-                keypairs.address = jingtum_1.getAddress(secret);
+                keypairs.address = x_wallet_1.jtWallet.getAddress(secret);
             }
             keypairs.secret = secret;
             keypairs.type = "swt";
             keypairs.default = true;
-            keypairs.alias = "swt wallet";
+            keypairs.alias = alias || "swt wallet";
             var jcWallet = {};
             var walletObj = util_1.encryptWallet(password, keypairs);
             jcWallet.version = JingchangWallet.version;
@@ -134,7 +138,7 @@ var JingchangWallet = /** @class */ (function () {
      * @memberof JingchangWallet
      */
     JingchangWallet.get = function () {
-        var jcWallet = Lockr.get(JingchangWallet._walletID);
+        var jcWallet = lockr_1.default.get(JingchangWallet._walletID);
         if (!JingchangWallet.isValid(jcWallet)) {
             return null;
         }
@@ -147,7 +151,7 @@ var JingchangWallet = /** @class */ (function () {
      * @memberof JingchangWallet
      */
     JingchangWallet.clear = function () {
-        Lockr.set(JingchangWallet._walletID, {});
+        lockr_1.default.set(JingchangWallet._walletID, {});
     };
     /**
      * save jingchang wallet to local storage.
@@ -157,7 +161,7 @@ var JingchangWallet = /** @class */ (function () {
      * @memberof JingchangWallet
      */
     JingchangWallet.save = function (wallet) {
-        Lockr.set(JingchangWallet._walletID, wallet);
+        lockr_1.default.set(JingchangWallet._walletID, wallet);
     };
     /**
      * derive key pair with secret
@@ -192,7 +196,7 @@ var JingchangWallet = /** @class */ (function () {
             var encode;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, eccrypto.encrypt(Buffer.from(publicKey, "hex"), Buffer.from(message))];
+                    case 0: return [4 /*yield*/, eccrypto_1.default.encrypt(Buffer.from(publicKey, "hex"), Buffer.from(message))];
                     case 1:
                         encode = _a.sent();
                         return [2 /*return*/, {
@@ -226,7 +230,7 @@ var JingchangWallet = /** @class */ (function () {
                             iv: Buffer.from(message.iv, "hex"),
                             mac: Buffer.from(message.mac, "hex")
                         };
-                        return [4 /*yield*/, eccrypto.decrypt(Buffer.from(privateKey, "hex"), encode)];
+                        return [4 /*yield*/, eccrypto_1.default.decrypt(Buffer.from(privateKey, "hex"), encode)];
                     case 1:
                         decode = _a.sent();
                         return [2 /*return*/, decode.toString()];
@@ -406,8 +410,8 @@ var JingchangWallet = /** @class */ (function () {
                         if (!this._samePassword) {
                             return [2 /*return*/, reject(new Error("the property of _samePassword is false, so please don't call this function!"))];
                         }
-                        jcWallet = cloneDeep(this._jingchangWallet);
-                        assert.notEqual(jcWallet, this._jingchangWallet);
+                        jcWallet = clone_deep_1.default(this._jingchangWallet);
+                        assert_1.default.notEqual(jcWallet, this._jingchangWallet);
                         wallets = JingchangWallet.getWallets(jcWallet);
                         _a.label = 1;
                     case 1:
@@ -536,8 +540,8 @@ var JingchangWallet = /** @class */ (function () {
     JingchangWallet.prototype.removeWalletWithAddress = function (address) {
         var _this = this;
         return new Promise(function (resolve, reject) {
-            var jcWallet = cloneDeep(_this._jingchangWallet);
-            assert.notEqual(_this._jingchangWallet, jcWallet);
+            var jcWallet = clone_deep_1.default(_this._jingchangWallet);
+            assert_1.default.notEqual(_this._jingchangWallet, jcWallet);
             var wallets = JingchangWallet.getWallets(jcWallet);
             try {
                 var wallet_1 = _this.findWallet(function (w) { return w.address === address; });
@@ -597,10 +601,11 @@ var JingchangWallet = /** @class */ (function () {
      * @param {string} password
      * @param {string} type
      * @param {(secret: string) => string} retriveSecret
+     * @param {string} [alias] wallet name
      * @returns {Promise<IJingchangWalletModel>} resolve new jingchang wallet if success
      * @memberof JingchangWallet
      */
-    JingchangWallet.prototype.importSecret = function (secret, password, type, retriveSecret) {
+    JingchangWallet.prototype.importSecret = function (secret, password, type, retriveSecret, alias) {
         var _this = this;
         return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
             var address_1, wallets, wallet, keypairs, error_6;
@@ -627,7 +632,7 @@ var JingchangWallet = /** @class */ (function () {
                         }
                         keypairs = {
                             address: address_1,
-                            alias: type + " wallet",
+                            alias: alias || type + " wallet",
                             secret: secret,
                             type: type
                         };
@@ -692,8 +697,8 @@ var JingchangWallet = /** @class */ (function () {
             // support type: ethereum, stream, jingtum, call and moac
             keypairs.default = _this._multiple ? !_this.hasDefault(keypairs.type) : true;
             var encryptData = _this.getEncryptData(password, keypairs);
-            var jcWallet = cloneDeep(_this._jingchangWallet);
-            assert.notEqual(_this._jingchangWallet, jcWallet);
+            var jcWallet = clone_deep_1.default(_this._jingchangWallet);
+            assert_1.default.notEqual(_this._jingchangWallet, jcWallet);
             var wallets = jcWallet.wallets;
             var pre = wallets.findIndex(function (w) { return w.type.toLowerCase() === keypairs.type.toLowerCase(); });
             if (_this._multiple) {
@@ -712,7 +717,7 @@ var JingchangWallet = /** @class */ (function () {
     };
     JingchangWallet.version = "1.0";
     JingchangWallet._name = "wallets";
-    JingchangWallet._walletID = crypto
+    JingchangWallet._walletID = crypto_1.default
         .createHash("sha256")
         .update(JingchangWallet._name.toLowerCase())
         .digest("hex");