jcc_wallet 3.0.2 → 4.0.1

package/lib/{constant/index.js → constant.js}

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WALLET_IS_EMPTY = exports.SECRET_IS_INVALID = exports.PASSWORD_IS_WRONG = exports.PASSWORD_IS_REQUIRED = exports.KEYSTORE_IS_INVALID = exports.ETH_PASSWORD_IS_WRONG = exports.ADDRESS_IS_EXISTENT = void 0;
-var PASSWORD_IS_REQUIRED = "password is required";
+const PASSWORD_IS_REQUIRED = "password is required";
 exports.PASSWORD_IS_REQUIRED = PASSWORD_IS_REQUIRED;
-var WALLET_IS_EMPTY = "wallet is empty";
+const WALLET_IS_EMPTY = "wallet is empty";
 exports.WALLET_IS_EMPTY = WALLET_IS_EMPTY;
-var PASSWORD_IS_WRONG = "password is wrong";
+const PASSWORD_IS_WRONG = "password is wrong";
 exports.PASSWORD_IS_WRONG = PASSWORD_IS_WRONG;
-var KEYSTORE_IS_INVALID = "keystore is invalid";
+const KEYSTORE_IS_INVALID = "keystore is invalid";
 exports.KEYSTORE_IS_INVALID = KEYSTORE_IS_INVALID;
-var ETH_PASSWORD_IS_WRONG = "ethereum ".concat(PASSWORD_IS_WRONG);
+const ETH_PASSWORD_IS_WRONG = `ethereum ${PASSWORD_IS_WRONG}`;
 exports.ETH_PASSWORD_IS_WRONG = ETH_PASSWORD_IS_WRONG;
-var SECRET_IS_INVALID = "secret is invalid";
+const SECRET_IS_INVALID = `secret is invalid`;
 exports.SECRET_IS_INVALID = SECRET_IS_INVALID;
-var ADDRESS_IS_EXISTENT = "address is existent";
+const ADDRESS_IS_EXISTENT = `address is existent`;
 exports.ADDRESS_IS_EXISTENT = ADDRESS_IS_EXISTENT;
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=constant.js.map

package/lib/constant.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constant.js","sourceRoot":"","sources":["../src/constant.ts"],"names":[],"mappings":";;;AAAA,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;AAYlD,oDAAoB;AAXtB,MAAM,eAAe,GAAG,iBAAiB,CAAC;AAcxC,0CAAe;AAbjB,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAW5C,8CAAiB;AAVnB,MAAM,mBAAmB,GAAG,qBAAqB,CAAC;AAQhD,kDAAmB;AAPrB,MAAM,qBAAqB,GAAG,YAAY,iBAAiB,EAAE,CAAC;AAM5D,sDAAqB;AALvB,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAS5C,8CAAiB;AARnB,MAAM,mBAAmB,GAAG,qBAAqB,CAAC;AAGhD,kDAAmB"}

