@subwallet/extension-base 1.2.32-0 → 1.2.33-0

package/services/chain-service/handler/TonChainHandler.js

@@ -0,0 +1,73 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { AbstractChainHandler } from '@subwallet/extension-base/services/chain-service/handler/AbstractChainHandler';
+import { TonApi } from '@subwallet/extension-base/services/chain-service/handler/TonApi';
+export class TonChainHandler extends AbstractChainHandler {
+  tonApiMap = {};
+
+  // eslint-disable-next-line no-useless-constructor
+  constructor(parent) {
+    super(parent);
+  }
+  getTonApiMap() {
+    return this.tonApiMap;
+  }
+  getTonApiByChain(chain) {
+    return this.tonApiMap[chain];
+  }
+  getApiByChain(chain) {
+    return this.getTonApiByChain(chain);
+  }
+  setTonApi(chain, tonApi) {
+    this.tonApiMap[chain] = tonApi;
+  }
+  async initApi(chainSlug, apiUrl, {
+    onUpdateStatus,
+    providerName
+  } = {}) {
+    const existed = this.getTonApiByChain(chainSlug);
+    if (existed) {
+      existed.connect();
+      if (apiUrl !== existed.apiUrl) {
+        existed.updateApiUrl(apiUrl).catch(console.error);
+      }
+      return existed;
+    }
+    const apiObject = new TonApi(chainSlug, apiUrl, {
+      providerName
+    });
+    apiObject.connectionStatusSubject.subscribe(this.handleConnection.bind(this, chainSlug));
+    apiObject.connectionStatusSubject.subscribe(onUpdateStatus);
+    return Promise.resolve(apiObject);
+  }
+  async recoverApi(chain) {
+    const existed = this.getTonApiByChain(chain);
+    if (existed && !existed.isApiReadyOnce) {
+      console.log(`Reconnect ${existed.providerName || existed.chainSlug} at ${existed.apiUrl}`);
+      return existed.recoverConnect();
+    }
+  }
+  destroyTonApi(chain) {
+    const tonApi = this.getTonApiByChain(chain);
+    tonApi === null || tonApi === void 0 ? void 0 : tonApi.destroy().catch(console.error);
+  }
+  async sleep() {
+    this.isSleeping = true;
+    this.cancelAllRecover();
+    await Promise.all(Object.values(this.getTonApiMap()).map(tonApi => {
+      return tonApi.disconnect().catch(console.error);
+    }));
+    return Promise.resolve();
+  }
+  wakeUp() {
+    var _this$parent;
+    this.isSleeping = false;
+    const activeChains = ((_this$parent = this.parent) === null || _this$parent === void 0 ? void 0 : _this$parent.getActiveChains()) || [];
+    for (const chain of activeChains) {
+      const tonApi = this.getTonApiByChain(chain);
+      tonApi === null || tonApi === void 0 ? void 0 : tonApi.connect();
+    }
+    return Promise.resolve();
+  }
+}

package/services/chain-service/index.d.ts

