@yerofey/cryptowallet-cli 1.31.2 → 1.31.3

package/package.json

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

package/src/Wallet.js

@@ -499,51 +499,60 @@ 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',
-            address: nonBounceableV5Address,
-          },
-          {
-            title:
-              'V5R1: EQ format (new): best for smart contracts, - bounceable',
-            address: bouncableAddressV5,
-          },
-          {
+      let addresses = [];
+
+      switch (format.toUpperCase()) {
+        case 'V4R2':
+          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);
+          addresses.push({
             title: 'V4R2: UQ format: best for wallets, - non-bounceable',
             address: nonBounceableAddress,
-          },
-          {
+          });
+          const bouncableAddress = address.toString(true, true, true);
+          addresses.push({
             title: 'V4R2: EQ format: best for smart contracts, - bounceable',
             address: bouncableAddress,
-          },
-        ],
+          });
+          break;
+
+        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 format: best for wallets, - non-bounceable',
+            address: nonBounceableV5Address,
+          });
+          const bouncableAddressV5 = v5Address.toString({
+            bounceable: true, // (EQ)
+            urlSafe: true,
+            testOnly: false,
+          });
+          addresses.push({
+            title:
+              'W5 (V5R1): EQ format: best for smart contracts, - bounceable',
+            address: bouncableAddressV5,
+          });
+          break;
+      }
+
+      Object.assign(result, {
+        addresses: addresses,
         mnemonic: mnemonicString,
       });
     } else if (chain == 'TRX') {

package/src/chains/TON.json

@@ -1,7 +1,7 @@
 {
   "title": "The Open Network",
   "network": "TON",
-  "defaultFormat": "V4R2",
+  "defaultFormat": "W5",
   "formats": {
     "V4R2": {
       "format": "V4R2",
@@ -10,6 +10,23 @@
       "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"]
     }
   }
 }