@subwallet/extension-base 1.3.62-0 → 1.3.64-0

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.62-0",
+  "version": "1.3.64-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1191,6 +1191,11 @@
       "require": "./cjs/services/earning-service/handlers/native-staking/relay-chain.js",
       "default": "./services/earning-service/handlers/native-staking/relay-chain.js"
     },
+    "./services/earning-service/handlers/native-staking/tanssi": {
+      "types": "./services/earning-service/handlers/native-staking/tanssi.d.ts",
+      "require": "./cjs/services/earning-service/handlers/native-staking/tanssi.js",
+      "default": "./services/earning-service/handlers/native-staking/tanssi.js"
+    },
     "./services/earning-service/handlers/native-staking/tao": {
       "types": "./services/earning-service/handlers/native-staking/tao.d.ts",
       "require": "./cjs/services/earning-service/handlers/native-staking/tao.js",
@@ -1481,6 +1486,11 @@
       "require": "./cjs/services/migration-service/scripts/databases/MigrateAssetSetting.js",
       "default": "./services/migration-service/scripts/databases/MigrateAssetSetting.js"
     },
+    "./services/migration-service/scripts/databases/MigrateAssetSetting20251027": {
+      "types": "./services/migration-service/scripts/databases/MigrateAssetSetting20251027.d.ts",
+      "require": "./cjs/services/migration-service/scripts/databases/MigrateAssetSetting20251027.js",
+      "default": "./services/migration-service/scripts/databases/MigrateAssetSetting20251027.js"
+    },
     "./services/migration-service/scripts/databases/MigrateEarningHistory": {
       "types": "./services/migration-service/scripts/databases/MigrateEarningHistory.d.ts",
       "require": "./cjs/services/migration-service/scripts/databases/MigrateEarningHistory.js",
@@ -1611,6 +1621,11 @@
       "require": "./cjs/services/migration-service/scripts/MigrateTransactionHistoryBySymbol.js",
       "default": "./services/migration-service/scripts/MigrateTransactionHistoryBySymbol.js"
     },
+    "./services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251027": {
+      "types": "./services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251027.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251027.js",
+      "default": "./services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251027.js"
+    },
     "./services/migration-service/scripts/MigrateWalletReference": {
       "types": "./services/migration-service/scripts/MigrateWalletReference.d.ts",
       "require": "./cjs/services/migration-service/scripts/MigrateWalletReference.js",
@@ -2016,6 +2031,11 @@
       "require": "./cjs/services/swap-service/handler/kyber-handler.js",
       "default": "./services/swap-service/handler/kyber-handler.js"
     },
+    "./services/swap-service/handler/optimex-handler": {
+      "types": "./services/swap-service/handler/optimex-handler.d.ts",
+      "require": "./cjs/services/swap-service/handler/optimex-handler.js",
+      "default": "./services/swap-service/handler/optimex-handler.js"
+    },
     "./services/swap-service/handler/simpleswap-handler": {
       "types": "./services/swap-service/handler/simpleswap-handler.d.ts",
       "require": "./cjs/services/swap-service/handler/simpleswap-handler.js",
@@ -2883,11 +2903,11 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet-monorepos/subwallet-services-sdk": "^0.1.8",
-    "@subwallet/chain-list": "0.2.118",
-    "@subwallet/extension-base": "^1.3.62-0",
-    "@subwallet/extension-chains": "^1.3.62-0",
-    "@subwallet/extension-dapp": "^1.3.62-0",
-    "@subwallet/extension-inject": "^1.3.62-0",
+    "@subwallet/chain-list": "0.2.120",
+    "@subwallet/extension-base": "^1.3.64-0",
+    "@subwallet/extension-chains": "^1.3.64-0",
+    "@subwallet/extension-dapp": "^1.3.64-0",
+    "@subwallet/extension-inject": "^1.3.64-0",
     "@subwallet/keyring": "^0.1.13",
     "@subwallet/ui-keyring": "^0.1.13",
     "@ton/core": "^0.56.3",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.62-0'
+  version: '1.3.64-0'
 };

package/services/balance-service/transfer/smart-contract.d.ts

@@ -10,9 +10,10 @@ interface TransferEvmProps extends TransactionFee {
     value: string;
     evmApi: _EvmApi;
     fallbackFee?: boolean;
+    data?: string;
 }
