@yerofey/cryptowallet-cli 1.41.2 → 1.43.0

package/cli.js

@@ -16,7 +16,9 @@ import Method from './src/Method.js';
 import chalk from 'chalk';
 
 // load environment variables
-config();
+config({
+  quiet: true,
+});
 
 // get the current file path
 const __filename = fileURLToPath(import.meta.url);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yerofey/cryptowallet-cli",
-  "version": "1.41.2",
+  "version": "1.43.0",
   "description": "Crypto wallet generator CLI tool",
   "type": "module",
   "homepage": "https://github.com/yerofey/cryptowallet-cli",
@@ -116,45 +116,47 @@
   ],
   "dependencies": {
     "@binance-chain/javascript-sdk": "^4.2.2",
-    "@emurgo/cardano-serialization-lib-nodejs": "^14.1.1",
-    "@harmony-js/account": "^0.1.58",
+    "@emurgo/cardano-serialization-lib-nodejs": "^15.0.1",
+    "@harmony-js/account": "^0.1.57",
     "@mysten/sui": "^1.18.0",
-    "@solana/web3.js": "^1.98.0",
-    "@ton/core": "^0.60.0",
+    "@solana/web3.js": "^1.98.4",
+    "@ton/core": "^0.61.0",
     "@ton/crypto": "^3.3.0",
-    "@ton/ton": "^15.1.0",
+    "@ton/ton": "^15.3.1",
     "@yerofey/dogecoin-bip84": "^0.0.5",
     "@yerofey/litecoin-bip84": "^0.0.5",
     "bigint-buffer": "^1.1.5",
+    "bip32": "^5.0.0",
     "bip39": "^3.1.0",
     "bip84": "^0.2.9",
     "bip86": "^0.0.4",
     "bs58": "^6.0.0",
     "cardano-wallet-js": "^1.4.0",
-    "chalk": "5.4.1",
+    "chalk": "5.6.2",
     "clipboardy": "^4.0.0",
     "coininfo": "5.2.1",
     "coinkey": "3.0.0",
     "columnify": "1.6.0",
-    "commander": "^13.1.0",
+    "commander": "^14.0.1",
     "csv-writer": "^1.6.0",
-    "dotenv": "^16.4.7",
+    "dotenv": "^17.2.2",
     "ed25519-hd-key": "^1.3.0",
     "eth-lib": "0.1.29",
     "ethereum-bip84": "0.0.3",
-    "ethereum-cryptography": "^3.1.0",
+    "ethereum-cryptography": "^3.2.0",
     "ethereum-mnemonic-privatekey-utils": "1.0.5",
     "qrcode-terminal": "^0.12.0",
     "ripple-address-codec": "^5.0.0",
     "ripple-keypairs": "^2.0.0",
-    "stellar-hd-wallet": "^0.0.10",
+    "stellar-hd-wallet": "^1.0.2",
     "tezos-sign": "1.4.1",
+    "tiny-secp256k1": "^2.2.4",
     "tonweb": "^0.0.66",
-    "tronweb": "^6.0.1",
+    "tronweb": "^6.0.4",
     "xrpl": "^4.2.0"
   },
   "devDependencies": {
-    "ava": "^6.2.0",
-    "eslint": "^9.17.0"
+    "ava": "^6.4.1",
+    "eslint": "^9.35.0"
   }
 }

package/src/Method.js

@@ -9,7 +9,9 @@ import CW from './CW.js';
 import { generateMnemonicString } from './Wallet.js';
 import { log, supportedChains, loadJson } from './utils.js';
 