@@ -15,6 +15,7 @@ export declare class ChainService {
     private lockChainInfoMap;
     private substrateChainHandler;
     private evmChainHandler;
+    private tonChainHandler;
     private mantaChainHandler;
     refreshLatestChainDataTimeOut: NodeJS.Timer | undefined;
     get mantaPay(): MantaPrivateHandler | undefined;
@@ -45,8 +46,10 @@ export declare class ChainService {
     get swapRefMap(): Record<string, _AssetRef>;
     getEvmApi(slug: string): import("./handler/EvmApi").EvmApi;
     getEvmApiMap(): Record<string, import("./handler/EvmApi").EvmApi>;
-    getSubstrateApiMap(): Record<string, _SubstrateApi>;
     getSubstrateApi(slug: string): _SubstrateApi;
+    getSubstrateApiMap(): Record<string, _SubstrateApi>;
+    getTonApi(slug: string): import("./handler/TonApi").TonApi;
+    getTonApiMap(): Record<string, import("./handler/TonApi").TonApi>;
     getChainCurrentProviderByKey(slug: string): {
         endpoint: string;
         providerName: string;
@@ -133,6 +136,7 @@ export declare class ChainService {
     private generateSlugForNativeToken;
     refreshSubstrateApi(slug: string): void;
     refreshEvmApi(slug: string): void;
+    refreshTonApi(slug: string): void;
     stopAllChainApis(): Promise<void>;
     resumeAllChainApis(): Promise<void>;
     initAssetSettings(): Promise<void>;

package/services/chain-service/index.js

@@ -7,6 +7,7 @@ import { _DEFAULT_ACTIVE_CHAINS, _ZK_ASSET_PREFIX, LATEST_CHAIN_DATA_FETCHING_IN
 import { EvmChainHandler } from '@subwallet/extension-base/services/chain-service/handler/EvmChainHandler';
 import { MantaPrivateHandler } from '@subwallet/extension-base/services/chain-service/handler/manta/MantaPrivateHandler';
 import { SubstrateChainHandler } from '@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler';
+import { TonChainHandler } from '@subwallet/extension-base/services/chain-service/handler/TonChainHandler';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _ChainConnectionStatus, _CUSTOM_PREFIX, _NFT_CONTRACT_STANDARDS, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
 import { _isAssetAutoEnable, _isAssetCanPayTxFee, _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, fetchPatchData, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
@@ -18,7 +19,7 @@ import { logger as createLogger } from '@polkadot/util/logger';
 const filterChainInfoMap = (data, ignoredChains) => {
   return Object.fromEntries(Object.entries(data).filter(([slug, info]) => !info.bitcoinInfo && !ignoredChains.includes(slug)));
 };
-const ignoredList = ['bevm', 'bevmTest', 'bevm_testnet', 'layerEdge_testnet', 'merlinEvm', 'botanixEvmTest', 'syscoin_evm', 'syscoin_evm_testnet', 'rollux_evm', 'rollux_testnet', 'boolAlpha', 'boolBeta_testnet', 'core', 'satoshivm', 'satoshivm_testnet', 'ton', 'ton_testnet', 'storyPartner_testnet'];
+const ignoredList = ['bevm', 'bevmTest', 'bevm_testnet', 'layerEdge_testnet', 'merlinEvm', 'botanixEvmTest', 'syscoin_evm', 'syscoin_evm_testnet', 'rollux_evm', 'rollux_testnet', 'boolAlpha', 'boolBeta_testnet', 'core', 'satoshivm', 'satoshivm_testnet', 'storyPartner_testnet'];
 const filterAssetInfoMap = (chainInfo, assets) => {
   return Object.fromEntries(Object.entries(assets).filter(([, info]) => chainInfo[info.originChain]));
 };
@@ -83,6 +84,7 @@ export class ChainService {
     }
     this.substrateChainHandler = new SubstrateChainHandler(this);
     this.evmChainHandler = new EvmChainHandler(this);
+    this.tonChainHandler = new TonChainHandler(this);
     this.logger = createLogger('chain-service');
   }
   get value() {
@@ -130,11 +132,17 @@ export class ChainService {
   getEvmApiMap() {
     return this.evmChainHandler.getEvmApiMap();
   }
+  getSubstrateApi(slug) {
+    return this.substrateChainHandler.getSubstrateApiByChain(slug);
+  }
   getSubstrateApiMap() {
     return this.substrateChainHandler.getSubstrateApiMap();
   }
-  getSubstrateApi(slug) {
-    return this.substrateChainHandler.getSubstrateApiByChain(slug);
+  getTonApi(slug) {
+    return this.tonChainHandler.getTonApiByChain(slug);
+  }
+  getTonApiMap() {
+    return this.tonChainHandler.getTonApiMap();
   }
   getChainCurrentProviderByKey(slug) {
     const providerName = this.getChainStateByKey(slug).currentProvider;
@@ -737,6 +745,13 @@ export class ChainService {
       });
       this.evmChainHandler.setEvmApi(chainInfo.slug, chainApi);
     }
+    if (chainInfo.tonInfo !== null && chainInfo.tonInfo !== undefined) {
+      const chainApi = await this.tonChainHandler.initApi(chainInfo.slug, endpoint, {
+        providerName,
+        onUpdateStatus
+      });
+      this.tonChainHandler.setTonApi(chainInfo.slug, chainApi);
+    }
   }
   destroyApiForChain(chainInfo) {
     if (chainInfo.substrateInfo !== null) {
@@ -745,6 +760,9 @@ export class ChainService {
     if (chainInfo.evmInfo !== null) {
       this.evmChainHandler.destroyEvmApi(chainInfo.slug);
     }
+    if (chainInfo.tonInfo !== null) {
+      this.tonChainHandler.destroyTonApi(chainInfo.slug);
+    }
   }
   async enableChain(chainSlug) {
     const chainInfo = this.getChainInfoByKey(chainSlug);
@@ -1010,7 +1028,7 @@ export class ChainService {
             deprecatedChainMap[storedSlug] = duplicatedDefaultSlug;
             deprecatedChains.push(storedSlug);
           } else {
-            var _storedChainInfo$bitc, _storedChainInfo$tonI;
+            var _storedChainInfo$bitc;
             mergedChainInfoMap[storedSlug] = {
               slug: storedSlug,
               name: storedChainInfo.name,
@@ -1019,7 +1037,7 @@ export class ChainService {
               evmInfo: storedChainInfo.evmInfo,
               substrateInfo: storedChainInfo.substrateInfo,
               bitcoinInfo: (_storedChainInfo$bitc = storedChainInfo.bitcoinInfo) !== null && _storedChainInfo$bitc !== void 0 ? _storedChainInfo$bitc : null,
-              tonInfo: (_storedChainInfo$tonI = storedChainInfo.tonInfo) !== null && _storedChainInfo$tonI !== void 0 ? _storedChainInfo$tonI : null,
+              tonInfo: storedChainInfo.tonInfo,
               isTestnet: storedChainInfo.isTestnet,
               chainStatus: storedChainInfo.chainStatus,
               icon: storedChainInfo.icon,
@@ -1196,6 +1214,7 @@ export class ChainService {
     const newChainSlug = this.generateSlugForCustomChain(params.chainEditInfo.chainType, params.chainEditInfo.name, params.chainSpec.paraId, params.chainSpec.evmChainId);
     let substrateInfo = null;
     let evmInfo = null;
+    const tonInfo = null;
     if (params.chainSpec.genesisHash !== '') {
       substrateInfo = {
         crowdloanFunds: params.chainSpec.crowdloanFunds || null,
@@ -1233,7 +1252,7 @@ export class ChainService {
       substrateInfo,
       evmInfo,
       bitcoinInfo: null,
-      tonInfo: null,
+      tonInfo,
       isTestnet: false,
       chainStatus: _ChainStatus.ACTIVE,
       icon: '',
@@ -1344,6 +1363,8 @@ export class ChainService {
 
         // TODO: EVM chain might have WS provider
         if (provider.startsWith('http')) {
+          // todo: handle validate ton provider
+
           // HTTP provider is EVM by default
           api = await this.evmChainHandler.initApi('custom', provider);
         } else {
@@ -1537,12 +1558,15 @@ export class ChainService {
   refreshEvmApi(slug) {
     this.evmChainHandler.recoverApi(slug).catch(console.error);
   }
+  refreshTonApi(slug) {
+    this.tonChainHandler.recoverApi(slug).catch(console.error);
+  }
   async stopAllChainApis() {
-    await Promise.all([this.substrateChainHandler.sleep(), this.evmChainHandler.sleep()]);
+    await Promise.all([this.substrateChainHandler.sleep(), this.evmChainHandler.sleep(), this.tonChainHandler.sleep()]);
     this.stopCheckLatestChainData();
   }
   async resumeAllChainApis() {
-    await Promise.all([this.substrateChainHandler.wakeUp(), this.evmChainHandler.wakeUp()]);
+    await Promise.all([this.substrateChainHandler.wakeUp(), this.evmChainHandler.wakeUp(), this.tonChainHandler.wakeUp()]);
     this.checkLatestData();
   }
   async initAssetSettings() {

package/services/chain-service/types.d.ts

@@ -1,6 +1,10 @@
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _CrowdloanFund } from '@subwallet/chain-list/types';
+import { AccountState, TxByMsgResponse } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/types';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
+import { TonWalletContract } from '@subwallet/keyring/types';
+import { Cell } from '@ton/core';
+import { Address, Contract, OpenedContract } from '@ton/ton';
 import { BehaviorSubject, Subscription } from 'rxjs';
 import Web3 from 'web3';
 import { ApiPromise } from '@polkadot/api';
@@ -100,6 +104,26 @@ export interface _EvmApi extends _ChainBaseApi {
     api: Web3;
     isReady: Promise<_EvmApi>;
 }
+export interface _TonApi extends _ChainBaseApi, _TonUtilsApi {
+    isReady: Promise<_TonApi>;
+}
+export interface _TonUtilsApi {
+    getBalance(address: Address): Promise<bigint>;
+    open<T extends Contract>(src: T): OpenedContract<T>;
+    estimateExternalMessageFee(walletContract: TonWalletContract, body: Cell, isInit: boolean, ignoreSignature?: boolean): Promise<EstimateExternalMessageFee>;
+    sendTonTransaction(boc: string): Promise<string>;
+    getTxByInMsg(extMsgHash: string): Promise<TxByMsgResponse>;
+    getStatusByExtMsgHash(extMsgHash: string): Promise<[boolean, string]>;
+    getAccountState(address: string): Promise<AccountState>;
+}
+export interface EstimateExternalMessageFee {
+    source_fees: {
+        in_fwd_fee: number;
+        storage_fee: number;
+        gas_fee: number;
+        fwd_fee: number;
+    };
+}
 export declare type _NetworkUpsertParams = {
     mode: 'update' | 'insert';
     chainEditInfo: {

package/services/chain-service/utils/index.d.ts

@@ -2,6 +2,7 @@ import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from
 import { BasicTokenInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _ChainState, _DataMap } from '@subwallet/extension-base/services/chain-service/types';
 import { IChain } from '@subwallet/extension-base/services/storage-service/databases';
+import { AccountChainType } from '@subwallet/extension-base/types';
 export declare function _isCustomChain(slug: string): boolean;
 export declare function _isCustomAsset(slug: string): boolean;
 export declare function _getCustomAssets(assetRegistry: Record<string, _ChainAsset>): Record<string, _ChainAsset>;
@@ -9,6 +10,7 @@ export declare function _isEqualContractAddress(address1: string, address2: stri
 export declare function _isEqualSmartContractAsset(asset1: _ChainAsset, asset2: _ChainAsset): boolean;
 export declare function _isPureEvmChain(chainInfo: _ChainInfo): boolean;
 export declare function _isPureSubstrateChain(chainInfo: _ChainInfo): boolean;
+export declare function _isPureTonChain(chainInfo: _ChainInfo): boolean;
 export declare function _getOriginChainOfAsset(assetSlug: string): string;
 export declare function _getContractAddressOfToken(tokenInfo: _ChainAsset): string;
 /**
@@ -26,15 +28,19 @@ export declare function _isNativeTokenTransferredByEvm(tokenInfo: _ChainAsset):
  * */
 export declare function _isTokenTransferredByEvm(tokenInfo: _ChainAsset): boolean;
 export declare function _checkSmartContractSupportByChain(chainInfo: _ChainInfo, contractType: _AssetType): boolean;
+export declare function _isJettonToken(tokenInfo: _ChainAsset): boolean;
+export declare function _isTokenTransferredByTon(tokenInfo: _ChainAsset): boolean;
 export declare function _getTokenOnChainAssetId(tokenInfo: _ChainAsset): string;
 export declare function _getTokenOnChainInfo(tokenInfo: _ChainAsset): Record<string, any>;
 export declare function _isBridgedToken(tokenInfo: _ChainAsset): boolean;
 export declare function _getTokenMinAmount(tokenInfo: _ChainAsset): string;
 export declare function _isChainEvmCompatible(chainInfo: _ChainInfo): boolean;
+export declare function _isChainBitcoinCompatible(chainInfo: _ChainInfo): boolean;
+export declare function _isChainTonCompatible(chainInfo: _ChainInfo): boolean;
 export declare function _isNativeToken(tokenInfo: _ChainAsset): boolean;
 export declare function _isNativeTokenBySlug(tokenSlug: string): boolean;
 export declare function _isSmartContractToken(tokenInfo: _ChainAsset): boolean;
-export declare function _isSubstrateChain(chainInfo: _ChainInfo): boolean;
+export declare function _isChainSubstrateCompatible(chainInfo: _ChainInfo): boolean;
 export declare function _getEvmChainId(chainInfo: _ChainInfo): number | undefined;
 export declare function _getSubstrateParaId(chainInfo: _ChainInfo): number;
 export declare function _getSubstrateRelayParent(chainInfo: _ChainInfo): string | null | undefined;
@@ -56,6 +62,7 @@ export declare function _getChainNativeTokenBasicInfo(chainInfo: _ChainInfo): Ba
 export declare function _getChainNativeTokenSlug(chainInfo: _ChainInfo): string;
 export declare function _isLocalToken(tokenInfo: _ChainAsset): boolean;
 export declare function _isTokenEvmSmartContract(tokenInfo: _ChainAsset): boolean;
+export declare function _isTokenTonSmartContract(tokenInfo: _ChainAsset): boolean;
 export declare function _isTokenWasmSmartContract(tokenInfo: _ChainAsset): boolean;
 export declare function _isAssetSmartContractNft(assetInfo: _ChainAsset): boolean;
 export declare function _isTokenGearSmartContract(tokenInfo: _ChainAsset): boolean;
@@ -77,7 +84,7 @@ export declare function _getMultiChainAssetPriceId(multiChainAsset: _MultiChainA
 export declare function _getAssetSymbol(assetInfo?: _ChainAsset): string;
 export declare function _getMultiChainAssetSymbol(multiChainAsset: _MultiChainAsset): string;
 export declare function _getAssetOriginChain(assetInfo?: _ChainAsset): string;
-export declare function _getChainName(chainInfo: _ChainInfo): string;
+export declare function _getChainName(chainInfo?: _ChainInfo): string;
 export declare function _getAssetDecimals(assetInfo?: _ChainAsset): number;
 export declare function _getBlockExplorerFromChain(chainInfo: _ChainInfo): string | undefined;
 export declare function _parseMetadataForSmartContractAsset(contractAddress: string): Record<string, string>;
@@ -101,4 +108,5 @@ export declare function updateLatestChainInfo(currentDataMap: _DataMap, latestCh
     storedChainInfoList: IChain[];
     needUpdateChainApiList: _ChainInfo[];
 };
+export declare const _chainInfoToChainType: (chainInfo: _ChainInfo) => AccountChainType;
 export * from './patch';

package/services/chain-service/utils/index.js

@@ -4,6 +4,7 @@
 import { _AssetRefPath, _AssetType, _ChainStatus, _SubstrateChainType } from '@subwallet/chain-list/types';
 import { _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _CUSTOM_PREFIX, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
+import { AccountChainType } from '@subwallet/extension-base/types';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 export function _isCustomChain(slug) {
   if (slug.length === 0) {
@@ -47,10 +48,13 @@ export function _isEqualSmartContractAsset(asset1, asset2) {
   return false;
 }
 export function _isPureEvmChain(chainInfo) {
-  return !!chainInfo.evmInfo && !chainInfo.substrateInfo;
+  return !!chainInfo.evmInfo && !chainInfo.substrateInfo && !chainInfo.tonInfo;
 }
 export function _isPureSubstrateChain(chainInfo) {
-  return !chainInfo.evmInfo && !!chainInfo.substrateInfo;
+  return !chainInfo.evmInfo && !!chainInfo.substrateInfo && !chainInfo.tonInfo;
+}
+export function _isPureTonChain(chainInfo) {
+  return !chainInfo.evmInfo && !chainInfo.substrateInfo && !!chainInfo.tonInfo;
 }
 export function _getOriginChainOfAsset(assetSlug) {
   if (assetSlug.startsWith(_CUSTOM_PREFIX)) {
@@ -96,19 +100,26 @@ export function _checkSmartContractSupportByChain(chainInfo, contractType) {
   }
   return chainInfo.substrateInfo.supportSmartContract !== null && chainInfo.substrateInfo.supportSmartContract.includes(contractType);
 }
+export function _isJettonToken(tokenInfo) {
+  var _tokenInfo$metadata4;
+  return tokenInfo.assetType === _AssetType.TEP74 && !!((_tokenInfo$metadata4 = tokenInfo.metadata) !== null && _tokenInfo$metadata4 !== void 0 && _tokenInfo$metadata4.contractAddress);
+}
+export function _isTokenTransferredByTon(tokenInfo) {
+  return _isJettonToken(tokenInfo) || _isNativeToken(tokenInfo);
+}
 
 // Utils for balance functions
 export function _getTokenOnChainAssetId(tokenInfo) {
-  var _tokenInfo$metadata4;
-  return ((_tokenInfo$metadata4 = tokenInfo.metadata) === null || _tokenInfo$metadata4 === void 0 ? void 0 : _tokenInfo$metadata4.assetId) || '-1';
+  var _tokenInfo$metadata5;
+  return ((_tokenInfo$metadata5 = tokenInfo.metadata) === null || _tokenInfo$metadata5 === void 0 ? void 0 : _tokenInfo$metadata5.assetId) || '-1';
 }
 export function _getTokenOnChainInfo(tokenInfo) {
-  var _tokenInfo$metadata5;
-  return (_tokenInfo$metadata5 = tokenInfo.metadata) === null || _tokenInfo$metadata5 === void 0 ? void 0 : _tokenInfo$metadata5.onChainInfo;
+  var _tokenInfo$metadata6;
+  return (_tokenInfo$metadata6 = tokenInfo.metadata) === null || _tokenInfo$metadata6 === void 0 ? void 0 : _tokenInfo$metadata6.onChainInfo;
 }
 export function _isBridgedToken(tokenInfo) {
-  var _tokenInfo$metadata6;
-  return (_tokenInfo$metadata6 = tokenInfo.metadata) === null || _tokenInfo$metadata6 === void 0 ? void 0 : _tokenInfo$metadata6.isBridged;
+  var _tokenInfo$metadata7;
+  return (_tokenInfo$metadata7 = tokenInfo.metadata) === null || _tokenInfo$metadata7 === void 0 ? void 0 : _tokenInfo$metadata7.isBridged;
 }
 export function _getTokenMinAmount(tokenInfo) {
   return tokenInfo.minAmount || '0';
@@ -116,6 +127,12 @@ export function _getTokenMinAmount(tokenInfo) {
 export function _isChainEvmCompatible(chainInfo) {
   return !!chainInfo.evmInfo;
 }
+export function _isChainBitcoinCompatible(chainInfo) {
+  return !!chainInfo.bitcoinInfo;
+}
+export function _isChainTonCompatible(chainInfo) {
+  return !!chainInfo.tonInfo;
+}
 export function _isNativeToken(tokenInfo) {
   return tokenInfo.assetType === _AssetType.NATIVE;
 }
@@ -125,7 +142,7 @@ export function _isNativeTokenBySlug(tokenSlug) {
 export function _isSmartContractToken(tokenInfo) {
   return _SMART_CONTRACT_STANDARDS.includes(tokenInfo.assetType);
 }
-export function _isSubstrateChain(chainInfo) {
+export function _isChainSubstrateCompatible(chainInfo) {
   return !!chainInfo.substrateInfo; // fallback to Ethereum
 }
 
@@ -232,17 +249,22 @@ export function _getChainNativeTokenBasicInfo(chainInfo) {
       decimals: -1
     };
   }
-  if (chainInfo.substrateInfo !== null) {
+  if (chainInfo.substrateInfo) {
     // substrate by default
     return {
       symbol: chainInfo.substrateInfo.symbol,
       decimals: chainInfo.substrateInfo.decimals
     };
-  } else if (chainInfo.evmInfo !== null) {
+  } else if (chainInfo.evmInfo) {
     return {
       symbol: chainInfo.evmInfo.symbol,
       decimals: chainInfo.evmInfo.decimals
     };
+  } else if (chainInfo.tonInfo) {
+    return {
+      symbol: chainInfo.tonInfo.symbol,
+      decimals: chainInfo.tonInfo.decimals
+    };
   }
   return {
     symbol: '',
@@ -261,6 +283,10 @@ export function _isLocalToken(tokenInfo) {
 export function _isTokenEvmSmartContract(tokenInfo) {
   return [_AssetType.ERC721, _AssetType.ERC20].includes(tokenInfo.assetType);
 }
+export function _isTokenTonSmartContract(tokenInfo) {
+  return [_AssetType.TEP74].includes(tokenInfo.assetType); // add TEP-62 when supporting
+}
+
 export function _isTokenWasmSmartContract(tokenInfo) {
   return [_AssetType.PSP22, _AssetType.PSP34].includes(tokenInfo.assetType);
 }
@@ -281,16 +307,16 @@ export function _isXcmPathSupported(originTokenSlug, destinationTokenSlug, asset
   return assetRef.path === _AssetRefPath.XCM;
 }
 export function _getXcmAssetType(tokenInfo) {
-  var _tokenInfo$metadata7;
-  return ((_tokenInfo$metadata7 = tokenInfo.metadata) === null || _tokenInfo$metadata7 === void 0 ? void 0 : _tokenInfo$metadata7.assetType) || '';
+  var _tokenInfo$metadata8;
+  return ((_tokenInfo$metadata8 = tokenInfo.metadata) === null || _tokenInfo$metadata8 === void 0 ? void 0 : _tokenInfo$metadata8.assetType) || '';
 }
 export function _getXcmAssetId(tokenInfo) {
-  var _tokenInfo$metadata8;
-  return ((_tokenInfo$metadata8 = tokenInfo.metadata) === null || _tokenInfo$metadata8 === void 0 ? void 0 : _tokenInfo$metadata8.assetId) || '-1';
+  var _tokenInfo$metadata9;
+  return ((_tokenInfo$metadata9 = tokenInfo.metadata) === null || _tokenInfo$metadata9 === void 0 ? void 0 : _tokenInfo$metadata9.assetId) || '-1';
 }
 export function _getXcmAssetMultilocation(tokenInfo) {
-  var _tokenInfo$metadata9;
-  return (_tokenInfo$metadata9 = tokenInfo.metadata) === null || _tokenInfo$metadata9 === void 0 ? void 0 : _tokenInfo$metadata9.multilocation;
+  var _tokenInfo$metadata10;
+  return (_tokenInfo$metadata10 = tokenInfo.metadata) === null || _tokenInfo$metadata10 === void 0 ? void 0 : _tokenInfo$metadata10.multilocation;
 }
 export function _getXcmTransferType(originChainInfo, destinationChainInfo) {
   var _originChainInfo$subs, _destinationChainInfo;
@@ -336,7 +362,7 @@ export function _getAssetOriginChain(assetInfo) {
   return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.originChain) || '';
 }
 export function _getChainName(chainInfo) {
-  return chainInfo.name;
+  return (chainInfo === null || chainInfo === void 0 ? void 0 : chainInfo.name) || '';
 }
 export function _getAssetDecimals(assetInfo) {
   return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.decimals) || 0;
@@ -503,4 +529,19 @@ export function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
     needUpdateChainApiList
   };
 }
+export const _chainInfoToChainType = chainInfo => {
+  if (_isPureSubstrateChain(chainInfo)) {
+    return AccountChainType.SUBSTRATE;
+  }
+  if (_isChainEvmCompatible(chainInfo)) {
+    return AccountChainType.ETHEREUM;
+  }
+  if (_isChainTonCompatible(chainInfo)) {
+    return AccountChainType.TON;
+  }
+  if (_isChainBitcoinCompatible(chainInfo)) {
+    return AccountChainType.BITCOIN;
+  }
+  return AccountChainType.SUBSTRATE;
+};
 export * from "./patch.js";

package/services/earning-service/constants/chains.d.ts

@@ -13,6 +13,7 @@ export declare const _STAKING_CHAIN_GROUP: {
     krest_network: string[];
     manta: string[];
 };
+export declare const TON_CHAINS: string[];
 export declare const MaxEraRewardPointsEras = 14;
 export declare const ST_LIQUID_TOKEN_ABI: Record<string, any>;
 export declare const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;

package/services/earning-service/constants/chains.js

@@ -18,6 +18,7 @@ export const _STAKING_CHAIN_GROUP = {
   krest_network: ['krest_network'],
   manta: ['manta_network']
 };
+export const TON_CHAINS = ['ton', 'ton_testnet'];
 export const MaxEraRewardPointsEras = 14;
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment

package/services/earning-service/handlers/base.js

@@ -4,7 +4,7 @@
 import { ChainType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
 import { DEFAULT_YIELD_FIRST_STEP } from '@subwallet/extension-base/services/earning-service/constants';
-import { formatNumber } from '@subwallet/extension-base/utils';
+import { formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { BN, BN_TEN } from '@polkadot/util';
 
 /**
@@ -101,7 +101,8 @@ export default class BasePoolHandler {
     return await this.state.earningService.getYieldPool(this.slug);
   }
   async getPoolPosition(address) {
-    return await this.state.earningService.getYieldPosition(address, this.slug);
+    const originAddress = reformatAddress(address);
+    return await this.state.earningService.getYieldPosition(originAddress, this.slug);
   }
 
   /* Subscribe data */

package/services/earning-service/handlers/lending/base.js

@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { BasicTxErrorType, StakingTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
-import { YieldPoolType } from '@subwallet/extension-base/types';
+import { BasicTxErrorType, StakingTxErrorType, YieldPoolType } from '@subwallet/extension-base/types';
 import { BN_ZERO, formatNumber } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';

package/services/earning-service/handlers/lending/interlay.js

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { BasicTxErrorType, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { _getTokenOnChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
-import { EarningStatus, YieldStepType } from '@subwallet/extension-base/types';
+import { BasicTxErrorType, EarningStatus, YieldStepType } from '@subwallet/extension-base/types';
 import { BN, BN_TEN, BN_ZERO } from '@polkadot/util';
 import { fakeAddress } from "../../constants/index.js";
 import BaseLendingPoolHandler from "./base.js";

package/services/earning-service/handlers/liquid-staking/base.js

@@ -2,9 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { BasicTxErrorType, StakingTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
 import { convertDerivativeToOriginToken } from '@subwallet/extension-base/koni/api/yield/helper/utils';
-import { YieldPoolType } from '@subwallet/extension-base/types';
+import { BasicTxErrorType, StakingTxErrorType, YieldPoolType } from '@subwallet/extension-base/types';
 import { formatNumber } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';

package/services/earning-service/handlers/liquid-staking/stella-swap.js

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { BasicTxErrorType, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { getERC20Contract, getERC20SpendingApprovalTx } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
 import { _getAssetDecimals, _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
-import { EarningStatus, UnstakingStatus, YieldStepType } from '@subwallet/extension-base/types';
+import { BasicTxErrorType, EarningStatus, UnstakingStatus, YieldStepType } from '@subwallet/extension-base/types';
 import { BN, BN_TEN, BN_ZERO } from '@polkadot/util';
 import { ST_LIQUID_TOKEN_ABI } from "../../constants/index.js";
 import BaseLiquidStakingPoolHandler from "./base.js";

package/services/earning-service/handlers/native-staking/amplitude.js

@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { APIItemState, BasicTxErrorType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { APIItemState, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { getBondedValidators, getEarningStatusByNominations, isUnstakeAll } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
 import { parseIdentity } from '@subwallet/extension-base/services/earning-service/utils';
-import { EarningStatus, UnstakingStatus, YieldStepType } from '@subwallet/extension-base/types';
+import { BasicTxErrorType, EarningStatus, UnstakingStatus, YieldStepType } from '@subwallet/extension-base/types';
 import { balanceFormatter, formatNumber, parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { BN, BN_ZERO } from '@polkadot/util';
 import BaseParaNativeStakingPoolHandler from "./base-para.js";

package/services/earning-service/handlers/native-staking/astar.js

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { BasicTxErrorType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { getEarningStatusByNominations } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
-import { EarningStatus, UnstakingStatus, YieldStepType } from '@subwallet/extension-base/types';
+import { BasicTxErrorType, EarningStatus, UnstakingStatus, YieldStepType } from '@subwallet/extension-base/types';
 import { balanceFormatter, formatNumber, isUrl, parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { BN, BN_ZERO } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';

package/services/earning-service/handlers/native-staking/base-para.js

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { BasicTxErrorType, StakingTxErrorType, StakingType } from '@subwallet/extension-base/background/KoniTypes';
+import { StakingType } from '@subwallet/extension-base/background/KoniTypes';
 import { getBondedValidators, getExistUnstakeErrorMessage, getMaxValidatorErrorMessage, getMinStakeErrorMessage } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import BaseNativeStakingPoolHandler from '@subwallet/extension-base/services/earning-service/handlers/native-staking/base';
-import { EarningStatus, YieldStepType } from '@subwallet/extension-base/types';
+import { BasicTxErrorType, EarningStatus, StakingTxErrorType, YieldStepType } from '@subwallet/extension-base/types';
 import { isSameAddress, reformatAddress } from '@subwallet/extension-base/utils';
 import { t } from 'i18next';
 import { BN, BN_ZERO } from '@polkadot/util';

package/services/earning-service/handlers/native-staking/base.js

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { BasicTxErrorType, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
+import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { BasicTxErrorType, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
 import { noop } from '@polkadot/util';
 import BasePoolHandler from "../base.js";
 export default class BaseNativeStakingPoolHandler extends BasePoolHandler {