wative 1.0.29 → 1.0.31

package/src/tools.ts

@@ -5,7 +5,7 @@ import { addrValidator, chainAddressValidator, confirmSomething, editorSomething
 import { loginIn } from './account';
 import { getAccountBalance, getDefaultNetworkByAddress, getEvmNetworks, getNetworkInfoByName, getNetworkTypeByName } from './network';
 import { GasUtil } from './tx_gas_utils';
-import { deleteTokenBalance, getAccountBalanceInEvm, getAccountBalanceInSolana, getAccountInfoInSolana, getCodeInEvm, getPrioritizationFee, getTokenBalanceInEvm, getTokenBalanceInSolana, getTokenInfoInEvm, getTokenInfoInSolana, getTransferTokenData } from './web3';
+import { deleteTokenBalance, getAccountBalanceInEvm, getAccountBalanceInSolana, getAccountInfoInSolana, getCodeInEvm, getLatestBlockhash, getPrioritizationFee, getTokenBalanceInEvm, getTokenBalanceInSolana, getTokenInfoInEvm, getTokenInfoInSolana, getTransferTokenData } from './web3';
 import { getAssetListByTokenName } from './assets';
 import { ComputeBudgetProgram, PublicKey, SystemProgram, Transaction } from '@solana/web3.js';
 import {
@@ -184,6 +184,13 @@ export const sendSolanaRawTransaction = async (chain_id: string, chain_rpc_url:
     );
 
     transaction.feePayer = new PublicKey(account_address);
+
+    let last_blockhash: any = await getLatestBlockhash(chain_rpc_url);
+    if (!last_blockhash.status) {
+        console.log(chalk.red(last_blockhash.output));
+        return;
+    }
+    transaction.recentBlockhash = last_blockhash.output.blockhash;
     const simulate_result = await wative_core.account.simulateTransaction(
         account_address,
         chain_rpc_url,
@@ -253,7 +260,8 @@ export const sendSolanaRawTransaction = async (chain_id: string, chain_rpc_url:
         lamports: Number(transfer_amount)
     }));
 
-    transaction.feePayer = new PublicKey(account_address);
+    transactions.feePayer = new PublicKey(account_address);
+    transactions.recentBlockhash = last_blockhash.output.blockhash;
 
     const signed_message_result = await wative_core.account.signTransaction(
         account_address,
@@ -705,7 +713,7 @@ const excuteTools = async (keystore_path: string, account_label: string, account
     }
 
     if (network_type === "evm") {
-        let confirm = await confirmSomething(`Network (${default_network}), want a change?`);
+        let confirm = await confirmSomething(`Network (${default_network}), want a change?`, false);
         if (confirm) {
             const evm_networks = getEvmNetworks(keystore_path);
             const selected_network = await selectSomething(evm_networks, "Select a network");

package/src/utils.ts

@@ -421,12 +421,13 @@ export const inputPassword = async (text: string) => {
     return password;
 }
 
-export const confirmSomething = async (text: string) => {
+export const confirmSomething = async (text: string, _default = true) => {
     const questions = [
         {
             name: 'confirm',
             type: 'confirm',
             message: `${text}`,
+            default: _default
         }
     ]
     const { confirm } = await inquirer.prompt(questions);

package/src/web3.ts

@@ -253,6 +253,23 @@ export const getPrioritizationFee = async (rpc_url: string) => {
     }
 }
 
+export const getLatestBlockhash = async (rpc_url: string) => {
+    const connection = new Connection(rpc_url);
+    let result = await excutePromiseFunction(connection.getLatestBlockhash.bind(connection), [{
+        commitment: "finalized"
+    }]);
+    if (!result.status) {
+        return {
+            status: false,
+            output: "Failed to get latest blockhash"
+        }
+    }
+    return {
+        status: true,
+        output: result.output
+    }
+}
+
 export const getAccountInfoInSolana = async (account: string, rpc_url: string) => {
     const connection = new Connection(rpc_url);
     let result = await excutePromiseFunction(connection.getAccountInfo.bind(connection), [