jcc_wallet 4.0.5 → 4.0.7

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

@@ -1,6 +1,7 @@
-import { IHDPlugin } from "../types";
+import { IHDPlugin, IKeyPair } from "../types";
 export interface IEosPlugin extends IHDPlugin {
     checkPrivateKey(privateKey: string): string;
     privateKeyToLegacyString(privateKey: string): string;
+    getKeyPairFromPrivateKey(privateKey: string): IKeyPair | null;
 }
 export declare const plugin: IEosPlugin;

package/lib/hd/eos.plugin.js

@@ -77,5 +77,25 @@ exports.plugin = {
     recover(message, signature) {
         const s = Signature_1.Signature.fromString(signature);
         return s.recover(message).toLegacyString();
+    },
+    getKeyPairFromPrivateKey(privateKey) {
+        try {
+            const key = exports.plugin.checkPrivateKey(privateKey);
+            if (!exports.plugin.isValidSecret(key)) {
+                return null;
+            }
+            const eosPrivateKey = exports.plugin.privateKeyToLegacyString(key);
+            const pk = PrivateKey_1.PrivateKey.fromString(eosPrivateKey);
+            const pubKey = pk.getPublicKey();
+            const point = pubKey.toPoint();
+            const publicKey = point.toHex(true);
+            return {
+                privateKey: key,
+                publicKey
+            };
+        }
+        catch (_a) {
+            return null;
+        }
     }
 };

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

@@ -1,6 +1,7 @@
-import { IHDPlugin } from "../types";
+import { IKeyPair, IHDPlugin } from "../types";
 export interface IEthereumPlugin extends IHDPlugin {
     checkPrivateKey(privateKey: string): string;
     decryptKeystore(password: string, encryptData: any): Promise<string>;
+    getKeyPairFromPrivateKey(privateKey: string): IKeyPair | null;
 }
 export declare const plugin: IEthereumPlugin;

package/lib/hd/ethereum.plugin.js

@@ -111,5 +111,21 @@ exports.plugin = {
         const priv = (0, utils_js_1.randomBytes)(32);
         const address = exports.plugin.getAddress((0, bytes_1.bytesToHex)(priv));
         return { address, secret: (0, bytes_1.bytesToHex)(priv) };
+    },
+    getKeyPairFromPrivateKey(privateKey) {
+        try {
+            const key = exports.plugin.checkPrivateKey(privateKey);
+            if (!exports.plugin.isValidSecret(key)) {
+                return null;
+            }
+            const publicKey = secp256k1_js_1.secp256k1.ProjectivePoint.fromPrivateKey(Buffer.from((0, internal_1.stripHexPrefix)(key), "hex")).toHex(false);
+            return {
+                privateKey: key,
+                publicKey: publicKey.substring(2)
+            };
+        }
+        catch (_a) {
+            return null;
+        }
     }
 };

package/lib/hd/index.d.ts

