wative 1.0.8 → 1.0.10

package/src/network.ts

@@ -13,14 +13,16 @@ import {
     getSymbol,
     getColor,
     Result,
-    getAccountChainType
+    getAccountChainType,
+    formatAddr
 } from "./utils";
 import {
     getAccountInfo,
     saveAccountInfo
 } from "./account";
-import { getAccountBalanceInEvm, getAccountBalanceInSolana } from "./web3";
+import { deleteTokenBalance, getAccountBalanceInEvm, getAccountBalanceInSolana } from "./web3";
 import { getChainType, getNativeTokenDecimals } from "./chain";
+import { addToken } from "./assets";
 
 export const createNetwork = async (keystore_path: string) => {
     const network_path = path.resolve(keystore_path, 'network.json');
@@ -39,28 +41,29 @@ export const createNetwork = async (keystore_path: string) => {
 }
 
 export const selectOrEditNetwork = async (keystore_path: string, selected_network: any) => {
-    let options: string[] = [
-        "> Edit"
+    let options: any[] = [
+        '> Edit'
     ];
 
     if (selected_network.name !== "Ethereum Mainnet" && selected_network.name !== "Solana Mainnet") {
-        options.push("> Remove");
+        options.push('> Remove');
     }
 
-    options.push("> Back");
+    options.push(new inquirer.Separator('----------------------------------'));
+    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 +232,11 @@ export const showAvailableNetworks = async (keystore_path: string) => {
         }
     }
 
-    let options: any = ["> Back", new inquirer.Separator(`----Networks(evm)----`)];
+    let options: any = [
+        '> Back',
+        '+ Add Network',
+        new inquirer.Separator(`----Networks(evm)----`)
+    ];
 
     for (let i = 0; i < evm_ids.length; i++) {
         const evm_id = evm_ids[i];
@@ -257,41 +264,179 @@ export const showAvailableNetworks = async (keystore_path: string) => {
     }
 
     const selected_option = await selectSomething(options);
-    if (selected_option === "> Back") {
+    if (selected_option === '> Back') {
+        return;
+    }
+
+    if (selected_option === '+ Add Network') {
+        await addNetwork(keystore_path);
         return;
     }
 
+
     let option_id = options.indexOf(selected_option);
     let select_network: any;
-    if (option_id < evm_ids.length + 2) {
-        select_network = networks.networks[evm_ids[option_id - 2]];
+    if (option_id < evm_ids.length + 3) {
+        select_network = networks.networks[evm_ids[option_id - 3]];
     } else {
-        select_network = networks.networks[solana_ids[option_id - evm_ids.length - 3]];
+        select_network = networks.networks[solana_ids[option_id - evm_ids.length - 4]];
     }
 
     await selectOrEditNetwork(keystore_path, select_network);
     await showAvailableNetworks(keystore_path);
 }
 
+export const showDataview = async (keystore_path: string) => {
+    let options: any = [
+        '> Enhanced Balance Display',
+        new inquirer.Separator('----------------------------------'),
+        '> Back',
+    ];
+
+    const selected_option = await selectSomething(options);
+    switch (selected_option) {
+        case '> Enhanced Balance Display': {
+            await enhancedBalanceDisplay(keystore_path);
+            break;
+        }
+        case '> Back': {
+            return;
+        }
+    }
+
+    await showDataview(keystore_path);
+}
+
+export const updateStatus = async (keystore_path: string) => {
+    const network_path = path.resolve(keystore_path, 'network.json');
+    const networks = JSON.parse(fs.readFileSync(network_path, 'utf8'));
+
+    if (!("status" in networks)) {
+        networks.status = {
+            fullAddr: false,
+            gasToken: false,
+            extendedToken: false
+        }
+    }
+
+    let options = [
+        `> Show Full Address  [${networks.status.fullAddr ? "ON" : "OFF"}]`,
+        `> Show Gas Token     [${networks.status.gasToken ? "ON" : "OFF"}]`,
+        `> Show Extended Token[${networks.status.extendedToken ? "ON" : "OFF"}]`,
+        new inquirer.Separator('----------------------------------'),
+        '> Back',
+    ];
+
+    const selected_option = await selectSomething(options);
+
+    if (selected_option === '> Back') {
+        return;
+    }
+
+    if (selected_option.includes('Full Address')) {
+        networks.status.fullAddr = await selectFlag();
+    } else if (selected_option.includes('Gas Token')) {
+        networks.status.gasToken = await selectFlag();
+    } else if (selected_option.includes('Extended Token')) {
+        networks.status.extendedToken = await selectFlag();
+    }
+
+    fs.writeFileSync(network_path, JSON.stringify(networks, null, 2));
+}
+
+export const selectFlag = async () => {
+    let options = [
+        '> On',
+        '> Off'
+    ];
+
+    const selected_option = await selectSomething(options);
+    switch (selected_option) {
+        case '> On': {
+            return true;
+        }
+        case '> Off': {
+            return false;
+        }
+    }
+}
+
+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'));
+
+    let network_settings_map: any = {};
+    for (let network_info of networks.networks) {
+        network_settings_map[network_info.chainId.toString()] = network_info.name;
+    }
+
+    const assets_path = path.resolve(keystore_path, 'assets.json');
+    const assets = JSON.parse(fs.readFileSync(assets_path, 'utf8'));
+
+    for (let chain_id in assets) {
+        console.log(`----- Networks (${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)}`)
+                }  Decimals: ${token_info.display_decimals ? token_info.display_decimals : "4"}`);
+        }
+    }
+}
+
+export const enhancedBalanceDisplay = async (keystore_path: string) => {
+    const options = [
+        '> Status',
+        '> Token List',
+        '> Add Token',
+        new inquirer.Separator('----------------------------------'),
+        '> Back',
+    ];
+
+    const selected_option = await selectSomething(options);
+
+    switch (selected_option) {
+        case '> Status': {
+            await updateStatus(keystore_path);
+            break;
+        }
+        case '> Token List': {
+            await showTokenList(keystore_path);
+            break;
+        }
+        case '> Add Token': {
+            await addToken(keystore_path);
+            break;
+        }
+        case '> Back': {
+            return;
+        }
+    }
+
+    await enhancedBalanceDisplay(keystore_path);
+}
+
 export const showNetwork = async (keystore_path: string) => {
     let network_info_list = [
-        "> Available Networks",
-        "> Add Network",
-        "> Back"
+        '> Networks',
+        '> Dataview',
+        new inquirer.Separator('----------------------------------'),
+        '> Back'
     ];
 
     const selected_network_info = await selectSomething(network_info_list);
 
     switch (selected_network_info) {
-        case "> Available Networks": {
+        case '> Networks': {
             await showAvailableNetworks(keystore_path);
             break;
         }
-        case "> Add Network": {
-            await addNetwork(keystore_path);
+        case '> Dataview': {
+            await showDataview(keystore_path);
             break;
         }
-        case "> Back": {
+        case '> Back': {
             return;
         }
     }
@@ -340,10 +485,11 @@ export const getNetworkInfoByName = (keystore_path: string, network_name: string
 export const getAccountAddress = (keystore_path: string, account_label: string, account_id: number) => {
     const account_info = getAccountInfo(keystore_path, account_label);
 
-    let default_network = account_info.default_network;
-    if (account_info.data[account_id].default_network && account_info.data[account_id].default_network !== "") {
-        default_network = account_info.data[account_id].default_network;
+    if (account_info.account_type === "PK") {
+        return account_info.data[account_id].ciphertexts.address;
     }
+
+    let default_network = account_info.default_network;
     let network_type = getNetworkTypeByName(keystore_path, default_network);
 
     if (network_type === "solana") {
@@ -368,7 +514,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 +543,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);
@@ -420,6 +567,44 @@ export const switchPPNetwork = async (keystore_path: string, account_label: stri
     );
 }
 
+export const showAllAccounts = async (keystore_path: string, account_label: 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 default_network = account_info.default_network;
+
+    const network_type = getNetworkTypeByName(keystore_path, default_network);
+
+    for (let i = 0; i < network_len; i++) {
+
+        const network = network_list[i];
+        const this_network_type = getNetworkTypeByName(keystore_path, network.name);
+        if (account_info.account_type === "PK" && network_type !== this_network_type) {
+            continue;
+        }
+
+        let account_address: string;
+        if (account_info.account_type === "PK") {
+            account_address = account_info.data[account_index].ciphertexts.address;
+        } else {
+            if (this_network_type === "evm") {
+                account_address = account_info.data[account_index].ciphertexts.evm.address;
+            } else {
+                account_address = account_info.data[account_index].ciphertexts.solana.address;
+            }
+        }
+
+        if (network.name === default_network) {
+            console.log(`● ${account_address} [${network.name}]`);
+        } else {
+            console.log(`○ ${account_address} [${network.name}]`);
+        }
+    }
+}
+
 export const switchNetworkByAccountLabel = async (keystore_path: string, account_label: string, is_account_label: boolean) => {
     const network_path = path.resolve(keystore_path, 'network.json');
     const networks = JSON.parse(fs.readFileSync(network_path, 'utf8'));
@@ -428,7 +613,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 +650,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) {
@@ -520,6 +706,8 @@ export const getAccountBalance = async (account: string, keystore_path: string,
         let balance = new BigNumber(result.output.toString());
         result.output = balance.dividedBy(Math.pow(10, decimals)).toFixed(4, BigNumber.ROUND_FLOOR);
     }
+
+    deleteTokenBalance(network_info.chainId.toString(), account, "0");
     return result;
 }
 
@@ -557,3 +745,8 @@ export const getEvmNetworks = (keystore_path: string) => {
     return result;
 }
 
+export const getStatus = (keystore_path: string) => {
+    const network_path = path.resolve(keystore_path, 'network.json');
+    const networks = JSON.parse(fs.readFileSync(network_path, 'utf8'));
+    return networks.status;
+}

package/src/tools.ts

@@ -1,7 +1,7 @@
 const chalk = require('chalk');
 import { BigNumber } from 'bignumber.js';
 import inquirer from 'inquirer';
-import { chainAddressValidator, confirmSomething, editorSomething, getAccountChainType, hexValidator, inputSomething, numberValidator, selectSomething } from "./utils";
+import { addrValidator, chainAddressValidator, confirmSomething, editorSomething, 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';
@@ -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"
+        '> Send Raw Tx',
+        '> Send Token',
+        new inquirer.Separator('----------------------------------'),
+        '> Back',
     ];
 
     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",
+        '> SendTx',
+        '> SignMessage',
+        new inquirer.Separator('----------------------------------'),
+        '> Back'
     ];
 
     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;
         }
     }
@@ -727,15 +729,44 @@ export const selectToolsOptions = async (keystore_path: string, account_label: s
 }
 
 export const showTools = async (keystore_path: string, wative_core: typeof WativeCore) => {
-    const account_address = await inputSomething("Input the address to send tx", chainAddressValidator);
-    const account_label = wative_core.account.getAccountLabel(account_address);
+    let options = [
+        "> Send Tx",
+        "> Search Accounts",
+        new inquirer.Separator('----------------------------------'),
+        "> Back"
+    ];
+
+    let selected_option = await selectSomething(options);
+
+    if (selected_option === "> Back") {
+        return;
+    }
+
+    let account_address: any;
+    if (selected_option === "> Send Tx") {
+        account_address = await inputSomething("Input address to send tx", chainAddressValidator);
+    }
+
+    if (selected_option === "> Search Accounts") {
+        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) {
+        console.log(chalk.red("Account not found"));
+        await showTools(keystore_path, wative_core);
+        return;
+    }
+
+    let account_label = account_label_info.account_label;
+    account_address = account_label_info.account_address;
     if (account_label === null) {
         console.log(chalk.red("Account not found"));
         await showTools(keystore_path, wative_core);
         return;
     }
     let login_result = await loginIn(account_label, wative_core);
-    if (!login_result) {
+    if (!login_result.isLoginIn) {
         await showTools(keystore_path, wative_core);
         return;
     }