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

package/cjs/koni/api/staking/bonding/utils.js

@@ -11,6 +11,7 @@ exports.calculateAlephZeroValidatorReturn = calculateAlephZeroValidatorReturn;
 exports.calculateAnalogChainStakedReturn = calculateAnalogChainStakedReturn;
 exports.calculateChainStakedReturn = calculateChainStakedReturn;
 exports.calculateChainStakedReturnV2 = calculateChainStakedReturnV2;
+exports.calculateEnergyWebCollatorReturn = calculateEnergyWebCollatorReturn;
 exports.calculateInflation = calculateInflation;
 exports.calculateTernoaValidatorReturn = calculateTernoaValidatorReturn;
 exports.calculateValidatorStakedReturn = calculateValidatorStakedReturn;
@@ -139,6 +140,11 @@ async function calculateChainStakedReturnV2(chainInfo, totalIssuance, erasPerDay
 function calculateAlephZeroValidatorReturn(chainStakedReturn, commission) {
   return chainStakedReturn * (100 - commission) / 100;
 }
+function calculateEnergyWebCollatorReturn(annualReward, collatorCommission, numberCollators, totalStake) {
+  const rewardForNominators = new _bignumber.default(annualReward).multipliedBy(1 - collatorCommission);
+  const rewardPerNominator = rewardForNominators.div(numberCollators);
+  return rewardPerNominator.div(totalStake).shiftedBy(2).toNumber();
+}
 function calculateTernoaValidatorReturn(rewardPerValidator, validatorStake, commission) {
   const percentRewardForNominators = (100 - commission) / 100;
   const rewardForNominators = rewardPerValidator * percentRewardForNominators;

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.3.63-0'
+  version: '1.3.64-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -12,7 +12,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';
-const ChainListVersion = '0.2.119'; // update this when build chain-list
+const ChainListVersion = '0.2.120'; // update this when build chain-list
 
 // todo: move this interface to chainlist
 exports.ChainListVersion = ChainListVersion;

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

@@ -17,6 +17,9 @@ var _basePara = _interopRequireDefault(require("./base-para"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+const DEFAULT_ANNUAL_REWARD = {
+  energy_web_x: 2000000
+};
 class EnergyNativeStakingPoolHandler extends _basePara.default {
   /* Subscribe pool info */
 
@@ -60,6 +63,13 @@ class EnergyNativeStakingPoolHandler extends _basePara.default {
       const unstakingPeriod = parseInt(unstakingDelay.toString()) * eraTime;
       const minStake = '0';
       const minToHuman = (0, _utils3.formatNumber)(minStake.toString(), nativeToken.decimals || 0, _utils3.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,
@@ -83,8 +93,7 @@ class EnergyNativeStakingPoolHandler extends _basePara.default {
           // TODO recheck
           era,
           eraTime,
-          totalApy: undefined,
-          // not have
+          totalApy: maxApy,
           tvl: totalStake.toString(),
           unstakingPeriod: unstakingPeriod
         },
@@ -257,12 +266,21 @@ class EnergyNativeStakingPoolHandler extends _basePara.default {
     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];
@@ -289,6 +307,41 @@ class EnergyNativeStakingPoolHandler extends _basePara.default {
         });
       }
     }
+    const annualReward = DEFAULT_ANNUAL_REWARD[this.chain] ? new _util.BN(DEFAULT_ANNUAL_REWARD[this.chain]).mul(_util.BN_TEN.pow(new _util.BN(this.nativeToken.decimals || 18))) : _util.BN_ZERO;
+
+    // calculate expected return
+    await Promise.all(allCollators.map(async collator => {
+      if (!selectedCollators.includes(collator.address) || annualReward.lte(_util.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, _ref) => {
+        let {
+          amount,
+          owner
+        } = _ref;
+        record[owner] = amount || '0';
+        return record;
+      }, {});
+      let bnTotalActiveStake = new _util.BN(collator.totalStake);
+      if (nominationScheduledRequests !== null && nominationScheduledRequests !== void 0 && nominationScheduledRequests.length) {
+        const bnTotalInactiveStake = nominationScheduledRequests.reduce((partialSum, _ref2) => {
+          let {
+            action,
+            nominator,
+            whenExecutable
+          } = _ref2;
+          if (whenExecutable + delay - parseInt(currentRound) < 0 && action) {
+            return partialSum.add(new _util.BN(topNominationsRecord[nominator] || Object.values(action)[0] || _util.BN_ZERO));
+          }
+          return partialSum;
+        }, _util.BN_ZERO);
+        bnTotalActiveStake = bnTotalActiveStake.sub(bnTotalInactiveStake);
+      }
+      collator.expectedReturn = (0, _utils.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), (0, _utils2.parseIdentity)(substrateIdentityApi, collator.address)]);
@@ -304,6 +357,7 @@ class EnergyNativeStakingPoolHandler extends _basePara.default {
       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/cjs/services/earning-service/handlers/native-staking/relay-chain.js

@@ -67,10 +67,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
       }
       const unlimitedNominatorRewarded = substrateApi.api.consts.staking.maxExposurePageSize !== undefined;
       const maxNominatorRewarded = (_substrateApi$api$con = substrateApi.api.consts.staking.maxNominatorRewardedPerValidator) === null || _substrateApi$api$con === void 0 ? void 0 : _substrateApi$api$con.toString();
-
-      // hotfix for kusama asset hub migration
-      const kahMaxNominations = '24';
-      const maxNominations = chainInfo.slug === 'statemine' ? kahMaxNominations : await (0, _utils.getRelayMaxNominations)(substrateApi, this.chain);
+      const maxNominations = await (0, _utils.getRelayMaxNominations)(substrateApi, this.chain);
       const currentEra = _currentEra.toString();
       const maxUnlockingChunks = substrateApi.api.consts.staking.maxUnlockingChunks.toString();
       const unlockingEras = substrateApi.api.consts.staking.bondingDuration.toString();

package/cjs/services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251027.js

@@ -0,0 +1,51 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateTransactionHistoryBySymbol20251027 extends _Base.default {
+  async run() {
+    const state = this.state;
+    try {
+      const changeSlugsMap = {
+        'moonriver-ERC20-GLMR.wb-0xFfFffFff1a49463978f19dfD6983f2fa1885C254': 'moonriver-ERC20-GLMR.mb-0xFfFffFff1a49463978f19dfD6983f2fa1885C254'
+      };
+      const allTxs = [];
+      await Promise.all(Object.entries(changeSlugsMap).map(async (_ref, i) => {
+        let [oldSlug, newSlug] = _ref;
+        const oldSlugSplit = oldSlug.split('-');
+        const oldChainSlug = oldSlugSplit[0];
+        const oldSymbolSlug = oldSlugSplit[2];
+        const newSlugSplit = newSlug.split('-');
+        const newSymbolSlug = newSlugSplit[2];
+        const filterTransactions = await state.dbService.stores.transaction.table.where({
+          chain: oldChainSlug
+        }).and(tx => {
+          var _tx$amount;
+          return ((_tx$amount = tx.amount) === null || _tx$amount === void 0 ? void 0 : _tx$amount.symbol) === oldSymbolSlug;
+        }).toArray();
+        if (filterTransactions.length > 0) {
+          for (const transaction of filterTransactions) {
+            if (transaction.amount && transaction.amount.symbol === oldSymbolSlug) {
+              transaction.amount.symbol = newSymbolSlug;
+            }
+            if (transaction.fee && transaction.fee.symbol === oldSymbolSlug) {
+              transaction.fee.symbol = newSymbolSlug;
+            }
+          }
+        }
+        allTxs.push(...filterTransactions);
+      }));
+      await state.dbService.stores.transaction.table.bulkPut(allTxs);
+    } catch (e) {
+      this.logger.error(e);
+    }
+  }
+}
+exports.default = MigrateTransactionHistoryBySymbol20251027;

package/cjs/services/migration-service/scripts/databases/MigrateAssetSetting20251027.js

@@ -0,0 +1,37 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateAssetSetting20251027 extends _Base.default {
+  async run() {
+    try {
+      const changeSlugsMap = {
+        'moonriver-ERC20-GLMR.wb-0xFfFffFff1a49463978f19dfD6983f2fa1885C254': 'moonriver-ERC20-GLMR.mb-0xFfFffFff1a49463978f19dfD6983f2fa1885C254'
+      };
+      const assetSetting = await this.state.chainService.getAssetSettings();
+      const migratedAssetSetting = {};
+      for (const [oldSlug, newSlug] of Object.entries(changeSlugsMap)) {
+        if (Object.keys(assetSetting).includes(oldSlug)) {
+          const isVisible = assetSetting[oldSlug].visible;
+          migratedAssetSetting[newSlug] = {
+            visible: isVisible
+          };
+        }
+      }
+      this.state.chainService.setAssetSettings({
+        ...assetSetting,
+        ...migratedAssetSetting
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateAssetSetting20251027;

package/cjs/services/migration-service/scripts/index.js

@@ -9,6 +9,7 @@ var _MigrateChainPatrol = _interopRequireDefault(require("@subwallet/extension-b
 var _ClearMetadataDatabase = _interopRequireDefault(require("./databases/ClearMetadataDatabase"));
 var _ClearMetadataForMythos = _interopRequireDefault(require("./databases/ClearMetadataForMythos"));
 var _MigrateAssetSetting = _interopRequireDefault(require("./databases/MigrateAssetSetting"));
+var _MigrateAssetSetting2 = _interopRequireDefault(require("./databases/MigrateAssetSetting20251027"));
 var _MigrateEarningVersion = _interopRequireDefault(require("./databases/MigrateEarningVersion"));
 var _ReloadMetadata = _interopRequireDefault(require("./databases/ReloadMetadata"));
 var _MigrateLedgerAccount = _interopRequireDefault(require("./keyring/MigrateLedgerAccount"));
@@ -33,6 +34,7 @@ var _MigrateTokenDecimals = _interopRequireDefault(require("./MigrateTokenDecima
 var _MigrateTransactionHistory = _interopRequireDefault(require("./MigrateTransactionHistory"));
 var _MigrateTransactionHistoryBridge = _interopRequireDefault(require("./MigrateTransactionHistoryBridge"));
 var _MigrateTransactionHistoryBySymbol = _interopRequireDefault(require("./MigrateTransactionHistoryBySymbol"));
+var _MigrateTransactionHistoryBySymbol2 = _interopRequireDefault(require("./MigrateTransactionHistoryBySymbol20251027"));
 var _MigrateWalletReference = _interopRequireDefault(require("./MigrateWalletReference"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -78,6 +80,8 @@ var _default = {
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
   '1.3.42-01': _MigrateNewUnifiedAccount.default,
   '1.3.54-01': _MigrateChainPatrol.default,
-  '1.3.62-01': _DeleteEarningData2.default
+  '1.3.62-01': _DeleteEarningData2.default,
+  '1.3.64-01': _MigrateAssetSetting2.default,
+  '1.3.64-02': _MigrateTransactionHistoryBySymbol2.default
 };
 exports.default = _default;

package/koni/api/staking/bonding/utils.d.ts

@@ -102,6 +102,7 @@ export declare function calculateInflation(totalEraStake: BN, totalIssuance: BN,
 export declare function calculateChainStakedReturn(inflation: number, totalEraStake: BN, totalIssuance: BN, networkKey: string): number;
 export declare function calculateChainStakedReturnV2(chainInfo: _ChainInfo, totalIssuance: string, erasPerDay: number, lastTotalStaked: string, validatorEraReward: BigNumber, inflation: BigNumber, isCompound?: boolean): Promise<number | undefined>;
 export declare function calculateAlephZeroValidatorReturn(chainStakedReturn: number, commission: number): number;
+export declare function calculateEnergyWebCollatorReturn(annualReward: string, collatorCommission: number, numberCollators: number, totalStake: string): number;
 export declare function calculateTernoaValidatorReturn(rewardPerValidator: number, validatorStake: number, commission: number): number;
 export declare function calculateAnalogChainStakedReturn(): Promise<number | undefined>;
 export declare function calculateValidatorStakedReturn(chainStakedReturn: number, totalValidatorStake: BN, avgStake: BN, commission: number): number;

package/koni/api/staking/bonding/utils.js

@@ -97,6 +97,11 @@ export async function calculateChainStakedReturnV2(chainInfo, totalIssuance, era
 export function calculateAlephZeroValidatorReturn(chainStakedReturn, commission) {
   return chainStakedReturn * (100 - commission) / 100;
 }
+export function calculateEnergyWebCollatorReturn(annualReward, collatorCommission, numberCollators, totalStake) {
+  const rewardForNominators = new BigNumber(annualReward).multipliedBy(1 - collatorCommission);
+  const rewardPerNominator = rewardForNominators.div(numberCollators);
+  return rewardPerNominator.div(totalStake).shiftedBy(2).toNumber();
+}
 export function calculateTernoaValidatorReturn(rewardPerValidator, validatorStake, commission) {
   const percentRewardForNominators = (100 - commission) / 100;
   const rewardForNominators = rewardPerValidator * percentRewardForNominators;

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.63-0",
+  "version": "1.3.64-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1486,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",
@@ -1616,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",
@@ -2893,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.119",
-    "@subwallet/extension-base": "^1.3.63-0",
-    "@subwallet/extension-chains": "^1.3.63-0",
-    "@subwallet/extension-dapp": "^1.3.63-0",
-    "@subwallet/extension-inject": "^1.3.63-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.63-0'
+  version: '1.3.64-0'
 };

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.119";
+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.119'; // 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/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/relay-chain.js

@@ -60,10 +60,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       }
       const unlimitedNominatorRewarded = substrateApi.api.consts.staking.maxExposurePageSize !== undefined;
       const maxNominatorRewarded = (_substrateApi$api$con = substrateApi.api.consts.staking.maxNominatorRewardedPerValidator) === null || _substrateApi$api$con === void 0 ? void 0 : _substrateApi$api$con.toString();
-
-      // hotfix for kusama asset hub migration
-      const kahMaxNominations = '24';
-      const maxNominations = chainInfo.slug === 'statemine' ? kahMaxNominations : await getRelayMaxNominations(substrateApi, this.chain);
+      const maxNominations = await getRelayMaxNominations(substrateApi, this.chain);
       const currentEra = _currentEra.toString();
       const maxUnlockingChunks = substrateApi.api.consts.staking.maxUnlockingChunks.toString();
       const unlockingEras = substrateApi.api.consts.staking.bondingDuration.toString();

package/services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251027.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateTransactionHistoryBySymbol20251027 extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251027.js

@@ -0,0 +1,42 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateTransactionHistoryBySymbol20251027 extends BaseMigrationJob {
+  async run() {
+    const state = this.state;
+    try {
+      const changeSlugsMap = {
+        'moonriver-ERC20-GLMR.wb-0xFfFffFff1a49463978f19dfD6983f2fa1885C254': 'moonriver-ERC20-GLMR.mb-0xFfFffFff1a49463978f19dfD6983f2fa1885C254'
+      };
+      const allTxs = [];
+      await Promise.all(Object.entries(changeSlugsMap).map(async ([oldSlug, newSlug], i) => {
+        const oldSlugSplit = oldSlug.split('-');
+        const oldChainSlug = oldSlugSplit[0];
+        const oldSymbolSlug = oldSlugSplit[2];
+        const newSlugSplit = newSlug.split('-');
+        const newSymbolSlug = newSlugSplit[2];
+        const filterTransactions = await state.dbService.stores.transaction.table.where({
+          chain: oldChainSlug
+        }).and(tx => {
+          var _tx$amount;
+          return ((_tx$amount = tx.amount) === null || _tx$amount === void 0 ? void 0 : _tx$amount.symbol) === oldSymbolSlug;
+        }).toArray();
+        if (filterTransactions.length > 0) {
+          for (const transaction of filterTransactions) {
+            if (transaction.amount && transaction.amount.symbol === oldSymbolSlug) {
+              transaction.amount.symbol = newSymbolSlug;
+            }
+            if (transaction.fee && transaction.fee.symbol === oldSymbolSlug) {
+              transaction.fee.symbol = newSymbolSlug;
+            }
+          }
+        }
+        allTxs.push(...filterTransactions);
+      }));
+      await state.dbService.stores.transaction.table.bulkPut(allTxs);
+    } catch (e) {
+      this.logger.error(e);
+    }
+  }
+}

package/services/migration-service/scripts/databases/MigrateAssetSetting20251027.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateAssetSetting20251027 extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/databases/MigrateAssetSetting20251027.js

@@ -0,0 +1,29 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateAssetSetting20251027 extends BaseMigrationJob {
+  async run() {
+    try {
+      const changeSlugsMap = {
+        'moonriver-ERC20-GLMR.wb-0xFfFffFff1a49463978f19dfD6983f2fa1885C254': 'moonriver-ERC20-GLMR.mb-0xFfFffFff1a49463978f19dfD6983f2fa1885C254'
+      };
+      const assetSetting = await this.state.chainService.getAssetSettings();
+      const migratedAssetSetting = {};
+      for (const [oldSlug, newSlug] of Object.entries(changeSlugsMap)) {
+        if (Object.keys(assetSetting).includes(oldSlug)) {
+          const isVisible = assetSetting[oldSlug].visible;
+          migratedAssetSetting[newSlug] = {
+            visible: isVisible
+          };
+        }
+      }
+      this.state.chainService.setAssetSettings({
+        ...assetSetting,
+        ...migratedAssetSetting
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

package/services/migration-service/scripts/index.js

@@ -5,6 +5,7 @@ import MigrateChainPatrol from '@subwallet/extension-base/services/migration-ser
 import ClearMetadataDatabase from "./databases/ClearMetadataDatabase.js";
 import ClearMetadataForMythos from "./databases/ClearMetadataForMythos.js";
 import MigrateAssetSetting from "./databases/MigrateAssetSetting.js";
+import MigrateAssetSetting20251027 from "./databases/MigrateAssetSetting20251027.js";
 import MigrateEarningVersion from "./databases/MigrateEarningVersion.js";
 import ReloadMetadata from "./databases/ReloadMetadata.js";
 import MigrateLedgerAccount from "./keyring/MigrateLedgerAccount.js";
@@ -29,6 +30,7 @@ import MigrateTokenDecimals from "./MigrateTokenDecimals.js";
 import MigrateTransactionHistory from "./MigrateTransactionHistory.js";
 import MigrateTransactionHistoryBridge from "./MigrateTransactionHistoryBridge.js";
 import MigrateTransactionHistoryBySymbol from "./MigrateTransactionHistoryBySymbol.js";
+import MigrateTransactionHistoryBySymbol20251027 from "./MigrateTransactionHistoryBySymbol20251027.js";
 import MigrateWalletReference from "./MigrateWalletReference.js";
 export const EVERYTIME = '__everytime__';
 export const MYTHOS_MIGRATION_KEY = '1.3.21-01';
@@ -69,5 +71,7 @@ export default {
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
   '1.3.42-01': MigrateNewUnifiedAccount,
   '1.3.54-01': MigrateChainPatrol,
-  '1.3.62-01': DeleteEarningData20251010
+  '1.3.62-01': DeleteEarningData20251010,
+  '1.3.64-01': MigrateAssetSetting20251027,
+  '1.3.64-02': MigrateTransactionHistoryBySymbol20251027
 };