wative 1.0.12 → 1.0.14

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 { getAccountBalanceInEvm, getAccountBalanceInSolana, getAccountInfoInSolana, getCodeInEvm, getPrioritizationFee, getTokenBalanceInEvm, getTokenBalanceInSolana, getTokenInfoInEvm, getTokenInfoInSolana, getTransferTokenData } from './web3';
+import { deleteTokenBalance, getAccountBalanceInEvm, getAccountBalanceInSolana, getAccountInfoInSolana, getCodeInEvm, getPrioritizationFee, getTokenBalanceInEvm, getTokenBalanceInSolana, getTokenInfoInEvm, getTokenInfoInSolana, getTransferTokenData } from './web3';
 import { getAssetListByTokenName } from './assets';
 import { ComputeBudgetProgram, PublicKey, SystemProgram, Transaction } from '@solana/web3.js';
 import {
@@ -62,7 +62,7 @@ const confirmEvmRawTransaction = async (tx_params: any): Promise<any> => {
     return await confirmEvmRawTransaction(tx_params);
 }
 
-const sendEvmRawTransaction = async (chain_rpc_url: string, chain_symbols: string, account_address: string, wative_core: typeof WativeCore) => {
+const sendEvmRawTransaction = async (chain_id: string, chain_rpc_url: string, chain_symbols: string, account_address: string, wative_core: typeof WativeCore) => {
     const to = await inputSomething("to", chainAddressValidator);
     const gasUtil = new GasUtil(chain_rpc_url);
     const estimateGasPrice = await gasUtil.getGasPrice();
@@ -165,10 +165,20 @@ const sendEvmRawTransaction = async (chain_rpc_url: string, chain_symbols: strin
         return;
     }
 
+    deleteTokenBalance(
+        chain_id,
+        [
+            account_address,
+            to
+        ],
+        [
+            "0"
+        ]
+    );
     console.log(chalk.green(`Transaction hash: ${transaction_receipt_result.output.transactionHash}`));
 }
 
-export const sendSolanaRawTransaction = async (chain_rpc_url: string, chain_symbols: string, account_address: string, wative_core: typeof WativeCore) => {
+export const sendSolanaRawTransaction = async (chain_id: string, chain_rpc_url: string, chain_symbols: string, account_address: string, wative_core: typeof WativeCore) => {
     const to = await inputSomething("to", chainAddressValidator);
 
     let transaction = new Transaction().add(SystemProgram.transfer({
@@ -278,6 +288,16 @@ export const sendSolanaRawTransaction = async (chain_rpc_url: string, chain_symb
         return;
     }
 
+    deleteTokenBalance(
+        chain_id,
+        [
+            account_address,
+            to
+        ],
+        [
+            "0"
+        ]
+    );
     console.log(chalk.green(`Transaction hash: ${transaction_receipt_result.output}`));
 }
 
@@ -399,6 +419,17 @@ const sendEvmTokenTransaction = async (keystore_path: string, chain_rpc_url: str
         return;
     }
 
+    deleteTokenBalance(
+        chain_id,
+        [
+            account_address,
+            receipt
+        ],
+        [
+            "0",
+            token_address
+        ]
+    );
     console.log(chalk.green(`Transaction hash: ${transaction_receipt_result.output.transactionHash}`));
 }
 
@@ -596,6 +627,18 @@ const sendSolanaTokenTransaction = async (keystore_path: string, chain_rpc_url:
         return;
     }
 
+    deleteTokenBalance(
+        chain_id,
+        [
+            account_address,
+            receipt
+        ],
+        [
+            "0",
+            token_address
+        ]
+    );
+
     console.log(chalk.green(`Transaction hash: ${transaction_receipt_result.output}`));
 }
 
@@ -650,6 +693,7 @@ const excuteTools = async (keystore_path: string, account_label: string, account
         case '> Send Raw Tx': {
             if (account_chain_type === "evm") {
                 await sendEvmRawTransaction(
+                    network_info.chainId.toString(),
                     network_info.rpcUrl,
                     network_info.nativeCurrency.symbol,
                     account_address,
@@ -659,6 +703,7 @@ const excuteTools = async (keystore_path: string, account_label: string, account
 
             if (account_chain_type === "solana") {
                 await sendSolanaRawTransaction(
+                    network_info.chainId.toString(),
                     network_info.rpcUrl,
                     network_info.nativeCurrency.symbol,
                     account_address,

package/src/web3.ts

@@ -361,8 +361,14 @@ export const getTokenBalance = (
     return batchAccountBalanceOf;
 }
 
-export const deleteTokenBalance = (chain_id: string, account_address: string, token_address: string) => {
-    try {
-        delete chainIdAccountBalanceMap[chain_id][token_address][account_address];
-    } catch (error) { }
+export const deleteTokenBalance = (chain_id: string, account_address_list: string[], token_address_list: string[]) => {
+    for (let i = 0; i < account_address_list.length; i++) {
+        let account_address = account_address_list[i];
+        for (let j = 0; j < token_address_list.length; j++) {
+            let token_address = token_address_list[j];
+            try {
+                delete chainIdAccountBalanceMap[chain_id][token_address][account_address];
+            } catch (err) { }
+        }
+    }
 }