-export declare function getEVMTransactionObject({ chain, evmApi, fallbackFee, feeCustom: _feeCustom, feeInfo: _feeInfo, feeOption, from, to, transferAll, value }: TransferEvmProps): Promise<[TransactionConfig, string, string]>;
-export declare function getERC20TransactionObject({ assetAddress, chain, evmApi, fallbackFee, feeCustom: _feeCustom, feeInfo: _feeInfo, feeOption, from, to, transferAll, value }: TransferERC20Props): Promise<[TransactionConfig, string, string]>;
+export declare function getEVMTransactionObject(props: TransferEvmProps): Promise<[TransactionConfig, string, string]>;
+export declare function getERC20TransactionObject(props: TransferERC20Props): Promise<[TransactionConfig, string, string]>;
 interface TransferERC20Props extends TransactionFee {
     assetAddress: string;
     chain: string;

package/services/balance-service/transfer/smart-contract.js

@@ -9,29 +9,32 @@ import { EVM_REFORMAT_DECIMALS } from '@subwallet/extension-base/services/chain-
 import { combineEthFee } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
-export async function getEVMTransactionObject({
-  chain,
-  evmApi,
-  fallbackFee,
-  feeCustom: _feeCustom,
-  feeInfo: _feeInfo,
-  feeOption,
-  from,
-  to,
-  transferAll,
-  value
-}) {
+export async function getEVMTransactionObject(props) {
+  const {
+    chain,
+    data,
+    evmApi,
+    fallbackFee,
+    feeCustom: _feeCustom,
+    feeInfo: _feeInfo,
+    feeOption,
+    from,
+    to,
+    transferAll,
+    value
+  } = props;
   const feeCustom = _feeCustom;
   const feeInfo = _feeInfo;
   const feeCombine = combineEthFee(feeInfo, feeOption, feeCustom);
   let errorOnEstimateFee = '';
   const transactionObject = {
-    to: to,
-    value: value,
-    from: from,
+    to,
+    value,
+    from,
+    data,
     ...feeCombine
   };
-  const gasLimit = await evmApi.api.eth.estimateGas(transactionObject).catch(e => {
+  const gasEstimate = await evmApi.api.eth.estimateGas(transactionObject).catch(e => {
     console.log('Cannot estimate fee with native transfer on', chain, e);
     if (fallbackFee) {
       errorOnEstimateFee = e.message;
@@ -40,6 +43,8 @@ export async function getEVMTransactionObject({
       throw Error('Unable to estimate fee for this transaction. Edit fee and try again.');
     }
   });
+  const gasLimit = Math.floor(gasEstimate * 1.1); // 10% buffer for fluctuations
+
   transactionObject.gas = gasLimit;
   let estimateFee;
   if (feeCombine.maxFeePerGas) {
@@ -55,19 +60,20 @@ export async function getEVMTransactionObject({
   }
   return [transactionObject, transactionObject.value.toString(), errorOnEstimateFee];
 }
-export async function getERC20TransactionObject({
-  assetAddress,
-  chain,
-  evmApi,
-  fallbackFee,
-  feeCustom: _feeCustom,
-  feeInfo: _feeInfo,
-  feeOption,
-  from,
-  to,
-  transferAll,
-  value
-}) {
+export async function getERC20TransactionObject(props) {
+  const {
+    assetAddress,
+    chain,
+    evmApi,
+    fallbackFee,
+    feeCustom: _feeCustom,
+    feeInfo: _feeInfo,
+    feeOption,
+    from,
+    to,
+    transferAll,
+    value
+  } = props;
   const erc20Contract = getERC20Contract(assetAddress, evmApi);
   const feeCustom = _feeCustom;
   let freeAmount = new BigN(0);

package/services/balance-service/transfer/xcm/acrossBridge/index.d.ts

@@ -1,10 +1,6 @@
 import { CreateXcmExtrinsicProps } from '..';
 export declare function _isAcrossChainBridge(srcChain: string, destChain: string): boolean;
 export declare function _isAcrossTestnetBridge(srcChain: string): boolean;
-export declare const AcrossErrorMsg: {
-    AMOUNT_TOO_LOW: string;
-    AMOUNT_TOO_HIGH: string;
-};
 export interface AcrossQuote {
     outputAmount: string;
     rate: string;

package/services/balance-service/transfer/xcm/acrossBridge/index.js

@@ -15,10 +15,6 @@ export function _isAcrossChainBridge(srcChain, destChain) {
 export function _isAcrossTestnetBridge(srcChain) {
   return srcChain === 'base_sepolia' || srcChain === 'arbitrum_sepolia' || srcChain === COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA;
 }
-export const AcrossErrorMsg = {
-  AMOUNT_TOO_LOW: 'amount too low',
-  AMOUNT_TOO_HIGH: 'amount too high'
-};
 // Calculate fee for across bridge transfer
 export const getAcrossQuote = async ({
   destinationChain,

package/services/balance-service/transfer/xcm/utils.js

@@ -69,6 +69,7 @@ export async function buildXcm(request) {
     originChain,
     originTokenInfo,
     recipient,
+    sender,
     sendingValue,
     substrateApi
   } = request;
@@ -81,6 +82,7 @@ export async function buildXcm(request) {
   }
   const paraSpellChainMap = await fetchParaSpellChainMap();
   const bodyData = {
+    senderAddress: sender,
     address: recipient,
     from: paraSpellChainMap[originChain.slug],
     to: paraSpellChainMap[destinationChain.slug],

package/services/chain-service/constants.js

@@ -67,6 +67,8 @@ export const _STAKING_ERA_LENGTH_MAP = {
   aleph: 24,
   polkadot: 24,
   kusama: 6,
+  statemint: 24,
+  statemine: 6,
   westend: 6,
   hydradx: 24,
   default: 24,
@@ -121,6 +123,8 @@ export const _EXPECTED_BLOCK_TIME = {
   aleph: 1,
   polkadot: 6,
   kusama: 6,
+  statemint: 6,
+  statemine: 6,
   polkadex: 12,
   ternoa: 6,
   ternoa_alphanet: 6,
@@ -224,6 +228,13 @@ export const _KNOWN_CHAIN_INFLATION_PARAMS = {
     auctionMax: 60,
     stakeTarget: 0.75
   },
+  statemine: {
+    ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
+    auctionAdjust: 0.3 / 60,
+    auctionMax: 60,
+    stakeTarget: 0.75
+  },
+  // todo: recheck
   neatcoin: {
     ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
     stakeTarget: 0.75
@@ -237,6 +248,11 @@ export const _KNOWN_CHAIN_INFLATION_PARAMS = {
     ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
     stakeTarget: 0.75
   },
+  statemint: {
+    ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
+    stakeTarget: 0.75
+  },
+  // todo: recheck
   vara_network: {
     ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
     stakeTarget: 0.8

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

@@ -1,5 +1,5 @@
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
-import { BasicTokenInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { BasicTokenInfo, ChainType } 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, AccountSignMode } from '@subwallet/extension-base/types';
@@ -122,7 +122,8 @@ export declare function updateLatestChainInfo(currentDataMap: _DataMap, latestCh
     storedChainInfoList: IChain[];
     needUpdateChainApiList: _ChainInfo[];
 };
-export declare const _chainInfoToChainType: (chainInfo: _ChainInfo) => AccountChainType;
+export declare const _chainInfoToAccountChainType: (chainInfo: _ChainInfo) => AccountChainType;
+export declare const _chainInfoToChainType: (chainInfo: _ChainInfo) => ChainType | undefined;
 interface AccountInfo {
     chainType: AccountChainType;
     type: KeypairType;

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { _AssetRefPath, _AssetType, _ChainStatus, _SubstrateChainType } from '@subwallet/chain-list/types';
+import { ChainType } from '@subwallet/extension-base/background/KoniTypes';
 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, AccountSignMode } from '@subwallet/extension-base/types';
@@ -596,7 +597,7 @@ export function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
     needUpdateChainApiList
   };
 }
-export const _chainInfoToChainType = chainInfo => {
+export const _chainInfoToAccountChainType = chainInfo => {
   if (_isPureSubstrateChain(chainInfo)) {
     return AccountChainType.SUBSTRATE;
   }
@@ -614,6 +615,24 @@ export const _chainInfoToChainType = chainInfo => {
   }
   return AccountChainType.SUBSTRATE;
 };
+export const _chainInfoToChainType = chainInfo => {
+  if (_isChainSubstrateCompatible(chainInfo)) {
+    return ChainType.SUBSTRATE;
+  }
+  if (_isPureEvmChain(chainInfo)) {
+    return ChainType.EVM;
+  }
+  if (_isPureTonChain(chainInfo)) {
+    return ChainType.TON;
+  }
+  if (_isPureCardanoChain(chainInfo)) {
+    return ChainType.CARDANO;
+  }
+  if (_isPureBitcoinChain(chainInfo)) {
+    return ChainType.BITCOIN;
+  }
+  return undefined;
+};
 export const _isChainInfoCompatibleWithAccountInfo = (chainInfo, accountInfo) => {
   const {
     chainType: accountChainType,

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

@@ -1,5 +1,5 @@
 import { _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
-export declare const ChainListVersion = "0.2.118";
+export declare const ChainListVersion = "0.2.120";
 export interface PatchInfo {
     patchVersion: string;
     appliedVersion: string;

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

@@ -5,7 +5,7 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = process.env.PATCH_CHAIN_LIST_URL || (PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev');
 const fetchFile = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';
-export const ChainListVersion = '0.2.118'; // update this when build chain-list
+export const ChainListVersion = '0.2.120'; // update this when build chain-list
 
 // todo: move this interface to chainlist
 

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

@@ -15,6 +15,7 @@ export declare const _STAKING_CHAIN_GROUP: {
     bittensor: string[];
     energy: string[];
     mythos: string[];
+    tanssi: string[];
 };
 export declare const RELAY_HANDLER_DIRECT_STAKING_CHAINS: string[];
 export declare const TON_CHAINS: string[];

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

@@ -19,7 +19,8 @@ export const _STAKING_CHAIN_GROUP = {
   manta: ['manta_network'],
   bittensor: ['bittensor', 'bittensor_testnet'],
   energy: ['energy_web_x_testnet', 'energy_web_x'],
-  mythos: ['mythos', 'muse_testnet']
+  mythos: ['mythos', 'muse_testnet'],
+  tanssi: ['tanssi', 'dancelight']
 };
 export const RELAY_HANDLER_DIRECT_STAKING_CHAINS = [..._STAKING_CHAIN_GROUP.relay, ..._STAKING_CHAIN_GROUP.assetHub];
 export const TON_CHAINS = ['ton', 'ton_testnet'];

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

@@ -9,6 +9,7 @@ import { BasicTxErrorType, EarningStatus, StakingTxErrorType, YieldStepType } fr
 import { isSameAddress, reformatAddress } from '@subwallet/extension-base/utils';
 import { t } from 'i18next';
 import { BN, BN_ZERO } from '@polkadot/util';
+import { _STAKING_CHAIN_GROUP } from "../../constants/index.js";
 export default class BaseParaNativeStakingPoolHandler extends BaseNativeStakingPoolHandler {
   /* Join pool action */
 
@@ -125,9 +126,11 @@ export default class BaseParaNativeStakingPoolHandler extends BaseNativeStakingP
     const bnChainMinStake = new BN(poolInfo.statistic.earningThreshold.join || '0');
     const bnCollatorMinStake = new BN(targetNomination.validatorMinStake || '0');
     const bnMinStake = BN.max(bnCollatorMinStake, bnChainMinStake);
-    const existUnstakeErrorMessage = getExistUnstakeErrorMessage(this.chain, StakingType.NOMINATED);
-    if (targetNomination.hasUnstaking) {
-      errors.push(new TransactionError(StakingTxErrorType.EXIST_UNSTAKING_REQUEST, existUnstakeErrorMessage));
+    if (!_STAKING_CHAIN_GROUP.tanssi.includes(this.chain)) {
+      const existUnstakeErrorMessage = getExistUnstakeErrorMessage(this.chain, StakingType.NOMINATED);
+      if (targetNomination.hasUnstaking) {
+        errors.push(new TransactionError(StakingTxErrorType.EXIST_UNSTAKING_REQUEST, existUnstakeErrorMessage));
+      }
     }
     if (!(bnRemainingStake.isZero() || bnRemainingStake.gte(bnMinStake))) {
       errors.push(new TransactionError(StakingTxErrorType.INVALID_ACTIVE_STAKE));

package/services/earning-service/handlers/native-staking/energy.d.ts

@@ -16,6 +16,12 @@ export interface PalletEnergyStakingNominationRequestsScheduledRequest {
     whenExecutable: number;
     action: Record<PalletParachainStakingRequestType, number>;
 }
+export interface PalletEnergyStakingTopNominations {
+    nominations: Array<{
+        owner: string;
+        amount: string;
+    }>;
+}
 export default class EnergyNativeStakingPoolHandler extends BaseParaNativeStakingPoolHandler {
     subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;
     parseNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, nominatorState: PalletEnergyStakingNominator): Promise<Omit<YieldPositionInfo, keyof BaseYieldPositionInfo>>;

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

@@ -3,13 +3,16 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { getBondedValidators, getEarningStatusByNominations, isUnstakeAll } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { calculateEnergyWebCollatorReturn, getBondedValidators, getEarningStatusByNominations, isUnstakeAll } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _EXPECTED_BLOCK_TIME, _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { parseIdentity } from '@subwallet/extension-base/services/earning-service/utils';
 import { BasicTxErrorType, EarningStatus, UnstakingStatus } from '@subwallet/extension-base/types';
 import { balanceFormatter, formatNumber, parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
-import { BN, BN_ZERO } from '@polkadot/util';
+import { BN, BN_TEN, BN_ZERO } from '@polkadot/util';
 import BaseParaNativeStakingPoolHandler from "./base-para.js";
+const DEFAULT_ANNUAL_REWARD = {
+  energy_web_x: 2000000
+};
 export default class EnergyNativeStakingPoolHandler extends BaseParaNativeStakingPoolHandler {
   /* Subscribe pool info */
 
@@ -53,6 +56,13 @@ export default class EnergyNativeStakingPoolHandler extends BaseParaNativeStakin
       const unstakingPeriod = parseInt(unstakingDelay.toString()) * eraTime;
       const minStake = '0';
       const minToHuman = formatNumber(minStake.toString(), nativeToken.decimals || 0, balanceFormatter);
+      const collators = await this.getPoolTargets();
+      let maxApy = 0;
+      for (const collator of collators) {
+        if (collator.expectedReturn && collator.expectedReturn > maxApy) {
+          maxApy = collator.expectedReturn;
+        }
+      }
       const data = {
         ...this.baseInfo,
         type: this.type,
@@ -76,8 +86,7 @@ export default class EnergyNativeStakingPoolHandler extends BaseParaNativeStakin
           // TODO recheck
           era,
           eraTime,
-          totalApy: undefined,
-          // not have
+          totalApy: maxApy,
           tvl: totalStake.toString(),
           unstakingPeriod: unstakingPeriod
         },
@@ -250,12 +259,21 @@ export default class EnergyNativeStakingPoolHandler extends BaseParaNativeStakin
     const apiProps = await this.substrateApi.isReady;
     const substrateIdentityApi = this.substrateIdentityApi;
     const allCollators = [];
-    const [_allCollators, _selectedCandidates] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(),
-    // use it when energy support collatorCommission
-    // apiProps.api.query.parachainStaking.collatorCommission(),
-    apiProps.api.query.parachainStaking.selectedCandidates()]);
+    const [_allCollators, _selectedCandidates, _eraInfo, unstakingDelay] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.selectedCandidates(), apiProps.api.query.parachainStaking.era(), apiProps.api.query.parachainStaking.delay()]);
+    const delay = parseInt(unstakingDelay.toString()); // in era unit
+    const roundInfo = _eraInfo.toPrimitive();
+    const currentRound = roundInfo.current;
+    let defaultCommission = 0;
+    if (apiProps.api.query.parachainStaking.defaultCollatorCommission) {
+      const _defaultCommission = await apiProps.api.query.parachainStaking.defaultCollatorCommission();
+      const {
+        current
+      } = _defaultCommission.toPrimitive();
+      defaultCommission = current / 1000000000;
+    }
     const maxNominationPerCollator = apiProps.api.consts.parachainStaking.maxTopNominationsPerCandidate.toString();
     const selectedCollators = _selectedCandidates.toPrimitive();
+    const selectedCollatorsCount = selectedCollators.length;
     for (const collator of _allCollators) {
       const _collatorAddress = collator[0].toHuman();
       const collatorAddress = _collatorAddress[0];
@@ -282,6 +300,39 @@ export default class EnergyNativeStakingPoolHandler extends BaseParaNativeStakin
         });
       }
     }
+    const annualReward = DEFAULT_ANNUAL_REWARD[this.chain] ? new BN(DEFAULT_ANNUAL_REWARD[this.chain]).mul(BN_TEN.pow(new BN(this.nativeToken.decimals || 18))) : BN_ZERO;
+
+    // calculate expected return
+    await Promise.all(allCollators.map(async collator => {
+      if (!selectedCollators.includes(collator.address) || annualReward.lte(BN_ZERO)) {
+        return;
+      }
+      const [_topNominations, _nominationScheduledRequests] = await Promise.all([apiProps.api.query.parachainStaking.topNominations(collator.address), apiProps.api.query.parachainStaking.nominationScheduledRequests(collator.address)]);
+      const nominationScheduledRequests = _nominationScheduledRequests.toPrimitive();
+      const topNominations = _topNominations.toPrimitive();
+      const topNominationsRecord = topNominations.nominations.reduce((record, {
+        amount,
+        owner
+      }) => {
+        record[owner] = amount || '0';
+        return record;
+      }, {});
+      let bnTotalActiveStake = new BN(collator.totalStake);
+      if (nominationScheduledRequests !== null && nominationScheduledRequests !== void 0 && nominationScheduledRequests.length) {
+        const bnTotalInactiveStake = nominationScheduledRequests.reduce((partialSum, {
+          action,
+          nominator,
+          whenExecutable
+        }) => {
+          if (whenExecutable + delay - parseInt(currentRound) < 0 && action) {
+            return partialSum.add(new BN(topNominationsRecord[nominator] || Object.values(action)[0] || BN_ZERO));
+          }
+          return partialSum;
+        }, BN_ZERO);
+        bnTotalActiveStake = bnTotalActiveStake.sub(bnTotalInactiveStake);
+      }
+      collator.expectedReturn = calculateEnergyWebCollatorReturn(annualReward.toString(), defaultCommission, selectedCollatorsCount, bnTotalActiveStake.toString());
+    }));
     const extraInfoMap = {};
     await Promise.all(allCollators.map(async collator => {
       const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), parseIdentity(substrateIdentityApi, collator.address)]);
@@ -297,6 +348,7 @@ export default class EnergyNativeStakingPoolHandler extends BaseParaNativeStakin
       validator.blocked = !extraInfoMap[validator.address].active;
       validator.identity = extraInfoMap[validator.address].identity;
       validator.isVerified = extraInfoMap[validator.address].isVerified;
+      validator.commission = defaultCommission * 100;
     }
     return allCollators;
   }

package/services/earning-service/handlers/native-staking/tanssi.d.ts

@@ -0,0 +1,16 @@
+import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { EarningRewardItem, StakeCancelWithdrawalParams, SubmitJoinNativeStaking, TransactionData, UnstakingInfo, YieldPoolInfo, YieldPoolMethodInfo, YieldPoolTarget, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+import BaseParaNativeStakingPoolHandler from './base-para';
+export default class TanssiNativeStakingPoolHandler extends BaseParaNativeStakingPoolHandler {
+    readonly availableMethod: YieldPoolMethodInfo;
+    subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;
+    subscribePoolPosition(useAddresses: string[], onUpdate: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;
+    checkAccountHaveStake(addresses: string[]): Promise<string[]>;
+    getPoolTargets(): Promise<YieldPoolTarget[]>;
+    createJoinExtrinsic(data: SubmitJoinNativeStaking, positionInfo?: YieldPositionInfo, bondDest?: string, netuid?: number): Promise<[TransactionData, YieldTokenBaseInfo]>;
+    protected handleYieldUnstake(amount: string, address: string, selectedTarget?: string): Promise<[ExtrinsicType, TransactionData]>;
+    getPoolReward(useAddresses: string[], callback: (rs: EarningRewardItem) => void): Promise<VoidFunction>;
+    handleYieldClaimReward(address: string, bondReward?: boolean): Promise<TransactionData>;
+    handleYieldWithdraw(address: string, unstakingInfo: UnstakingInfo): Promise<TransactionData>;
+    handleYieldCancelUnstake(params: StakeCancelWithdrawalParams): Promise<TransactionData>;
+}