wative 1.0.14 → 1.0.16

package/src/tools.ts

@@ -90,31 +90,38 @@ const sendEvmRawTransaction = async (chain_id: string, chain_rpc_url: string, ch
         }
         let account_balance = new BigNumber(account_balance_result.output);
         let tx_gas_price = new BigNumber(gasPrice);
-        let max_vaule = account_balance.minus(tx_gas_price.multipliedBy(21000)).toFixed(0, BigNumber.ROUND_FLOOR);
-        let total_balance = (new BigNumber(max_vaule)).dividedBy(1e18).toFixed(4, BigNumber.ROUND_FLOOR);
+        let max_value = account_balance.minus(tx_gas_price.multipliedBy(21000)).toFixed(0, BigNumber.ROUND_FLOOR);
+        let total_balance = (new BigNumber(max_value)).dividedBy(1e18).toFixed(4, BigNumber.ROUND_FLOOR);
 
         if (new BigNumber(total_balance) < new BigNumber(0)) {
             console.log(chalk.red("Not enough balance"));
             return
         }
 
-        let option_select_vaule_list: any = [
-            '> Input value',
-            `> Total Balance (${total_balance} ${chain_symbols})`
-        ]
-        let selected_vaule = await selectSomething(option_select_vaule_list);
-        let vaule_id = option_select_vaule_list.indexOf(selected_vaule);
-        if (vaule_id === 0) {
-            let input_value = await inputSomething("value", numberValidator);
-            value = new BigNumber(input_value).multipliedBy(1e18).toFixed(0, BigNumber.ROUND_FLOOR);
-        } else if (vaule_id === 1) {
-            value = max_vaule;
-        }
+        value = await getTransferValue(
+            total_balance,
+            max_value,
+            chain_symbols,
+            18
+        );
 
-        if ((new BigNumber(value)).isGreaterThan(new BigNumber(max_vaule))) {
-            console.log(chalk.red("Not enough balance"));
-            return;
-        }
+        // 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);
@@ -159,12 +166,10 @@ const sendEvmRawTransaction = async (chain_id: string, chain_rpc_url: string, ch
         console.log(chalk.red(signed_message_result.output));
         return;
     }
-    let transaction_receipt_result = await wative_core.account.sendSignedTransaction(account_address, signed_message_result.output.rawTransaction, chain_rpc_url);
-    if (!transaction_receipt_result.status) {
-        console.log(chalk.red(transaction_receipt_result.output));
-        return;
-    }
 
+    console.log(chalk.green(`Transaction hash: ${signed_message_result.output.transactionHash}`));
+
+    wative_core.account.sendSignedTransaction(account_address, signed_message_result.output.rawTransaction, chain_rpc_url);
     deleteTokenBalance(
         chain_id,
         [
@@ -175,7 +180,6 @@ const sendEvmRawTransaction = async (chain_id: string, chain_rpc_url: string, ch
             "0"
         ]
     );
-    console.log(chalk.green(`Transaction hash: ${transaction_receipt_result.output.transactionHash}`));
 }
 
 export const sendSolanaRawTransaction = async (chain_id: string, chain_rpc_url: string, chain_symbols: string, account_address: string, wative_core: typeof WativeCore) => {
@@ -230,30 +234,36 @@ export const sendSolanaRawTransaction = async (chain_id: string, chain_rpc_url:
     }
 
     const account_balance = new BigNumber(account_balance_result.output);
-    const max_vaule = account_balance.minus(5000).minus(used_prioritization_fee);
-    let total_balance = (new BigNumber(max_vaule)).dividedBy(1e9).toFixed(4, BigNumber.ROUND_FLOOR);
+    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)) {
         console.log(chalk.red("Not enough balance"));
         return
     }
 
