jcc_wallet 3.0.2 → 4.0.1

package/lib/minify-tron/message.js

@@ -0,0 +1,42 @@
+"use strict";
+// forked from https://github.com/tronprotocol/tronweb/blob/5.x/src/utils/message.js
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TRON_MESSAGE_PREFIX = void 0;
+exports.hashMessage = hashMessage;
+exports.signMessage = signMessage;
+exports.verifyMessage = verifyMessage;
+const address_1 = require("./address");
+const crypto_1 = require("./crypto");
+const code_1 = require("./code");
+const { keccak256, SigningKey, Signature } = require("ethers/crypto");
+const { recoverAddress } = require("ethers/transaction");
+const { toUtf8Bytes, concat } = require("ethers/utils");
+const joinSignature = (splitSig) => Signature.from(splitSig).serialized;
+exports.TRON_MESSAGE_PREFIX = "\x19TRON Signed Message:\n";
+function hashMessage(message) {
+    if (typeof message === "string") {
+        message = toUtf8Bytes(message);
+    }
+    if (Array.isArray(message)) {
+        message = new Uint8Array(message);
+    }
+    return keccak256(concat([toUtf8Bytes(exports.TRON_MESSAGE_PREFIX), toUtf8Bytes(String(message.length)), message]));
+}
+function signMessage(message, privateKey) {
+    if (!privateKey.match(/^0x/)) {
+        privateKey = "0x" + privateKey;
+    }
+    const signingKey = new SigningKey(privateKey);
+    const messageDigest = hashMessage(message);
+    const signature = signingKey.sign(messageDigest);
+    return joinSignature(signature);
+}
+function verifyMessage(message, signature) {
+    if (!signature.match(/^0x/)) {
+        signature = "0x" + signature;
+    }
+    const recovered = recoverAddress(hashMessage(message), signature);
+    const base58Address = (0, crypto_1.getBase58CheckAddress)((0, code_1.hexStr2byteArray)(recovered.replace(/^0x/, address_1.ADDRESS_PREFIX)));
+    return base58Address;
+}
+//# sourceMappingURL=message.js.map

package/lib/minify-tron/message.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"message.js","sourceRoot":"","sources":["../../src/minify-tron/message.ts"],"names":[],"mappings":";AAAA,oFAAoF;;;AAapF,kCAUC;AAED,kCAUC;AAED,sCAQC;AA3CD,uCAA2C;AAC3C,qCAAiD;AACjD,iCAA0C;AAC1C,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AACtE,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACzD,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAExD,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC;AAE3D,QAAA,mBAAmB,GAAG,4BAA4B,CAAC;AAEhE,SAAgB,WAAW,CAAC,OAAO;IACjC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,OAAO,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,2BAAmB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;AAC7G,CAAC;AAED,SAAgB,WAAW,CAAC,OAAO,EAAE,UAAU;IAC7C,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,UAAU,GAAG,IAAI,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC;IAC9C,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAEjD,OAAO,aAAa,CAAC,SAAS,CAAC,CAAC;AAClC,CAAC;AAED,SAAgB,aAAa,CAAC,OAAO,EAAE,SAAS;IAC9C,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC;IAC/B,CAAC;IACD,MAAM,SAAS,GAAG,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC;IAClE,MAAM,aAAa,GAAG,IAAA,8BAAqB,EAAC,IAAA,uBAAgB,EAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,wBAAc,CAAC,CAAC,CAAC,CAAC;IAExG,OAAO,aAAa,CAAC;AACvB,CAAC"}

package/lib/{types/index.d.ts → types.d.ts}

