wative 1.0.32 → 1.0.33

package/src/tools.ts

@@ -334,9 +334,10 @@ const sendEvmTokenTransaction = async (keystore_path: string, chain_rpc_url: str
 
     let token_address: any;
     let token_decimals: any;
+    let token_name: any;
     switch (selected_token_address) {
         case '> Input token ticker':
-            let token_name = await inputSomething("token ticker");
+            token_name = await inputSomething("token ticker");
 
             let token_address_list = await getAssetListByTokenName(keystore_path, chain_id, token_name);
             if (token_address_list.length === 0) {
@@ -381,6 +382,7 @@ const sendEvmTokenTransaction = async (keystore_path: string, chain_rpc_url: str
                 return;
             }
             token_decimals = Number(token_info.output.decimals);
+            token_name = token_info.output.name;
             break;
     }
 
@@ -390,19 +392,6 @@ const sendEvmTokenTransaction = async (keystore_path: string, chain_rpc_url: str
         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();
@@ -411,8 +400,12 @@ const sendEvmTokenTransaction = async (keystore_path: string, chain_rpc_url: str
     const inputGasPrice = await inputSomething(`Gas price (${_estimateGasPrice}), agree or enter`, gasValidator);
     let gasPrice = inputGasPrice ? inputGasPrice : _estimateGasPrice;
     gasPrice = (new BigNumber(gasPrice)).multipliedBy(1e9).toFixed(0);
+    let transfer_amount = await getTransferTokenAmount(
+        token_balance_result.output,
+        token_name,
+        token_decimals
+    );
 
-    let transfer_amount = new BigNumber(amount).multipliedBy(Math.pow(10, token_decimals)).toFixed(0);
     const data = await getTransferTokenData(receipt, transfer_amount, chain_rpc_url);
 
     const estimateNonce = await gasUtil.getTransactionCount(account_address);
@@ -485,9 +478,10 @@ const sendSolanaTokenTransaction = async (keystore_path: string, chain_rpc_url:
 
     let token_address: any;
     let token_decimals: any;
+    let token_name: any;
     switch (selected_token_address) {
         case '> Input token ticker':
-            let token_name = await inputSomething("token ticker");
+            token_name = await inputSomething("token ticker");
 
             let token_address_list = await getAssetListByTokenName(keystore_path, chain_id, token_name);
             if (token_address_list.length === 0) {
@@ -532,30 +526,36 @@ const sendSolanaTokenTransaction = async (keystore_path: string, chain_rpc_url:
                 return;
             }
             token_decimals = Number(token_info.output.decimals);
+            token_name = token_info.output.name;
             break;
     }
 
     const receipt = await inputSomething("Receipt", chainAddressValidator);
-    const token_balance_result = await getTokenBalanceInEvm(account_address, token_address, chain_rpc_url);
+    const token_balance_result = await getTokenBalanceInSolana(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 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 = await getTransferTokenAmount(
+        token_balance_result.output,
+        token_name,
+        token_decimals
+    );
     let from_token_account = getAssociatedTokenAddressSync(
         new PublicKey(token_address),
         new PublicKey(account_address),
@@ -709,6 +709,31 @@ const sendSolanaTokenTransaction = async (keystore_path: string, chain_rpc_url:
 }
 
 
+const getTransferTokenAmount = async (max_value: string, token_symbols: string, decimals: number): Promise<string> => {
+    let total_balance = (new BigNumber(max_value)).dividedBy(10 ** decimals).toFixed(4, BigNumber.ROUND_FLOOR);
+
+    let option_select_value_list: any = [
+        '> Input value',
+        `> Total Balance (${total_balance} ${token_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 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);
     let network_type = getNetworkTypeByName(keystore_path, default_network);

package/src/utils.ts

@@ -317,7 +317,7 @@ export const getSymbol = async (text: string) => {
 }
 
 export const getColor = async (text: string) => {
-    let reg = /^#[0-9A_F]{6}$/g;
+    let reg = /^#[0-9A-Fa-f]{6}$/g;
     for (let i = 0; i < 5; i++) {
         let color = await inputSomething(text);
         if (color === "") {
@@ -332,7 +332,7 @@ export const getColor = async (text: string) => {
 }
 
 export const getAccountLabel = async (text: string, account_label_list: string[]) => {
-    let reg = /^(?![-_]).*?[a-zA-Z0-9_-]{4,20}(?<![-_])$/g;
+    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();