wative 1.0.20 → 1.0.21

package/src/account.ts

@@ -23,6 +23,7 @@ import { selectToolsOptions } from './tools';
 import inquirer from "inquirer";
 import { getChainType } from "./chain";
 
+require("dotenv").config();
 const cliProgress = require('cli-progress');
 const { WativeCore } = require("wative-core");
 
@@ -240,7 +241,12 @@ export const loginIn = async (account_label: string, wative_core: typeof WativeC
     }
 
     for (let i = 0; i < 3; i++) {
-        const password = await inputPassword(`Please input the password for Account [${account_label}]`);
+        let password: any;
+        if (process.env.WativePassword && process.env.WativePassword !== '') {
+            password = process.env.WativePassword;
+        } else {
+            password = await inputPassword(`Please input the password for Account [${account_label}]`);
+        }
         if (!password) {
             console.log(
                 chalk.red("Password can't be empty")
@@ -552,6 +558,7 @@ const showAccounts = async (keystore_path: string, account_label: string, wative
     let network_info = getNetworkInfoByName(keystore_path, default_network);
     let network_type = getChainType(network_info.chainId.toString());
 
+    let pad_index = account_info.data.length.toString().length + 1;
     for (let i = 0; i < account_info.data.length; i++) {
         let tag = account_info.data[i].tag ? `(${account_info.data[i].tag})` : "";
         let is_disable_address = wative_core.account.checkIsDisableAddress(disabled_slots, i);
@@ -569,10 +576,10 @@ const showAccounts = async (keystore_path: string, account_label: string, wative
 
         if (is_disable_address) {
             option_accounts.push(
-                new inquirer.Separator(chalk.yellow(`#${i} ${formatAddr(account_address, status.fullAddr)} ${tag}`))
+                new inquirer.Separator(chalk.yellow(`#${i.toString().padEnd(pad_index)} ${formatAddr(account_address, status.fullAddr)} ${tag}`))
             )
         } else {
-            option_accounts.push(`#${i} ${formatAddr(account_address, status.fullAddr)} ${tag}`);
+            option_accounts.push(`#${i.toString().padEnd(pad_index)} ${formatAddr(account_address, status.fullAddr)} ${tag}`);
         }
     }
 
@@ -646,11 +653,11 @@ const showAccountDetail = async (keystore_path: string, account_label: string, s
 
     switch (selected_account_detail) {
         case tag: {
-            let cureent_tag = 'Current tag';
+            let current_tag = 'Current tag';
             if ("tag" in account_info.data[selected_account_id] && account_info.data[selected_account_id].tag !== "") {
-                cureent_tag = `Current tag (${account_info.data[selected_account_id].tag})`;
+                current_tag = `Current tag (${account_info.data[selected_account_id].tag})`;
             }
-            let tag = await inputSomething(cureent_tag, tagValidator);
+            let tag = await inputSomething(current_tag, tagValidator);
             tag = tag.replace(/\s+/g, " ").trim();
             account_info.data[selected_account_id].tag = tag.toLocaleLowerCase();
             saveAccountInfo(keystore_path, account_label, account_info);

package/src/assets.ts

@@ -3,7 +3,7 @@ import * as path from "path";
 import * as fs from 'fs';
 import { BigNumber } from 'bignumber.js';
 import { getChainType, isEvmAddress, isSolanaAddress } from "./chain";
-import { getNetworkInfoByName, getNetworkTypeByName } from "./network";
+import { getNetworkInfoByName, getNetworkTypeByName, getShowTokenList } from "./network";
 import { chainAddressValidator, checkFileExistence, inputSomething, numberValidator, selectSomething } from "./utils";
 import { deleteTokenBalance, getTokenBalance, getTokenBalanceInEvm, getTokenBalanceInSolana, getTokenInfoInEvm, getTokenInfoInSolana, updateBalance } from './web3';
 import inquirer from "inquirer";
@@ -36,7 +36,7 @@ export const getAssetListByTokenName = async (
     const asset_list = await getAssetList(keystore_path, chain_id);
     let token_address_list: any = [];
     for (let i = 0; i < asset_list.length; i++) {
-        if (asset_list[i].symbol === token_name) {
+        if (asset_list[i].symbol.toLocaleLowerCase() === token_name.toLocaleLowerCase()) {
             token_address_list.push(asset_list[i]);
         }
     }
@@ -102,7 +102,10 @@ export const saveAsset = async (
     }
 
     for (let i = 0; i < assets_mapping[chain_id].length; i++) {
-        if (assets_mapping[chain_id][i].address === asset_address) {
+        if (
+            assets_mapping[chain_id][i].address.toLocaleLowerCase() === asset_address.toLocaleLowerCase() ||
+            assets_mapping[chain_id][i].symbol.toLocaleLowerCase() === symbol.toLocaleLowerCase()
+        ) {
             assets_mapping[chain_id][i] = {
                 address: asset_address,
                 symbol,
@@ -172,7 +175,7 @@ export const addToken = async (
     }
 
     console.log(
-        chalk.green(`Token ${token_info_result.output.name} loaded successfully.`)
+        chalk.green(`Token ${token_info_result.output.symbol}(${token_info_result.output.name}) loaded successfully.`)
     );
 
     let display_decimals = await inputSomething("Enter decimals for display", numberValidator);
@@ -224,7 +227,7 @@ export const addAsset = async (
     }
 
     console.log(
-        chalk.green(`Token ${token_info_result.output.name} loaded successfully.`)
+        chalk.green(`Token ${token_info_result.output.symbol}(${token_info_result.output.name}) loaded successfully.`)
     );
 
     let display_decimals = await inputSomething("Enter decimals for display", numberValidator);
@@ -355,9 +358,15 @@ export const getBatchAccountBalance = async (
     }
 
     if (show_extended_token) {
+        let showTokenList = getShowTokenList(keystore_path, network_name);
+
         for (let i = 0; i < asset_info_list_len; i++) {
             let asset_info = asset_info_list[i];
             let token_address = asset_info.address;
+            if (!showTokenList.includes(token_address)) {
+                continue;
+            }
+            
             await updateBalance(
                 account_address_list,
                 token_address,

package/src/network.ts

@@ -13,9 +13,9 @@ import {
     getSymbol,
     getColor,
     Result,
-    getAccountChainType,
     formatAddr,
-    checkFileExistence
+    checkFileExistence,
+    selectCheckboxSomething
 } from "./utils";
 import {
     getAccountInfo,
@@ -362,6 +362,18 @@ export const selectFlag = async () => {
     }
 }
 
+export const getShowTokenList = (keystore_path: string, chain_name: string) => {
+    const network_path = path.resolve(keystore_path, 'network.json');
+    const networks = JSON.parse(fs.readFileSync(network_path, 'utf8'));
+
+    let showTokensMap = networks.showTokens;
+    if (chain_name in showTokensMap) {
+        return showTokensMap[chain_name];
+    }
+
+    return [];
+}
+
 export const showTokenList = async (keystore_path: string) => {
     const network_path = path.resolve(keystore_path, 'network.json');
     const networks = JSON.parse(fs.readFileSync(network_path, 'utf8'));
@@ -381,16 +393,48 @@ export const showTokenList = async (keystore_path: string) => {
 
     const assets = JSON.parse(fs.readFileSync(assets_path, 'utf8'));
 
+    let options: any = [];
+    let default_options: any = [];
+    let option_info_map: any = {};
     for (let chain_id in assets) {
-        console.log(`----- Networks (${network_settings_map[chain_id]}) -------`);
-
+        option_info_map[options.length] = {
+            name: network_settings_map[chain_id],
+            address: null
+        };
+        options.push(new inquirer.Separator(`----- Networks (${network_settings_map[chain_id]}) -------`));
+        let show_token_list: any = getShowTokenList(keystore_path, network_settings_map[chain_id]);
         let token_list_len = assets[chain_id].length;
         for (let i = 0; i < token_list_len; i++) {
             let token_info = assets[chain_id][i];
-            console.log(`${i + 1}.${token_info.symbol} CA: ${chalk.green(`${formatAddr(token_info.address)}`)
+            if (show_token_list.includes(token_info.address)) {
+                default_options.push(`${i + 1}.${token_info.symbol.padEnd(6)} CA: ${chalk.green(`${formatAddr(token_info.address).padEnd(45)}`)
+                    }  Decimals: ${token_info.display_decimals ? token_info.display_decimals : "4"}`);
+            }
+
+            option_info_map[options.length] = {
+                name: network_settings_map[chain_id],
+                address: token_info.address
+            };
+            options.push(`${i + 1}.${token_info.symbol.padEnd(6)} CA: ${chalk.green(`${formatAddr(token_info.address).padEnd(45)}`)
                 }  Decimals: ${token_info.display_decimals ? token_info.display_decimals : "4"}`);
         }
     }
+
+    let selected_option = await selectCheckboxSomething(options, "Choose Tokens", default_options);
+    let show_token_list_map: any = {};
+    for (let i = 0; i < selected_option.length; i++) {
+        let _option = selected_option[i];
+        let option_index = options.indexOf(_option);
+        let option_info = option_info_map[option_index];
+        if (option_info.name in show_token_list_map) {
+            show_token_list_map[option_info.name].push(option_info.address);
+        } else {
+            show_token_list_map[option_info.name] = [option_info.address];
+        }
+    }
+
+    networks.showTokens = show_token_list_map;
+    fs.writeFileSync(network_path, JSON.stringify(networks, null, 2));
 }
 
 export const enhancedBalanceDisplay = async (keystore_path: string) => {

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, getAccountChainType, hexValidator, inputSomething, numberValidator, selectSomething } from "./utils";
+import { addrValidator, chainAddressValidator, confirmSomething, editorSomething, gasValidator, getAccountChainType, hexValidator, inputSomething, numberValidator, selectSomething } from "./utils";
 import { loginIn } from './account';
 import { getAccountBalance, getDefaultNetworkByAddress, getEvmNetworks, getNetworkInfoByName, getNetworkTypeByName } from './network';
 import { GasUtil } from './tx_gas_utils';
@@ -68,7 +68,7 @@ const sendEvmRawTransaction = async (chain_id: string, chain_rpc_url: string, ch
     const estimateGasPrice = await gasUtil.getGasPrice();
     const estimateGasPriceEthers = (new BigNumber(estimateGasPrice.toString())).dividedBy(1e9);
     const _estimateGasPrice = estimateGasPriceEthers.toFixed(4, BigNumber.ROUND_FLOOR);
-    const inputGasPrice = await inputSomething(`Gas price (${_estimateGasPrice}), agree or enter`);
+    const inputGasPrice = await inputSomething(`Gas price (${_estimateGasPrice}), agree or enter`, gasValidator);
     let gasPrice = inputGasPrice ? inputGasPrice : _estimateGasPrice;
     gasPrice = (new BigNumber(gasPrice)).multipliedBy(1e9).toFixed(0);
 
@@ -104,24 +104,6 @@ const sendEvmRawTransaction = async (chain_id: string, chain_rpc_url: string, ch
             chain_symbols,
             18
         );
-
-        // let option_select_value_list: any = [
-        //     '> Input value',
-        //     `> Total Balance (${total_balance} ${chain_symbols})`
-        // ]
-        // let selected_value = await selectSomething(option_select_value_list);
-        // let value_id = option_select_value_list.indexOf(selected_value);
-        // if (value_id === 0) {
-        //     let input_value = await inputSomething("value", numberValidator);
-        //     value = new BigNumber(input_value).multipliedBy(1e18).toFixed(0, BigNumber.ROUND_FLOOR);
-        // } else if (value_id === 1) {
-        //     value = max_value;
-        // }
-
-        // if ((new BigNumber(value)).isGreaterThan(new BigNumber(max_value))) {
-        //     console.log(chalk.red("Not enough balance"));
-        //     return;
-        // }
     } else {
         data = await editorSomething("data", hexValidator);
         value = await inputSomething("value", numberValidator);
@@ -236,7 +218,7 @@ export const sendSolanaRawTransaction = async (chain_id: string, chain_rpc_url:
     }
 
     const account_balance = new BigNumber(account_balance_result.output);
-    
+
     const max_value = account_balance.minus(5000).minus(used_prioritization_fee);
     let total_balance = (new BigNumber(max_value)).dividedBy(1e9).toFixed(4, BigNumber.ROUND_FLOOR);
     if (new BigNumber(total_balance) < new BigNumber(0)) {
@@ -383,12 +365,30 @@ const sendEvmTokenTransaction = async (keystore_path: string, chain_rpc_url: str
     }
 
     const receipt = await inputSomething("Receipt", chainAddressValidator);
-    const amount = await inputSomething("Amount", numberValidator);
+    const token_balance_result = await getTokenBalanceInEvm(account_address, token_address, chain_rpc_url);
+    if (!token_balance_result.status) {
+        console.log(chalk.red(token_balance_result.output));
+        return;
+    }
+    let amount: any;
+    for (let i = 0; i < 5; i++) {
+        let input_amount = await inputSomething("Amount", numberValidator);
+        if ((new BigNumber(input_amount).multipliedBy(Math.pow(10, Number(token_decimals)))).isLessThanOrEqualTo(new BigNumber(token_balance_result.output))) {
+            amount = input_amount;
+            break;
+        }
+        console.log(chalk.red("Not enough balance"));
+    }
+
+    if (!amount) {
+        return;
+    }
+
     const gasUtil = new GasUtil(chain_rpc_url);
     const estimateGasPrice = await gasUtil.getGasPrice();
     const estimateGasPriceEthers = (new BigNumber(estimateGasPrice.toString())).dividedBy(1e9);
     const _estimateGasPrice = estimateGasPriceEthers.toFixed(4, BigNumber.ROUND_FLOOR);
-    const inputGasPrice = await inputSomething(`Gas price (${_estimateGasPrice}), agree or enter`);
+    const inputGasPrice = await inputSomething(`Gas price (${_estimateGasPrice}), agree or enter`, gasValidator);
     let gasPrice = inputGasPrice ? inputGasPrice : _estimateGasPrice;
     gasPrice = (new BigNumber(gasPrice)).multipliedBy(1e9).toFixed(0);
 
@@ -512,7 +512,24 @@ const sendSolanaTokenTransaction = async (keystore_path: string, chain_rpc_url:
     }
 
     const receipt = await inputSomething("Receipt", chainAddressValidator);
-    const amount = await inputSomething("Amount", numberValidator);
+    const token_balance_result = await getTokenBalanceInEvm(account_address, token_address, chain_rpc_url);
+    if (!token_balance_result.status) {
+        console.log(chalk.red(token_balance_result.output));
+        return;
+    }
+    let amount: any;
+    for (let i = 0; i < 5; i++) {
+        let input_amount = await inputSomething("Amount", numberValidator);
+        if ((new BigNumber(input_amount).multipliedBy(Math.pow(10, Number(token_decimals)))).isLessThanOrEqualTo(new BigNumber(token_balance_result.output))) {
+            amount = input_amount;
+            break;
+        }
+        console.log(chalk.red("Not enough balance"));
+    }
+
+    if (!amount) {
+        return;
+    }
 
     let transfer_amount = new BigNumber(amount).multipliedBy(Math.pow(10, token_decimals)).toFixed(0);
     let from_token_account = getAssociatedTokenAddressSync(

package/src/utils.ts

@@ -91,7 +91,7 @@ export const tagValidator = (tag: string) => {
 
     tag = tag.replace(/\s+/g, " ").trim();
 
-    if (tag.length > 10) {
+    if (tag.length > 40) {
         return "Tag length should be less than 10";
     }
 
@@ -116,6 +116,13 @@ export const numberValidator = (value: string) => {
     return true;
 }
 
+export const gasValidator = (value: string) => {
+    if (isNaN(Number(value)) || Number(value) > 1000) {
+        return "Value should be a number";
+    }
+    return true;
+}
+
 export const passphraseValidator = (passphrase: string) => {
     passphrase = passphrase.replace(/\s+/g, " ");
     const mnemonic_word_list = passphrase.split(/\s+/g);
@@ -188,6 +195,25 @@ export const selectSomething = async (options: any[], message?: string, _default
     return inputText.toString()
 }
 
+export const selectCheckboxSomething = async (options: any[], message?: string, _default?: any) => {
+    const questions = [
+        {
+            type: 'checkbox',
+            name: 'inputText',
+            message: message || 'Choose an option',
+            default: _default,
+            choices: options,
+            pageSize: 30,
+            filter: (val: string) => {
+                return val;
+            },
+        },
+    ]
+
+    const { inputText } = await inquirer.prompt(questions)
+    return inputText
+}
+
 export const showIntroduction = () => {
     console.log(
         chalk.green(
@@ -598,6 +624,20 @@ export const listWithLazyBalanceLoading = async (
             show_extended_token
         );
 
+        let pad_index_map: any = {};
+
+        for (let account_address in batchBalanceOf) {
+            for (let token_name in batchBalanceOf[account_address]) {
+                let balance = batchBalanceOf[account_address][token_name];
+                let new_pad_index = balance.length + 1;
+                if (!pad_index_map[token_name]) {
+                    pad_index_map[token_name] = new_pad_index;
+                } else if (pad_index_map[token_name] < new_pad_index) {
+                    pad_index_map[token_name] = new_pad_index;
+                }
+            }
+        }
+
         let gas_token_name = network_info.nativeCurrency.symbol;
         for (let i = fromIndex; i < toIndex; i++) {
             let _index = i >= accounts.length / 2 ? i - accounts.length / 2 : i;
@@ -622,7 +662,7 @@ export const listWithLazyBalanceLoading = async (
                     continue;
                 }
 
-                token_message += `${token_name}: ${batchBalanceOf[account_address][token_name]} `;
+                token_message += `${token_name}:${batchBalanceOf[account_address][token_name].padEnd(pad_index_map[token_name])} `;
             }
 
             let nameList = name.split('(');
@@ -653,6 +693,10 @@ export const updateStorage = (keystore_path: string) => {
         }
     }
 
+    if (!networks.showTokens) {
+        networks.showTokens = {};
+    }
+
     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];