@yerofey/cryptowallet-cli 1.17.4 → 1.17.7

package/README.md

@@ -47,6 +47,7 @@ $ cw -c btc
 $ cw -m
 
 # generate random mnemonic string of a specific length (12, 18, or 24 words)
+$ cw -m 12
 $ cw -m 18
 $ cw -m 24
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yerofey/cryptowallet-cli",
-  "version": "1.17.4",
+  "version": "1.17.7",
   "description": "Crypto wallet generator CLI tool",
   "type": "module",
   "homepage": "https://github.com/yerofey/cryptowallet-cli",
@@ -77,7 +77,6 @@
     "@solana/web3.js": "^1.89.1",
     "@ton/core": "^0.54.0",
     "@ton/crypto": "^3.2.0",
-    "@ton/ton": "^13.9.0",
     "@yerofey/dogecoin-bip84": "^0.0.5",
     "@yerofey/litecoin-bip84": "^0.0.5",
     "bip39": "3.1.0",
@@ -94,6 +93,7 @@
     "ethereum-bip84": "0.0.3",
     "ethereum-mnemonic-privatekey-utils": "1.0.5",
     "tezos-sign": "1.4.1",
+    "tonweb": "^0.0.62",
     "tronweb": "5.3.1"
   },
   "devDependencies": {

package/src/Method.js

@@ -93,6 +93,8 @@ class Method {
 
     const cw = await new CW(chain, options).init();
 
+    const startsWithSymbols = cw.row.startsWith.split('|') || [];
+
     let chainFullName =
       (cw.row.name || chain) +
       (cw.wallet.format !== undefined && cw.wallet.format != ''
@@ -196,7 +198,16 @@ class Method {
         for (const item of cw.wallet.addresses) {
           if (cw.wallet.addresses.length > 1) {
             log();
-            log(`🆔  ${item.index}`);
+
+            // Display index
+            if (item.index !== undefined) {
+              log(`🆔  ${item.index}`);
+            }
+
+            // Display address details
+            if (item.title) {
+              log(`🏷   ${item.title}`);
+            }
           }
 
           if (
@@ -205,51 +216,61 @@ class Method {
             cw.suffixFound &&
             cw.suffixFoundInWallets.includes(item.address)
           ) {
-            // highlight found prefix
-            const addressCutPrefixLength =
-              cw.row.startsWith.length + cw.options.prefix.length;
-            const addressFirstPart = item.address.slice(
-              cw.row.startsWith.length,
-              addressCutPrefixLength
+            // highlight found prefix and suffix
+            const addressStartingSymbol = startsWithSymbols.filter((symbol) =>
+              item.address.startsWith(symbol)
+            )[0];
+            const addressCutPrefixLength = addressStartingSymbol.length;
+            const addressHighlightedPart = item.address.substring(
+              addressCutPrefixLength + cw.options.prefix.length,
+              cw.options.prefix.length + 1
             );
             const addressLastPart = item.address.slice(
+              cw.options.prefix.length + addressCutPrefixLength,
+              item.address.length - cw.options.suffix.length
+            );
+            const addressHighlightedSuffix = item.address.slice(
               item.address.length - cw.options.suffix.length
             );
             log(
-              `👛  ${cw.row.startsWith}${magenta(
-                addressFirstPart
-              )}${item.address.substring(
-                cw.row.startsWith.length + addressFirstPart.length,
-                item.address.length - addressLastPart.length
-              )}${magenta(addressLastPart)}`
+              `👛  ${addressStartingSymbol}${magenta(
+                addressHighlightedPart
+              )}${addressLastPart}${magenta(addressHighlightedSuffix)}`
             );
           } else if (
             cw.prefixFound &&
             cw.prefixFoundInWallets.includes(item.address)
           ) {
             // highlight found prefix
-            const addressCutLength =
-              cw.row.startsWith.length + cw.options.prefix.length;
+            const addressStartingSymbol = startsWithSymbols.filter((symbol) =>
+              item.address.startsWith(symbol)
+            )[0];
+            const addressCutPrefixLength = addressStartingSymbol.length;
+            const addressHighlightedPart = item.address.substring(
+              addressCutPrefixLength + cw.options.prefix.length,
+              cw.options.prefix.length + 1
+            );
+            const addressLastPart = item.address.slice(
+              cw.options.prefix.length + addressCutPrefixLength
+            );
             log(
-              `👛  ${cw.row.startsWith}${magenta(
-                item.address.slice(cw.row.startsWith.length, addressCutLength)
-              )}${item.address.slice(addressCutLength)}`
+              `👛  ${addressStartingSymbol}${magenta(
+                addressHighlightedPart
+              )}${addressLastPart}`
             );
           } else if (
             cw.suffixFound &&
             cw.suffixFoundInWallets.includes(item.address)
           ) {
             // highlight found suffix
-            log(
-              `👛  ${item.address.slice(
-                0,
-                item.address.length - cw.options.suffix.length
-              )}${magenta(
-                item.address.slice(
-                  item.address.length - cw.options.suffix.length
-                )
-              )}`
+            const addressLastPart = item.address.slice(
+              0,
+              item.address.length - cw.options.suffix.length
+            );
+            const addressHighlightedSuffix = item.address.slice(
+              item.address.length - cw.options.suffix.length
             );
+            log(`👛  ${addressLastPart}${magenta(addressHighlightedSuffix)}`);
           } else {
             log(`👛  ${item.address}`);
           }
@@ -261,6 +282,7 @@ class Method {
         outputData.wallets = cw.wallet.addresses;
       }
 
+      // display path
       if (displayAsText && cw.row.path !== undefined && cw.options.geek) {
         log();
         log(`🗂   wallet address path: ${cw.row.path}'/0'/0/ID`);
@@ -324,8 +346,18 @@ class Method {
         log();
       }
 
+      // attempts
+      if (cw.attempts !== undefined && cw.attempts > 0 && cw.options.geek) {
+        log(
+          `🔍  It took ${cw.attempts} attempt${
+            cw.attempts !== 1 ? 's' : ''
+          } to generate this wallet`
+        );
+        log();
+      }
+
       // tested
-      if (cw.wallet.tested !== undefined) {
+      if (cw.wallet.tested !== undefined && cw.wallet.tested == false) {
         log(
           red(
             '‼️   This wallet generation format was not tested yet, do not use it!'
@@ -391,7 +423,7 @@ class Method {
       log();
       log(
         blueBright(
-          '🙏  Consider supporting the project - see donation options with: cw --donate'
+          '🙏  Consider supporting this project - check donations options with: cw --donate'
         )
       );
     }

package/src/Wallet.js

@@ -23,7 +23,7 @@ import {
   PublicKey as SolanaPublickey,
 } from '@solana/web3.js';
 import bs58 from 'bs58';
-import { TonClient, WalletContractV4, internal as TonInternal } from '@ton/ton';
+import TonWeb from 'tonweb';
 import {
   mnemonicNew as newTonMnemonic,
   mnemonicToPrivateKey as TonMnemonicToPrivateKey,
@@ -53,8 +53,10 @@ class Wallet {
       desiredSymbolsUniqueArray.filter(
         (char) => !RegExp(row.prefixTest, 'g').test(char)
       ) || [];
+    const startsWithSymbols = row.startsWith.split('|');
 
     let wallet = {};
+    let loops = 0;
     let prefixFound = false;
     let prefixFoundInWallets = [];
     let suffixFound = false;
@@ -63,13 +65,24 @@ class Wallet {
     let onlySuffix = false;
     let onlyBoth = false;
 
-    const prefixFoundInAddress = (address, isCaseSensitive, prefix, symbol) =>
-      (isCaseSensitive && address.startsWith(symbol + '' + prefix)) ||
-      (!isCaseSensitive &&
-        address.toUpperCase().startsWith((symbol + '' + prefix).toUpperCase()));
-    const suffixFoundInAddress = (address, isCaseSensitive, suffix) =>
-      (isCaseSensitive && address.endsWith(suffix)) ||
-      (!isCaseSensitive && address.toUpperCase().endsWith(suffix));
+    const prefixFoundInAddresses = (addresses, isCaseSensitive, prefix) => {
+      return addresses.filter((address) => {
+        return startsWithSymbols.some((symbol) => {
+          const fullPrefix = `${symbol}${prefix}`;
+          return isCaseSensitive
+            ? address.startsWith(fullPrefix)
+            : address.toUpperCase().startsWith(fullPrefix.toUpperCase());
+        });
+      });
+    };
+
+    const suffixFoundInAddresses = (addresses, isCaseSensitive, suffix) => {
+      return addresses.filter((address) => {
+        return isCaseSensitive
+          ? address.endsWith(suffix)
+          : address.toUpperCase().endsWith(suffix.toUpperCase());
+      });
+    };
 
     if (
       (options.prefix && row.flags.includes('p')) ||
@@ -107,114 +120,68 @@ class Wallet {
           }
         }
 
-        const startsWithSymbols = row.startsWith.split('|');
         // eslint-disable-next-line no-constant-condition
         loop: while (true) {
           wallet = await this.createWallet();
-          for (let firstSymbol of startsWithSymbols) {
-            if (wallet.address !== undefined) {
-              // one address
-              if (
-                onlyPrefix &&
-                prefixFoundInAddress(
-                  wallet.address,
-                  options.prefixIsCaseSensitive,
-                  options.prefix,
-                  firstSymbol
-                )
-              ) {
+          loops++;
+
+          if (!wallet.error) {
+            let addresses = [];
+            if (wallet.addresses === undefined) {
+              addresses.push(wallet.address);
+            } else {
+              addresses = wallet.addresses.map((item) => item.address);
+            }
+
+            if (onlyPrefix) {
+              prefixFoundInWallets = prefixFoundInAddresses(
+                addresses,
+                options.prefixIsCaseSensitive,
+                options.prefix
+              );
+              if (prefixFoundInWallets.length > 0) {
                 prefixFound = true;
-                break loop;
               }
-
-              if (
-                onlySuffix &&
-                suffixFoundInAddress(
-                  wallet.address,
-                  options.suffixIsCaseSensitive,
-                  options.suffix
-                )
-              ) {
+            } else if (onlySuffix) {
+              suffixFoundInWallets = suffixFoundInAddresses(
+                addresses,
+                options.suffixIsCaseSensitive,
+                options.suffix
+              );
+              if (suffixFoundInWallets.length > 0) {
                 suffixFound = true;
-                break loop;
               }
-
+            } else if (onlyBoth) {
+              prefixFoundInWallets = prefixFoundInAddresses(
+                addresses,
+                options.prefixIsCaseSensitive,
+                options.prefix
+              );
+              suffixFoundInWallets = suffixFoundInAddresses(
+                addresses,
+                options.suffixIsCaseSensitive,
+                options.suffix
+              );
               if (
-                onlyBoth &&
-                prefixFoundInAddress(
-                  wallet.address,
-                  options.prefixIsCaseSensitive,
-                  options.prefix,
-                  firstSymbol
-                ) &&
-                suffixFoundInAddress(
-                  wallet.address,
-                  options.suffixIsCaseSensitive,
-                  options.suffix
-                )
+                prefixFoundInWallets.length > 0 &&
+                suffixFoundInWallets.length > 0
               ) {
                 prefixFound = true;
                 suffixFound = true;
-                break loop;
               }
-            } else if (wallet.addresses !== undefined) {
-              // multiple addresses
-              for (let item of wallet.addresses) {
-                if (
-                  onlyPrefix &&
-                  prefixFoundInAddress(
-                    item.address,
-                    options.prefixIsCaseSensitive,
-                    options.prefix,
-                    firstSymbol
-                  )
-                ) {
-                  prefixFound = true;
-                  prefixFoundInWallets.push(item.address);
-                }
-
-                if (
-                  onlySuffix &&
-                  suffixFoundInAddress(
-                    item.address,
-                    options.suffixIsCaseSensitive,
-                    options.suffix
-                  )
-                ) {
-                  suffixFound = true;
-                  suffixFoundInWallets.push(item.address);
-                }
-
-                if (
-                  onlyBoth &&
-                  prefixFoundInAddress(
-                    item.address,
-                    options.prefixIsCaseSensitive,
-                    options.prefix,
-                    firstSymbol
-                  ) &&
-                  suffixFoundInAddress(
-                    item.address,
-                    options.suffixIsCaseSensitive,
-                    options.suffix
-                  )
-                ) {
-                  prefixFound = true;
-                  prefixFoundInWallets.push(item.address);
-                  suffixFound = true;
-                  suffixFoundInWallets.push(item.address);
-                }
-              }
-              if (
-                (onlyPrefix && prefixFound) ||
-                (onlySuffix && suffixFound) ||
-                (onlyBoth && prefixFound && suffixFound)
-              ) {
-                break loop;
-              }
-            } else {
+            }
+
+            if (
+              (onlyPrefix && prefixFound) ||
+              (onlySuffix && suffixFound) ||
+              (onlyBoth && prefixFound && suffixFound)
+            ) {
               break loop;
             }
+          } else {
+            log(red('⛔️  Error: ' + wallet.error));
+            // eslint-disable-next-line no-undef
+            process.exit(1);
           }
         }
       } else {
@@ -244,6 +211,7 @@ class Wallet {
       prefixFoundInWallets,
       suffixFound,
       suffixFoundInWallets,
+      attempts: loops,
     };
   }
 
@@ -260,7 +228,9 @@ class Wallet {
     const mnemonicWordsCount = (mnemonic.split(' ') || []).length || 0;
     if (mnemonicWordsCount == 1) {
       const mnemonicInput = parseInt(mnemonic.split(' ')[0], 10);
-      mnemonicLength = supportedMnemonicLengths.includes(mnemonicInput) ? mnemonicInput : 12;
+      mnemonicLength = supportedMnemonicLengths.includes(mnemonicInput)
+        ? mnemonicInput
+        : 12;
     } else {
       mnemonicString = mnemonic;
       mnemonicLength = mnemonicWordsCount;
@@ -475,23 +445,21 @@ class Wallet {
         mnemonicString = mnemonics.join(' ');
       }
       const keyPair = await TonMnemonicToPrivateKey(mnemonics);
-      // Define the workchain (usually 0)
-      const workchain = 0;
-      // Create a new wallet contract instance
-      const wallet = WalletContractV4.create({
-        workchain,
-        publicKey: keyPair.publicKey,
-      });
-      // Get the wallet address
-      const address = wallet.address.toString();
-
-      // TODO: add support for new UQ address format
+      const tonweb = new TonWeb();
+      const wallet = tonweb.wallet.create({ publicKey: keyPair.publicKey });
+      const address = await wallet.getAddress();
+      const nonBounceableAddress = address.toString(true, true, false);
+      const bouncableAddress = address.toString(true, true, true);
 
       Object.assign(result, {
         addresses: [
           {
-            index: 0,
-            address,
+            title: 'UQ format (new): best for wallets, - non-bounceable',
+            address: nonBounceableAddress,
+          },
+          {
+            title: 'EQ format (old): best for smart contracts, - bounceable',
+            address: bouncableAddress,
           },
         ],
         mnemonic: mnemonicString,

package/src/chains/ERC.json

@@ -1,5 +1,5 @@
 {
-  "name": "ERC-like",
+  "title": "ERC-like",
   "network": "EVM",
   "startsWith": "0x",
   "prefixTest": "[0-9a-fA-F]",

package/src/chains/TON.json

@@ -5,7 +5,7 @@
   "formats": {
     "V4R2": {
       "format": "V4R2",
-      "startsWith": "EQ",
+      "startsWith": "EQ|UQ",
       "prefixTest": "[0-9a-zA-Z-_]",
       "rareSymbols": "[0-9]",
       "apps": ["tonkeeper", "trustwallet"],