@yerofey/cryptowallet-cli 1.31.2 → 1.31.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yerofey/cryptowallet-cli",
-  "version": "1.31.2",
+  "version": "1.31.4",
   "description": "Crypto wallet generator CLI tool",
   "type": "module",
   "homepage": "https://github.com/yerofey/cryptowallet-cli",

package/src/Method.js

@@ -496,6 +496,15 @@ class Method {
         log();
       }
 
+      // should be activated (only for specific chains)
+      if (cw.row.requiresActivation !== undefined && cw.row.requiresActivation) {
+        log(
+          blue(
+            `💎  ${cw.row.title} (${cw.row.network}) requires wallet activation in order to use it (just make a small value transaction to itself)`
+          )
+        );
+      }
+
       // formats
       if (
         cw.row.formats !== undefined &&
@@ -546,7 +555,8 @@ class Method {
 
         let appsString = appsArray.join(', ');
         if (cw.row.apps || false) {
-          appsString += ' and any other wallet app (either using mnemonic or private key)';
+          appsString +=
+            ' and any other wallet app (either using mnemonic or private key)';
         }
         log(greenBright('ℹ️   You can import this wallet into ' + appsString));
       }

package/src/Wallet.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-case-declarations */
 import { config } from 'dotenv';
 import { log } from './utils.js';
 import chalk from 'chalk';
@@ -499,51 +500,79 @@ class Wallet {
         mnemonicString = mnemonics.join(' ');
       }
       const keyPair = await TonMnemonicToPrivateKey(mnemonics);
-      const tonweb = new TonWeb();
-      const WalletClass = tonweb.wallet.all.v4R2;
-      const wallet = new WalletClass(tonweb.provider, keyPair);
-      const address = await wallet.getAddress();
-      const nonBounceableAddress = address.toString(true, true, false);
-      const bouncableAddress = address.toString(true, true, true);
-
-      // w5
-      const workchain = 0;
-      const walletV5 = WalletContractV5R1.create({
-        workchain,
-        publicKey: keyPair.publicKey,
-      });
-      const v5Address = walletV5.address;
-      const nonBounceableV5Address = v5Address.toString({
-        bounceable: false, // (UQ)
-        urlSafe: true,
-        testOnly: false,
-      });
-      const bouncableAddressV5 = v5Address.toString({
-        bounceable: true, // (EQ)
-        urlSafe: true,
-        testOnly: false,
-      });
 
-      Object.assign(result, {
-        addresses: [
-          {
-            title: 'V5R1: UQ format (new): best for wallets, - non-bounceable',
+      let addresses = [];
+      let walletFormat = format.toLowerCase();
+
+      switch (walletFormat) {
+        // old formats
+        case 'simpler1':
+        case 'simpler2':
+        case 'simpler3':
+        case 'v2r1':
+        case 'v2r2':
+        case 'v3r1':
+        case 'v3r2':
+        case 'v4r1':
+        case 'v4r2':
+          const tonweb = new TonWeb();
+          const _tonwebFormat = walletFormat.replace('r', 'R');
+          const WalletClass = tonweb.wallet.all[_tonwebFormat];
+          const wallet = new WalletClass(tonweb.provider, keyPair);
+          const address = await wallet.getAddress();
+
+          if (walletFormat == 'v4r2') {
+            // when UQ was implemented (non-bounceable addresses)
+            const nonBounceableAddress = address.toString(true, true, false);
+            addresses.push({
+              title: 'V4R2 (UQ): best for wallets, - non-bounceable',
+              address: nonBounceableAddress,
+            });
+            const bouncableAddress = address.toString(true, true, true);
+            addresses.push({
+              title: 'V4R2 (EQ): best for smart contracts, - bounceable',
+              address: bouncableAddress,
+            });
+          } else {
+            addresses.push({
+              address: address.toString(true, true, true),
+            });
+          }
+          break;
+
+        // new format
+        case 'v5r1':
+        case 'w5':
+        default:
+          const workchain = 0;
+          const walletV5 = WalletContractV5R1.create({
+            workchain,
+            publicKey: keyPair.publicKey,
+          });
+          const v5Address = walletV5.address;
+          const nonBounceableV5Address = v5Address.toString({
+            bounceable: false, // (UQ)
+            urlSafe: true,
+            testOnly: false,
+          });
+          addresses.push({
+            title: 'W5 (V5R1) [UQ]: best for wallets, - non-bounceable',
             address: nonBounceableV5Address,
-          },
-          {
-            title:
-              'V5R1: EQ format (new): best for smart contracts, - bounceable',
+          });
+          const bouncableAddressV5 = v5Address.toString({
+            bounceable: true, // (EQ)
+            urlSafe: true,
+            testOnly: false,
+          });
+          addresses.push({
+            title: 'W5 (V5R1) [EQ]: best for smart contracts, - bounceable',
             address: bouncableAddressV5,
-          },
-          {
-            title: 'V4R2: UQ format: best for wallets, - non-bounceable',
-            address: nonBounceableAddress,
-          },
-          {
-            title: 'V4R2: EQ format: best for smart contracts, - bounceable',
-            address: bouncableAddress,
-          },
-        ],
+          });
+          break;
+      }
+
+      Object.assign(result, {
+        addresses: addresses,
         mnemonic: mnemonicString,
       });
     } else if (chain == 'TRX') {

package/src/chains/TON.json

@@ -1,8 +1,72 @@
 {
   "title": "The Open Network",
   "network": "TON",
-  "defaultFormat": "V4R2",
+  "defaultFormat": "W5",
   "formats": {
+    "simpleR1": {
+      "format": "simpleR1",
+      "startsWith": "EQ",
+      "prefixTest": "[0-9a-zA-Z-_]",
+      "rareSymbols": "[0-9]",
+      "apps": ["tonkeeper", "trustwallet"],
+      "flags": ["m", "p", "s"]
+    },
+    "simpleR2": {
+      "format": "simpleR2",
+      "startsWith": "EQ",
+      "prefixTest": "[0-9a-zA-Z-_]",
+      "rareSymbols": "[0-9]",
+      "apps": ["tonkeeper", "trustwallet"],
+      "flags": ["m", "p", "s"]
+    },
+    "simpleR3": {
+      "format": "simpleR3",
+      "startsWith": "EQ",
+      "prefixTest": "[0-9a-zA-Z-_]",
+      "rareSymbols": "[0-9]",
+      "apps": ["tonkeeper", "trustwallet"],
+      "flags": ["m", "p", "s"]
+    },
+    "V2R1": {
+      "format": "V2R1",
+      "startsWith": "EQ",
+      "prefixTest": "[0-9a-zA-Z-_]",
+      "rareSymbols": "[0-9]",
+      "apps": ["tonkeeper", "trustwallet"],
+      "flags": ["m", "p", "s"]
+    },
+    "V2R2": {
+      "format": "V2R2",
+      "startsWith": "EQ",
+      "prefixTest": "[0-9a-zA-Z-_]",
+      "rareSymbols": "[0-9]",
+      "apps": ["tonkeeper", "trustwallet"],
+      "flags": ["m", "p", "s"]
+    },
+    "V3R1": {
+      "format": "V3R1",
+      "startsWith": "EQ",
+      "prefixTest": "[0-9a-zA-Z-_]",
+      "rareSymbols": "[0-9]",
+      "apps": ["tonkeeper", "trustwallet"],
+      "flags": ["m", "p", "s"]
+    },
+    "V3R2": {
+      "format": "V3R2",
+      "startsWith": "EQ",
+      "prefixTest": "[0-9a-zA-Z-_]",
+      "rareSymbols": "[0-9]",
+      "apps": ["tonkeeper", "trustwallet"],
+      "flags": ["m", "p", "s"]
+    },
+    "V4R1": {
+      "format": "V4R1",
+      "startsWith": "EQ",
+      "prefixTest": "[0-9a-zA-Z-_]",
+      "rareSymbols": "[0-9]",
+      "apps": ["tonkeeper", "trustwallet"],
+      "flags": ["m", "p", "s"]
+    },
     "V4R2": {
       "format": "V4R2",
       "startsWith": "EQ|UQ",
@@ -10,6 +74,24 @@
       "rareSymbols": "[0-9]",
       "apps": ["tonkeeper", "trustwallet"],
       "flags": ["m", "p", "s"]
+    },
+    "V5R1": {
+      "format": "V5R1",
+      "startsWith": "EQ|UQ",
+      "prefixTest": "[0-9a-zA-Z-_]",
+      "rareSymbols": "[0-9]",
+      "apps": ["tonkeeper", "trustwallet"],
+      "flags": ["m", "p", "s"]
+    },
+    "W5": {
+      "comment": "This is the same as V5R1",
+      "format": "W5",
+      "startsWith": "EQ|UQ",
+      "prefixTest": "[0-9a-zA-Z-_]",
+      "rareSymbols": "[0-9]",
+      "apps": ["tonkeeper", "trustwallet"],
+      "flags": ["m", "p", "s"]
     }
-  }
+  },
+  "requiresActivation": true
 }