@yerofey/cryptowallet-cli 1.19.0 → 1.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yerofey/cryptowallet-cli",
-  "version": "1.19.0",
+  "version": "1.20.0",
   "description": "Crypto wallet generator CLI tool",
   "type": "module",
   "homepage": "https://github.com/yerofey/cryptowallet-cli",
@@ -120,6 +120,7 @@
     "commander": "11.1.0",
     "csv-writer": "^1.6.0",
     "dotenv": "^16.4.1",
+    "ed25519-hd-key": "^1.3.0",
     "eth-lib": "0.1.29",
     "ethereum-bip84": "0.0.3",
     "ethereum-mnemonic-privatekey-utils": "1.0.5",

package/src/Wallet.js

@@ -24,6 +24,7 @@ import {
   Keypair as SolanaKeypair,
   PublicKey as SolanaPublickey,
 } from '@solana/web3.js';
+import { derivePath } from 'ed25519-hd-key';
 import bs58 from 'bs58';
 import TonWeb from 'tonweb';
 import {
@@ -428,10 +429,21 @@ class Wallet {
         mnemonic,
       });
     } else if (chain == 'SOL') {
-      // TODO: generate wallet from mnemonic
-      const wallet = SolanaKeypair.generate();
-      const publicKeyString = new SolanaPublickey(wallet.publicKey).toBase58();
-      const secretKeyString = bs58.encode(wallet.secretKey);
+      // Validate mnemonic
+      if (mnemonicString != '' && !bip39.validateMnemonic(mnemonicString)) {
+        return {
+          error: 'mnemonic is not valid',
+        };
+      }
+
+      const mnemonic = mnemonicString || generateMnemonicString(24);
+      const seed = await bip39.mnemonicToSeed(mnemonic);
+      const derivationPath = "m/44'/501'/0'/0'";
+      const derivedSeed = derivePath(derivationPath, seed.toString('hex')).key;
+      const keypair = SolanaKeypair.fromSeed(derivedSeed);
+      const publicKey = new SolanaPublickey(keypair.publicKey);
+      const publicKeyString = publicKey.toString();
+      const secretKeyString = bs58.encode(keypair.secretKey);
 
       // TODO: add support for multiple addresses
 
@@ -443,6 +455,7 @@ class Wallet {
             privateKey: secretKeyString,
           },
         ],
+        mnemonic,
       });
     } else if (chain == 'TON') {
       // Validate mnemonic