-config();
+config({
+  quiet: true,
+});
 
 const {
   blue,

package/src/Wallet.js

@@ -6,6 +6,8 @@ const { red, yellow, gray } = chalk;
 import CoinKey from 'coinkey';
 import CoinInfo from 'coininfo';
 import bip39 from 'bip39';
+import { BIP32Factory } from 'bip32';
+import * as ecc from 'tiny-secp256k1';
 import bip84 from 'bip84';
 const { fromMnemonic, fromZPrv } = bip84;
 import bip86 from 'bip86';
@@ -46,7 +48,11 @@ import StellarHDWallet from 'stellar-hd-wallet';
 import { Seed as CardanoSeed } from 'cardano-wallet-js';
 import CardanoWasm from '@emurgo/cardano-serialization-lib-nodejs';
 
-config();
+const bip32 = BIP32Factory(ecc);
+
+config({
+  quiet: true,
+});
 
 class Wallet {
   constructor(cw) {
@@ -410,32 +416,64 @@ class Wallet {
 
       const mnemonic = mnemonicString || bip39.generateMnemonic();
 
-      const root =
-        row.format == 'taproot'
-          ? new fromMnemonicBip86(mnemonic, '')
-          : new fromMnemonic(mnemonic, '');
-      const child =
-        row.format == 'taproot' ? root.deriveAccount(0) : root.deriveAccount(0);
-      const account =
-        row.format == 'taproot' ? new fromXPrv(child) : new fromZPrv(child);
+      if (row.format == 'legacy') {
+        const seed = bip39.mnemonicToSeedSync(mnemonic);
+        const root = bip32.fromSeed(seed);
+        const coinPath = normalizeLegacyPath(row.path, "m/44'/0'");
+        const accountNode = root.derivePath(`${coinPath}/0'`);
+        const changeNode = accountNode.derive(0);
+        const coinInfo = CoinInfo(chain).versions;
+
+        let addresses = [];
+        if (number >= 1) {
+          for (let i = 0; i < number; i++) {
+            const child = changeNode.derive(i);
+            const key = new CoinKey(child.privateKey, coinInfo);
+            key.compressed = true;
+            addresses.push({
+              index: i,
+              address: key.publicAddress,
+              privateKey: key.privateWif,
+            });
+          }
+        }
 
-      let addresses = [];
-      if (number >= 1) {
-        for (let i = 0; i < number; i++) {
-          addresses.push({
-            index: i,
-            address: account.getAddress(i, false, row.purpose),
-            privateKey: account.getPrivateKey(i),
-          });
+        Object.assign(result, {
+          format: row.format,
+          addresses,
+          privateExtendedKey: accountNode.toBase58(),
+          mnemonic,
+        });
+      } else {
+        const root =
+          row.format == 'taproot'
+            ? new fromMnemonicBip86(mnemonic, '')
+            : new fromMnemonic(mnemonic, '');
+        const child =
+          row.format == 'taproot'
+            ? root.deriveAccount(0)
+            : root.deriveAccount(0);
+        const account =
+          row.format == 'taproot' ? new fromXPrv(child) : new fromZPrv(child);
+
+        let addresses = [];
+        if (number >= 1) {
+          for (let i = 0; i < number; i++) {
+            addresses.push({
+              index: i,
+              address: account.getAddress(i, false, row.purpose),
+              privateKey: account.getPrivateKey(i),
+            });
+          }
         }
-      }
 
-      Object.assign(result, {
-        format: row.format,
-        addresses,
-        privateExtendedKey: account.getAccountPrivateKey(),
-        mnemonic,
-      });
+        Object.assign(result, {
+          format: row.format,
+          addresses,
+          privateExtendedKey: account.getAccountPrivateKey(),
+          mnemonic,
+        });
+      }
     } else if (chain == 'DOGE' || chain == 'LTC') {
       // Validate mnemonic
       if (mnemonicString != '' && !bip39.validateMnemonic(mnemonicString)) {
@@ -444,31 +482,62 @@ class Wallet {
         };
       }
 
-      const _fromMnemonic =
-        chain == 'DOGE' ? fromMnemonicDoge : fromMnemonicLite;
-      const _fromZPrv = chain == 'DOGE' ? fromZPrvDoge : fromZPrvLite;
       const mnemonic = mnemonicString || bip39.generateMnemonic();
-      const root = new _fromMnemonic(mnemonic, '');
-      const child = root.deriveAccount(0);
-      const account = new _fromZPrv(child);
+      if (row.format == 'legacy') {
+        const seed = bip39.mnemonicToSeedSync(mnemonic);
+        const root = bip32.fromSeed(seed);
+        const fallbackPath = chain == 'DOGE' ? "m/44'/3'" : "m/44'/2'";
+        const coinPath = normalizeLegacyPath(row.path, fallbackPath);
+        const accountNode = root.derivePath(`${coinPath}/0'`);
+        const changeNode = accountNode.derive(0);
+        const coinInfo = CoinInfo(chain).versions;
+
+        let addresses = [];
+        if (number >= 1) {
+          for (let i = 0; i < number; i++) {
+            const child = changeNode.derive(i);
+            const key = new CoinKey(child.privateKey, coinInfo);
+            key.compressed = true;
+            addresses.push({
+              index: i,
+              address: key.publicAddress,
+              privateKey: key.privateWif,
+            });
+          }
+        }
 
-      let addresses = [];
-      if (number >= 1) {
-        for (let i = 0; i < number; i++) {
-          addresses.push({
-            index: i,
-            address: account.getAddress(i, false, row.purpose),
-            privateKey: account.getPrivateKey(i),
-          });
+        Object.assign(result, {
+          format: row.format,
+          addresses,
+          privateExtendedKey: accountNode.toBase58(),
+          mnemonic,
+        });
+      } else {
+        const _fromMnemonic =
+          chain == 'DOGE' ? fromMnemonicDoge : fromMnemonicLite;
+        const _fromZPrv = chain == 'DOGE' ? fromZPrvDoge : fromZPrvLite;
+        const root = new _fromMnemonic(mnemonic, '');
+        const child = root.deriveAccount(0);
+        const account = new _fromZPrv(child);
+
+        let addresses = [];
+        if (number >= 1) {
+          for (let i = 0; i < number; i++) {
+            addresses.push({
+              index: i,
+              address: account.getAddress(i, false, row.purpose),
+              privateKey: account.getPrivateKey(i),
+            });
+          }
         }
-      }
 
-      Object.assign(result, {
-        format: row.format,
-        addresses,
-        privateExtendedKey: account.getAccountPrivateKey(),
-        mnemonic,
-      });
+        Object.assign(result, {
+          format: row.format,
+          addresses,
+          privateExtendedKey: account.getAccountPrivateKey(),
+          mnemonic,
+        });
+      }
     } else if (row.format == 'BEP2') {
       // Validate mnemonic
       if (mnemonicString != '' && !bip39.validateMnemonic(mnemonicString)) {
@@ -922,4 +991,11 @@ function generateMnemonicString(length = 12) {
   return bip39.generateMnemonic(entropy);
 }
 
+function normalizeLegacyPath(pathValue, fallbackPath) {
+  const basePath = (pathValue && pathValue.trim()) || fallbackPath || '';
+  if (basePath === '') return basePath;
+  if (basePath.endsWith("'")) return basePath;
+  return basePath.replace(/\/(\d+)$/, "/$1'");
+}
+
 export { generateMnemonicString, Wallet };