v1.18.7

changelogs/1.18.7.txt

@@ -0,0 +1 @@
+Bug fixes and performance improvements

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mytonwallet",
-  "version": "1.18.6",
+  "version": "1.18.7",
   "description": "The most feature-rich web wallet and browser extension for TON – with support of multi-accounts, tokens (jettons), NFT, TON DNS, TON Sites, TON Proxy, and TON Magic.",
   "main": "index.js",
   "scripts": {

public/version.txt

@@ -1 +1 @@
-1.18.6
+1.18.7

src/api/blockchains/ton/util/apiV3.ts

@@ -6,13 +6,16 @@ import {
   TONHTTPAPI_V3_MAINNET_API_URL,
   TONHTTPAPI_V3_TESTNET_API_URL,
 } from '../../../../config';
+import { split } from '../../../../util/iteratees';
 import { fetchJson } from '../../../common/utils';
 import { getEnvironment } from '../../../environment';
 import { parseTxId, stringifyTxId } from './index';
 import { toBase64Address } from './tonCore';
 
 type AddressBook = Record<string, { user_friendly: string }>;
 
+const ADDRESS_BOOK_CHUNK_SIZE = 128;
+
 export async function fetchTransactions(
   network: ApiNetwork,
   address: string,
@@ -99,11 +102,20 @@ function getRawBody(msg: any) {
   return msg.message_content.body;
 }
 
-export function fetchAddressBook(network: ApiNetwork, addresses: string[]): Promise<AddressBook> {
-  return callApiV3(network, '/addressBook', {
-    address: addresses,
-  });
+export async function fetchAddressBook(network: ApiNetwork, addresses: string[]): Promise<AddressBook> {
+  const chunks = split(addresses, ADDRESS_BOOK_CHUNK_SIZE);
+
+  const results = await Promise.all(chunks.map((chunk) => {
+    return callApiV3(network, '/addressBook', {
+      address: chunk,
+    });
+  }));
+
+  return results.reduce((acc, value) => {
+    return Object.assign(acc, value);
+  }, {} as AddressBook);
 }
+
 function callApiV3(network: ApiNetwork, path: string, data?: AnyLiteral) {
   const { apiHeaders, tonhttpapiMainnetKey, tonhttpapiTestnetKey } = getEnvironment();
   const baseUrl = network === 'testnet' ? TONHTTPAPI_V3_TESTNET_API_URL : TONHTTPAPI_V3_MAINNET_API_URL;

src/api/methods/polling.ts

@@ -1,6 +1,5 @@
 import type { TokenBalanceParsed } from '../blockchains/ton/tokens';
 import type {
-  ApiActivity,
   ApiBackendStakingState,
   ApiBalanceBySlug,
   ApiBaseCurrency,
@@ -35,7 +34,7 @@ import { processNftUpdates, updateNfts } from './nfts';
 import { getBaseCurrency } from './prices';
 import { getBackendStakingState, getStakingCommonData, tryUpdateStakingCommonData } from './staking';
 import {
-  swapGetAssets, swapGetHistory, swapItemToActivity, swapReplaceTransactions,
+  swapGetAssets, swapGetHistory, swapItemToActivity, swapReplaceTransactionsByRanges,
 } from './swap';
 
 type IsAccountActiveFn = (accountId: string) => boolean;
@@ -295,9 +294,7 @@ async function processNewActivities(
   const { network, blockchain } = parseAccountId(accountId);
   const activeBlockchain = blockchains[blockchain];
 
-  let allTransactions: ApiTransactionActivity[] = [];
-  let allActivities: ApiActivity[] = [];
-
+  const chunks: ApiTransactionActivity[][] = [];
   const result: [string, string | undefined][] = [];
 
   // Process TON transactions first
@@ -308,13 +305,10 @@ async function processNewActivities(
     const transactions = await activeBlockchain.getTokenTransactionSlice(
       accountId, slug, undefined, newestTxId, FIRST_TRANSACTIONS_LIMIT,
     );
-    const activities = await swapReplaceTransactions(accountId, transactions, network, slug);
 
     if (transactions.length) {
       newestTxId = transactions[0]!.txId;
-
-      allActivities = allActivities.concat(activities);
-      allTransactions = allTransactions.concat(transactions);
+      chunks.push(transactions);
     }
 
     result.push([slug, newestTxId]);
@@ -331,35 +325,36 @@ async function processNewActivities(
     });
   }
 
+  // Process token transactions
   await Promise.all(tokenSlugs.map(async (slug) => {
     let newestTxId = newestTxIds[slug];
 
     const transactions = await activeBlockchain.getTokenTransactionSlice(
       accountId, slug, undefined, newestTxId, FIRST_TRANSACTIONS_LIMIT,
     );
-    const activities = await swapReplaceTransactions(accountId, transactions, network, slug);
 
     if (transactions.length) {
       newestTxId = transactions[0]!.txId;
-
-      allActivities = allActivities.concat(activities);
-      allTransactions = allTransactions.concat(transactions);
+      chunks.push(transactions);
     }
 
     result.push([slug, newestTxId]);
   }));
 
-  allTransactions.sort((a, b) => compareActivities(a, b, true));
+  const allTransactions = chunks.flat().sort((a, b) => compareActivities(a, b));
+  const isFirstRun = !Object.keys(newestTxIds).length;
+  const activities = await swapReplaceTransactionsByRanges(accountId, allTransactions, chunks, isFirstRun);
 
+  allTransactions.sort((a, b) => compareActivities(a, b, true));
   allTransactions.forEach((transaction) => {
     txCallbacks.runCallbacks(transaction);
   });
 
-  await activeBlockchain.fixTokenActivitiesAddressForm(network, allActivities);
+  await activeBlockchain.fixTokenActivitiesAddressForm(network, activities);
 
   onUpdate({
     type: 'newActivities',
-    activities: allActivities,
+    activities,
     accountId,
   });