-    let option_select_vaule_list: any = [
-        '> Input value',
-        `> Total Balance (${total_balance} ${chain_symbols})`
-    ]
-    let selected_vaule = await selectSomething(option_select_vaule_list);
-    let vaule_id = option_select_vaule_list.indexOf(selected_vaule);
-    let transfer_amount: string = "0";
-    if (vaule_id === 0) {
-        let input_value = await inputSomething("value", numberValidator);
-        transfer_amount = new BigNumber(input_value).multipliedBy(1e9).toFixed(0, BigNumber.ROUND_FLOOR);
-        if ((new BigNumber(transfer_amount)).isGreaterThan(new BigNumber(max_vaule))) {
-            console.log(chalk.red("Not enough balance"));
-            return;
-        }
-    } else if (vaule_id === 1) {
-        transfer_amount = max_vaule.toString();
-    }
+    let transfer_amount = await getTransferValue(
+        total_balance,
+        max_value.toString(),
+        chain_symbols,
+        9
+    );
+    // 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);
+    // let transfer_amount: string = "0";
+    // if (value_id === 0) {
+    //     let input_value = await inputSomething("value", numberValidator);
+    //     transfer_amount = new BigNumber(input_value).multipliedBy(1e9).toFixed(0, BigNumber.ROUND_FLOOR);
+    //     if ((new BigNumber(transfer_amount)).isGreaterThan(new BigNumber(max_value))) {
+    //         console.log(chalk.red("Not enough balance"));
+    //         return;
+    //     }
+    // } else if (value_id === 1) {
+    //     transfer_amount = max_value.toString();
+    // }
 
     let transactions = new Transaction();
     transactions.add(
@@ -301,6 +311,30 @@ export const sendSolanaRawTransaction = async (chain_id: string, chain_rpc_url:
     console.log(chalk.green(`Transaction hash: ${transaction_receipt_result.output}`));
 }
 
+
+const getTransferValue = async (total_balance: string, max_value: string, chain_symbols: string, decimals: number): Promise<string> => {
+    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);
+    let value = "0";
+    if (value_id === 0) {
+        let input_value = await inputSomething("value", numberValidator);
+        value = new BigNumber(input_value).multipliedBy(10 ** decimals).toFixed(0, BigNumber.ROUND_FLOOR);
+    } else if (value_id === 1) {
+        value = max_value;
+    }
+
+    if ((new BigNumber(value)).isLessThanOrEqualTo(new BigNumber(max_value))) {
+        return value;
+    }
+
+    console.log(chalk.red("Not enough balance"));
+    return getTransferValue(total_balance, max_value, chain_symbols, decimals);
+}
+
 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',
@@ -413,11 +447,9 @@ const sendEvmTokenTransaction = async (keystore_path: string, chain_rpc_url: str
         console.log(chalk.red(signed_message_result.output));
         return;
     }
-    let transaction_receipt_result = await wative_core.account.sendSignedTransaction(account_address, signed_message_result.output.rawTransaction, chain_rpc_url);
-    if (!transaction_receipt_result.status) {
-        console.log(chalk.red(transaction_receipt_result.output));
-        return;
-    }
+
+    console.log(chalk.green(`Transaction hash: ${signed_message_result.output.transactionHash}`));
+    wative_core.account.sendSignedTransaction(account_address, signed_message_result.output.rawTransaction, chain_rpc_url);
 
     deleteTokenBalance(
         chain_id,
@@ -430,7 +462,6 @@ const sendEvmTokenTransaction = async (keystore_path: string, chain_rpc_url: str
             token_address
         ]
     );
-    console.log(chalk.green(`Transaction hash: ${transaction_receipt_result.output.transactionHash}`));
 }
 
 const sendSolanaTokenTransaction = async (keystore_path: string, chain_rpc_url: string, chain_id: string, account_address: string, wative_core: typeof WativeCore) => {

package/src/utils.ts

@@ -653,6 +653,16 @@ 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 account_label_path = path.resolve(keystore_path, `accounts/${account_label}.json`);
+
+        if (!fs.existsSync(account_label_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;