@@ -71,7 +71,7 @@ export declare class HDWallet {
      * @param {number} index bip44 last level index
      * @returns {IKeyPair} return keypair object
      */
-    static getHDKeypair: (rootSecret: string, chain: number, account: number, index: number) => IKeyPair;
+    static getHDKeypair: (rootSecret: string, chain: number, account: number, index: number, change?: number) => IKeyPair;
     /**
      * generate hd wallet
      *

package/lib/hd/index.js

@@ -88,10 +88,13 @@ class HDWallet {
             if (isNaN(opt.chain) || isNaN(opt.account) || isNaN(opt.index)) {
                 return null;
             }
-            const hdKeypair = HDWallet.getHDKeypair(this._secret, opt.chain, opt.account, opt.index);
+            if (isNaN(opt.change)) {
+                opt.change = 0;
+            }
+            const hdKeypair = HDWallet.getHDKeypair(this._secret, opt.chain, opt.account, opt.index, opt.change);
             return new HDWallet({
                 keypair: hdKeypair,
-                path: { chain: opt.chain, account: opt.account, change: 0, index: opt.index }
+                path: { chain: opt.chain, account: opt.account, change: opt.change, index: opt.index }
             });
         };
         /**
@@ -327,7 +330,7 @@ HDWallet.getKeypairFromSecret = (secret) => {
  * @param {number} index bip44 last level index
  * @returns {IKeyPair} return keypair object
  */
-HDWallet.getHDKeypair = (rootSecret, chain, account = 0, index) => {
+HDWallet.getHDKeypair = (rootSecret, chain, account = 0, index, change = 0) => {
     const bip44Chain = (0, constant_1.getBIP44Chain)(chain);
     if (bip44Chain.length === 0) {
         return null;
@@ -336,7 +339,7 @@ HDWallet.getHDKeypair = (rootSecret, chain, account = 0, index) => {
     const mnemonic = HDWallet.getMnemonicFromSecret(rootSecret);
     const seed = BIP39.mnemonicToSeedSync(mnemonic);
     const b32 = bip32_1.HDKey.fromMasterSeed(seed);
-    const privateKey = b32.derive(`m/44'/${chainIdx}'/${account}'/0/${index}`).privateKey;
+    const privateKey = b32.derive(`m/44'/${chainIdx}'/${account}'/${change}/${index}`).privateKey;
     return keypair.deriveKeyPair(Buffer.from(privateKey).toString("hex"));
 };
 /**

package/lib/hd/swtc.plugin.js

@@ -70,6 +70,14 @@ const SWTCPlugin = (alphabet) => {
             return null;
         }
     };
+    const getKeyPairFromPrivateKey = (privateKey) => {
+        try {
+            return Wallet.deriveKeyPair(privateKey);
+        }
+        catch (_a) {
+            return null;
+        }
+    };
     return {
         isValidAddress,
         isValidSecret,
@@ -79,7 +87,8 @@ const SWTCPlugin = (alphabet) => {
         createWallet,
         getAddress,
         recover,
-        address
+        address,
+        getKeyPairFromPrivateKey
     };
 };
 exports.SWTCPlugin = SWTCPlugin;

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

@@ -1,5 +1,6 @@
-import { IHDPlugin } from "../types";
+import { IHDPlugin, IKeyPair } from "../types";
 export interface ITronPlugin extends IHDPlugin {
     checkPrivateKey(privateKey: string): string;
+    getKeyPairFromPrivateKey(privateKey: string): IKeyPair | null;
 }
 export declare const plugin: ITronPlugin;

package/lib/hd/tron.plugin.js

@@ -57,5 +57,24 @@ exports.plugin = {
     },
     recover(message, signature) {
         return (0, message_1.verifyMessage)(message, signature);
+    },
+    getKeyPairFromPrivateKey(privateKey) {
+        try {
+            const key = exports.plugin.checkPrivateKey(privateKey);
+            if (!exports.plugin.isValidSecret(key)) {
+                return null;
+            }
+            const pubBytes = (0, crypto_1.getPubKeyFromPriKey)((0, code_1.hexStr2byteArray)(key));
+            const publicKey = Array.from(pubBytes)
+                .map((b) => b.toString(16).padStart(2, "0"))
+                .join("");
+            return {
+                privateKey: key,
+                publicKey
+            };
+        }
+        catch (_a) {
+            return null;
+        }
     }
 };

package/lib/types.d.ts

@@ -89,6 +89,7 @@ export interface IHDPlugin {
     getAddress?(secret: string): string;
     createWallet?(opts?: ICreateOptionsModel): IWalletModel;
     proxy?(functionName: string, ...args: any[]): any;
+    getKeyPairFromPrivateKey?(privateKey: string): IKeyPair | null;
 }
 export declare enum Alphabet {
     JINGTUM = "jpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65rkm8oFqi1tuvAxyz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jcc_wallet",
-  "version": "4.0.5",
+  "version": "4.0.7",
   "description": "Toolkit of wallet to manage multiple chains & support multiple keystores for each chain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",