@yerofey/cryptowallet-cli 1.2.11 → 1.2.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yerofey/cryptowallet-cli",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "homepage": "https://github.com/yerofey/cryptowallet-cli",
   "author": "Yerofey S. <pm@yerofey.dev> (https://github.com/yerofey)",
   "bin": {
@@ -61,19 +61,19 @@
     "@yerofey/dogecoin-bip84": "^0.0.5",
     "@yerofey/litecoin-bip84": "^0.0.5",
     "bip39": "3.0.4",
-    "bip84": "^0.2.6",
+    "bip84": "0.2.6",
     "chalk": "4.1.2",
     "coininfo": "5.1.0",
     "coinkey": "3.0.0",
     "columnify": "1.5.4",
     "commander": "8.1.0",
     "eth-lib": "0.1.29",
+    "ethereum-bip84": "0.0.3",
     "ethereum-mnemonic-privatekey-utils": "1.0.5",
     "tezos-sign": "1.4.1",
     "tronweb": "4.0.0"
   },
   "devDependencies": {
-    "ava": "^3.15.0",
-    "ethereum-bip84": "0.0.2"
+    "ava": "^3.15.0"
   }
 }

package/src/Wallet.js

@@ -169,19 +169,36 @@ class Wallet {
                 }
             }
     
+            let addresses = [];
             const mnemonic = mnemonicString || bip39.generateMnemonic();
-            const privateKey = bCrypto.getPrivateKeyFromMnemonic(mnemonic, true, 0);
-    
+
+            if (number == 1) {
+                const privateKey = bCrypto.getPrivateKeyFromMnemonic(mnemonic, true, 0);
+                addresses.push({
+                    address: bCrypto.getAddressFromPrivateKey(privateKey, 'bnb'),
+                    privateKey
+                });
+            } else {
+                for (let i = 0; i <= number; i++) {
+                    const privateKey = bCrypto.getPrivateKeyFromMnemonic(mnemonic, true, i);
+                    addresses.push({
+                        index: i,
+                        address: bCrypto.getAddressFromPrivateKey(privateKey, 'bnb'),
+                        privateKey
+                    });
+                }
+            }
+
             Object.assign(result, {
                 format: 'BEP2',
-                address: bCrypto.getAddressFromPrivateKey(privateKey, 'bnb'),
-                privateKey,
+                addresses,
                 mnemonic
             });
         } else if (row.network == 'EVM') {
             const bip39 = require('bip39');
             const pkutils = require('ethereum-mnemonic-privatekey-utils');
             const { Account } = require('eth-lib/lib');
+            const { fromMnemonic, fromZPrv } = require('ethereum-bip84');
     
             if (mnemonicString != '' && !bip39.validateMnemonic(mnemonicString)) {
                 return {
@@ -189,14 +206,37 @@ class Wallet {
                 }
             }
     
+            let addresses = [];
             const mnemonic = mnemonicString || bip39.generateMnemonic();
             const privateKey = pkutils.getPrivateKeyFromMnemonic(mnemonic);
-            const account = Account.fromPrivate('0x' + privateKey);
-    
+
+            if (number == 1) {
+                const account = Account.fromPrivate('0x' + privateKey);
+
+                addresses.push({
+                    address: account.address,
+                    privateKey
+                });
+            } else {
+                // TODO: add variable for accountId
+                const root = new fromMnemonic(mnemonic, '');
+                const child = root.deriveAccount(0);
+                const account = new fromZPrv(child);
+                for (let walletId = 0; walletId <= number; walletId++) {
+                    const walletAddress = account.getAddress(walletId);
+                    const privateKey = account.getPrivateKey(walletId);
+
+                    addresses.push({
+                        index: walletId,
+                        address: walletAddress,
+                        privateKey
+                    });
+                }
+            }
+            
             Object.assign(result, {
                 format: row.format || '',
-                address: account.address,
-                privateKey: privateKey,
+                addresses,
                 mnemonic
             });
         } else if (coin == 'ONE') {

package/src/coins/BNB.json

@@ -14,6 +14,7 @@
             "flags": [
                 "f",
                 "m",
+                "n",
                 "p"
             ]
         },
@@ -30,6 +31,7 @@
             "flags": [
                 "f",
                 "m",
+                "n",
                 "p"
             ]
         },
@@ -46,6 +48,7 @@
             "flags": [
                 "f",
                 "m",
+                "n",
                 "p"
             ]
         }

package/src/coins/ERC.json

@@ -10,6 +10,7 @@
     ],
     "flags": [
         "m",
+        "n",
         "p"
     ]
 }

package/src/coins/ETC.json

@@ -13,6 +13,7 @@
             ],
             "flags": [
                 "m",
+                "n",
                 "p"
             ]
         }

package/src/coins/ETH.json

@@ -9,6 +9,7 @@
     ],
     "flags": [
         "m",
+        "n",
         "p"
     ]
 }

package/src/coins/POLYGON.json

@@ -9,6 +9,7 @@
     ],
     "flags": [
         "m",
+        "n",
         "p"
     ]
 }