wative 1.0.19 → 1.0.20

package/src/tools.ts

@@ -202,16 +202,12 @@ export const sendSolanaRawTransaction = async (chain_id: string, chain_rpc_url:
     );
 
     transaction.feePayer = new PublicKey(account_address);
-    console.log(account_address);
-    console.log(chain_rpc_url)
-    console.log(transaction);
     const simulate_result = await wative_core.account.simulateTransaction(
         account_address,
         chain_rpc_url,
         transaction
     );
 
-    console.log(simulate_result);
     if (!simulate_result.status) {
         console.log(chalk.red(simulate_result.output));
         return;
@@ -224,18 +220,16 @@ export const sendSolanaRawTransaction = async (chain_id: string, chain_rpc_url:
 
     let baseUnitsConsumed = new BigNumber(simulate_result.output.value.unitsConsumed.toString()).multipliedBy(1.2).toFixed(0, BigNumber.ROUND_CEIL);
     let unitsConsumed = new BigNumber(baseUnitsConsumed);
-    // const prioritization_fee_result = await getPrioritizationFee(chain_rpc_url);
-    // if (!prioritization_fee_result.status) {
-    //     console.log(chalk.red(prioritization_fee_result.output));
-    //     return;
-    // }
-
-    // const prioritization_fee = new BigNumber(prioritization_fee_result.output.toString());
-    const prioritization_fee = new BigNumber(1000);
+    const prioritization_fee_result = await getPrioritizationFee(chain_rpc_url);
+    if (!prioritization_fee_result.status) {
+        console.log(chalk.red(prioritization_fee_result.output));
+        return;
+    }
+
+    const prioritization_fee = new BigNumber(prioritization_fee_result.output.toString());
     const used_prioritization_fee = unitsConsumed.multipliedBy(prioritization_fee).dividedBy(1e6).toFixed(0, BigNumber.ROUND_CEIL);
 
     const account_balance_result = await getAccountBalanceInSolana(account_address, chain_rpc_url);
-    console.log(account_balance_result);
     if (!account_balance_result.status) {
         console.log(chalk.red(account_balance_result.output));
         return;
@@ -256,23 +250,6 @@ export const sendSolanaRawTransaction = async (chain_id: string, chain_rpc_url:
         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(
@@ -615,7 +592,6 @@ const sendSolanaTokenTransaction = async (keystore_path: string, chain_rpc_url:
         transaction
     );
 
-    console.log(simulate_result);
     if (!simulate_result.status) {
         console.log(chalk.red(simulate_result.output));
         return;
@@ -628,15 +604,14 @@ const sendSolanaTokenTransaction = async (keystore_path: string, chain_rpc_url:
 
     let unitsConsumed = new BigNumber(simulate_result.output.value.unitsConsumed.toString());
     unitsConsumed = new BigNumber(Math.ceil(Number(unitsConsumed) * 1.2));
-    // const prioritization_fee_result = await getPrioritizationFee(chain_rpc_url);
-    // if (!prioritization_fee_result.status) {
-    //     console.log(chalk.red(prioritization_fee_result.output));
-    //     return;
-    // }
-
-    // const prioritization_fee = new BigNumber(prioritization_fee_result.output.toString());
-    const prioritization_fee = new BigNumber(1000);
-    
+    const prioritization_fee_result = await getPrioritizationFee(chain_rpc_url);
+    if (!prioritization_fee_result.status) {
+        console.log(chalk.red(prioritization_fee_result.output));
+        return;
+    }
+
+    const prioritization_fee = new BigNumber(prioritization_fee_result.output.toString());
+
     transactions.add(
         createTransferInstruction(
             from_token_account,