@@ -39,7 +39,7 @@ export interface IWalletModel {
     secret: string;
 }
 export interface ICreateOptionsModel {
-    algorithm?: "ed25519" | "ecdsa-secp256k1";
+    algorithm?: "ed25519" | "secp256k1";
     entropy?: Uint8Array;
 }
 export interface IEncryptModel {
@@ -85,6 +85,19 @@ export interface IHDPlugin {
     hash(message: string, ...args: any[]): string;
     sign(message: string, ...args: any[]): string;
     verify(messgae: string, signature: string, address: string, ...args: any[]): boolean;
-    recover(message: string, signature: string, ...args: any[]): string;
-    proxy(functionName: string, ...args: any[]): any;
+    recover(message: string, signature: string, ...args: any[]): string | void;
+    getAddress?(secret: string): string;
+    createWallet?(opts?: ICreateOptionsModel): IWalletModel;
+    proxy?(functionName: string, ...args: any[]): any;
+}
+export declare enum Alphabet {
+    JINGTUM = "jpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65rkm8oFqi1tuvAxyz",
+    SWT = "jpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65rkm8oFqi1tuvAxyz",
+    RIPPLE = "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz",
+    CALL = "cpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2brdeCg65jkm8oFqi1tuvAxyz",
+    STREAM = "vpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1turAxyz",
+    BVCADT = "bpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2rcdeCg65jkm8oFqi1tuvAxyz",
+    BIZAIN = "bpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2jcdeCg65rkm8oFqi1tuvAxyz",
+    XRP = "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz",
+    SWTC = "jpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65rkm8oFqi1tuvAxyz"
 }

package/lib/types.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Alphabet = void 0;
+var Alphabet;
+(function (Alphabet) {
+    Alphabet["JINGTUM"] = "jpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65rkm8oFqi1tuvAxyz";
+    Alphabet["SWT"] = "jpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65rkm8oFqi1tuvAxyz";
+    Alphabet["RIPPLE"] = "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz";
+    Alphabet["CALL"] = "cpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2brdeCg65jkm8oFqi1tuvAxyz";
+    Alphabet["STREAM"] = "vpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1turAxyz";
+    Alphabet["BVCADT"] = "bpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2rcdeCg65jkm8oFqi1tuvAxyz";
+    Alphabet["BIZAIN"] = "bpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2jcdeCg65rkm8oFqi1tuvAxyz";
+    Alphabet["XRP"] = "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz";
+    Alphabet["SWTC"] = "jpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65rkm8oFqi1tuvAxyz";
+})(Alphabet || (exports.Alphabet = Alphabet = {}));
+//# sourceMappingURL=types.js.map

package/lib/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAwGA,IAAY,QAUX;AAVD,WAAY,QAAQ;IAClB,kFAAsE,CAAA;IACtE,8EAAkE,CAAA;IAClE,iFAAqE,CAAA;IACrE,+EAAmE,CAAA;IACnE,iFAAqE,CAAA;IACrE,iFAAqE,CAAA;IACrE,iFAAqE,CAAA;IACrE,8EAAkE,CAAA;IAClE,+EAAmE,CAAA;AACrE,CAAC,EAVW,QAAQ,wBAAR,QAAQ,QAUnB"}

package/lib/util/index.js

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encryptWallet = exports.encryptContact = exports.encrypt = exports.decrypt = void 0;
-var crypto_1 = __importDefault(require("crypto"));
-var jcc_common_1 = require("jcc_common");
-var keccak_1 = __importDefault(require("keccak"));
-var randombytes_1 = __importDefault(require("randombytes"));
-var scryptsy_1 = __importDefault(require("scryptsy"));
-var constant_1 = require("../constant");
+const crypto_1 = __importDefault(require("crypto"));
+const jcc_common_1 = require("jcc_common");
+const keccak_js_1 = require("ethereum-cryptography/keccak.js");
+const randombytes_1 = __importDefault(require("randombytes"));
+const scrypt_1 = require("@noble/hashes/scrypt");
+const constant_1 = require("../constant");
 /**
  * decrypt wallet with password
  *
@@ -18,22 +18,28 @@ var constant_1 = require("../constant");
  * @returns {(string)} return secret if success, otherwise throws `keystore is invalid` if the keystore is invalid or
  * throws `password is wrong` if the password is wrong
  */
-var decrypt = function (password, encryptData) {
+const decrypt = (password, encryptData) => {
     if ((0, jcc_common_1.isEmptyObject)(encryptData) || (0, jcc_common_1.isEmptyObject)(encryptData.crypto) || (0, jcc_common_1.isEmptyObject)(encryptData.crypto.kdfparams)) {
         throw new Error(constant_1.KEYSTORE_IS_INVALID);
     }
-    var iv = Buffer.from(encryptData.crypto.iv, "hex");
-    var kdfparams = encryptData.crypto.kdfparams;
-    var derivedKey = (0, scryptsy_1.default)(Buffer.from(password), Buffer.from(kdfparams.salt, "hex"), kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen);
-    var ciphertext = Buffer.from(encryptData.ciphertext, "hex");
-    var mac = (0, keccak_1.default)("keccak256")
+    const iv = Buffer.from(encryptData.crypto.iv, "hex");
+    const kdfparams = encryptData.crypto.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(encryptData.ciphertext, "hex");
+    const mac = keccak_js_1.keccak256
+        .create()
         .update(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))
         .digest();
-    if (mac.toString("hex") !== encryptData.mac) {
+    if (Buffer.from(mac).toString("hex") !== encryptData.mac) {
         throw new Error(constant_1.PASSWORD_IS_WRONG);
     }
-    var decipher = crypto_1.default.createDecipheriv("aes-128-ctr", derivedKey.slice(0, 16), iv);
-    var seed = Buffer.concat([decipher.update(ciphertext), decipher.final()]);
+    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();
 };
 exports.decrypt = decrypt;
@@ -45,41 +51,45 @@ exports.decrypt = decrypt;
  * @param {IEncryptModel} [opts={}]
  * @returns {IKeystoreModel}
  */
-var encrypt = function (password, data, opts) {
-    var iv = opts.iv || (0, randombytes_1.default)(16).toString("hex");
-    var kdfparams = {
+const encrypt = (password, data, opts) => {
+    const iv = opts.iv || (0, randombytes_1.default)(16).toString("hex");
+    const kdfparams = {
         dklen: opts.dklen || 32,
         n: opts.n || 4096,
         p: opts.p || 1,
         r: opts.r || 8,
         salt: opts.salt || (0, randombytes_1.default)(32).toString("hex")
     };
-    var derivedKey = (0, scryptsy_1.default)(Buffer.from(password), Buffer.from(kdfparams.salt, "hex"), kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen);
-    var cipher = crypto_1.default.createCipheriv(opts.cipher || "aes-128-ctr", derivedKey.slice(0, 16), Buffer.from(iv, "hex"));
-    var ciphertext = Buffer.concat([cipher.update(Buffer.from(data)), cipher.final()]);
-    var mac = (0, keccak_1.default)("keccak256")
+    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 cipher = crypto_1.default.createCipheriv(opts.cipher || "aes-128-ctr", derivedKey.slice(0, 16), Buffer.from(iv, "hex"));
+    const ciphertext = Buffer.concat([cipher.update(Buffer.from(data)), cipher.final()]);
+    const mac = keccak_js_1.keccak256
+        .create()
         .update(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))
         .digest();
     return {
         ciphertext: ciphertext.toString("hex"),
         crypto: {
             cipher: opts.cipher || "aes-128-ctr",
-            iv: iv,
+            iv,
             kdf: "scrypt",
-            kdfparams: kdfparams
+            kdfparams
         },
-        mac: mac.toString("hex")
+        mac: Buffer.from(mac).toString("hex")
     };
 };
 exports.encrypt = encrypt;
-var encryptContact = function (password, contacts, opts) {
-    if (opts === void 0) { opts = {}; }
+const encryptContact = (password, contacts, opts = {}) => {
     return encrypt(password, JSON.stringify(contacts), opts);
 };
 exports.encryptContact = encryptContact;
-var encryptWallet = function (password, keypairs, opts) {
-    if (opts === void 0) { opts = {}; }
-    var data = encrypt(password, keypairs.secret, opts);
+const encryptWallet = (password, keypairs, opts = {}) => {
+    const data = encrypt(password, keypairs.secret, opts);
     data.type = keypairs.type || "swt";
     data.address = keypairs.address;
     data.default = typeof keypairs.default === "boolean" ? keypairs.default : true;

package/lib/util/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA4B;AAC5B,yCAA2C;AAC3C,kDAAsC;AACtC,4DAAsC;AACtC,sDAA8B;AAC9B,wCAAqE;AAGrE;;;;;;;GAOG;AACH,IAAM,OAAO,GAAG,UAAC,QAAgB,EAAE,WAA2B;IAC5D,IAAI,IAAA,0BAAa,EAAC,WAAW,CAAC,IAAI,IAAA,0BAAa,EAAC,WAAW,CAAC,MAAM,CAAC,IAAI,IAAA,0BAAa,EAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAClH,MAAM,IAAI,KAAK,CAAC,8BAAmB,CAAC,CAAC;KACtC;IACD,IAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IACrD,IAAM,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC;IAC/C,IAAM,UAAU,GAAG,IAAA,kBAAM,EACvB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EACrB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,EAClC,SAAS,CAAC,CAAC,EACX,SAAS,CAAC,CAAC,EACX,SAAS,CAAC,CAAC,EACX,SAAS,CAAC,KAAK,CAChB,CAAC;IACF,IAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC9D,IAAM,GAAG,GAAG,IAAA,gBAAgB,EAAC,WAAW,CAAC;SACtC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;SAC7D,MAAM,EAAE,CAAC;IACZ,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,WAAW,CAAC,GAAG,EAAE;QAC3C,MAAM,IAAI,KAAK,CAAC,4BAAiB,CAAC,CAAC;KACpC;IACD,IAAM,QAAQ,GAAG,gBAAM,CAAC,gBAAgB,CAAC,aAAa,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACrF,IAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC5E,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;AACzB,CAAC,CAAC;AAyDO,0BAAO;AAvDhB;;;;;;;GAOG;AACH,IAAM,OAAO,GAAG,UAAC,QAAgB,EAAE,IAAY,EAAE,IAAmB;IAClE,IAAM,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,IAAA,qBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,IAAM,SAAS,GAAG;QAChB,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;QACvB,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,IAAI;QACjB,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC;QACd,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC;QACd,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAA,qBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;KACnD,CAAC;IACF,IAAM,UAAU,GAAG,IAAA,kBAAM,EACvB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EACrB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,EAClC,SAAS,CAAC,CAAC,EACX,SAAS,CAAC,CAAC,EACX,SAAS,CAAC,CAAC,EACX,SAAS,CAAC,KAAK,CAChB,CAAC;IACF,IAAM,MAAM,GAAG,gBAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,IAAI,aAAa,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;IACpH,IAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACrF,IAAM,GAAG,GAAG,IAAA,gBAAgB,EAAC,WAAW,CAAC;SACtC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;SAC7D,MAAM,EAAE,CAAC;IACZ,OAAO;QACL,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC;QACtC,MAAM,EAAE;YACN,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,aAAa;YACpC,EAAE,IAAA;YACF,GAAG,EAAE,QAAQ;YACb,SAAS,WAAA;SACV;QACD,GAAG,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC;KACzB,CAAC;AACJ,CAAC,CAAC;AAegB,0BAAO;AAbzB,IAAM,cAAc,GAAG,UAAC,QAAgB,EAAE,QAAa,EAAE,IAAwB;IAAxB,qBAAA,EAAA,SAAwB;IAC/E,OAAO,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;AAC3D,CAAC,CAAC;AAWyB,wCAAc;AATzC,IAAM,aAAa,GAAG,UAAC,QAAgB,EAAE,QAAwB,EAAE,IAAwB;IAAxB,qBAAA,EAAA,SAAwB;IACzF,IAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACtD,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,IAAI,KAAK,CAAC;IACnC,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IAChC,IAAI,CAAC,OAAO,GAAG,OAAO,QAAQ,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/E,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC;IAClC,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEyC,sCAAa"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jcc_wallet",
-  "version": "3.0.2",
+  "version": "4.0.1",
   "description": "Toolkit of wallet to manage multiple chains & support multiple keystores for each chain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -19,7 +19,8 @@
     "test:browser": "npm run build && karma start karma.conf.js",
     "eslint": "./node_modules/.bin/eslint src",
     "compile": "./compile.sh",
-    "pretty": "pretty-quick --staged"
+    "pretty": "pretty-quick --staged",
+    "analyzer": "cross-env REPORT=true webpack"
   },
   "repository": {
     "type": "git",
@@ -50,17 +51,18 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.15",
     "@types/eslint": "^8",
-    "@typescript-eslint/eslint-plugin": "^6.11.0",
-    "@typescript-eslint/parser": "^6.11.0",
+    "@typescript-eslint/eslint-plugin": "^7.12.0",
+    "@typescript-eslint/parser": "^7.12.0",
     "babel-loader": "^8.3.0",
     "browserify": "^16.5.0",
     "chai": "^4.2.0",
     "coveralls": "^3.1.1",
     "cross-env": "^7.0.0",
     "duplicate-package-checker-webpack-plugin": "^3.0.0",
-    "eslint": "^8.54.0",
+    "eslint": "^9.4.0",
     "eslint-plugin-jsdoc": "^46.9.0",
     "eslint-plugin-prefer-arrow": "^1.2.3",
+    "globals": "^15.8.0",
     "husky": "^7.0.4",
     "jsdom": "^22.1.0",
     "karma": "^6.4.2",
@@ -78,32 +80,35 @@
     "sinon": "^17.0.1",
     "ts-loader": "^6.2.1",
     "typescript": "^5.2.2",
+    "typescript-eslint": "^7.16.0",
     "webpack": "^5.89.0",
     "webpack-bundle-analyzer": "^4.10.1",
     "webpack-cli": "^5.1.4"
   },
+  "resolutions": {
+    "@noble/curves": "^1.4.2",
+    "@noble/hashes": "^1.4.0",
+    "randombytes": "^2.1.0",
+    "create-hmac": "^1.1.7",
+    "create-hash": "^1.2.0",
+    "browserify-aes": "^1.2.0",
+    "elliptic": "^6.5.5",
+    "buffer": "^6.0.3"
+  },
   "dependencies": {
-    "@ethereumjs/util": "^9.0.0",
-    "@ethereumjs/wallet": "^2.0.0",
-    "@swtc/wallet": "^1.1.1",
+    "@scure/bip32": "^1.4.0",
     "@types/node": "^16.11.6",
-    "bip32": "^4.0.0",
     "bip39": "^3.0.4",
     "bip44-constants": "^123.0.0",
     "bn.js": "^5.2.1",
     "clone-deep": "^4.0.1",
     "eccrypto": "^1.1.6",
-    "elliptic": "^6.5.4",
-    "eosjs": "^22.1.0",
     "eosjs-ecc": "^4.0.1",
+    "ethereum-cryptography": "^2.2.1",
+    "ethers": "^6.13.1",
     "jcc_common": "^0.1.0",
-    "keccak": "^3.0.3",
     "lockr": "^0.8.5",
     "node-polyfill-webpack-plugin": "^2.0.1",
-    "scryptsy": "^2.1.0",
-    "secp256k1": "^5.0.0",
-    "tiny-secp256k1": "^1.1.6",
-    "tronweb": "^5.3.1",
     "wif": "^4.0.0"
   },
   "nyc": {

package/lib/constant/index.js.map

@@ -1 +0,0 @@
-{"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,mBAAY,iBAAiB,CAAE,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,37 +0,0 @@
-import { IWalletModel } from "../types";
-/**
- * check eth secret is valid or not
- *
- * @param {string} secret
- * @returns {boolean} return true if valid
- */
-declare const isValidSecret: (secret: string) => boolean;
-/**
- * check eth address is valid or not
- *
- * @param {string} address
- * @returns {boolean} return true if valid
- */
-declare const isValidAddress: (address: string) => boolean;
-/**
- * get eth address with secret
- * @param {string} secret
- * @returns {string | null} return address if valid, otherwise return null
- */
-declare const getAddress: (secret: string) => string | null;
-/**
- * decrypt ethereum keystore file with ethereum password
- *
- * @param {string} password
- * @param {*} encryptData
- * @returns {string} return secret if success, otherwise throws `keystore is invalid` if the keystore is invalid or
- * throws `ethereum password is wrong` if the password is wrong
- */
-declare const decryptKeystore: (password: string, encryptData: any) => string;
-/**
- * create eth wallet
- *
- * @returns {IWalletModel}
- */
-declare const createWallet: () => IWalletModel;
-export { isValidSecret, isValidAddress, getAddress, decryptKeystore, createWallet };

package/lib/eth/index.js

@@ -1,98 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createWallet = exports.decryptKeystore = exports.getAddress = exports.isValidAddress = exports.isValidSecret = void 0;
-var crypto_1 = __importDefault(require("crypto"));
-var util_1 = require("@ethereumjs/util");
-var wallet_1 = require("@ethereumjs/wallet");
-var jcc_common_1 = require("jcc_common");
-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]";
-};
-/**
- * check eth secret is valid or not
- *
- * @param {string} secret
- * @returns {boolean} return true if valid
- */
-var isValidSecret = function (secret) {
-    secret = (0, jcc_common_1.filterOx)(secret);
-    try {
-        return (0, util_1.isValidPrivate)(Buffer.from(secret, "hex"));
-    }
-    catch (error) {
-        return false;
-    }
-};
-exports.isValidSecret = isValidSecret;
-/**
- * check eth address is valid or not
- *
- * @param {string} address
- * @returns {boolean} return true if valid
- */
-var isValidAddress = function (address) {
-    return (0, util_1.isValidAddress)(address);
-};
-exports.isValidAddress = isValidAddress;
-/**
- * get eth address with secret
- * @param {string} secret
- * @returns {string | null} return address if valid, otherwise return null
- */
-var getAddress = function (secret) {
-    secret = (0, jcc_common_1.filterOx)(secret);
-    if (!isValidSecret(secret)) {
-        return null;
-    }
-    var wallet = wallet_1.Wallet.fromPrivateKey(Buffer.from(secret, "hex"));
-    return wallet.getAddressString();
-};
-exports.getAddress = getAddress;
-/**
- * decrypt ethereum keystore file with ethereum password
- *
- * @param {string} password
- * @param {*} encryptData
- * @returns {string} return secret if success, otherwise throws `keystore is invalid` if the keystore is invalid or
- * throws `ethereum password is wrong` if the password is wrong
- */
-var decryptKeystore = function (password, encryptData) {
-    if (!isObject(encryptData)) {
-        throw new Error(constant_1.KEYSTORE_IS_INVALID);
-    }
-    var 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);
-    }
-    var iv = Buffer.from(cryptoData.cipherparams.iv, "hex");
-    var kdfparams = cryptoData.kdfparams;
-    var derivedKey = (0, 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 = (0, 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_1.default.createDecipheriv("aes-128-ctr", derivedKey.slice(0, 16), iv);
-    var seed = Buffer.concat([decipher.update(ciphertext), decipher.final()]);
-    return seed.toString("hex");
-};
-exports.decryptKeystore = decryptKeystore;
-/**
- * create eth wallet
- *
- * @returns {IWalletModel}
- */
-var createWallet = function () {
-    var _w = wallet_1.Wallet.generate();
-    return { address: _w.getAddressString(), secret: _w.getPrivateKeyString() };
-};
-exports.createWallet = createWallet;
-//# sourceMappingURL=index.js.map

package/lib/eth/index.js.map

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