wative 1.1.13 → 1.1.14

package/src/utils.ts

@@ -5,7 +5,7 @@ import inquirer from 'inquirer'
 import * as fs from 'fs'
 import * as path from "path";
 
-import { getChainIdByEvm, hasTokenBalance } from "./web3";
+import { getChainIdByEvm, batchHasTokenBalance } from "./web3";
 import { MNEMONIC_WORDS } from './config';
 import { getChainType } from './chain';
 import { getBatchAccountBalance } from './assets';
@@ -632,6 +632,117 @@ export const formatAddr = (addr: string, force_full_addr: boolean = true) => {
     return addr.slice(0, 6) + "..." + addr.slice(-6);
 }
 
+// 提取账户地址的辅助函数
+const extractAccountFromChoice = (choice: any, is_evm: boolean): string | null => {
+    if (!choice.name) {
+        return null;
+    }
+
+    let account: any = null;
+
+    if (is_evm) {
+        account = /0x[0-9a-fA-f]{40}/.exec(choice.name);
+        account = account ? account[0] : null;
+    } else {
+        let re_result = /\s+([0-9a-zA-Z]*)/.exec(choice.name);
+        account = re_result ? re_result[1] : null;
+
+        if (account === "Back") {
+            account = null;
+        }
+    }
+
+    return account;
+};
+
+// 计算分页索引的辅助函数
+const calculatePageIndices = (selected: number, pageSize: number, accountsLength: number): { fromIndex: number, toIndex: number } => {
+    let fromIndex: number, toIndex: number;
+    
+    if (selected < pageSize / 2) {
+        if (accountsLength / 2 <= pageSize) {
+            fromIndex = 0;
+            toIndex = accountsLength / 2;
+        } else {
+            fromIndex = 0;
+            toIndex = pageSize;
+        }
+    } else {
+        if (accountsLength / 2 <= pageSize) {
+            fromIndex = 0;
+            toIndex = accountsLength / 2;
+        } else {
+            fromIndex = selected - pageSize / 2 + 1;
+            toIndex = selected + pageSize / 2 + 1;
+        }
+    }
+    
+    return { fromIndex, toIndex };
+};
+
+// 提取账户列表的辅助函数
+const extractAccountsList = (choices: any[], is_evm: boolean): (string | null)[] => {
+    const accounts: (string | null)[] = [];
+    
+    for (let i = 0; i < choices.length; i++) {
+        const account = extractAccountFromChoice(choices[i], is_evm);
+        accounts.push(account);
+    }
+    
+    return accounts.concat(accounts);
+};
+
+// 处理账户余额显示的辅助函数
+const processAccountBalanceDisplay = (
+    choices: any[],
+    accounts: (string | null)[],
+    batchBalanceOf: any,
+    pad_index_map: any,
+    gas_token_name: string,
+    show_gas_token: boolean,
+    show_extended_token: boolean,
+    fromIndex: number,
+    toIndex: number
+) => {
+    for (let i = fromIndex; i < toIndex; i++) {
+        let _index = i >= accounts.length / 2 ? i - accounts.length / 2 : i;
+        let _choice = choices[_index];
+        if (!_choice.name) {
+            continue;
+        }
+
+        let name = _choice.name;
+        let account_address = accounts[i];
+        let token_message = '';
+        if (!account_address) {
+            continue;
+        }
+
+        for (let token_name in batchBalanceOf[account_address]) {
+            if (!show_gas_token && token_name === gas_token_name) {
+                continue;
+            }
+            if (!show_extended_token && token_name !== gas_token_name) {
+                continue;
+            }
+
+            if (name.includes(token_name)) {
+                continue;
+            }
+
+            token_message += `${token_name}:${batchBalanceOf[account_address][token_name].padEnd(pad_index_map[token_name])} `;
+        }
+
+        let nameList = name.split('(');
+        if (nameList.length > 1) {
+            let tag = nameList[1];
+            choices[_index].name = nameList[0] + ` ${token_message}` + `(${tag}`;
+        } else {
+            choices[_index].name = nameList[0] + ` ${token_message}`;
+        }
+    }
+};
+
 export const listWithLazyBalanceLoading = async (
     options: string[],
     is_evm: boolean,
@@ -642,8 +753,7 @@ export const listWithLazyBalanceLoading = async (
     show_extended_token: boolean,
     direct_display: boolean,
     message?: string,
-    default_account?: any,
-    default_account_addr?: any,
+    default_account?: any
 ) => {
     const questions = [
         {
@@ -665,6 +775,7 @@ export const listWithLazyBalanceLoading = async (
     let selected = 0;
     let round = 0;
     let pre_selected: any;
+    
     while (!promise.ui.activePrompt.answers[promise.ui.activePrompt.opt.name]) {
         if (!direct_display) {
             await sleep(1000);
@@ -684,7 +795,14 @@ export const listWithLazyBalanceLoading = async (
         if (direct_display) {
             round = 6;
             direct_display = false;
-            let has_balance = hasTokenBalance(network_info.chainId.toString(), default_account_addr as string, asset_info_list[0].address);
+
+            const pageSize = promise.ui.activePrompt.opt.pageSize;
+            const accounts = extractAccountsList(promise.ui.activePrompt.opt.choices.choices, is_evm);
+            const { fromIndex, toIndex } = calculatePageIndices(selected, pageSize, accounts.length);
+            const active_account: any = accounts.slice(fromIndex, toIndex);
+
+            let has_balance = batchHasTokenBalance(network_info.chainId.toString(), active_account);
+            console.log('has_balance', has_balance);
             if (!has_balance) {
                 round = 0;
                 continue;
@@ -694,57 +812,13 @@ export const listWithLazyBalanceLoading = async (
         if (round < 5) {
             continue;
         }
+        
         round = 0;
         const pageSize = promise.ui.activePrompt.opt.pageSize;
+        const accounts = extractAccountsList(promise.ui.activePrompt.opt.choices.choices, is_evm);
+        const { fromIndex, toIndex } = calculatePageIndices(selected, pageSize, accounts.length);
+        const active_account: any = accounts.slice(fromIndex, toIndex);
 
-        let accounts: any = [];
-        for (let i = 0; i < promise.ui.activePrompt.opt.choices.choices.length; i++) {
-            if (!promise.ui.activePrompt.opt.choices.choices[i].name) {
-                accounts.push(null);
-                continue;
-            }
-
-            let account: any = null;
-
-            if (is_evm) {
-                account = /0x[0-9a-fA-f]{40}/.exec(promise.ui.activePrompt.opt.choices.choices[i].name);
-                account = account ? account[0] : null;
-            } else {
-                let re_result = account = /\s+([0-9a-zA-Z]*)/.exec(promise.ui.activePrompt.opt.choices.choices[i].name);
-                account = re_result ? re_result[1] : null;
-
-                if (account === "Back") {
-                    account = null;
-                }
-            }
-
-            if (account) {
-                accounts.push(account)
-            } else {
-                accounts.push(null);
-            }
-        }
-        accounts = accounts.concat(accounts);
-        let fromIndex: number, toIndex: number;
-        if (selected < pageSize / 2) {
-            if (accounts.length / 2 <= pageSize) {
-                fromIndex = 0;
-                toIndex = accounts.length / 2;
-            } else {
-                fromIndex = 0;
-                toIndex = pageSize;
-            }
-        } else {
-            if (accounts.length / 2 <= pageSize) {
-                fromIndex = 0;
-                toIndex = accounts.length / 2;
-            } else {
-                fromIndex = selected - pageSize / 2 + 1;
-                toIndex = selected + pageSize / 2 + 1;
-            }
-        }
-
-        let active_account: any = accounts.slice(fromIndex, toIndex);
         let batchBalanceOf = await getBatchAccountBalance(
             keystore_path,
             active_account,
@@ -769,48 +843,26 @@ export const listWithLazyBalanceLoading = async (
             }
         }
 
-        let gas_token_name = network_info.nativeCurrency.symbol;
-        for (let i = fromIndex; i < toIndex; i++) {
-            let _index = i >= accounts.length / 2 ? i - accounts.length / 2 : i;
-            let _choice = promise.ui.activePrompt.opt.choices.choices[_index];
-            if (!_choice.name) {
-                continue;
-            }
-
-            let name = _choice.name;
-            let account_address = accounts[i];
-            let token_message = '';
-
-            for (let token_name in batchBalanceOf[account_address]) {
-                if (!show_gas_token && token_name === gas_token_name) {
-                    continue;
-                }
-                if (!show_extended_token && token_name !== gas_token_name) {
-                    continue;
-                }
-
-                if (name.includes(token_name)) {
-                    continue;
-                }
-
-                token_message += `${token_name}:${batchBalanceOf[account_address][token_name].padEnd(pad_index_map[token_name])} `;
-            }
-
-            let nameList = name.split('(');
-            if (nameList.length > 1) {
-                let tag = nameList[1];
-                promise.ui.activePrompt.opt.choices.choices[_index].name = nameList[0] + ` ${token_message}` + `(${tag}`;
-            } else {
-                promise.ui.activePrompt.opt.choices.choices[_index].name = nameList[0] + ` ${token_message}`;
-            }
-        }
+        const gas_token_name = network_info.nativeCurrency.symbol;
+        processAccountBalanceDisplay(
+            promise.ui.activePrompt.opt.choices.choices,
+            accounts,
+            batchBalanceOf,
+            pad_index_map,
+            gas_token_name,
+            show_gas_token,
+            show_extended_token,
+            fromIndex,
+            toIndex
+        );
+        
         promise.ui.activePrompt.screen.render('');
         promise.ui.activePrompt.render();
         pre_selected = selected;
     }
 
     return promise.ui.activePrompt.answers[promise.ui.activePrompt.opt.name];
-}
+};
 
 export const updateStorage = (keystore_path: string) => {
     const network_path = path.resolve(keystore_path, 'network.json');

package/src/web3.ts

@@ -397,13 +397,19 @@ export const batchUpdateUserTokenBalance = async (chain_id: string, account_addr
     }
 }
 
-export const hasTokenBalance = (chain_id: string, account_address: string, token_address: string) => {
+export const batchHasTokenBalance = (chain_id: string, account_address_list: string[]) => {
+    let hasAccount = 0;
     if (chain_id in chainIdAccountBalanceMap) {
-        if (token_address in chainIdAccountBalanceMap[chain_id]) {
-            if (account_address in chainIdAccountBalanceMap[chain_id][token_address]) {
-                return true;
+        if ("0" in chainIdAccountBalanceMap[chain_id]) {
+            for (let i = 0; i < account_address_list.length; i++) {
+                if (account_address_list[i] in chainIdAccountBalanceMap[chain_id]["0"]) {
+                    hasAccount += 1;
+                }
             }
         }
     }
-    return false;
+    if (hasAccount === 0) {
+        return false
+    }
+    return hasAccount / account_address_list.length > 0.8;
 }