v3.0.29

changelogs/3.0.29.txt

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mytonwallet",
-  "version": "3.0.28",
+  "version": "3.0.29",
   "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 @@
-3.0.28
+3.0.29

src/api/chains/ton/constants.ts

@@ -219,6 +219,21 @@ export const KnownContracts: Record<ContractName, ContractInfo> = {
     hash: '14ce618a0e9a94adc99fa6e975219ddd675425b30dfa9728f98714c8dc55f9da',
     isSwapAllowed: true,
   },
+  stonRouterV2: {
+    name: 'stonRouterV2',
+    hash: 'd61cb7fb7bee0cc414286a482fccdec53c3f8717e4aae4fc362d98ab6254e6cd',
+    isSwapAllowed: true,
+  },
+  stonPoolV2: {
+    name: 'stonPoolV2',
+    hash: '16cc513c380e329f45d54f294787e2030e289799eca138961c1cd7e26e882c7c',
+    isSwapAllowed: true,
+  },
+  stonPtonWalletV2: {
+    name: 'stonPtonWalletV2',
+    hash: '2761042202032258de9eb1b672e1ec2e4f13b2af00700195801ada33f7ced1b6',
+    isSwapAllowed: true,
+  },
   megatonWtonMaster: {
     name: 'megatonWtonMaster',
     hash: '4c9790d808ea4470614e021f76c40529efe2fbce8138da4284a29b5f1943ef19',

src/api/chains/ton/types.ts

@@ -54,14 +54,12 @@ export interface JettonMetadata {
   custom_payload_api_uri?: string;
 }
 
-export interface InitData {
-  code?: Cell;
-  data?: Cell;
-}
-
-export type ContractName = ApiTonWalletVersion | 'v4R1' | 'highloadV2' | 'multisig' | 'multisigV2' | 'multisigNew'
-| 'nominatorPool' | 'vesting' | 'dedustPool' | 'dedustVaultNative' | 'dedustVaultJetton'
-| 'stonPtonWallet' | 'stonRouter' | 'megatonWtonMaster' | 'megatonRouter';
+export type ContractName = ApiTonWalletVersion
+| 'v4R1' | 'highloadV2' | 'multisig' | 'multisigV2' | 'multisigNew'
+| 'nominatorPool' | 'vesting'
+| 'dedustPool' | 'dedustVaultNative' | 'dedustVaultJetton'
+| 'stonPtonWallet' | 'stonRouter' | 'stonRouterV2' | 'stonPoolV2' | 'stonPtonWalletV2'
+| 'megatonWtonMaster' | 'megatonRouter';
 
 export type ContractInfo = {
   name: ContractName;

src/api/chains/tron/constants.ts

@@ -0,0 +1 @@
+export const ONE_TRX = 1_000_000n;

src/api/chains/tron/polling.ts

@@ -1,9 +1,8 @@
 import type { ApiTxTimestamps, OnApiUpdate } from '../../types';
 
-import {
-  getChainConfig, TRX,
-} from '../../../config';
+import { TRX } from '../../../config';
 import { parseAccountId } from '../../../util/account';
+import { getChainConfig } from '../../../util/chain';
 import { compareActivities } from '../../../util/compareActivities';
 import { logDebugError } from '../../../util/logs';
 import { pauseOrFocus } from '../../../util/pauseOrFocus';

src/api/chains/tron/transactions.ts

@@ -2,8 +2,9 @@ import { TronWeb } from 'tronweb';
 
 import type { ApiNetwork, ApiTransactionActivity } from '../../types';
 
-import { getChainConfig, TRX } from '../../../config';
+import { TRX } from '../../../config';
 import { parseAccountId } from '../../../util/account';
+import { getChainConfig } from '../../../util/chain';
 import { compareActivities } from '../../../util/compareActivities';
 import { fetchJson } from '../../../util/fetch';
 import { buildCollectionByKey } from '../../../util/iteratees';

src/api/chains/tron/transfer.ts

@@ -5,8 +5,8 @@ import type { ContractParamter, Transaction } from 'tronweb/lib/commonjs/types';
 
 import type { ApiSubmitTransferOptions, CheckTransactionDraftOptions } from '../../methods/types';
 import type { ApiCheckTransactionDraftResult } from '../ton/types';
-import type { ApiAccountWithMnemonic } from '../../types';
 import { ApiTransactionDraftError, ApiTransactionError } from '../../types';
+import type { ApiAccountWithMnemonic, ApiBip39Account } from '../../types';
 
 import { parseAccountId } from '../../../util/account';
 import { logDebugError } from '../../../util/logs';
@@ -16,6 +16,8 @@ import { getMnemonic } from '../../common/mnemonic';
 import { handleServerError } from '../../errors';
 import { getWalletBalance } from './wallet';
 import type { ApiSubmitTransferTronResult } from './types';
+import { hexToString } from '../../../util/stringFormat';
+import { ONE_TRX } from './constants';
 
 const SIGNATURE_SIZE = 65;
 const FEE_LIMIT_TRX = 35_000_000n; // 35 TRX
@@ -93,11 +95,11 @@ export async function submitTransfer(options: ApiSubmitTransferOptions): Promise
     const tronWeb = getTronClient(network);
 
     const account = await fetchStoredAccount<ApiAccountWithMnemonic>(accountId);
-    const { address } = account.ton;
+    const { address } = (account as ApiBip39Account).tron;
     const trxBalance = await getWalletBalance(network, address);
 
     const trxAmount = tokenAddress ? fee : fee + amount;
-    const isEnoughTrx = trxBalance > trxAmount;
+    const isEnoughTrx = (trxBalance - ONE_TRX) >= trxAmount;
 
     if (!isEnoughTrx) {
       return { error: ApiTransactionError.InsufficientBalance };
@@ -127,6 +129,16 @@ export async function submitTransfer(options: ApiSubmitTransferOptions): Promise
         privateKey,
       });
 
+      if ('code' in result && !('result' in result && result.result)) {
+        const error = 'message' in result && result.message
+          ? hexToString(result.message)
+          : result.code.toString();
+
+        logDebugError('submitTransfer', { error, result });
+
+        return { error };
+      }
+
       return { amount, toAddress, txId: result.transaction.txID };
     }
   } catch (err: any) {

src/api/chains/tron/util/tronweb.ts

@@ -2,7 +2,7 @@ import { TronWeb } from 'tronweb';
 
 import type { ApiNetwork } from '../../../types';
 
-import { getChainConfig } from '../../../../config';
+import { getChainConfig } from '../../../../util/chain';
 
 let clientByNetwork: Record<ApiNetwork, TronWeb> | undefined;
 

src/api/common/swap.ts

@@ -4,7 +4,7 @@ import type { ApiSwapActivity, ApiSwapHistoryItem } from '../types';
 import { TONCOIN } from '../../config';
 import { buildSwapId } from '../../util/swap/buildSwapId';
 import { callBackendGet, callBackendPost } from './backend';
-import { buildTokenSlug } from './tokens';
+import { buildTokenSlug, getTokenByAddress } from './tokens';
 
 export function swapGetHistory(address: string, params: {
   fromLt?: number;
@@ -37,7 +37,11 @@ export function swapItemToActivity(swap: ApiSwapHistoryItem): ApiSwapActivity {
 }
 
 export function getSwapItemSlug(item: ApiSwapHistoryItem, asset: string) {
-  if (asset === TONCOIN.symbol) return TONCOIN.slug;
-  if (item.cex) return asset;
+  if (asset === TONCOIN.symbol) {
+    return TONCOIN.slug;
+  }
+  if (item.cex) {
+    return getTokenByAddress(asset)?.slug ?? asset;
+  }
   return buildTokenSlug('ton', asset);
 }

src/api/methods/accounts.ts

@@ -2,8 +2,9 @@ import type {
   ApiChain, ApiLedgerAccount, ApiTonWallet, ApiTxTimestamps, OnApiUpdate,
 } from '../types';
 
-import { getChainConfig, IS_EXTENSION } from '../../config';
+import { IS_EXTENSION } from '../../config';
 import { parseAccountId } from '../../util/account';
+import { getChainConfig } from '../../util/chain';
 import chains from '../chains';
 import {
   fetchStoredAccount,

src/api/methods/polling.ts

@@ -5,7 +5,7 @@ import type {
   OnApiUpdate,
 } from '../types';
 
-import { IS_AIR_APP } from '../../config';
+import { IS_AIR_APP, TONCOIN } from '../../config';
 import { buildCollectionByKey, omit } from '../../util/iteratees';
 import { logDebugError } from '../../util/logs';
 import { pauseOrFocus } from '../../util/pauseOrFocus';
@@ -140,7 +140,9 @@ export async function tryLoadSwapTokens(localOnUpdate?: OnApiUpdate) {
         // Fix legacy variable names
         ...omit(asset as any, ['blockchain']) as ApiSwapAsset,
         chain: 'blockchain' in asset ? asset.blockchain as string : asset.chain,
-        tokenAddress: 'contract' in asset ? asset.contract as string : asset.tokenAddress,
+        tokenAddress: 'contract' in asset && asset.contract !== TONCOIN.symbol
+          ? asset.contract as string
+          : asset.tokenAddress,
         price: prices.bySlug[asset.slug]?.price ?? 0,
       };
       return acc;

src/api/methods/swap.ts

@@ -194,11 +194,11 @@ export async function swapCexCreateTransaction(
   const { swap } = await callBackendPost<ApiSwapCexCreateTransactionResponse>('/swap/cex/createTransaction', request, {
     authToken,
   });
+
   const activity = swapItemToActivity(swap);
 
   onUpdate({
     type: 'newActivities',
-    chain: 'ton',
     accountId,
     activities: [activity],
   });

src/api/methods/transactions.ts

@@ -11,8 +11,8 @@ import type {
 } from '../types';
 import type { ApiSubmitTransferOptions, ApiSubmitTransferResult, CheckTransactionDraftOptions } from './types';
 
-import { getChainConfig } from '../../config';
 import { parseAccountId } from '../../util/account';
+import { getChainConfig } from '../../util/chain';
 import { compareActivities } from '../../util/compareActivities';
 import { logDebugError } from '../../util/logs';
 import chains from '../chains';
@@ -110,7 +110,7 @@ export async function submitTransfer(
   chain: ApiChain,
   options: ApiSubmitTransferOptions,
   shouldCreateLocalTransaction = true,
-) {
+): Promise<(ApiSubmitTransferResult | ApiSubmitTransferWithDieselResult) & { txId?: string }> {
   const {
     accountId,
     password,

src/api/types/updates.ts

@@ -27,7 +27,7 @@ export type ApiUpdateBalances = {
 export type ApiUpdateNewActivities = {
   type: 'newActivities';
   accountId: string;
-  chain: ApiChain;
+  chain?: ApiChain;
   activities: ApiActivity[];
   noForward?: boolean; // Forbid cyclic update redirection to/from NBS
 };

src/components/common/SwapResult.module.scss

@@ -57,3 +57,8 @@
 .changellyTextField {
   width: 100%;
 }
+
+.feeBlock {
+  margin-top: 2rem;
+  margin-bottom: -0.75rem;
+}

src/components/common/SwapResult.tsx

@@ -1,10 +1,15 @@
-import React, { memo } from '../../lib/teact/teact';
+import React, { memo, useMemo } from '../../lib/teact/teact';
 import { withGlobal } from '../../global';
 
 import type { Account, UserSwapToken } from '../../global/types';
 import { SwapType } from '../../global/types';
 
+import { TONCOIN } from '../../config';
+import { getIsInternalSwap, getIsSupportedChain } from '../../global/helpers';
 import { selectCurrentAccount } from '../../global/selectors';
+import buildClassName from '../../util/buildClassName';
+import { findChainConfig } from '../../util/chain';
+import { formatCurrency } from '../../util/formatNumber';
 import getChainNetworkName from '../../util/swap/getChainNetworkName';
 import { ANIMATED_STICKERS_PATHS } from '../ui/helpers/animatedAssets';
 
@@ -15,6 +20,7 @@ import Button from '../ui/Button';
 import InteractiveTextField from '../ui/InteractiveTextField';
 import SwapTokensInfo from './SwapTokensInfo';
 
+import transactionStyles from '../main/modals/TransactionModal.module.scss';
 import styles from './SwapResult.module.scss';
 
 interface OwnProps {
@@ -27,6 +33,7 @@ interface OwnProps {
   secondButtonText?: string;
   swapType?: SwapType;
   toAddress?: string;
+  networkFee?: number;
   onFirstButtonClick?: NoneToVoidFunction;
   onSecondButtonClick?: NoneToVoidFunction;
 }
@@ -45,12 +52,25 @@ function SwapResult({
   secondButtonText,
   swapType,
   toAddress = '',
+  networkFee,
   addressByChain,
   onFirstButtonClick,
   onSecondButtonClick,
 }: OwnProps & StateProps) {
   const lang = useLang();
 
+  const isInternalSwap = getIsInternalSwap({
+    from: tokenIn, to: tokenOut, toAddress, addressByChain,
+  });
+  const isToAddressInCurrentWallet = useMemo(() => {
+    return Boolean(toAddress && Object.values(addressByChain ?? {}).some((address) => address === toAddress));
+  }, [addressByChain, toAddress]);
+  const nativeToken = useMemo(() => {
+    if (!tokenIn) return undefined;
+
+    return findChainConfig(tokenIn.chain)?.nativeToken;
+  }, [tokenIn]);
+
   function renderButtons() {
     if (!firstButtonText && !secondButtonText) {
       return undefined;
@@ -69,7 +89,7 @@ function SwapResult({
   }
 
   function renderSticker() {
-    if (swapType === SwapType.CrosschainFromToncoin) return undefined;
+    if (swapType === SwapType.CrosschainFromWallet && !isInternalSwap) return undefined;
 
     return (
       <AnimatedIconWithPreview
@@ -83,6 +103,19 @@ function SwapResult({
     );
   }
 
+  function renderFee() {
+    return (
+      <div className={buildClassName(styles.feeBlock, transactionStyles.textFieldWrapperFullWidth)}>
+        <span className={transactionStyles.textFieldLabel}>
+          {lang('Blockchain Fee')}
+        </span>
+        <div className={transactionStyles.textField}>
+          {formatCurrency(networkFee!, nativeToken?.symbol ?? TONCOIN.symbol, undefined, true)}
+        </div>
+      </div>
+    );
+  }
+
   function renderTimeWarning() {
     return (
       <div className={styles.changellyInfoBlock}>
@@ -94,11 +127,10 @@ function SwapResult({
   }
 
   function renderChangellyInfo() {
-    if (swapType !== SwapType.CrosschainFromToncoin || (
-      toAddress && (toAddress === addressByChain?.ton || toAddress === addressByChain?.tron)
-    )) {
+    if (swapType !== SwapType.CrosschainFromWallet || isToAddressInCurrentWallet) {
       return undefined;
     }
+    const chain = getIsSupportedChain(tokenOut?.chain) ? tokenOut.chain : undefined;
 
     return (
       <div className={styles.changellyInfoBlock}>
@@ -114,7 +146,7 @@ function SwapResult({
           }
         </span>
         <InteractiveTextField
-          chain="ton"
+          chain={chain}
           address={toAddress}
           copyNotification={lang('Address was copied!')}
           noSavedAddress
@@ -136,6 +168,8 @@ function SwapResult({
         amountOut={amountOut}
       />
 
+      {!!networkFee && renderFee()}
+
       {swapType !== SwapType.OnChain && renderTimeWarning()}
       {renderChangellyInfo()}