wative 1.0.7 → 1.0.9

package/src/account.ts

@@ -107,9 +107,11 @@ const importPrivateKey = async (keystore_path: string, wative_core: typeof Wativ
 
 const createAccount = async (keystore_path: string, wative_core: typeof WativeCore) => {
     const create_account_options = [
+        '> Back',
+        new inquirer.Separator('----------------------------------'),
         '> Import Passphrase',
         '> Import Private Key',
-        '> Back'
+        
     ];
 
     let selected_create_account = await selectSomething(create_account_options);
@@ -151,16 +153,19 @@ export const loginIn = async (account_label: string, wative_core: typeof WativeC
     if (is_login) {
         return true;
     }
-    let password = await inputPassword(`Please input the password for Account [${account_label}]`);
-    const login_result = await wative_core.account.login(account_label, password);
-    if (login_result.status) {
-        return true;
-    } else {
-        console.log(
-            chalk.red(login_result.output)
-        );
-        return false;
+
+    for (let i = 0; i < 3; i++) {
+        const password = await inputPassword(`Please input the password for Account [${account_label}]`);
+        const login_result = await wative_core.account.login(account_label, password);
+        if (login_result.status) {
+            return true;
+        } else {
+            console.log(
+                chalk.red(login_result.output)
+            );
+        }
     }
+    return false;
 }
 
 const selectAccount = async (keystore_path: string, wative_core: typeof WativeCore) => {
@@ -168,7 +173,8 @@ const selectAccount = async (keystore_path: string, wative_core: typeof WativeCo
     const account_label_list = networks.accounts;
 
     let select_account_options = [
-        "> Back"
+        '> Back',
+        new inquirer.Separator('----------------------------------') 
     ];
 
     const account_label_len = account_label_list.length;
@@ -190,11 +196,11 @@ const selectAccount = async (keystore_path: string, wative_core: typeof WativeCo
     }
 
     const selected_account = await selectSomething(select_account_options, "Select an account");
-    if (selected_account === "> Back") {
+    if (selected_account === '> Back') {
         return;
     }
 
-    const selected_account_label = account_label_list[select_account_options.indexOf(selected_account) - 1];
+    const selected_account_label = account_label_list[select_account_options.indexOf(selected_account) - 2];
     let login_result = await loginIn(selected_account_label, wative_core);
     if (login_result) {
         await accountManager(keystore_path, selected_account_label, wative_core);
@@ -207,7 +213,8 @@ const setDisableAddress = async (keystore_path: string, account_label: string, w
     const account_info = await getAccountInfo(keystore_path, account_label);
 
     let disable_address_options = [
-        "> Back",
+        '> Back',
+        new inquirer.Separator('----------------------------------'),
         "1.Disabled Slots",
         "2.Add Single",
         "3.Add Range"
@@ -215,7 +222,7 @@ const setDisableAddress = async (keystore_path: string, account_label: string, w
 
     const selected_disable_address = await selectSomething(disable_address_options);
     switch (selected_disable_address) {
-        case "> Back": {
+        case '> Back': {
             return;
         }
         case "1.Disabled Slots": {
@@ -230,7 +237,8 @@ const setDisableAddress = async (keystore_path: string, account_label: string, w
             let account_data = account_info.data;
 
             let disabled_slots_options = [
-                "> Back",
+                '> Back',
+                new inquirer.Separator('----------------------------------'),
             ];
 
             let default_network = account_info.default_network;
@@ -284,7 +292,7 @@ const setDisableAddress = async (keystore_path: string, account_label: string, w
 
             let selected_disabled_slots = await selectSomething(disabled_slots_options);
 
-            if (selected_disabled_slots === "> Back") {
+            if (selected_disabled_slots === '> Back') {
                 break;
             }
 
@@ -292,7 +300,7 @@ const setDisableAddress = async (keystore_path: string, account_label: string, w
             if (!confirm) {
                 break;
             }
-            let selected_disabled_slots_index = disabled_slots_options.indexOf(selected_disabled_slots) - 1;
+            let selected_disabled_slots_index = disabled_slots_options.indexOf(selected_disabled_slots) - 2;
 
             account_info.disabled_slots.splice(selected_disabled_slots_index, 1);
             saveAccountInfo(keystore_path, account_label, account_info);
@@ -346,24 +354,27 @@ const setDisableAddress = async (keystore_path: string, account_label: string, w
 const accountManager = async (keystore_path: string, account_label: string, wative_core: typeof WativeCore) => {
     let account_info = await getAccountInfo(keystore_path, account_label);
 
-    let account_manager_options: string[];
+    let account_manager_options: any[];
 
     if (account_info.account_type === "PP") {
         account_manager_options = [
+            '> Back',
+            new inquirer.Separator('----------------------------------'),
             '1.Address List',
             '2.Expand Address',
             '3.Slice Address',
             '4.Disable Address',
             '5.Reset Account Password',
             `6.Switch Networks [${account_info.default_network}]`,
-            '> Back'
+            
         ];
     } else {
         account_manager_options = [
+            '> Back',
+            new inquirer.Separator('----------------------------------'),
             '1.Address List',
             '2.Reset Account Password',
             `3.Switch Networks [${account_info.default_network}]`,
-            '> Back'
         ];
     }
 
@@ -445,7 +456,8 @@ const accountManager = async (keystore_path: string, account_label: string, wati
 const showPPAccounts = async (keystore_path: string, account_label: string, wative_core: typeof WativeCore) => {
     const account_info = await getAccountInfo(keystore_path, account_label);
     let option_accounts: any = [
-        '> Back'
+        '> Back',
+        new inquirer.Separator('----------------------------------'),
     ];
 
     let disabled_slots = account_info.disabled_slots;
@@ -485,11 +497,11 @@ const showPPAccounts = async (keystore_path: string, account_label: string, wati
     }
 
     let selected_account = await selectSomething(option_accounts, "Select an account");
-    if (selected_account === "> Back") {
+    if (selected_account === '> Back') {
         return;
     }
 
-    let selected_account_id = option_accounts.indexOf(selected_account) - 1;
+    let selected_account_id = option_accounts.indexOf(selected_account) - 2;
 
     await showPPAccountDetail(keystore_path, account_label, selected_account_id, wative_core);
     await showPPAccounts(keystore_path, account_label, wative_core);
@@ -521,18 +533,19 @@ const showPPAccountDetail = async (keystore_path: string, account_label: string,
         );
     }
 
-    let tag = "> Tag()";
+    let tag = '> Tag()';
     if ("tag" in account_info.data[selected_account_id] && account_info.data[selected_account_id].tag !== "") {
         tag = `> Tag(${account_info.data[selected_account_id].tag})`;
     }
 
     let options_account_detail = [
+        '> Back',
+        new inquirer.Separator('----------------------------------'),
         tag,
         '> Switch network',
         '> Assets',
         '> Tools',
-        '> Dump private key',
-        '> Back'
+        '> Dump private key'
     ];
 
     let selected_account_detail = await selectSomething(options_account_detail);
@@ -577,7 +590,8 @@ const showPPAccountDetail = async (keystore_path: string, account_label: string,
 const showPKAccounts = async (keystore_path: string, account_label: string, wative_core: typeof WativeCore) => {
     const account_info = await getAccountInfo(keystore_path, account_label);
     let option_accounts = [
-        '> Back'
+        '> Back',
+        new inquirer.Separator('----------------------------------')
     ];
 
     let tag = "";
@@ -587,7 +601,7 @@ const showPKAccounts = async (keystore_path: string, account_label: string, wati
 
     option_accounts.push(`#0 ${account_info.ciphertexts.address} ${tag} [${account_info.default_network}]`);
     let selected_account = await selectSomething(option_accounts, "Select an account");
-    if (selected_account === "> Back") {
+    if (selected_account === '> Back') {
         return;
     }
 
@@ -604,18 +618,19 @@ const showPKAccounts = async (keystore_path: string, account_label: string, wati
 
 const showPKAccountDetail = async (keystore_path: string, account_label: string, wative_core: typeof WativeCore) => {
     const account_info = await getAccountInfo(keystore_path, account_label);
-    let tag = "> Tag()";
+    let tag = '> Tag()';
     if ("tag" in account_info && account_info.tag !== "") {
         tag = `> Tag(${account_info.tag})`;
     }
 
     let options_account_detail = [
+        '> Back',
+        new inquirer.Separator('----------------------------------'),
         tag,
         '> Switch network',
         '> Assets',
         '> Tools',
         '> Dump private key',
-        '> Back'
     ];
 
     let selected_account_detail = await selectSomething(options_account_detail);
@@ -696,11 +711,24 @@ export const accountSetting = async (keystore_path: string, wative_core: typeof
         fs.mkdirSync(account_path);
     }
 
-    const account_setting_options = [
-        '> Select an account',
-        '> Create a new account',
-        '> Back'
-    ];
+    const networks = getNetworkInfo(keystore_path);
+    const account_label_list = networks.accounts;
+
+    let account_setting_options: any[];
+    if (account_label_list.length === 0) {
+        account_setting_options = [
+            '> Back',
+            new inquirer.Separator('----------------------------------'),
+            '> Create a new account'
+        ];
+    } else {
+        account_setting_options = [
+            '> Back',
+            new inquirer.Separator('----------------------------------'),
+            '> Select an account',
+            '> Create a new account'
+        ];
+    }
 
     let selected_account_setting = await selectSomething(account_setting_options);
 

package/src/assets.ts

@@ -6,6 +6,7 @@ import { isEvmAddress, isSolanaAddress } from "./chain";
 import { getNetworkInfoByName, getNetworkTypeByName } from "./network";
 import { chainAddressValidator, checkFileExistence, inputSomething, selectSomething } from "./utils";
 import { getTokenBalanceInEvm, getTokenBalanceInSolana, getTokenInfoInEvm, getTokenInfoInSolana } from './web3';
+import inquirer from "inquirer";
 
 
 // symbol; name; address; decimals
@@ -157,22 +158,23 @@ export const showAssets = async (
     default_network: string
 ) => {
     const options_assets_list = [
-        "> Show Assets",
-        "> Add Asset",
-        "> Back"
+        '> Back',
+        new inquirer.Separator('----------------------------------'),
+        '> Show Assets',
+        '> Add Asset'
     ];
 
     const selected_option = await selectSomething(options_assets_list);
     switch (selected_option) {
-        case "> Show Assets": {
+        case '> Show Assets': {
             await showAssetsDetail(keystore_path, default_network, account_address);
             break;
         }
-        case "> Add Asset": {
+        case '> Add Asset': {
             await addAsset(keystore_path, default_network);
             break;
         }
-        case "> Back": {
+        case '> Back': {
             return;
         }
     }

package/src/network.ts

@@ -39,28 +39,28 @@ export const createNetwork = async (keystore_path: string) => {
 }
 
 export const selectOrEditNetwork = async (keystore_path: string, selected_network: any) => {
-    let options: string[] = [
-        "> Edit"
+    let options: any[] = [
+        '> Back',
+        new inquirer.Separator('----------------------------------'),
+        '> Edit'
     ];
 
     if (selected_network.name !== "Ethereum Mainnet" && selected_network.name !== "Solana Mainnet") {
-        options.push("> Remove");
+        options.push('> Remove');
     }
 
-    options.push("> Back");
-
     const selected_network_info = await selectSomething(options);
 
     switch (selected_network_info) {
-        case "> Edit": {
+        case '> Edit': {
             await updateNetwork(keystore_path, selected_network);
             break;
         }
-        case "> Remove": {
+        case '> Remove': {
             await removeNetwork(keystore_path, selected_network);
             break;
         }
-        case "> Back": {
+        case '> Back': {
             break;
         }
     }
@@ -229,7 +229,7 @@ export const showAvailableNetworks = async (keystore_path: string) => {
         }
     }
 
-    let options: any = ["> Back", new inquirer.Separator(`----Networks(evm)----`)];
+    let options: any = ['> Back', new inquirer.Separator(`----Networks(evm)----`)];
 
     for (let i = 0; i < evm_ids.length; i++) {
         const evm_id = evm_ids[i];
@@ -257,7 +257,7 @@ export const showAvailableNetworks = async (keystore_path: string) => {
     }
 
     const selected_option = await selectSomething(options);
-    if (selected_option === "> Back") {
+    if (selected_option === '> Back') {
         return;
     }
 
@@ -275,23 +275,24 @@ export const showAvailableNetworks = async (keystore_path: string) => {
 
 export const showNetwork = async (keystore_path: string) => {
     let network_info_list = [
-        "> Available Networks",
-        "> Add Network",
-        "> Back"
+        '> Back',
+        new inquirer.Separator('----------------------------------'),
+        '> Available Networks',
+        '> Add Network'
     ];
 
     const selected_network_info = await selectSomething(network_info_list);
 
     switch (selected_network_info) {
-        case "> Available Networks": {
+        case '> Available Networks': {
             await showAvailableNetworks(keystore_path);
             break;
         }
-        case "> Add Network": {
+        case '> Add Network': {
             await addNetwork(keystore_path);
             break;
         }
-        case "> Back": {
+        case '> Back': {
             return;
         }
     }
@@ -368,7 +369,8 @@ export const switchPPNetwork = async (keystore_path: string, account_label: stri
 
     let account_info = getAccountInfo(keystore_path, account_label);
     let options_switch_network = [
-        "> Back"
+        '> Back',
+        new inquirer.Separator('----------------------------------')
     ];
 
     let default_network = account_info.data[account_id].default_network;
@@ -396,15 +398,15 @@ export const switchPPNetwork = async (keystore_path: string, account_label: stri
 
     const selected_network = await selectSomething(options_switch_network);
 
-    if (selected_network === "> Back") {
+    if (selected_network === '> Back') {
         return;
     }
 
     let selected_network_id = options_switch_network.indexOf(selected_network);
-    if (selected_network_id === 1) {
+    if (selected_network_id === 2) {
         delete account_info.data[account_id].default_network;
     } else {
-        account_info.data[account_id].default_network = network_list[selected_network_id - 2].name;
+        account_info.data[account_id].default_network = network_list[selected_network_id - 3].name;
     }
 
     saveAccountInfo(keystore_path, account_label, account_info);
@@ -428,7 +430,8 @@ export const switchNetworkByAccountLabel = async (keystore_path: string, account
 
     let account_info = getAccountInfo(keystore_path, account_label);
     let options_switch_network = [
-        "> Back"
+        '> Back',
+        new inquirer.Separator('----------------------------------'),
     ];
 
     let default_network = account_info.default_network;
@@ -464,12 +467,12 @@ export const switchNetworkByAccountLabel = async (keystore_path: string, account
     }
 
     const selected_network = await selectSomething(options_switch_network);
-    if (selected_network === "> Back") {
+    if (selected_network === '> Back') {
         return;
     }
 
     let selected_network_id = options_switch_network.indexOf(selected_network);
-    account_info.default_network = option_network_name_list[selected_network_id - 1];
+    account_info.default_network = option_network_name_list[selected_network_id - 2];
     saveAccountInfo(keystore_path, account_label, account_info);
 
     if (!is_account_label) {

package/src/tools.ts

@@ -16,7 +16,7 @@ import {
 
 const { WativeCore } = require("wative-core");
 
-const confirmEvmRawTransaction = async (tx_params: any) => {
+const confirmEvmRawTransaction = async (tx_params: any): Promise<any> => {
     let option_send_evm_raw_transaction_list: any = [
         new inquirer.Separator("————Tx Detail—————-"),
         `from: ${tx_params.from}`,
@@ -59,7 +59,7 @@ const confirmEvmRawTransaction = async (tx_params: any) => {
         return tx_params;
     }
 
-    await confirmEvmRawTransaction(tx_params);
+    return await confirmEvmRawTransaction(tx_params);
 }
 
 const sendEvmRawTransaction = async (chain_rpc_url: string, chain_symbols: string, account_address: string, wative_core: typeof WativeCore) => {
@@ -99,7 +99,7 @@ const sendEvmRawTransaction = async (chain_rpc_url: string, chain_symbols: strin
         }
 
         let option_select_vaule_list: any = [
-            "> Input value",
+            '> Input value',
             `> Total Balance (${total_balance} ${chain_symbols})`
         ]
         let selected_vaule = await selectSomething(option_select_vaule_list);
@@ -228,7 +228,7 @@ export const sendSolanaRawTransaction = async (chain_rpc_url: string, chain_symb
     }
 
     let option_select_vaule_list: any = [
-        "> Input value",
+        '> Input value',
         `> Total Balance (${total_balance} ${chain_symbols})`
     ]
     let selected_vaule = await selectSomething(option_select_vaule_list);
@@ -283,15 +283,15 @@ export const sendSolanaRawTransaction = async (chain_rpc_url: string, chain_symb
 
 const sendEvmTokenTransaction = async (keystore_path: string, chain_rpc_url: string, chain_id: string, account_address: string, wative_core: typeof WativeCore) => {
     const option_token_address_list = [
-        "> Input token ticker",
-        "> Input token contract address"
+        '> Input token ticker',
+        '> Input token contract address'
     ];
     let selected_token_address = await selectSomething(option_token_address_list);
 
     let token_address: any;
     let token_decimals: any;
     switch (selected_token_address) {
-        case "> Input token ticker":
+        case '> Input token ticker':
             let token_name = await inputSomething("token ticker");
 
             let token_address_list = await getAssetListByTokenName(keystore_path, chain_id, token_name);
@@ -329,7 +329,7 @@ const sendEvmTokenTransaction = async (keystore_path: string, chain_rpc_url: str
             token_address = token_ticker_info.address;
             token_decimals = Number(token_ticker_info.decimals);
             break;
-        case "> Input token contract address":
+        case '> Input token contract address':
             token_address = await inputSomething("token contract address", chainAddressValidator);
             let token_info: any = await getTokenInfoInEvm(token_address, chain_rpc_url);
             if (!token_info.status) {
@@ -404,15 +404,15 @@ const sendEvmTokenTransaction = async (keystore_path: string, chain_rpc_url: str
 
 const sendSolanaTokenTransaction = async (keystore_path: string, chain_rpc_url: string, chain_id: string, account_address: string, wative_core: typeof WativeCore) => {
     const option_token_address_list = [
-        "> Input token ticker",
-        "> Input token contract address"
+        '> Input token ticker',
+        '> Input token contract address'
     ];
     let selected_token_address = await selectSomething(option_token_address_list);
 
     let token_address: any;
     let token_decimals: any;
     switch (selected_token_address) {
-        case "> Input token ticker":
+        case '> Input token ticker':
             let token_name = await inputSomething("token ticker");
 
             let token_address_list = await getAssetListByTokenName(keystore_path, chain_id, token_name);
@@ -450,7 +450,7 @@ const sendSolanaTokenTransaction = async (keystore_path: string, chain_rpc_url:
             token_address = token_ticker_info.address;
             token_decimals = Number(token_ticker_info.decimals);
             break;
-        case "> Input token contract address":
+        case '> Input token contract address':
             token_address = await inputSomething("token contract address", chainAddressValidator);
             let token_info: any = await getTokenInfoInSolana(token_address, chain_rpc_url);
             if (!token_info.status) {
@@ -638,15 +638,16 @@ const excuteTools = async (keystore_path: string, account_label: string, account
     );
 
     const option_send_tx = [
-        "> Send Raw Tx",
-        "> Send Token",
-        "> Back"
+        '> Back',
+        new inquirer.Separator('----------------------------------'),
+        '> Send Raw Tx',
+        '> Send Token'
     ];
 
     const selected_send_tx = await selectSomething(option_send_tx);
 
     switch (selected_send_tx) {
-        case "> Send Raw Tx": {
+        case '> Send Raw Tx': {
             if (account_chain_type === "evm") {
                 await sendEvmRawTransaction(
                     network_info.rpcUrl,
@@ -666,7 +667,7 @@ const excuteTools = async (keystore_path: string, account_label: string, account
             }
             break;
         }
-        case "> Send Token": {
+        case '> Send Token': {
             if (account_chain_type === "evm") {
                 await sendEvmTokenTransaction(
                     keystore_path,
@@ -688,7 +689,7 @@ const excuteTools = async (keystore_path: string, account_label: string, account
             }
             break;
         }
-        case "> Back": {
+        case '> Back': {
             return;
         }
     }
@@ -696,18 +697,19 @@ 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) => {
     const tools_options = [
-        "> SendTx",
-        "> SignMessage",
-        "> Back",
+        '> Back',
+        new inquirer.Separator('----------------------------------'),
+        '> SendTx',
+        '> SignMessage'
     ];
 
     const selected_tools_option = await selectSomething(tools_options);
     switch (selected_tools_option) {
-        case "> SendTx": {
+        case '> SendTx': {
             await excuteTools(keystore_path, account_label, account_address, wative_core);
             break;
         }
-        case "> SignMessage": {
+        case '> SignMessage': {
             const message = await editorSomething("Input the message to sign");
             const signed_message = wative_core.account.signMessage(account_address, message);
             if (!signed_message.status) {
@@ -719,7 +721,7 @@ export const selectToolsOptions = async (keystore_path: string, account_label: s
             );
             break;
         }
-        case "> Back": {
+        case '> Back': {
             return;
         }
     }

package/src/utils.ts

@@ -400,7 +400,7 @@ export const editorSomething = async (text: string, validate_func?: Function) =>
 
 export const hexValidator = function (value: string) {
     let reg = /^0x[0-9a-fA-F]*$/g;
-    if (reg.test(value)) {
+    if (reg.test(value.trim())) {
         return true;
     } else {
         return false;