wative 1.0.34 → 1.0.36

package/src/network.ts

@@ -541,8 +541,8 @@ export const getNetworkInfoByName = (keystore_path: string, network_name: string
     return null;
 }
 
-export const getAccountAddress = (keystore_path: string, account_label: string, account_id: number) => {
-    const account_info = getAccountInfo(keystore_path, account_label);
+export const getAccountAddress = (keystore_path: string, keystore_slug: string, account_id: number) => {
+    const account_info = getAccountInfo(keystore_path, keystore_slug);
 
     if (account_info.account_type === "PK") {
         return account_info.data[account_id].ciphertexts.address;
@@ -560,18 +560,18 @@ export const getAccountAddress = (keystore_path: string, account_label: string,
     return null;
 }
 
-export const getPKAccountAddress = (keystore_path: string, account_label: string) => {
-    const account_info = getAccountInfo(keystore_path, account_label);
+export const getPKAccountAddress = (keystore_path: string, keystore_slug: string) => {
+    const account_info = getAccountInfo(keystore_path, keystore_slug);
     return account_info.ciphertexts.address;
 }
 
-export const switchPPNetwork = async (keystore_path: string, account_label: string, account_id: number) => {
+export const switchPPNetwork = async (keystore_path: string, keystore_slug: string, account_id: number) => {
     const network_path = path.resolve(keystore_path, 'network.json');
     const networks = JSON.parse(fs.readFileSync(network_path, 'utf8'));
     const network_list = networks.networks;
     const network_len = network_list.length;
 
-    let account_info = getAccountInfo(keystore_path, account_label);
+    let account_info = getAccountInfo(keystore_path, keystore_slug);
     let options_switch_network = [
         '> Back',
         new inquirer.Separator('----------------------------------')
@@ -613,7 +613,7 @@ export const switchPPNetwork = async (keystore_path: string, account_label: stri
         account_info.data[account_id].default_network = network_list[selected_network_id - 3].name;
     }
 
-    saveAccountInfo(keystore_path, account_label, account_info);
+    saveAccountInfo(keystore_path, keystore_slug, account_info);
 
     let new_default_network = account_info.default_network;
     if ("default_network" in account_info.data[account_id] && account_info.data[account_id].default_network !== "") {
@@ -626,13 +626,13 @@ export const switchPPNetwork = async (keystore_path: string, account_label: stri
     );
 }
 
-export const showAllAccounts = async (keystore_path: string, account_label: string, account_index: number) => {
+export const showAllAccounts = async (keystore_path: string, keystore_slug: string, account_index: number) => {
     const network_path = path.resolve(keystore_path, 'network.json');
     const networks = JSON.parse(fs.readFileSync(network_path, 'utf8'));
     const network_list = networks.networks;
     const network_len = network_list.length;
 
-    let account_info = getAccountInfo(keystore_path, account_label);
+    let account_info = getAccountInfo(keystore_path, keystore_slug);
     let default_network = account_info.default_network;
 
     const network_type = getNetworkTypeByName(keystore_path, default_network);
@@ -664,13 +664,13 @@ export const showAllAccounts = async (keystore_path: string, account_label: stri
     }
 }
 
-export const switchNetworkByAccountLabel = async (keystore_path: string, account_label: string, is_account_label: boolean) => {
+export const switchNetworkByAccountName = async (keystore_path: string, keystore_slug: string, is_keystore_slug: boolean) => {
     const network_path = path.resolve(keystore_path, 'network.json');
     const networks = JSON.parse(fs.readFileSync(network_path, 'utf8'));
     const network_list = networks.networks;
     const network_len = network_list.length;
 
-    let account_info = getAccountInfo(keystore_path, account_label);
+    let account_info = getAccountInfo(keystore_path, keystore_slug);
     let options_switch_network = [
         '> Back',
         new inquirer.Separator('----------------------------------'),
@@ -679,7 +679,7 @@ export const switchNetworkByAccountLabel = async (keystore_path: string, account
     let default_network = account_info.default_network;
 
     let account_address = "";
-    if (!is_account_label) {
+    if (!is_keystore_slug) {
         account_address = account_info.ciphertexts.address;
     }
     let option_network_name_list: string[] = [];
@@ -693,13 +693,13 @@ export const switchNetworkByAccountLabel = async (keystore_path: string, account
             continue;
         }
         if (network.name === default_network) {
-            if (is_account_label) {
+            if (is_keystore_slug) {
                 options_switch_network.push(`● ${network.name}`);
             } else {
                 options_switch_network.push(`● ${account_address} [${network.name}]`);
             }
         } else {
-            if (is_account_label) {
+            if (is_keystore_slug) {
                 options_switch_network.push(`○ ${network.name}`);
             } else {
                 options_switch_network.push(`○ ${account_address} [${network.name}]`);
@@ -715,9 +715,9 @@ export const switchNetworkByAccountLabel = async (keystore_path: string, account
 
     let selected_network_id = options_switch_network.indexOf(selected_network);
     account_info.default_network = option_network_name_list[selected_network_id - 2];
-    saveAccountInfo(keystore_path, account_label, account_info);
+    saveAccountInfo(keystore_path, keystore_slug, account_info);
 
-    if (!is_account_label) {
+    if (!is_keystore_slug) {
         let new_default_network = account_info.default_network;
         let new_network = getNetworkInfoByName(keystore_path, new_default_network);
         console.log(
@@ -726,14 +726,14 @@ export const switchNetworkByAccountLabel = async (keystore_path: string, account
     }
 }
 
-export const accountBalanceLog = async (account_label: string, account_id: number, keystore_path: string, default_network: string) => {
-    const account_info = getAccountInfo(keystore_path, account_label);
+export const accountBalanceLog = async (keystore_slug: string, account_id: number, keystore_path: string, default_network: string) => {
+    const account_info = getAccountInfo(keystore_path, keystore_slug);
 
     let account_address: string;
     if (account_info.account_type === "PK") {
-        account_address = getAccountAddress(keystore_path, account_label, account_id);
+        account_address = getAccountAddress(keystore_path, keystore_slug, account_id);
     } else {
-        account_address = getPKAccountAddress(keystore_path, account_label);
+        account_address = getPKAccountAddress(keystore_path, keystore_slug);
     }
 
     const balance_result = await getAccountBalance(account_address, keystore_path, default_network);
@@ -778,8 +778,8 @@ export const getAccountBalance = async (account: string, keystore_path: string,
     return result;
 }
 
-export const getDefaultNetworkByAddress = (keystore_path: string, account_label: string, account_address: string) => {
-    const account_info = getAccountInfo(keystore_path, account_label);
+export const getDefaultNetworkByAddress = (keystore_path: string, keystore_slug: string, account_address: string) => {
+    const account_info = getAccountInfo(keystore_path, keystore_slug);
     if (account_info.account_type === "PK") {
         return account_info.default_network;
     }

package/src/tools.ts

@@ -1,7 +1,7 @@
 const chalk = require('chalk');
 import { BigNumber } from 'bignumber.js';
 import inquirer from 'inquirer';
-import { addrValidator, chainAddressValidator, confirmSomething, editorSomething, gasValidator, getAccountChainType, hexValidator, inputSomething, numberValidator, selectSomething, un_format_account_label } from "./utils";
+import { addrValidator, chainAddressValidator, confirmSomething, editorSomething, gasValidator, getAccountChainType, hexValidator, inputSomething, numberValidator, selectSomething, getAccountNameByKeystoreSlug } from "./utils";
 import { loginIn } from './account';
 import { getAccountBalance, getDefaultNetworkByAddress, getEvmNetworks, getNetworkInfoByName, getNetworkTypeByName } from './network';
 import { GasUtil } from './tx_gas_utils';
@@ -720,8 +720,8 @@ const getTransferTokenAmount = async (max_value: string, token_symbols: string,
     return getTransferTokenAmount(max_value, token_symbols, decimals);
 }
 
-const excuteTools = async (keystore_path: string, account_label: string, account_address: string, wative_core: typeof WativeCore) => {
-    let default_network = getDefaultNetworkByAddress(keystore_path, account_label, account_address);
+const excuteTools = async (keystore_path: string, keystore_slug: string, account_address: string, wative_core: typeof WativeCore) => {
+    let default_network = getDefaultNetworkByAddress(keystore_path, keystore_slug, account_address);
     let network_type = getNetworkTypeByName(keystore_path, default_network);
     let account_chain_type = getAccountChainType(account_address);
 
@@ -817,7 +817,7 @@ const excuteTools = async (keystore_path: string, account_label: string, account
     }
 }
 
-export const selectToolsOptions = async (keystore_path: string, account_label: string, account_address: string, wative_core: typeof WativeCore) => {
+export const selectToolsOptions = async (keystore_path: string, keystore_slug: string, account_address: string, wative_core: typeof WativeCore) => {
     const tools_options = [
         '> SendTx',
         '> SignMessage',
@@ -828,7 +828,7 @@ export const selectToolsOptions = async (keystore_path: string, account_label: s
     const selected_tools_option = await selectSomething(tools_options);
     switch (selected_tools_option) {
         case '> SendTx': {
-            await excuteTools(keystore_path, account_label, account_address, wative_core);
+            await excuteTools(keystore_path, keystore_slug, account_address, wative_core);
             break;
         }
         case '> SignMessage': {
@@ -847,7 +847,7 @@ export const selectToolsOptions = async (keystore_path: string, account_label: s
             return;
         }
     }
-    await selectToolsOptions(keystore_path, account_label, account_address, wative_core);
+    await selectToolsOptions(keystore_path, keystore_slug, account_address, wative_core);
 }
 
 export const showTools = async (keystore_path: string, wative_core: typeof WativeCore) => {
@@ -873,28 +873,28 @@ export const showTools = async (keystore_path: string, wative_core: typeof Wativ
         account_address = await inputSomething("Input part address to send tx", addrValidator);
     }
 
-    let account_label_info = wative_core.account.getAccountLabel(account_address);
-    if (account_label_info === null) {
+    let keystore_slug_info = wative_core.account.getAccountLabel(account_address);
+    if (keystore_slug_info === null) {
         console.log(chalk.red("Account not found"));
         await showTools(keystore_path, wative_core);
         return;
     }
 
-    let account_label = account_label_info.account_label;
-    let show_account_label = un_format_account_label(keystore_path, account_label);
-    console.log(chalk.green(`Found account label: [${show_account_label}]`));
+    let keystore_slug = keystore_slug_info.account_label;
+    let account_name = getAccountNameByKeystoreSlug(keystore_path, keystore_slug);
+    console.log(chalk.green(`Found account name: [${account_name}]`));
 
-    account_address = account_label_info.account_address;
-    if (account_label === null) {
+    account_address = keystore_slug_info.account_address;
+    if (keystore_slug === null) {
         console.log(chalk.red("Account not found"));
         await showTools(keystore_path, wative_core);
         return;
     }
-    let login_result = await loginIn(account_label, wative_core);
+    let login_result = await loginIn(keystore_path, keystore_slug, wative_core);
     if (!login_result.isLoginIn) {
         await showTools(keystore_path, wative_core);
         return;
     }
-    await selectToolsOptions(keystore_path, account_label, account_address, wative_core);
+    await selectToolsOptions(keystore_path, keystore_slug, account_address, wative_core);
     await showTools(keystore_path, wative_core);
 }

package/src/utils.ts

@@ -332,52 +332,50 @@ export const getColor = async (text: string) => {
     return null;
 }
 
-export const un_format_account_label = (keystore_path: string, account_label: string) => {
+export const getAccountNameByKeystoreSlug = (keystore_path: string, keystore_slug: string) => {
     const networks = getNetworkInfo(keystore_path);
-
-    const account_label_list = networks.accounts;
-    const formatted_account_label_list = batch_format_account_label(account_label_list);
-
-    const index = formatted_account_label_list.indexOf(account_label);
+    const account_name_list = networks.accounts;
+    const keystore_slug_list = batchGetKeystoreSlugByAccountName(account_name_list);
+    const index = keystore_slug_list.indexOf(keystore_slug);
     if (index !== -1) {
-        return account_label_list[index];
+        return account_name_list[index];
     }
-    return account_label;
+    return keystore_slug;
 }
 
-export const format_account_label = (account_label: string) => {
-    account_label = account_label.trim();
-    account_label = account_label.toLocaleLowerCase();
-    account_label = account_label.replace(/\s+/g, "-").trim();
-    return account_label;
+export const getKeystoreSlugByAccountName = (account_name: string) => {
+    account_name = account_name.trim();
+    account_name = account_name.toLocaleLowerCase();
+    account_name = account_name.replace(/\s+/g, "-").trim();
+    account_name = account_name.replace(/\-+/g, "-").trim();
+    return account_name;
 }
 
-
-export const batch_format_account_label = (account_label_list: string[]) => {
-    let formatted_account_label_list: string[] = [];
-    for (let i = 0; i < account_label_list.length; i++) {
-        formatted_account_label_list.push(
-            format_account_label(account_label_list[i])
+export const batchGetKeystoreSlugByAccountName = (account_name_list: string[]) => {
+    let keystore_slug_list: string[] = [];
+    for (let i = 0; i < account_name_list.length; i++) {
+        keystore_slug_list.push(
+            getKeystoreSlugByAccountName(account_name_list[i])
         );
     }
-    return formatted_account_label_list;
+    return keystore_slug_list;
 }
 
 
-export const getAccountLabel = async (text: string, account_label_list: string[]) => {
-    let formatted_account_label_list = batch_format_account_label(account_label_list);
+export const getAccountName = async (text: string, account_name_list: string[]) => {
+    let keystore_slug_list = batchGetKeystoreSlugByAccountName(account_name_list);
     let reg = /^(?![-_])[a-zA-Z0-9_-]{4,20}(?<![-_])$/g;
     for (let i = 0; i < 5; i++) {
-        let account_label = await inputSomething(text);
-        account_label = account_label.trim();
-        let formatted_account_label = format_account_label(account_label);
+        let account_name = await inputSomething(text);
+        account_name = account_name.trim();
+        let keystore_slug = getKeystoreSlugByAccountName(account_name);
 
-        if (reg.test(formatted_account_label)) {
-            if (formatted_account_label_list.includes(formatted_account_label)) {
-                console.log(chalk.red("Keystore name already exists"));
+        if (reg.test(keystore_slug)) {
+            if (keystore_slug_list.includes(keystore_slug)) {
+                console.log(chalk.red("Account name already exists"));
                 continue;
             } else {
-                return account_label;
+                return account_name;
             }
         }
     }
@@ -750,22 +748,22 @@ export const updateStorage = (keystore_path: string) => {
 
     let account_list_len = networks.accounts.length;
     for (let i = 0; i < account_list_len; i++) {
-        let account_label = networks.accounts[account_list_len - 1 - i];
-        let formatted_account_label = format_account_label(account_label);
-        let account_label_path = path.resolve(keystore_path, `accounts/${formatted_account_label}.json`);
+        let account_name = networks.accounts[account_list_len - 1 - i];
+        let keystore_slug = getKeystoreSlugByAccountName(account_name);
+        let keystore_slug_path = path.resolve(keystore_path, `accounts/${keystore_slug}.json`);
 
-        if (!fs.existsSync(account_label_path)) {
+        if (!fs.existsSync(keystore_slug_path)) {
             networks.accounts.splice(account_list_len - 1 - i, 1);
         }
     }
 
     fs.writeFileSync(network_path, JSON.stringify(networks, null, 4));
-    let account_label_list = networks.accounts;
-    account_label_list = batch_format_account_label(account_label_list);
+    let account_name_list = networks.accounts;
+    let keystore_slug_list = batchGetKeystoreSlugByAccountName(account_name_list);
 
-    for (let i = 0; i < account_label_list.length; i++) {
-        let account_label_path = path.resolve(keystore_path, `accounts/${account_label_list[i]}.json`);
-        let account_info = JSON.parse(fs.readFileSync(account_label_path, 'utf8'));
+    for (let i = 0; i < keystore_slug_list.length; i++) {
+        let keystore_slug_path = path.resolve(keystore_path, `accounts/${keystore_slug_list[i]}.json`);
+        let account_info = JSON.parse(fs.readFileSync(keystore_slug_path, 'utf8'));
         if (account_info.account_type === "PP") {
             continue;
         }
@@ -778,6 +776,6 @@ export const updateStorage = (keystore_path: string) => {
             }
         ];
         delete account_info.ciphertexts;
-        fs.writeFileSync(account_label_path, JSON.stringify(account_info, null, 4));
+        fs.writeFileSync(keystore_slug_path, JSON.stringify(account_info, null, 4));
     }
 }