package/lib/hd/constant.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBIP44Chain = exports.BIP44ChainMap = exports.BIP44Chain = void 0;
-var bip44_constants_1 = __importDefault(require("bip44-constants"));
+const bip44_constants_1 = __importDefault(require("bip44-constants"));
 // BIP44 链常量定义
 var BIP44Chain;
 (function (BIP44Chain) {
@@ -31,11 +31,11 @@ var BIP44Chain;
  * @param {number} chain chain index number
  * @returns {number} bip44 chain constant
  */
-var getBIP44Chain = function (chain) {
-    return bip44_constants_1.default.filter(function (e) { return e[0] === chain; });
+const getBIP44Chain = (chain) => {
+    return bip44_constants_1.default.filter((e) => e[0] === chain);
 };
 exports.getBIP44Chain = getBIP44Chain;
-var BIP44ChainMap = new Map([
+const BIP44ChainMap = new Map([
     [BIP44Chain.BITCOIN, "bitcoin"],
     [BIP44Chain.BSC, "bsc"],
     [BIP44Chain.EOS, "eos"],

package/lib/hd/constant.js.map

@@ -1 +1 @@
-{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../src/hd/constant.ts"],"names":[],"mappings":";;;;;;AAAA,oEAAwC;AAExC,cAAc;AACd,IAAK,UAkBJ;AAlBD,WAAK,UAAU;IACb,0DAAoB,CAAA;IACpB,kDAAgB,CAAA;IAChB,kDAAgB,CAAA;IAChB,oDAAiB,CAAA;IACjB,kDAAgB,CAAA;IAChB,kDAAgB,CAAA;IAChB,oDAAiB,CAAA;IACjB,oDAAiB,CAAA;IACjB,0DAAoB,CAAA;IACpB,wDAAmB,CAAA;IACnB,oDAAiB,CAAA;IACjB,oDAAiB,CAAA;IAEjB,wEAAwE;IACxE,wDAAmB,CAAA;IACnB,wDAAmB,CAAA;IACnB,wDAAmB,CAAA;AACrB,CAAC,EAlBI,UAAU,0BAAV,UAAU,QAkBd;AAED;;;;;GAKG;AACH,IAAM,aAAa,GAAG,UAAC,KAAa;IAClC,OAAO,yBAAS,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,EAAd,CAAc,CAAC,CAAC;AACjD,CAAC,CAAC;AAoBkC,sCAAa;AAlBjD,IAAM,aAAa,GAAG,IAAI,GAAG,CAAC;IAC5B,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC;IAC/B,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC;IACvB,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC;IACvB,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;IACzB,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC;IACvB,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC;IAC5B,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;IACzB,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;IACzB,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC;IAC/B,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC7B,CAAC,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC;IAC5B,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;IACzB,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC7B,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC7B,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC;CAC9B,CAAC,CAAC;AAEkB,sCAAa"}
+{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../src/hd/constant.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAwC;AAExC,cAAc;AACd,IAAK,UAkBJ;AAlBD,WAAK,UAAU;IACb,0DAAoB,CAAA;IACpB,kDAAgB,CAAA;IAChB,kDAAgB,CAAA;IAChB,oDAAiB,CAAA;IACjB,kDAAgB,CAAA;IAChB,kDAAgB,CAAA;IAChB,oDAAiB,CAAA;IACjB,oDAAiB,CAAA;IACjB,0DAAoB,CAAA;IACpB,wDAAmB,CAAA;IACnB,oDAAiB,CAAA;IACjB,oDAAiB,CAAA;IAEjB,wEAAwE;IACxE,wDAAmB,CAAA;IACnB,wDAAmB,CAAA;IACnB,wDAAmB,CAAA;AACrB,CAAC,EAlBI,UAAU,0BAAV,UAAU,QAkBd;AAED;;;;;GAKG;AACH,MAAM,aAAa,GAAG,CAAC,KAAa,EAAO,EAAE;IAC3C,OAAO,yBAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC;AACjD,CAAC,CAAC;AAoBkC,sCAAa;AAlBjD,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC;IAC5B,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC;IAC/B,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC;IACvB,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC;IACvB,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;IACzB,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC;IACvB,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC;IAC5B,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;IACzB,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;IACzB,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC;IAC/B,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC7B,CAAC,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC;IAC5B,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;IACzB,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC7B,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC7B,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC;CAC9B,CAAC,CAAC;AAEkB,sCAAa"}

package/lib/hd/eos.plugin.js

@@ -1,49 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.plugin = void 0;
-var EosJs = require("eosjs");
-var ecc = require("eosjs-ecc");
-var wif = require("wif");
-var secp256k1 = require("secp256k1");
-var jcc_common_1 = require("jcc_common");
+const PublicKey = require("eosjs-ecc/lib/key_public");
+const PrivateKey = require("eosjs-ecc/lib/key_private");
+const Signature = require("eosjs-ecc/lib/signature");
+const wif = require("wif");
+const secp256k1_1 = require("@noble/curves/secp256k1");
+const jcc_common_1 = require("jcc_common");
+const sha256_1 = require("@noble/hashes/sha256");
 exports.plugin = {
-    checkPrivateKey: function (privateKey) {
+    checkPrivateKey(privateKey) {
         // check and cut swtc keypair lib add prefix 00
         return privateKey.length === 66 ? privateKey.substring(2) : privateKey;
     },
-    address: function (key) {
+    address(key) {
         if (key.privateKey) {
-            var privateKey = this.checkPrivateKey(key.privateKey);
-            var buffer = Buffer.from(privateKey, "hex");
-            // const eosPrivateKey = wif.encode(128, buffer, false)
+            const privateKey = exports.plugin.checkPrivateKey(key.privateKey);
             // TODO: secp256k1 version confict fixed, but need refactor later
-            var rawPublicKey = Buffer.from(secp256k1.publicKeyCreate(buffer, true));
-            var eosPublicKey = ecc.PublicKey(rawPublicKey).toString();
+            const rawPublicKey = Buffer.from(secp256k1_1.secp256k1.ProjectivePoint.fromPrivateKey(privateKey).toRawBytes(true));
+            const eosPublicKey = PublicKey(rawPublicKey).toString();
             return eosPublicKey;
         }
         if (key.publicKey) {
-            var rawPublicKey = Buffer.from(key.publicKey, "hex");
-            var eosPublicKey = ecc.PublicKey(rawPublicKey).toString();
+            const rawPublicKey = Buffer.from(key.publicKey, "hex");
+            const eosPublicKey = PublicKey(rawPublicKey).toString();
             return eosPublicKey;
         }
         return null;
     },
-    isValidAddress: function (address) {
-        return ecc.isValidPublic(address);
+    isValidAddress(address) {
+        return PublicKey.isValid(address);
     },
-    isValidSecret: function (secret) {
+    isValidSecret(secret) {
         try {
-            var privateKey = this.checkPrivateKey((0, jcc_common_1.filterOx)(secret));
-            var buffer = Buffer.from(privateKey, "hex");
-            var eosPrivateKey = wif.encode(128, buffer, false);
-            return ecc.isValidPrivate(eosPrivateKey);
+            const privateKey = exports.plugin.checkPrivateKey((0, jcc_common_1.filterOx)(secret));
+            const buffer = Buffer.from(privateKey, "hex");
+            const eosPrivateKey = wif.encode(128, buffer, false);
+            return PrivateKey.isValid(eosPrivateKey);
         }
-        catch (error) {
+        catch (_) {
             return false;
         }
     },
-    hash: function (message) {
-        return ecc.sha256(message);
+    hash(message) {
+        return Buffer.from(sha256_1.sha256
+            .create()
+            .update(message)
+            .digest()).toString("hex");
     },
     /**
      *
@@ -51,23 +54,17 @@ exports.plugin = {
      * @param privateKey private key
      * @returns signature string
      */
-    sign: function (message, privateKey) {
-        var buffer = Buffer.from(this.checkPrivateKey((0, jcc_common_1.filterOx)(privateKey)), "hex");
-        var eosPrivateKey = wif.encode(128, buffer, false);
-        return ecc.sign(message, eosPrivateKey, "utf8");
+    sign(message, privateKey) {
+        const buffer = Buffer.from(exports.plugin.checkPrivateKey((0, jcc_common_1.filterOx)(privateKey)), "hex");
+        const eosPrivateKey = wif.encode(128, buffer, false);
+        return Signature.sign(message, eosPrivateKey, "utf8").toString();
     },
-    verify: function (message, signature, address) {
-        return this.recover(message, signature) === address;
+    verify(message, signature, address) {
+        return exports.plugin.recover(message, signature) === address;
     },
-    recover: function (message, signature) {
-        return ecc.recover(signature, message, "utf8");
-    },
-    proxy: function (functionName) {
-        var args = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            args[_i - 1] = arguments[_i];
-        }
-        return EosJs[functionName].apply(EosJs, args);
+    recover(message, signature) {
+        const s = Signature.from(signature);
+        return s.recover(message, "utf8").toString();
     }
 };
 //# sourceMappingURL=eos.plugin.js.map

package/lib/hd/eos.plugin.js.map

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

package/lib/hd/ethereum.plugin.d.ts

@@ -1,5 +1,6 @@
 import { IHDPlugin } from "../types";
 export interface IEthereumPlugin extends IHDPlugin {
     checkPrivateKey(privateKey: string): string;
+    decryptKeystore(password: string, encryptData: any): string;
 }
 export declare const plugin: IEthereumPlugin;

package/lib/hd/ethereum.plugin.js

@@ -1,68 +1,63 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.plugin = void 0;
-var wallet_1 = require("@ethereumjs/wallet");
-var ethUtil = __importStar(require("@ethereumjs/util"));
-var keccak_js_1 = require("ethereum-cryptography/keccak.js");
-var jcc_common_1 = require("jcc_common");
+const secp256k1_1 = require("@noble/curves/secp256k1");
+const keccak_js_1 = require("ethereum-cryptography/keccak.js");
+const bytes_1 = require("../minify-ethereumjs-util/bytes");
+const internal_1 = require("../minify-ethereumjs-util/internal");
+const signature_1 = require("../minify-ethereumjs-util/signature");
+const account_1 = require("../minify-ethereumjs-util/account");
+const jcc_common_1 = require("jcc_common");
+const constant_1 = require("../constant");
+const scrypt_1 = require("@noble/hashes/scrypt");
+const crypto_1 = __importDefault(require("crypto"));
+const utils_1 = require("@noble/hashes/utils");
+const isObject = (obj) => {
+    return Object.prototype.toString.call(obj) === "[object Object]";
+};
 exports.plugin = {
-    checkPrivateKey: function (privateKey) {
+    checkPrivateKey(privateKey) {
         // check and cut swtc keypair lib add prefix 00
         return privateKey.length === 66 ? privateKey.substring(2) : privateKey;
     },
-    address: function (key) {
+    address(key) {
         if (key.privateKey) {
-            var privateKey = this.checkPrivateKey(key.privateKey);
-            var buffer = Buffer.from(privateKey, "hex");
-            var wallet = wallet_1.Wallet.fromPrivateKey(buffer);
-            // console.log("get public key:", wallet.getPublicKeyString());
-            return wallet.getAddressString();
+            const privateKey = exports.plugin.checkPrivateKey(key.privateKey);
+            return exports.plugin.getAddress(privateKey);
         }
         if (key.publicKey) {
-            // TODO: length of ethereum publick key of keypaire is 128, but swtc lib keypair is 64
-            // so, if you want get address from public key, get it from private first
-            var wallet = wallet_1.Wallet.fromPublicKey(Buffer.from(key.publicKey, "hex"));
-            return wallet.getAddressString();
+            const address = (0, account_1.pubToAddress)(Buffer.from(key.publicKey, "hex"));
+            return (0, bytes_1.bytesToHex)(address);
         }
         return null;
     },
-    isValidAddress: function (address) {
-        return ethUtil.isValidAddress(address);
+    isValidAddress(address) {
+        if (typeof address !== "string") {
+            return false;
+        }
+        return /^(0x)?[0-9a-fA-F]{40}$/.test((0, internal_1.stripHexPrefix)(address));
     },
-    isValidSecret: function (secret) {
+    getAddress(secret) {
+        if (!exports.plugin.isValidSecret(secret)) {
+            return null;
+        }
+        const pk = secp256k1_1.secp256k1.ProjectivePoint.fromPrivateKey(Buffer.from((0, internal_1.stripHexPrefix)(secret), "hex")).toHex(false);
+        return (0, bytes_1.bytesToHex)((0, account_1.pubToAddress)(Buffer.from(pk.substring(2), "hex")));
+    },
+    isValidSecret(secret) {
         try {
-            return ethUtil.isValidPrivate(Buffer.from((0, jcc_common_1.filterOx)(secret), "hex"));
+            return secp256k1_1.secp256k1.utils.isValidPrivateKey(Buffer.from((0, internal_1.stripHexPrefix)(secret), "hex"));
         }
-        catch (error) {
+        catch (_) {
             return false;
         }
     },
-    hash: function (message) {
-        var hash = ethUtil.bytesToHex((0, keccak_js_1.keccak256)(Buffer.from(message, "utf-8")));
-        return ethUtil.stripHexPrefix(hash);
+    hash(message) {
+        const hash = (0, bytes_1.bytesToHex)((0, keccak_js_1.keccak256)(Buffer.from(message, "utf-8")));
+        return (0, internal_1.stripHexPrefix)(hash);
     },
     /**
      *
@@ -70,32 +65,56 @@ exports.plugin = {
      * @param privateKey private key
      * @returns signature string
      */
-    sign: function (message, privateKey) {
-        var key = this.checkPrivateKey(privateKey).toLowerCase();
-        var hash = (0, keccak_js_1.keccak256)(Buffer.from(message, "utf-8"));
-        var signed = ethUtil.ecsign(hash, Buffer.from(key, "hex"));
-        return (ethUtil.stripHexPrefix(ethUtil.bytesToHex(signed.r)) +
-            ethUtil.stripHexPrefix(ethUtil.bytesToHex(signed.s)) +
-            signed.v.toString(16));
+    sign(message, privateKey) {
+        const key = exports.plugin.checkPrivateKey(privateKey).toLowerCase();
+        const hash = (0, keccak_js_1.keccak256)(Buffer.from(message, "utf-8"));
+        const signed = (0, signature_1.ecsign)(hash, Buffer.from(key, "hex"));
+        return (0, internal_1.stripHexPrefix)((0, bytes_1.bytesToHex)(signed.r)) + (0, internal_1.stripHexPrefix)((0, bytes_1.bytesToHex)(signed.s)) + signed.v.toString(16);
     },
-    verify: function (message, signature, address) {
-        return this.recover(message, signature) === address;
+    verify(message, signature, address) {
+        return exports.plugin.recover(message, signature) === address;
     },
-    recover: function (message, signature) {
-        var hash = (0, keccak_js_1.keccak256)(Buffer.from(message, "utf-8"));
-        var r = Buffer.from(Buffer.from(signature.substring(0, 64), "hex"));
-        var s = Buffer.from(Buffer.from(signature.substring(64, 128), "hex"));
-        var bytes = ethUtil.hexToBytes("0x" + signature.substring(128, 130));
-        var pk = ethUtil.ecrecover(hash, ethUtil.bytesToBigInt(bytes), r, s);
-        var wallet = wallet_1.Wallet.fromPublicKey(pk);
-        return wallet.getAddressString();
+    recover(message, signature) {
+        const hash = (0, keccak_js_1.keccak256)(Buffer.from(message, "utf-8"));
+        const r = Buffer.from(Buffer.from(signature.substring(0, 64), "hex"));
+        const s = Buffer.from(Buffer.from(signature.substring(64, 128), "hex"));
+        const bytes = (0, bytes_1.hexToBytes)("0x" + signature.substring(128, 130));
+        const pk = (0, signature_1.ecrecover)(hash, (0, bytes_1.bytesToBigInt)(bytes), r, s);
+        const address = (0, account_1.pubToAddress)(Buffer.from(pk));
+        return (0, bytes_1.bytesToHex)(address);
     },
-    proxy: function (functionName) {
-        var args = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            args[_i - 1] = arguments[_i];
+    decryptKeystore(password, encryptData) {
+        if (!isObject(encryptData)) {
+            throw new Error(constant_1.KEYSTORE_IS_INVALID);
+        }
+        const cryptoData = encryptData.Crypto || encryptData.crypto;
+        if ((0, jcc_common_1.isEmptyObject)(cryptoData) || (0, jcc_common_1.isEmptyObject)(cryptoData.cipherparams) || (0, jcc_common_1.isEmptyObject)(cryptoData.kdfparams)) {
+            throw new Error(constant_1.KEYSTORE_IS_INVALID);
         }
-        return ethUtil[functionName].apply(ethUtil, args);
+        const iv = Buffer.from(cryptoData.cipherparams.iv, "hex");
+        const kdfparams = cryptoData.kdfparams;
+        const derivedKey = (0, scrypt_1.scrypt)(Buffer.from(password), Buffer.from(kdfparams.salt, "hex"), {
+            N: kdfparams.n,
+            r: kdfparams.r,
+            p: kdfparams.p,
+            dkLen: kdfparams.dklen
+        });
+        const ciphertext = Buffer.from(cryptoData.ciphertext, "hex");
+        const mac = keccak_js_1.keccak256
+            .create()
+            .update(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))
+            .digest();
+        if (Buffer.from(mac).toString("hex") !== cryptoData.mac) {
+            throw new Error(constant_1.ETH_PASSWORD_IS_WRONG);
+        }
+        const decipher = crypto_1.default.createDecipheriv("aes-128-ctr", derivedKey.slice(0, 16), iv);
+        const seed = Buffer.concat([decipher.update(ciphertext), decipher.final()]);
+        return seed.toString("hex");
+    },
+    createWallet() {
+        const priv = (0, utils_1.randomBytes)(32);
+        const address = exports.plugin.getAddress((0, bytes_1.bytesToHex)(priv));
+        return { address, secret: (0, bytes_1.bytesToHex)(priv) };
     }
 };
 //# sourceMappingURL=ethereum.plugin.js.map

package/lib/hd/ethereum.plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"ethereum.plugin.js","sourceRoot":"","sources":["../../src/hd/ethereum.plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA4C;AAC5C,wDAA4C;AAC5C,6DAA4D;AAC5D,yCAAsC;AAOzB,QAAA,MAAM,GAAoB;IACrC,eAAe,YAAC,UAAkB;QAChC,+CAA+C;QAC/C,OAAO,UAAU,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IACzE,CAAC;IACD,OAAO,YAAC,GAAa;QACnB,IAAI,GAAG,CAAC,UAAU,EAAE;YAClB,IAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACxD,IAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YAC9C,IAAM,MAAM,GAAG,eAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC7C,+DAA+D;YAC/D,OAAO,MAAM,CAAC,gBAAgB,EAAE,CAAC;SAClC;QACD,IAAI,GAAG,CAAC,SAAS,EAAE;YACjB,sFAAsF;YACtF,yEAAyE;YACzE,IAAM,MAAM,GAAG,eAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;YACvE,OAAO,MAAM,CAAC,gBAAgB,EAAE,CAAC;SAClC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc,YAAC,OAAe;QAC5B,OAAO,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,aAAa,YAAC,MAAc;QAC1B,IAAI;YACF,OAAO,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,qBAAQ,EAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;SACrE;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IACD,IAAI,YAAC,OAAe;QAClB,IAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,IAAA,qBAAS,EAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1E,OAAO,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IACD;;;;;OAKG;IACH,IAAI,YAAC,OAAe,EAAE,UAAkB;QACtC,IAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;QAE3D,IAAM,IAAI,GAAG,IAAA,qBAAS,EAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACtD,IAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QAE7D,OAAO,CACL,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACpD,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACpD,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CACtB,CAAC;IACJ,CAAC;IACD,MAAM,YAAC,OAAe,EAAE,SAAiB,EAAE,OAAe;QACxD,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,OAAO,CAAC;IACtD,CAAC;IACD,OAAO,YAAC,OAAe,EAAE,SAAiB;QACxC,IAAM,IAAI,GAAG,IAAA,qBAAS,EAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACtD,IAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QACtE,IAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QACxE,IAAM,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QACvE,IAAM,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACvE,IAAM,MAAM,GAAG,eAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACxC,OAAO,MAAM,CAAC,gBAAgB,EAAE,CAAC;IACnC,CAAC;IACD,KAAK,YAAC,YAAY;QAAE,cAAO;aAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;YAAP,6BAAO;;QACzB,OAAO,OAAO,CAAC,YAAY,CAAC,OAArB,OAAO,EAAkB,IAAI,EAAE;IACxC,CAAC;CACF,CAAC"}
+{"version":3,"file":"ethereum.plugin.js","sourceRoot":"","sources":["../../src/hd/ethereum.plugin.ts"],"names":[],"mappings":"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"}

package/lib/hd/index.d.ts

@@ -201,7 +201,7 @@ export declare class HDWallet {
      *
      * @returns {string} return address
      */
-    recover: (messgae: string, signature: string) => string;
+    recover: (messgae: string, signature: string) => string | void;
     /**
      * get specified chain wallet api
      *