@subwallet/extension-base 1.1.41-0 → 1.1.43-0

package/cjs/koni/background/handlers/State.js

@@ -824,7 +824,7 @@ class KoniState {
     return this.chainService.getMultiChainAssetMap();
   }
   getXcmRefMap() {
-    return this.chainService.getXcmRefMap();
+    return this.chainService.xcmRefMap;
   }
   getAssetByChainAndAsset(chain, assetTypes) {
     return this.chainService.getAssetByChainAndType(chain, assetTypes);

package/cjs/packageInfo.js

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

package/cjs/page/SubWalleEvmProvider.js

@@ -14,7 +14,6 @@ class SubWalletEvmProvider extends _safeEventEmitter.default {
   isSubWallet = true;
   isMetaMask = false;
   _connected = false;
-  _isEnable = false;
   constructor(sendMessage, version) {
     super();
     this.version = version;
@@ -76,13 +75,11 @@ class SubWalletEvmProvider extends _safeEventEmitter.default {
       method,
       params
     } = _ref2;
-    if (!this._isEnable) {
-      if (method === 'eth_accounts') {
-        return this.request({
-          method: 'eth_requestAccounts'
-        });
-      }
-    }
+    // if (!this._isEnable) {
+    //   if (method === 'eth_accounts') {
+    //     return this.request<T>({ method: 'eth_requestAccounts' });
+    //   }
+    // }
 
     // Subscribe events
     switch (method) {
@@ -93,7 +90,6 @@ class SubWalletEvmProvider extends _safeEventEmitter.default {
             origin,
             accountAuthType: 'evm'
           }).then(() => {
-            this._isEnable = true;
             // Return account list
             this.request({
               method: 'eth_accounts'

package/cjs/services/chain-service/constants.js

@@ -40,7 +40,7 @@ const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude', 'continuum_network'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge'],
@@ -221,13 +221,13 @@ const _TRANSFER_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   crab: ['crab', 'pangolin'],
   bitcountry: ['pioneer', 'bitcountry', 'bifrost', 'bifrost_dot'],
-  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest'],
+  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet'],
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate'],
   avail: ['kate', 'goldberg_testnet'],
   pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main'],
   centrifuge: ['centrifuge'],
-  disable_transfer: ['invarch', 'continuum_network']
+  disable_transfer: ['invarch']
 };
 exports._TRANSFER_CHAIN_GROUP = _TRANSFER_CHAIN_GROUP;
 const _BALANCE_PARSING_CHAIN_GROUP = {

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

@@ -52,7 +52,7 @@ class ChainService {
     this.chainInfoMapSubject.next(this.dataMap.chainInfoMap);
     this.chainStateMapSubject.next(this.dataMap.chainStateMap);
     this.assetRegistrySubject.next(this.dataMap.assetRegistry);
-    this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
+    this.xcmRefMapSubject.next(this.xcmRefMap);
     if (_utils2.MODULE_SUPPORT.MANTA_ZK) {
       console.log('Init Manta ZK');
       this.mantaChainHandler = new _MantaPrivateHandler.MantaPrivateHandler(dbService);
@@ -63,19 +63,16 @@ class ChainService {
   }
 
   // Getter
-  getXcmRefMap() {
-    return this.dataMap.assetRefMap;
-    // const result: Record<string, _AssetRef> = {};
-    //
-    // Object.entries(AssetRefMap).forEach(([key, assetRef]) => {
-    //   if (assetRef.path === _AssetRefPath.XCM) {
-    //     result[key] = assetRef;
-    //   }
-    // });
-    //
-    // return result;
+  get xcmRefMap() {
+    const result = {};
+    Object.entries(this.dataMap.assetRefMap).forEach(_ref => {
+      let [key, assetRef] = _ref;
+      if (assetRef.path === _types._AssetRefPath.XCM) {
+        result[key] = assetRef;
+      }
+    });
+    return result;
   }
-
   getEvmApi(slug) {
     return this.evmChainHandler.getEvmApiByChain(slug);
   }
@@ -199,11 +196,11 @@ class ChainService {
     return this.getChainStatusMap()[key];
   }
   getActiveChains() {
-    return Object.entries(this.dataMap.chainStateMap).filter(_ref => {
-      let [, chainState] = _ref;
+    return Object.entries(this.dataMap.chainStateMap).filter(_ref2 => {
+      let [, chainState] = _ref2;
       return (0, _utils._isChainEnabled)(chainState);
-    }).map(_ref2 => {
-      let [key] = _ref2;
+    }).map(_ref3 => {
+      let [key] = _ref3;
       return key;
     });
   }
@@ -274,7 +271,7 @@ class ChainService {
       if (asset.originChain === destinationChainSlug) {
         // check
         const assetRefKey = (0, _utils._parseAssetRefKey)(originTokenSlug, asset.slug);
-        const assetRef = this.getAssetRefMap()[assetRefKey];
+        const assetRef = this.xcmRefMap[assetRefKey];
         if (assetRef && assetRef.path === _types._AssetRefPath.XCM) {
           // there's only 1 corresponding token on 1 chain
           destinationTokenInfo = asset;
@@ -369,8 +366,8 @@ class ChainService {
     (0, _utils2.addLazy)('updateChainConnectionStatus', () => {
       const chainStatusMap = this.getChainStatusMap();
       let update = false;
-      Object.entries(this.connectionStatusQueueMap).forEach(_ref3 => {
-        let [slug, status] = _ref3;
+      Object.entries(this.connectionStatusQueueMap).forEach(_ref4 => {
+        let [slug, status] = _ref4;
         if (chainStatusMap[slug]) {
           if (chainStatusMap[slug].connectionStatus !== status) {
             chainStatusMap[slug].connectionStatus = status;
@@ -451,7 +448,7 @@ class ChainService {
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.assetRegistrySubject.next(this.getAssetRegistry());
-    this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
+    this.xcmRefMapSubject.next(this.xcmRefMap);
     await this.initApis();
     await this.initAssetSettings();
     await this.initAssetRefMap();
@@ -511,15 +508,13 @@ class ChainService {
       delete updatedAssetRefMap[blockedAssetRef];
     });
     this.dataMap.assetRefMap = updatedAssetRefMap;
-
-    // this.dbService.setAssetRef(this.dataMap.assetRefMap).catch(console.error);
-    this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
+    this.xcmRefMapSubject.next(this.xcmRefMap);
     this.logger.log('Finished updating latest asset ref');
   }
   handleLatestPriceId(latestPriceIds) {
     let isUpdated = false;
-    Object.entries(latestPriceIds).forEach(_ref4 => {
-      let [slug, priceId] = _ref4;
+    Object.entries(latestPriceIds).forEach(_ref5 => {
+      let [slug, priceId] = _ref5;
       if (this.dataMap.assetRegistry[slug] && this.dataMap.assetRegistry[slug].priceId !== priceId) {
         isUpdated = true;
         this.dataMap.assetRegistry[slug].priceId = priceId;
@@ -545,12 +540,12 @@ class ChainService {
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
     const chainStateMap = this.getChainStateMap();
-    await Promise.all(Object.entries(chainInfoMap).filter(_ref5 => {
+    await Promise.all(Object.entries(chainInfoMap).filter(_ref6 => {
       var _chainStateMap$slug;
-      let [slug] = _ref5;
+      let [slug] = _ref6;
       return (_chainStateMap$slug = chainStateMap[slug]) === null || _chainStateMap$slug === void 0 ? void 0 : _chainStateMap$slug.active;
-    }).map(_ref6 => {
-      let [, chainInfo] = _ref6;
+    }).map(_ref7 => {
+      let [, chainInfo] = _ref7;
       try {
         return this.initApiForChain(chainInfo);
       } catch (e) {
@@ -875,8 +870,8 @@ class ChainService {
       }
 
       // Fill in the missing chainState and storageData (new chains never before seen)
-      Object.entries(mergedChainInfoMap).forEach(_ref7 => {
-        let [slug, chainInfo] = _ref7;
+      Object.entries(mergedChainInfoMap).forEach(_ref8 => {
+        let [slug, chainInfo] = _ref8;
         if (!(slug in this.dataMap.chainStateMap)) {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._STAKING_CHAIN_GROUP = exports.ST_LIQUID_TOKEN_ABI = void 0;
+exports._STAKING_CHAIN_GROUP = exports.ST_LIQUID_TOKEN_ABI = exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = exports.MANTA_MIN_DELEGATION = void 0;
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -21,10 +21,15 @@ const _STAKING_CHAIN_GROUP = {
   ternoa: ['ternoa'],
   liquidStaking: ['bifrost_dot', 'acala', 'parallel', 'moonbeam'],
   lending: ['interlay'],
-  krest_network: ['krest_network']
+  krest_network: ['krest_network'],
+  manta: ['manta_network']
 };
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports._STAKING_CHAIN_GROUP = _STAKING_CHAIN_GROUP;
 const ST_LIQUID_TOKEN_ABI = require('./abis/st_liquid_token_abi.json');
-exports.ST_LIQUID_TOKEN_ABI = ST_LIQUID_TOKEN_ABI;
+exports.ST_LIQUID_TOKEN_ABI = ST_LIQUID_TOKEN_ABI;
+const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;
+exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = MANTA_VALIDATOR_POINTS_PER_BLOCK;
+const MANTA_MIN_DELEGATION = 500;
+exports.MANTA_MIN_DELEGATION = MANTA_MIN_DELEGATION;

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

@@ -9,14 +9,30 @@ var _TransactionError = require("@subwallet/extension-base/background/errors/Tra
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/koni/api/staking/bonding/utils");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
+var _constants2 = require("@subwallet/extension-base/services/earning-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/earning-service/utils");
 var _types = require("@subwallet/extension-base/types");
 var _utils3 = require("@subwallet/extension-base/utils");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _util = require("@polkadot/util");
 var _basePara = _interopRequireDefault(require("./base-para"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+function calculateMantaNominatorReturn(decimal, commission, totalActiveCollators, bnAnnualInflation, blocksPreviousRound, bnCollatorExpectedBlocksPerRound, bnCollatorTotalStaked, isCountCommission) {
+  const MIN_DELEGATION = new _bignumber.default(_constants2.MANTA_MIN_DELEGATION);
+  const factor = new _bignumber.default(10).pow(decimal);
+  const annualInflation = bnAnnualInflation.dividedBy(factor);
+  const collatorTotalStaked = bnCollatorTotalStaked.dividedBy(factor);
+  const annualRewardsPerCollator = annualInflation.dividedBy(totalActiveCollators);
+  const adjustmentFactor = new _bignumber.default(blocksPreviousRound).dividedBy(bnCollatorExpectedBlocksPerRound);
+  const marginalReward = annualRewardsPerCollator.multipliedBy(MIN_DELEGATION).dividedBy(collatorTotalStaked.plus(MIN_DELEGATION));
+  let bnApy = new _bignumber.default(100).multipliedBy(adjustmentFactor).multipliedBy(marginalReward).dividedBy(MIN_DELEGATION);
+  if (isCountCommission) {
+    bnApy = new _bignumber.default((1 - commission) * 100).multipliedBy(adjustmentFactor).multipliedBy(marginalReward).dividedBy(MIN_DELEGATION);
+  }
+  return bnApy.toNumber();
+}
 class ParaNativeStakingPoolHandler extends _basePara.default {
   /* Subscribe pool info */
 
@@ -258,52 +274,130 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
   async getPoolTargets() {
     const apiProps = await this.substrateApi.isReady;
     const allCollators = [];
-    const [_allCollators, _collatorCommission] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.collatorCommission()]);
-    const maxDelegationPerCollator = apiProps.api.consts.parachainStaking.maxTopDelegationsPerCandidate.toString();
-    const rawCollatorCommission = _collatorCommission.toHuman();
-    const collatorCommission = parseFloat(rawCollatorCommission.split('%')[0]);
-    for (const collator of _allCollators) {
-      const _collatorAddress = collator[0].toHuman();
-      const collatorAddress = _collatorAddress[0];
-      const collatorInfo = collator[1].toPrimitive();
-      const bnTotalStake = new _util.BN(collatorInfo.totalCounted);
-      const bnOwnStake = new _util.BN(collatorInfo.bond);
-      const bnOtherStake = bnTotalStake.sub(bnOwnStake);
-      const bnMinBond = new _util.BN(collatorInfo.lowestTopDelegationAmount);
-      allCollators.push({
-        commission: 0,
-        expectedReturn: 0,
-        address: collatorAddress,
-        totalStake: bnTotalStake.toString(),
-        ownStake: bnOwnStake.toString(),
-        otherStake: bnOtherStake.toString(),
-        nominatorCount: collatorInfo.delegationCount,
-        blocked: false,
-        isVerified: false,
-        minBond: bnMinBond.toString(),
-        chain: this.chain,
-        isCrowded: parseInt(maxDelegationPerCollator) > 0
-      });
-    }
-    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)(apiProps, collator.address)]);
-      const rawInfo = _info.toHuman();
-      const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
-      extraInfoMap[collator.address] = {
-        identity,
-        isVerified: isReasonable,
-        active
-      };
-    }));
-    for (const validator of allCollators) {
-      validator.blocked = !extraInfoMap[validator.address].active;
-      validator.identity = extraInfoMap[validator.address].identity;
-      validator.isVerified = extraInfoMap[validator.address].isVerified;
-      // @ts-ignore
-      validator.commission = collatorCommission;
+    if (_constants2._STAKING_CHAIN_GROUP.manta.includes(this.chain)) {
+      var _this$chainInfo$subst;
+      const DECIMAL = (_this$chainInfo$subst = this.chainInfo.substrateInfo) === null || _this$chainInfo$subst === void 0 ? void 0 : _this$chainInfo$subst.decimals;
+      const POINTS_PER_BLOCK = _constants2.MANTA_VALIDATOR_POINTS_PER_BLOCK; // producing 1 block will get 20 points for validator
+
+      const [_allCollators, _collatorCommission, _allCollatorsPool, _selectedCollators, _round, _totalIssuance, _inflationConfig] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.collatorCommission(), apiProps.api.query.parachainStaking.candidatePool(), apiProps.api.query.parachainStaking.selectedCandidates(), apiProps.api.query.parachainStaking.round(), apiProps.api.query.balances.totalIssuance(), apiProps.api.query.parachainStaking.inflationConfig()]);
+
+      // noted: Annual Inflation = Total Issuance * Annual Inflation Percent
+      const round = _round.toPrimitive();
+      const totalIssuance = _totalIssuance.toString();
+      const inflationConfig = _inflationConfig.toHuman();
+      const annualInflationPercent = parseFloat(inflationConfig.annual.ideal.slice(0, -1)) / 100;
+      const bnAnnualInflation = new _bignumber.default(totalIssuance).multipliedBy(annualInflationPercent);
+
+      // noted: allCollatorsPool -> all candidate collators; selectedCollators -> candidate collators selected in current round
+      const allCollatorsPoolInfo = _allCollatorsPool.toPrimitive();
+      const allCollatorsPool = allCollatorsPoolInfo.map(collator => collator.owner.toString());
+      const selectedCollators = _selectedCollators.toPrimitive();
+      const totalActiveCollators = selectedCollators.length;
+      const bnCollatorExpectedBlocksPerRound = new _bignumber.default(round.length).dividedBy(allCollatorsPool.length);
+      const maxDelegationPerCollator = apiProps.api.consts.parachainStaking.maxTopDelegationsPerCandidate.toString();
+      const rawCollatorCommission = _collatorCommission.toHuman();
+      const collatorCommission = parseFloat(rawCollatorCommission.split('%')[0]);
+      const collatorCommissionPercent = collatorCommission / 100;
+      for (const collator of _allCollators) {
+        const _collatorAddress = collator[0].toHuman();
+        const collatorAddress = _collatorAddress[0];
+        if (allCollatorsPool.includes(collatorAddress)) {
+          const collatorInfo = collator[1].toPrimitive();
+          const bnTotalStake = new _util.BN(collatorInfo.totalCounted);
+          const bnOwnStake = new _util.BN(collatorInfo.bond);
+          const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+          const bnMinBond = new _util.BN(collatorInfo.lowestTopDelegationAmount);
+          allCollators.push({
+            commission: 0,
+            address: collatorAddress,
+            totalStake: bnTotalStake.toString(),
+            ownStake: bnOwnStake.toString(),
+            otherStake: bnOtherStake.toString(),
+            nominatorCount: collatorInfo.delegationCount,
+            blocked: false,
+            isVerified: false,
+            minBond: bnMinBond.toString(),
+            chain: this.chain,
+            isCrowded: parseInt(maxDelegationPerCollator) > 0
+          });
+        }
+      }
+      await Promise.all(allCollators.map(async collator => {
+        if (allCollatorsPool.includes(collator.address)) {
+          // noted: number of blocks = total points / points per block
+          const _collatorPoints = await apiProps.api.query.parachainStaking.awardedPts(parseInt(round.current) - 1, collator.address);
+          const collatorPoints = _collatorPoints.toPrimitive();
+          const blocksPreviousRound = collatorPoints / POINTS_PER_BLOCK;
+          collator.expectedReturn = calculateMantaNominatorReturn(DECIMAL, collatorCommissionPercent, totalActiveCollators, bnAnnualInflation, blocksPreviousRound, bnCollatorExpectedBlocksPerRound, new _bignumber.default(collator.totalStake), false);
+        }
+      }));
+      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)(apiProps, collator.address)]);
+        const rawInfo = _info.toHuman();
+        const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
+        extraInfoMap[collator.address] = {
+          identity,
+          isVerified: isReasonable,
+          active
+        };
+      }));
+      for (const validator of allCollators) {
+        validator.blocked = !extraInfoMap[validator.address].active;
+        validator.identity = extraInfoMap[validator.address].identity;
+        validator.isVerified = extraInfoMap[validator.address].isVerified;
+        // @ts-ignore
+        validator.commission = collatorCommission;
+      }
+      return allCollators;
+    } else {
+      const [_allCollators, _collatorCommission] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.collatorCommission()]);
+      const maxDelegationPerCollator = apiProps.api.consts.parachainStaking.maxTopDelegationsPerCandidate.toString();
+      const rawCollatorCommission = _collatorCommission.toHuman();
+      const collatorCommission = parseFloat(rawCollatorCommission.split('%')[0]);
+      for (const collator of _allCollators) {
+        const _collatorAddress = collator[0].toHuman();
+        const collatorAddress = _collatorAddress[0];
+        const collatorInfo = collator[1].toPrimitive();
+        const bnTotalStake = new _util.BN(collatorInfo.totalCounted);
+        const bnOwnStake = new _util.BN(collatorInfo.bond);
+        const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+        const bnMinBond = new _util.BN(collatorInfo.lowestTopDelegationAmount);
+        allCollators.push({
+          commission: 0,
+          expectedReturn: 0,
+          address: collatorAddress,
+          totalStake: bnTotalStake.toString(),
+          ownStake: bnOwnStake.toString(),
+          otherStake: bnOtherStake.toString(),
+          nominatorCount: collatorInfo.delegationCount,
+          blocked: false,
+          isVerified: false,
+          minBond: bnMinBond.toString(),
+          chain: this.chain,
+          isCrowded: parseInt(maxDelegationPerCollator) > 0
+        });
+      }
+      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)(apiProps, collator.address)]);
+        const rawInfo = _info.toHuman();
+        const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
+        extraInfoMap[collator.address] = {
+          identity,
+          isVerified: isReasonable,
+          active
+        };
+      }));
+      for (const validator of allCollators) {
+        validator.blocked = !extraInfoMap[validator.address].active;
+        validator.identity = extraInfoMap[validator.address].identity;
+        validator.isVerified = extraInfoMap[validator.address].isVerified;
+        // @ts-ignore
+        validator.commission = collatorCommission;
+      }
+      return allCollators;
     }
-    return allCollators;
   }
 
   /* Get pool targets */

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

@@ -0,0 +1,50 @@
+"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 MigrateAssetSetting extends _Base.default {
+  async run() {
+    try {
+      const oldSlugs = ['ethereum-ERC20-WFTM-0x4E15361FD6b4BB609Fa63C81A2be19d873717870', 'moonbeam-ERC20-CSG-0x2Dfc76901bB2ac2A5fA5fc479590A490BBB10a5F', 'astar-LOCAL-aUSD', 'astarEvm-ERC20-aUSD-0xfFFFFfFF00000000000000010000000000000001',
+      //
+      'moonriver-LOCAL-xcaUSD',
+      //
+      'moonriver-LOCAL-xckBTC', 'bifrost-LOCAL-aUSD', 'calamari-LOCAL-AUSD', 'shiden-LOCAL-aUSD', 'shidenEvm-ERC20-aUSD-0xfFFfFFfF00000000000000010000000000000000',
+      //
+      'ethereum_goerli-NATIVE-GoerliETH', 'binance_test-NATIVE-BNB',
+      //
+      'pangolin-LOCAL-CKTON',
+      //
+      'zeta_test-NATIVE-aZETA' //
+      ];
+
+      const newSlugs = ['ethereum-ERC20-FTM-0x4E15361FD6b4BB609Fa63C81A2be19d873717870', 'moonbeam-ERC20-CGS-0x2Dfc76901bB2ac2A5fA5fc479590A490BBB10a5F', 'astar-LOCAL-aSEED', 'astarEvm-ERC20-aSEED-0xfFFFFfFF00000000000000010000000000000001', 'moonriver-LOCAL-xcaSeed', 'moonriver-LOCAL-xcKBTC', 'bifrost-LOCAL-KUSD', 'calamari-LOCAL-AUSD', 'shiden-LOCAL-aSEED', 'shidenEvm-ERC20-aSEED-0xfFFfFFfF00000000000000010000000000000000', 'ethereum_goerli-NATIVE-ETH', 'binance_test-NATIVE-tBNB', 'pangolin-LOCAL-PKTON', 'zeta_test-NATIVE-ZETA'];
+      const assetSetting = await this.state.chainService.getAssetSettings();
+      const migratedAssetSetting = {};
+      for (let i = 0; i < oldSlugs.length; i++) {
+        const slug = oldSlugs[i];
+        if (Object.keys(assetSetting).includes(slug)) {
+          const isVisible = assetSetting[slug].visible;
+          const newSlug = newSlugs[i];
+          migratedAssetSetting[newSlug] = {
+            visible: isVisible
+          };
+        }
+      }
+      this.state.chainService.setAssetSettings({
+        ...assetSetting,
+        ...migratedAssetSetting
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateAssetSetting;

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

@@ -28,6 +28,8 @@ var _MigrateWalletReference = _interopRequireDefault(require("./MigrateWalletRef
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+// import MigrateAssetSetting from './databases/MigrateAssetSetting';
+
 const EVERYTIME = '__everytime__';
 exports.EVERYTIME = EVERYTIME;
 var _default = {
@@ -52,6 +54,7 @@ var _default = {
   '1.1.26-01': _MigratePolygonUSDCProvider.default,
   '1.1.28-01': _MigrateEarningVersion.default,
   '1.1.41-01': _DeleteChainStaking.default
+  // '1.1.41-02': MigrateAssetSetting
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };
 exports.default = _default;

package/koni/background/handlers/State.js

@@ -810,7 +810,7 @@ export default class KoniState {
     return this.chainService.getMultiChainAssetMap();
   }
   getXcmRefMap() {
-    return this.chainService.getXcmRefMap();
+    return this.chainService.xcmRefMap;
   }
   getAssetByChainAndAsset(chain, assetTypes) {
     return this.chainService.getAssetByChainAndType(chain, assetTypes);

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.41-0",
+  "version": "1.1.43-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -940,6 +940,11 @@
       "require": "./cjs/services/migration-service/scripts/ClearOldStorage.js",
       "default": "./services/migration-service/scripts/ClearOldStorage.js"
     },
+    "./services/migration-service/scripts/databases/MigrateAssetSetting": {
+      "types": "./services/migration-service/scripts/databases/MigrateAssetSetting.d.ts",
+      "require": "./cjs/services/migration-service/scripts/databases/MigrateAssetSetting.js",
+      "default": "./services/migration-service/scripts/databases/MigrateAssetSetting.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",
@@ -1786,11 +1791,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.42",
-    "@subwallet/extension-base": "^1.1.41-0",
-    "@subwallet/extension-chains": "^1.1.41-0",
-    "@subwallet/extension-dapp": "^1.1.41-0",
-    "@subwallet/extension-inject": "^1.1.41-0",
+    "@subwallet/chain-list": "0.2.43",
+    "@subwallet/extension-base": "^1.1.43-0",
+    "@subwallet/extension-chains": "^1.1.43-0",
+    "@subwallet/extension-dapp": "^1.1.43-0",
+    "@subwallet/extension-inject": "^1.1.43-0",
     "@subwallet/keyring": "^0.1.3",
     "@subwallet/ui-keyring": "^0.1.3",
     "@walletconnect/sign-client": "^2.8.4",

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.1.41-0'
+  version: '1.1.43-0'
 };

package/page/SubWalleEvmProvider.d.ts

@@ -12,7 +12,6 @@ export declare class SubWalletEvmProvider extends SafeEventEmitter implements Ev
     readonly version: string;
     protected sendMessage: SendRequest;
     protected _connected: boolean;
-    private _isEnable;
     constructor(sendMessage: SendRequest, version: string);
     get connected(): boolean;
     isConnected(): boolean;

package/page/SubWalleEvmProvider.js

@@ -7,7 +7,6 @@ export class SubWalletEvmProvider extends SafeEventEmitter {
   isSubWallet = true;
   isMetaMask = false;
   _connected = false;
-  _isEnable = false;
   constructor(sendMessage, version) {
     super();
     this.version = version;
@@ -67,13 +66,11 @@ export class SubWalletEvmProvider extends SafeEventEmitter {
     method,
     params
   }) {
-    if (!this._isEnable) {
-      if (method === 'eth_accounts') {
-        return this.request({
-          method: 'eth_requestAccounts'
-        });
-      }
-    }
+    // if (!this._isEnable) {
+    //   if (method === 'eth_accounts') {
+    //     return this.request<T>({ method: 'eth_requestAccounts' });
+    //   }
+    // }
 
     // Subscribe events
     switch (method) {
@@ -84,7 +81,6 @@ export class SubWalletEvmProvider extends SafeEventEmitter {
             origin,
             accountAuthType: 'evm'
           }).then(() => {
-            this._isEnable = true;
             // Return account list
             this.request({
               method: 'eth_accounts'

package/services/chain-service/constants.js

@@ -29,7 +29,7 @@ export const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude', 'continuum_network'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge'],
@@ -203,13 +203,13 @@ export const _TRANSFER_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   crab: ['crab', 'pangolin'],
   bitcountry: ['pioneer', 'bitcountry', 'bifrost', 'bifrost_dot'],
-  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest'],
+  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet'],
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate'],
   avail: ['kate', 'goldberg_testnet'],
   pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main'],
   centrifuge: ['centrifuge'],
-  disable_transfer: ['invarch', 'continuum_network']
+  disable_transfer: ['invarch']
 };
 export const _BALANCE_PARSING_CHAIN_GROUP = {
   bobabeam: ['bobabeam', 'bobabase']

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

@@ -27,7 +27,7 @@ export declare class ChainService {
     private assetSettingSubject;
     private logger;
     constructor(dbService: DatabaseService, eventService: EventService);
-    getXcmRefMap(): Record<string, _AssetRef>;
+    get xcmRefMap(): Record<string, _AssetRef>;
     getEvmApi(slug: string): import("./handler/EvmApi").EvmApi;
     getEvmApiMap(): Record<string, import("./handler/EvmApi").EvmApi>;
     getSubstrateApiMap(): Record<string, import("./handler/SubstrateApi").SubstrateApi>;

package/services/chain-service/index.js

@@ -45,7 +45,7 @@ export class ChainService {
     this.chainInfoMapSubject.next(this.dataMap.chainInfoMap);
     this.chainStateMapSubject.next(this.dataMap.chainStateMap);
     this.assetRegistrySubject.next(this.dataMap.assetRegistry);
-    this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
+    this.xcmRefMapSubject.next(this.xcmRefMap);
     if (MODULE_SUPPORT.MANTA_ZK) {
       console.log('Init Manta ZK');
       this.mantaChainHandler = new MantaPrivateHandler(dbService);
@@ -56,19 +56,15 @@ export class ChainService {
   }
 
   // Getter
-  getXcmRefMap() {
-    return this.dataMap.assetRefMap;
-    // const result: Record<string, _AssetRef> = {};
-    //
-    // Object.entries(AssetRefMap).forEach(([key, assetRef]) => {
-    //   if (assetRef.path === _AssetRefPath.XCM) {
-    //     result[key] = assetRef;
-    //   }
-    // });
-    //
-    // return result;
+  get xcmRefMap() {
+    const result = {};
+    Object.entries(this.dataMap.assetRefMap).forEach(([key, assetRef]) => {
+      if (assetRef.path === _AssetRefPath.XCM) {
+        result[key] = assetRef;
+      }
+    });
+    return result;
   }
-
   getEvmApi(slug) {
     return this.evmChainHandler.getEvmApiByChain(slug);
   }
@@ -260,7 +256,7 @@ export class ChainService {
       if (asset.originChain === destinationChainSlug) {
         // check
         const assetRefKey = _parseAssetRefKey(originTokenSlug, asset.slug);
-        const assetRef = this.getAssetRefMap()[assetRefKey];
+        const assetRef = this.xcmRefMap[assetRefKey];
         if (assetRef && assetRef.path === _AssetRefPath.XCM) {
           // there's only 1 corresponding token on 1 chain
           destinationTokenInfo = asset;
@@ -436,7 +432,7 @@ export class ChainService {
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.assetRegistrySubject.next(this.getAssetRegistry());
-    this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
+    this.xcmRefMapSubject.next(this.xcmRefMap);
     await this.initApis();
     await this.initAssetSettings();
     await this.initAssetRefMap();
@@ -496,9 +492,7 @@ export class ChainService {
       delete updatedAssetRefMap[blockedAssetRef];
     });
     this.dataMap.assetRefMap = updatedAssetRefMap;
-
-    // this.dbService.setAssetRef(this.dataMap.assetRefMap).catch(console.error);
-    this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
+    this.xcmRefMapSubject.next(this.xcmRefMap);
     this.logger.log('Finished updating latest asset ref');
   }
   handleLatestPriceId(latestPriceIds) {

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

@@ -11,5 +11,8 @@ export declare const _STAKING_CHAIN_GROUP: {
     liquidStaking: string[];
     lending: string[];
     krest_network: string[];
+    manta: string[];
 };
 export declare const ST_LIQUID_TOKEN_ABI: Record<string, any>;
+export declare const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;
+export declare const MANTA_MIN_DELEGATION = 500;

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

@@ -15,8 +15,11 @@ export const _STAKING_CHAIN_GROUP = {
   ternoa: ['ternoa'],
   liquidStaking: ['bifrost_dot', 'acala', 'parallel', 'moonbeam'],
   lending: ['interlay'],
-  krest_network: ['krest_network']
+  krest_network: ['krest_network'],
+  manta: ['manta_network']
 };
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
-export const ST_LIQUID_TOKEN_ABI = require("./abis/st_liquid_token_abi.json");
+export const ST_LIQUID_TOKEN_ABI = require("./abis/st_liquid_token_abi.json");
+export const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;
+export const MANTA_MIN_DELEGATION = 500;

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

@@ -5,11 +5,27 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { BasicTxErrorType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { getBondedValidators, getEarningStatusByNominations, getParaCurrentInflation, 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, MANTA_MIN_DELEGATION, MANTA_VALIDATOR_POINTS_PER_BLOCK } from '@subwallet/extension-base/services/earning-service/constants';
 import { parseIdentity } from '@subwallet/extension-base/services/earning-service/utils';
 import { EarningStatus, UnstakingStatus } from '@subwallet/extension-base/types';
 import { balanceFormatter, formatNumber, parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
+import BigN from 'bignumber.js';
 import { BN, BN_ZERO } from '@polkadot/util';
 import BaseParaNativeStakingPoolHandler from "./base-para.js";
+function calculateMantaNominatorReturn(decimal, commission, totalActiveCollators, bnAnnualInflation, blocksPreviousRound, bnCollatorExpectedBlocksPerRound, bnCollatorTotalStaked, isCountCommission) {
+  const MIN_DELEGATION = new BigN(MANTA_MIN_DELEGATION);
+  const factor = new BigN(10).pow(decimal);
+  const annualInflation = bnAnnualInflation.dividedBy(factor);
+  const collatorTotalStaked = bnCollatorTotalStaked.dividedBy(factor);
+  const annualRewardsPerCollator = annualInflation.dividedBy(totalActiveCollators);
+  const adjustmentFactor = new BigN(blocksPreviousRound).dividedBy(bnCollatorExpectedBlocksPerRound);
+  const marginalReward = annualRewardsPerCollator.multipliedBy(MIN_DELEGATION).dividedBy(collatorTotalStaked.plus(MIN_DELEGATION));
+  let bnApy = new BigN(100).multipliedBy(adjustmentFactor).multipliedBy(marginalReward).dividedBy(MIN_DELEGATION);
+  if (isCountCommission) {
+    bnApy = new BigN((1 - commission) * 100).multipliedBy(adjustmentFactor).multipliedBy(marginalReward).dividedBy(MIN_DELEGATION);
+  }
+  return bnApy.toNumber();
+}
 export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingPoolHandler {
   /* Subscribe pool info */
 
@@ -251,52 +267,130 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
   async getPoolTargets() {
     const apiProps = await this.substrateApi.isReady;
     const allCollators = [];
-    const [_allCollators, _collatorCommission] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.collatorCommission()]);
-    const maxDelegationPerCollator = apiProps.api.consts.parachainStaking.maxTopDelegationsPerCandidate.toString();
-    const rawCollatorCommission = _collatorCommission.toHuman();
-    const collatorCommission = parseFloat(rawCollatorCommission.split('%')[0]);
-    for (const collator of _allCollators) {
-      const _collatorAddress = collator[0].toHuman();
-      const collatorAddress = _collatorAddress[0];
-      const collatorInfo = collator[1].toPrimitive();
-      const bnTotalStake = new BN(collatorInfo.totalCounted);
-      const bnOwnStake = new BN(collatorInfo.bond);
-      const bnOtherStake = bnTotalStake.sub(bnOwnStake);
-      const bnMinBond = new BN(collatorInfo.lowestTopDelegationAmount);
-      allCollators.push({
-        commission: 0,
-        expectedReturn: 0,
-        address: collatorAddress,
-        totalStake: bnTotalStake.toString(),
-        ownStake: bnOwnStake.toString(),
-        otherStake: bnOtherStake.toString(),
-        nominatorCount: collatorInfo.delegationCount,
-        blocked: false,
-        isVerified: false,
-        minBond: bnMinBond.toString(),
-        chain: this.chain,
-        isCrowded: parseInt(maxDelegationPerCollator) > 0
-      });
-    }
-    const extraInfoMap = {};
-    await Promise.all(allCollators.map(async collator => {
-      const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), parseIdentity(apiProps, collator.address)]);
-      const rawInfo = _info.toHuman();
-      const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
-      extraInfoMap[collator.address] = {
-        identity,
-        isVerified: isReasonable,
-        active
-      };
-    }));
-    for (const validator of allCollators) {
-      validator.blocked = !extraInfoMap[validator.address].active;
-      validator.identity = extraInfoMap[validator.address].identity;
-      validator.isVerified = extraInfoMap[validator.address].isVerified;
-      // @ts-ignore
-      validator.commission = collatorCommission;
+    if (_STAKING_CHAIN_GROUP.manta.includes(this.chain)) {
+      var _this$chainInfo$subst;
+      const DECIMAL = (_this$chainInfo$subst = this.chainInfo.substrateInfo) === null || _this$chainInfo$subst === void 0 ? void 0 : _this$chainInfo$subst.decimals;
+      const POINTS_PER_BLOCK = MANTA_VALIDATOR_POINTS_PER_BLOCK; // producing 1 block will get 20 points for validator
+
+      const [_allCollators, _collatorCommission, _allCollatorsPool, _selectedCollators, _round, _totalIssuance, _inflationConfig] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.collatorCommission(), apiProps.api.query.parachainStaking.candidatePool(), apiProps.api.query.parachainStaking.selectedCandidates(), apiProps.api.query.parachainStaking.round(), apiProps.api.query.balances.totalIssuance(), apiProps.api.query.parachainStaking.inflationConfig()]);
+
+      // noted: Annual Inflation = Total Issuance * Annual Inflation Percent
+      const round = _round.toPrimitive();
+      const totalIssuance = _totalIssuance.toString();
+      const inflationConfig = _inflationConfig.toHuman();
+      const annualInflationPercent = parseFloat(inflationConfig.annual.ideal.slice(0, -1)) / 100;
+      const bnAnnualInflation = new BigN(totalIssuance).multipliedBy(annualInflationPercent);
+
+      // noted: allCollatorsPool -> all candidate collators; selectedCollators -> candidate collators selected in current round
+      const allCollatorsPoolInfo = _allCollatorsPool.toPrimitive();
+      const allCollatorsPool = allCollatorsPoolInfo.map(collator => collator.owner.toString());
+      const selectedCollators = _selectedCollators.toPrimitive();
+      const totalActiveCollators = selectedCollators.length;
+      const bnCollatorExpectedBlocksPerRound = new BigN(round.length).dividedBy(allCollatorsPool.length);
+      const maxDelegationPerCollator = apiProps.api.consts.parachainStaking.maxTopDelegationsPerCandidate.toString();
+      const rawCollatorCommission = _collatorCommission.toHuman();
+      const collatorCommission = parseFloat(rawCollatorCommission.split('%')[0]);
+      const collatorCommissionPercent = collatorCommission / 100;
+      for (const collator of _allCollators) {
+        const _collatorAddress = collator[0].toHuman();
+        const collatorAddress = _collatorAddress[0];
+        if (allCollatorsPool.includes(collatorAddress)) {
+          const collatorInfo = collator[1].toPrimitive();
+          const bnTotalStake = new BN(collatorInfo.totalCounted);
+          const bnOwnStake = new BN(collatorInfo.bond);
+          const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+          const bnMinBond = new BN(collatorInfo.lowestTopDelegationAmount);
+          allCollators.push({
+            commission: 0,
+            address: collatorAddress,
+            totalStake: bnTotalStake.toString(),
+            ownStake: bnOwnStake.toString(),
+            otherStake: bnOtherStake.toString(),
+            nominatorCount: collatorInfo.delegationCount,
+            blocked: false,
+            isVerified: false,
+            minBond: bnMinBond.toString(),
+            chain: this.chain,
+            isCrowded: parseInt(maxDelegationPerCollator) > 0
+          });
+        }
+      }
+      await Promise.all(allCollators.map(async collator => {
+        if (allCollatorsPool.includes(collator.address)) {
+          // noted: number of blocks = total points / points per block
+          const _collatorPoints = await apiProps.api.query.parachainStaking.awardedPts(parseInt(round.current) - 1, collator.address);
+          const collatorPoints = _collatorPoints.toPrimitive();
+          const blocksPreviousRound = collatorPoints / POINTS_PER_BLOCK;
+          collator.expectedReturn = calculateMantaNominatorReturn(DECIMAL, collatorCommissionPercent, totalActiveCollators, bnAnnualInflation, blocksPreviousRound, bnCollatorExpectedBlocksPerRound, new BigN(collator.totalStake), false);
+        }
+      }));
+      const extraInfoMap = {};
+      await Promise.all(allCollators.map(async collator => {
+        const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), parseIdentity(apiProps, collator.address)]);
+        const rawInfo = _info.toHuman();
+        const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
+        extraInfoMap[collator.address] = {
+          identity,
+          isVerified: isReasonable,
+          active
+        };
+      }));
+      for (const validator of allCollators) {
+        validator.blocked = !extraInfoMap[validator.address].active;
+        validator.identity = extraInfoMap[validator.address].identity;
+        validator.isVerified = extraInfoMap[validator.address].isVerified;
+        // @ts-ignore
+        validator.commission = collatorCommission;
+      }
+      return allCollators;
+    } else {
+      const [_allCollators, _collatorCommission] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.collatorCommission()]);
+      const maxDelegationPerCollator = apiProps.api.consts.parachainStaking.maxTopDelegationsPerCandidate.toString();
+      const rawCollatorCommission = _collatorCommission.toHuman();
+      const collatorCommission = parseFloat(rawCollatorCommission.split('%')[0]);
+      for (const collator of _allCollators) {
+        const _collatorAddress = collator[0].toHuman();
+        const collatorAddress = _collatorAddress[0];
+        const collatorInfo = collator[1].toPrimitive();
+        const bnTotalStake = new BN(collatorInfo.totalCounted);
+        const bnOwnStake = new BN(collatorInfo.bond);
+        const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+        const bnMinBond = new BN(collatorInfo.lowestTopDelegationAmount);
+        allCollators.push({
+          commission: 0,
+          expectedReturn: 0,
+          address: collatorAddress,
+          totalStake: bnTotalStake.toString(),
+          ownStake: bnOwnStake.toString(),
+          otherStake: bnOtherStake.toString(),
+          nominatorCount: collatorInfo.delegationCount,
+          blocked: false,
+          isVerified: false,
+          minBond: bnMinBond.toString(),
+          chain: this.chain,
+          isCrowded: parseInt(maxDelegationPerCollator) > 0
+        });
+      }
+      const extraInfoMap = {};
+      await Promise.all(allCollators.map(async collator => {
+        const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), parseIdentity(apiProps, collator.address)]);
+        const rawInfo = _info.toHuman();
+        const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
+        extraInfoMap[collator.address] = {
+          identity,
+          isVerified: isReasonable,
+          active
+        };
+      }));
+      for (const validator of allCollators) {
+        validator.blocked = !extraInfoMap[validator.address].active;
+        validator.identity = extraInfoMap[validator.address].identity;
+        validator.isVerified = extraInfoMap[validator.address].isVerified;
+        // @ts-ignore
+        validator.commission = collatorCommission;
+      }
+      return allCollators;
     }
-    return allCollators;
   }
 
   /* Get pool targets */

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

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

package/services/migration-service/scripts/databases/MigrateAssetSetting.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 MigrateAssetSetting extends BaseMigrationJob {
+  async run() {
+    try {
+      const oldSlugs = ['ethereum-ERC20-WFTM-0x4E15361FD6b4BB609Fa63C81A2be19d873717870', 'moonbeam-ERC20-CSG-0x2Dfc76901bB2ac2A5fA5fc479590A490BBB10a5F', 'astar-LOCAL-aUSD', 'astarEvm-ERC20-aUSD-0xfFFFFfFF00000000000000010000000000000001',
+      //
+      'moonriver-LOCAL-xcaUSD',
+      //
+      'moonriver-LOCAL-xckBTC', 'bifrost-LOCAL-aUSD', 'calamari-LOCAL-AUSD', 'shiden-LOCAL-aUSD', 'shidenEvm-ERC20-aUSD-0xfFFfFFfF00000000000000010000000000000000',
+      //
+      'ethereum_goerli-NATIVE-GoerliETH', 'binance_test-NATIVE-BNB',
+      //
+      'pangolin-LOCAL-CKTON',
+      //
+      'zeta_test-NATIVE-aZETA' //
+      ];
+
+      const newSlugs = ['ethereum-ERC20-FTM-0x4E15361FD6b4BB609Fa63C81A2be19d873717870', 'moonbeam-ERC20-CGS-0x2Dfc76901bB2ac2A5fA5fc479590A490BBB10a5F', 'astar-LOCAL-aSEED', 'astarEvm-ERC20-aSEED-0xfFFFFfFF00000000000000010000000000000001', 'moonriver-LOCAL-xcaSeed', 'moonriver-LOCAL-xcKBTC', 'bifrost-LOCAL-KUSD', 'calamari-LOCAL-AUSD', 'shiden-LOCAL-aSEED', 'shidenEvm-ERC20-aSEED-0xfFFfFFfF00000000000000010000000000000000', 'ethereum_goerli-NATIVE-ETH', 'binance_test-NATIVE-tBNB', 'pangolin-LOCAL-PKTON', 'zeta_test-NATIVE-ZETA'];
+      const assetSetting = await this.state.chainService.getAssetSettings();
+      const migratedAssetSetting = {};
+      for (let i = 0; i < oldSlugs.length; i++) {
+        const slug = oldSlugs[i];
+        if (Object.keys(assetSetting).includes(slug)) {
+          const isVisible = assetSetting[slug].visible;
+          const newSlug = newSlugs[i];
+          migratedAssetSetting[newSlug] = {
+            visible: isVisible
+          };
+        }
+      }
+      this.state.chainService.setAssetSettings({
+        ...assetSetting,
+        ...migratedAssetSetting
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import DeleteEarningData from '@subwallet/extension-base/services/migration-service/scripts/DeleteEarningData';
+// import MigrateAssetSetting from './databases/MigrateAssetSetting';
 import MigrateEarningVersion from "./databases/MigrateEarningVersion.js";
 import MigrateEthProvider from "./providers/MigrateEthProvider.js";
 import MigratePioneerProvider from "./providers/MigratePioneerProvider.js";
@@ -44,5 +45,6 @@ export default {
   '1.1.26-01': MigratePolygonUSDCProvider,
   '1.1.28-01': MigrateEarningVersion,
   '1.1.41-01': DeleteChainStaking
+  // '1.1.41-02': MigrateAssetSetting
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };