@subwallet/extension-base 1.1.24-0 → 1.1.24-2

package/background/KoniTypes.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _FundStatus, _MultiChainAsset } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { AuthUrls, Resolver } from '@subwallet/extension-base/background/handlers/State';
@@ -7,7 +6,7 @@ import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chai
 import { _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse, EnableChainParams, EnableMultiChainParams } from '@subwallet/extension-base/services/chain-service/types';
 import { SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
 import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
-import { BuyServiceInfo, BuyTokenInfo } from '@subwallet/extension-base/types';
+import { BalanceJson, BuyServiceInfo, BuyTokenInfo } from '@subwallet/extension-base/types';
 import { InjectedAccount, InjectedAccountWithMeta, MetadataDefBase } from '@subwallet/extension-inject/types';
 import { KeyringPair$Json, KeyringPair$Meta } from '@subwallet/keyring/types';
 import { KeyringOptions } from '@subwallet/ui-keyring/options/types';
@@ -18,7 +17,6 @@ import Web3 from 'web3';
 import { RequestArguments, TransactionConfig } from 'web3-core';
 import { JsonRpcPayload, JsonRpcResponse } from 'web3-core-helpers';
 import { SignerResult } from '@polkadot/types/types/extrinsic';
-import { BN } from '@polkadot/util';
 import { HexString } from '@polkadot/util/types';
 import { KeypairType } from '@polkadot/util-crypto/types';
 import { TransactionWarning } from './warnings/TransactionWarning';
@@ -196,28 +194,6 @@ export interface MetadataItem {
     specVersion: string;
     hexValue: HexString;
 }
-export interface TokenBalanceRaw {
-    reserved: BN;
-    frozen: BN;
-    free: BN;
-}
-export interface SubstrateBalance {
-    reserved?: string;
-    miscFrozen?: string;
-    feeFrozen?: string;
-}
-export interface BalanceItem {
-    tokenSlug: string;
-    state: APIItemState;
-    timestamp?: number;
-    free: string;
-    locked: string;
-    substrateInfo?: SubstrateBalance;
-}
-export interface BalanceJson {
-    reset?: boolean;
-    details: Record<string, BalanceItem>;
-}
 export interface CrowdloanItem {
     state: APIItemState;
     paraState?: CrowdloanParaState;
@@ -1182,6 +1158,7 @@ export interface NominationPoolInfo extends Pick<PalletNominationPoolsBondedPool
     address: string;
     name?: string;
     bondedAmount: string;
+    isProfitable: boolean;
 }
 export declare enum UnstakingStatus {
     CLAIMABLE = "CLAIMABLE",

package/cjs/constants/index.js

@@ -25,9 +25,11 @@ var _exportNames = {
   ALL_GENESIS_HASH: true,
   IGNORE_GET_SUBSTRATE_FEATURES_LIST: true,
   IGNORE_QR_SIGNER: true,
-  XCM_MIN_AMOUNT_RATIO: true
+  XCM_MIN_AMOUNT_RATIO: true,
+  GAS_PRICE_RATIO: true,
+  NETWORK_MULTI_GAS_FEE: true
 };
-exports.XCM_MIN_AMOUNT_RATIO = exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.MANTA_PAY_BALANCE_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.CRON_SYNC_MANTA_PAY = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_RECOVER_HISTORY_INTERVAL = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = void 0;
+exports.XCM_MIN_AMOUNT_RATIO = exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.NETWORK_MULTI_GAS_FEE = exports.MANTA_PAY_BALANCE_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.GAS_PRICE_RATIO = exports.CRON_SYNC_MANTA_PAY = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_RECOVER_HISTORY_INTERVAL = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = void 0;
 var _staking = require("./staking");
 Object.keys(_staking).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -98,4 +100,8 @@ exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = IGNORE_GET_SUBSTRATE_FEATURES_LIST;
 const IGNORE_QR_SIGNER = [];
 exports.IGNORE_QR_SIGNER = IGNORE_QR_SIGNER;
 const XCM_MIN_AMOUNT_RATIO = 1.2;
-exports.XCM_MIN_AMOUNT_RATIO = XCM_MIN_AMOUNT_RATIO;
+exports.XCM_MIN_AMOUNT_RATIO = XCM_MIN_AMOUNT_RATIO;
+const GAS_PRICE_RATIO = 1.05;
+exports.GAS_PRICE_RATIO = GAS_PRICE_RATIO;
+const NETWORK_MULTI_GAS_FEE = ['astarEvm'];
+exports.NETWORK_MULTI_GAS_FEE = NETWORK_MULTI_GAS_FEE;

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

@@ -75,8 +75,7 @@ async function subscribeAmplitudeNominatorMetadata(chainInfo, address, substrate
   let activeStake = '0';
   if (delegatorState) {
     // delegatorState can be null while unstaking all
-    const identityInfo = substrateApi.api.query.identity ? (await substrateApi.api.query.identity.identityOf(delegatorState.owner)).toPrimitive() : undefined;
-    const identity = identityInfo ? (0, _utils.parseIdentity)(identityInfo) : undefined;
+    const [identity] = await (0, _utils.parseIdentity)(substrateApi, delegatorState.owner);
     activeStake = delegatorState.amount.toString();
     const bnActiveStake = new _util.BN(activeStake);
     let delegationStatus = _KoniTypes.StakingStatus.NOT_EARNING;
@@ -125,6 +124,10 @@ async function subscribeAmplitudeNominatorMetadata(chainInfo, address, substrate
     unstakings: unstakingList
   };
 }
+
+/**
+ * Deprecated
+ * */
 async function getAmplitudeNominatorMetadata(chainInfo, address, substrateApi) {
   if ((0, _utilCrypto.isEthereumAddress)(address)) {
     return;
@@ -151,8 +154,7 @@ async function getAmplitudeNominatorMetadata(chainInfo, address, substrateApi) {
   let activeStake = '0';
   if (delegatorState) {
     // delegatorState can be null while unstaking all
-    const identityInfo = chainApi.api.query.identity ? (await chainApi.api.query.identity.identityOf(delegatorState.owner)).toPrimitive() : undefined;
-    const identity = identityInfo ? (0, _utils.parseIdentity)(identityInfo) : undefined;
+    const [identity] = await (0, _utils.parseIdentity)(substrateApi, delegatorState.owner);
     activeStake = delegatorState.amount.toString();
     const bnActiveStake = new _util.BN(activeStake);
     let delegationStatus = _KoniTypes.StakingStatus.NOT_EARNING;

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

@@ -164,6 +164,10 @@ async function subscribeAstarNominatorMetadata(chainInfo, address, substrateApi,
     status: stakingStatus
   };
 }
+
+/**
+ * Deprecated
+ * */
 async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
   if ((0, _utilCrypto.isEthereumAddress)(address)) {
     return;

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

@@ -48,6 +48,10 @@ async function getChainStakingMetadata(chainInfo, substrateApi) {
   }
   return (0, _relayChain.getRelayChainStakingMetadata)(chainInfo, substrateApi);
 }
+
+/**
+ * Deprecated
+ * */
 async function getNominatorMetadata(chainInfo, address, substrateApi) {
   if (_constants._STAKING_CHAIN_GROUP.astar.includes(chainInfo.slug)) {
     return (0, _astar.getAstarNominatorMetadata)(chainInfo, address, substrateApi);
@@ -122,6 +126,7 @@ async function getCancelWithdrawalExtrinsic(substrateApi, chain, selectedUnstaki
 function subscribeEssentialChainStakingMetadata(substrateApiMap, chainInfoMap, callback) {
   const unsubList = [];
 
+  // TODO: replace with for of to improve performance
   // eslint-disable-next-line @typescript-eslint/no-misused-promises
   Object.values(chainInfoMap).forEach(async chainInfo => {
     if (!substrateApiMap[chainInfo.slug]) {

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

@@ -45,7 +45,7 @@ function validateParaChainUnbondingCondition(amount, nominatorMetadata, chainSta
   const bnChainMinStake = new _util.BN(chainStakingMetadata.minStake || '0');
   const bnCollatorMinStake = new _util.BN(targetNomination.validatorMinStake || '0');
   const bnMinStake = _util.BN.max(bnCollatorMinStake, bnChainMinStake);
-  const existUnstakeErrorMessage = (0, _utils.getExistUnstakeErrorMessage)(chainStakingMetadata.chain);
+  const existUnstakeErrorMessage = (0, _utils.getExistUnstakeErrorMessage)(chainStakingMetadata.chain, nominatorMetadata === null || nominatorMetadata === void 0 ? void 0 : nominatorMetadata.type);
   if (targetNomination.hasUnstaking) {
     errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXIST_UNSTAKING_REQUEST, existUnstakeErrorMessage));
   }
@@ -63,7 +63,7 @@ function validateParaChainBondingCondition(chainInfo, amount, selectedCollators,
   const bnMinStake = bnCollatorMinStake > bnChainMinStake ? bnCollatorMinStake : bnChainMinStake;
   const minStakeErrorMessage = (0, _utils.getMinStakeErrorMessage)(chainInfo, bnMinStake);
   const maxValidatorErrorMessage = (0, _utils.getMaxValidatorErrorMessage)(chainInfo, chainStakingMetadata.maxValidatorPerNominator);
-  const existUnstakeErrorMessage = (0, _utils.getExistUnstakeErrorMessage)(chainInfo.slug, true);
+  const existUnstakeErrorMessage = (0, _utils.getExistUnstakeErrorMessage)(chainInfo.slug, nominatorMetadata === null || nominatorMetadata === void 0 ? void 0 : nominatorMetadata.type, true);
   if (!nominatorMetadata || nominatorMetadata.status === _KoniTypes.StakingStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
       errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
@@ -170,13 +170,10 @@ async function subscribeParaChainNominatorMetadata(chainInfo, address, substrate
   const roundInfo = _roundInfo.toPrimitive();
   const currentRound = roundInfo.current;
   await Promise.all(delegatorState.delegations.map(async delegation => {
-    var _substrateApi$api$que;
-    const [_delegationScheduledRequests, _identity, _collatorInfo] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (_substrateApi$api$que = substrateApi.api.query.identity) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.identityOf(delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
+    const [_delegationScheduledRequests, [identity], _collatorInfo] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (0, _utils.parseIdentity)(substrateApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
     const collatorInfo = _collatorInfo.toPrimitive();
     const minDelegation = collatorInfo === null || collatorInfo === void 0 ? void 0 : collatorInfo.lowestTopDelegationAmount.toString();
-    const identityInfo = _identity === null || _identity === void 0 ? void 0 : _identity.toHuman();
     const delegationScheduledRequests = _delegationScheduledRequests.toPrimitive();
-    const identity = (0, _utils.parseIdentity)(identityInfo);
     let hasUnstaking = false;
     let delegationStatus = _KoniTypes.StakingStatus.NOT_EARNING;
 
@@ -238,6 +235,10 @@ async function subscribeParaChainNominatorMetadata(chainInfo, address, substrate
     unstakings: Object.values(unstakingMap)
   };
 }
+
+/**
+ * Deprecated
+ * */
 async function getParaChainNominatorMetadata(chainInfo, address, substrateApi) {
   if ((0, _utils2._isChainEvmCompatible)(chainInfo) && !(0, _utilCrypto.isEthereumAddress)(address)) {
     return;
@@ -261,14 +262,12 @@ async function getParaChainNominatorMetadata(chainInfo, address, substrateApi) {
   }
   let bnTotalActiveStake = _util.BN_ZERO;
   await Promise.all(delegatorState.delegations.map(async delegation => {
-    const [_delegationScheduledRequests, _identity, _roundInfo, _collatorInfo] = await Promise.all([chainApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), chainApi.api.query.identity.identityOf(delegation.owner), chainApi.api.query.parachainStaking.round(), chainApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
+    const [_delegationScheduledRequests, [identity], _roundInfo, _collatorInfo] = await Promise.all([chainApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (0, _utils.parseIdentity)(substrateApi, delegation.owner), chainApi.api.query.parachainStaking.round(), chainApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
     const rawCollatorInfo = _collatorInfo.toHuman();
     const minDelegation = (rawCollatorInfo === null || rawCollatorInfo === void 0 ? void 0 : rawCollatorInfo.lowestTopDelegationAmount).replaceAll(',', '');
-    const identityInfo = _identity.toHuman();
     const roundInfo = _roundInfo.toPrimitive();
     const delegationScheduledRequests = _delegationScheduledRequests.toPrimitive();
     const currentRound = roundInfo.current;
-    const identity = (0, _utils.parseIdentity)(identityInfo);
     let hasUnstaking = false;
     let delegationStatus = _KoniTypes.StakingStatus.NOT_EARNING;
 
@@ -358,19 +357,9 @@ async function getParachainCollatorsInfo(chain, substrateApi) {
   }
   const extraInfoMap = {};
   await Promise.all(allCollators.map(async collator => {
-    var _apiProps$api$query, _apiProps$api$query$i;
-    const [_info, _identity] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), (_apiProps$api$query = apiProps.api.query) === null || _apiProps$api$query === void 0 ? void 0 : (_apiProps$api$query$i = _apiProps$api$query.identity) === null || _apiProps$api$query$i === void 0 ? void 0 : _apiProps$api$query$i.identityOf(collator.address) // some chains might not have identity pallet
-    ]);
+    const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), (0, _utils.parseIdentity)(apiProps, collator.address)]);
     const rawInfo = _info.toHuman();
-    const rawIdentity = _identity ? _identity.toHuman() : null;
     const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
-    let isReasonable = false;
-    let identity;
-    if (rawIdentity !== null) {
-      // Check if identity is eth address
-      isReasonable = rawIdentity.judgements.length > 0;
-      identity = (0, _utils.parseIdentity)(rawIdentity);
-    }
     extraInfoMap[collator.address] = {
       identity,
       isVerified: isReasonable,

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

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -28,6 +29,7 @@ var _utils = require("@subwallet/extension-base/koni/api/staking/bonding/utils")
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils3 = require("@subwallet/extension-base/utils");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
@@ -58,7 +60,7 @@ function validatePoolBondingCondition(chainInfo, amount, selectedPool, address,
   let bnTotalStake = new _util.BN(amount);
   const bnMinStake = new _util.BN(chainStakingMetadata.minJoinNominationPool || '0');
   const minStakeErrorMessage = (0, _utils.getMinStakeErrorMessage)(chainInfo, bnMinStake);
-  const existUnstakeErrorMessage = (0, _utils.getExistUnstakeErrorMessage)(chainInfo.slug, true);
+  const existUnstakeErrorMessage = (0, _utils.getExistUnstakeErrorMessage)(chainInfo.slug, nominatorMetadata === null || nominatorMetadata === void 0 ? void 0 : nominatorMetadata.type, true);
   if (selectedPool.state !== 'Open') {
     errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.INACTIVE_NOMINATION_POOL));
   }
@@ -214,13 +216,13 @@ async function subscribeRelayChainNominatorMetadata(chainInfo, address, substrat
   if (nominations) {
     const validatorList = nominations.targets;
     await Promise.all(validatorList.map(async validatorAddress => {
-      var _chainApi$api$query$i;
       let nominationStatus = _KoniTypes.StakingStatus.NOT_EARNING;
-      const [_identityInfo, _eraStaker] = await Promise.all([(_chainApi$api$query$i = chainApi.api.query.identity) === null || _chainApi$api$query$i === void 0 ? void 0 : _chainApi$api$query$i.identityOf(validatorAddress), chainApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
+      const [[identity], _eraStaker] = await Promise.all([(0, _utils.parseIdentity)(chainApi, validatorAddress), chainApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
       const eraStaker = _eraStaker.toPrimitive();
-      const identityInfo = _identityInfo === null || _identityInfo === void 0 ? void 0 : _identityInfo.toHuman();
-      const identity = (0, _utils.parseIdentity)(identityInfo);
-      const topNominators = eraStaker.others.map(nominator => {
+      const sortedNominators = eraStaker.others.sort((a, b) => {
+        return new _bignumber.default(b.value).minus(a.value).toNumber();
+      });
+      const topNominators = sortedNominators.map(nominator => {
         return nominator.who;
       });
       if (!topNominators.includes((0, _utils3.reformatAddress)(address, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
@@ -278,6 +280,10 @@ async function subscribeRelayChainNominatorMetadata(chainInfo, address, substrat
     isBondedBefore: bonded !== null
   };
 }
+
+/**
+ * Deprecated
+ * */
 async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi) {
   var _chainApi$api$query10, _chainApi$api$query11, _chainApi$api$query12, _chainApi$api$query13, _chainApi$api$query14, _chainApi$api$query15, _chainApi$api$query16, _chainApi$api$query17, _chainApi$api$query18, _chainApi$api$query19, _chainApi$api$query20, _chainApi$api$query21, _chainApi$api$query22, _chainApi$api$query23;
   if ((0, _utilCrypto.isEthereumAddress)(address)) {
@@ -315,11 +321,12 @@ async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi)
     const validatorList = nominations.targets;
     await Promise.all(validatorList.map(async validatorAddress => {
       let nominationStatus = _KoniTypes.StakingStatus.NOT_EARNING;
-      const [_identityInfo, _eraStaker] = await Promise.all([chainApi.api.query.identity.identityOf(validatorAddress), chainApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
+      const [[identity], _eraStaker] = await Promise.all([(0, _utils.parseIdentity)(chainApi, validatorAddress), chainApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
       const eraStaker = _eraStaker.toPrimitive();
-      const identityInfo = _identityInfo.toHuman();
-      const identity = (0, _utils.parseIdentity)(identityInfo);
-      const topNominators = eraStaker.others.map(nominator => {
+      const sortedNominators = eraStaker.others.sort((a, b) => {
+        return new _bignumber.default(b.value).minus(a.value).toNumber();
+      });
+      const topNominators = sortedNominators.map(nominator => {
         return nominator.who;
       });
       if (!topNominators.includes((0, _utils3.reformatAddress)(address, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
@@ -393,7 +400,10 @@ async function subscribeRelayChainPoolMemberMetadata(chainInfo, address, substra
     await Promise.all(validatorList.map(async validatorAddress => {
       const _eraStaker = await substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress);
       const eraStaker = _eraStaker.toPrimitive();
-      const topNominators = eraStaker.others.map(nominator => {
+      const sortedNominators = eraStaker.others.sort((a, b) => {
+        return new _bignumber.default(b.value).minus(a.value).toNumber();
+      });
+      const topNominators = sortedNominators.map(nominator => {
         return nominator.who;
       }).slice(0, maxNominatorRewardedPerValidator);
       if (topNominators.includes((0, _utils3.reformatAddress)(poolStashAccount, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
@@ -471,7 +481,10 @@ async function getRelayChainPoolMemberMetadata(chainInfo, address, substrateApi)
     await Promise.all(validatorList.map(async validatorAddress => {
       const _eraStaker = await chainApi.api.query.staking.erasStakers(currentEra, validatorAddress);
       const eraStaker = _eraStaker.toPrimitive();
-      const topNominators = eraStaker.others.map(nominator => {
+      const sortedNominators = eraStaker.others.sort((a, b) => {
+        return new _bignumber.default(b.value).minus(a.value).toNumber();
+      });
+      const topNominators = sortedNominators.map(nominator => {
         return nominator.who;
       }).slice(0, maxNominatorRewardedPerValidator);
       if (topNominators.includes((0, _utils3.reformatAddress)(poolStashAccount, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
@@ -568,20 +581,14 @@ async function getRelayValidatorsInfo(chain, substrateApi, decimals, chainStakin
   }
   const extraInfoMap = {};
   await Promise.all(allValidators.map(async address => {
-    var _chainApi$api$query24, _chainApi$api$query25, _identityInfo$judgeme;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const [_commissionInfo, _identityInfo] = await Promise.all([chainApi.api.query.staking.validators(address), (_chainApi$api$query24 = chainApi.api.query) === null || _chainApi$api$query24 === void 0 ? void 0 : (_chainApi$api$query25 = _chainApi$api$query24.identity) === null || _chainApi$api$query25 === void 0 ? void 0 : _chainApi$api$query25.identityOf(address)]);
+    const [_commissionInfo, [identity, isVerified]] = await Promise.all([chainApi.api.query.staking.validators(address), (0, _utils.parseIdentity)(chainApi, address)]);
     const commissionInfo = _commissionInfo.toHuman();
-    const identityInfo = _identityInfo ? _identityInfo.toHuman() : null;
-    let identity;
-    if (identityInfo !== null) {
-      identity = (0, _utils.parseIdentity)(identityInfo);
-    }
     extraInfoMap[address] = {
       commission: commissionInfo.commission,
       blocked: commissionInfo.blocked,
       identity,
-      isVerified: identityInfo && (identityInfo === null || identityInfo === void 0 ? void 0 : (_identityInfo$judgeme = identityInfo.judgements) === null || _identityInfo$judgeme === void 0 ? void 0 : _identityInfo$judgeme.length) > 0
+      isVerified: isVerified
     };
   }));
   const bnAvgStake = bnTotalEraStake.divn(validatorInfoList.length).div(bnDecimals);
@@ -613,10 +620,20 @@ async function getRelayPoolsInfo(chain, substrateApi) {
     const poolAddressList = _poolInfo[0].toHuman();
     const poolAddress = poolAddressList[0];
     const poolId = _poolInfo[1].toPrimitive();
-    const [_bondedPool, _metadata] = await Promise.all([chainApi.api.query.nominationPools.bondedPools(poolId), chainApi.api.query.nominationPools.metadata(poolId)]);
+    const poolsPalletId = substrateApi.api.consts.nominationPools.palletId.toString();
+    const poolStashAccount = (0, _utils.parsePoolStashAddress)(substrateApi.api, 0, poolId, poolsPalletId);
+    const [_nominations, _bondedPool, _metadata, _minimumActiveStake] = await Promise.all([chainApi.api.query.staking.nominators(poolStashAccount), chainApi.api.query.nominationPools.bondedPools(poolId), chainApi.api.query.nominationPools.metadata(poolId), chainApi.api.query.staking.minimumActiveStake()]);
+    const minimumActiveStake = _minimumActiveStake.toPrimitive();
+    const nominations = _nominations.toJSON();
     const poolMetadata = _metadata.toPrimitive();
     const bondedPool = _bondedPool.toPrimitive();
-    const poolName = (0, _utils.transformPoolName)(poolMetadata.isUtf8 ? poolMetadata.toUtf8() : poolMetadata.toString());
+
+    // const poolName = transformPoolName(poolMetadata.isUtf8 ? poolMetadata.toUtf8() : poolMetadata.toString());
+
+    const poolName = (0, _util.isHex)(poolMetadata) ? (0, _util.hexToString)(poolMetadata) : poolMetadata;
+    const isPoolOpen = bondedPool.state === 'Open';
+    const isPoolNominating = !!nominations && nominations.targets.length > 0;
+    const isPoolEarningReward = bondedPool.points > minimumActiveStake;
     nominationPools.push({
       id: poolId,
       address: poolAddress,
@@ -624,7 +641,8 @@ async function getRelayPoolsInfo(chain, substrateApi) {
       bondedAmount: ((_bondedPool$points = bondedPool.points) === null || _bondedPool$points === void 0 ? void 0 : _bondedPool$points.toString()) || '0',
       roles: bondedPool.roles,
       memberCounter: bondedPool.memberCounter,
-      state: bondedPool.state
+      state: bondedPool.state,
+      isProfitable: isPoolOpen && isPoolNominating && isPoolEarningReward
     });
   }));
   return nominationPools;

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

@@ -57,22 +57,63 @@ function parsePoolStashAddress(api, index, poolId, poolsPalletId) {
 function transformPoolName(input) {
   return input.replace(/[^\x20-\x7E]/g, '');
 }
-function parseIdentity(identityInfo) {
-  let identity;
-  if (identityInfo) {
-    var _identityInfo$info, _identityInfo$info$di, _identityInfo$info2, _identityInfo$info2$w, _identityInfo$info3, _identityInfo$info3$r, _identityInfo$info4, _identityInfo$info4$t;
-    const displayName = identityInfo === null || identityInfo === void 0 ? void 0 : (_identityInfo$info = identityInfo.info) === null || _identityInfo$info === void 0 ? void 0 : (_identityInfo$info$di = _identityInfo$info.display) === null || _identityInfo$info$di === void 0 ? void 0 : _identityInfo$info$di.Raw;
-    const web = identityInfo === null || identityInfo === void 0 ? void 0 : (_identityInfo$info2 = identityInfo.info) === null || _identityInfo$info2 === void 0 ? void 0 : (_identityInfo$info2$w = _identityInfo$info2.web) === null || _identityInfo$info2$w === void 0 ? void 0 : _identityInfo$info2$w.Raw;
-    const riot = identityInfo === null || identityInfo === void 0 ? void 0 : (_identityInfo$info3 = identityInfo.info) === null || _identityInfo$info3 === void 0 ? void 0 : (_identityInfo$info3$r = _identityInfo$info3.riot) === null || _identityInfo$info3$r === void 0 ? void 0 : _identityInfo$info3$r.Raw;
-    const twitter = identityInfo === null || identityInfo === void 0 ? void 0 : (_identityInfo$info4 = identityInfo.info) === null || _identityInfo$info4 === void 0 ? void 0 : (_identityInfo$info4$t = _identityInfo$info4.twitter) === null || _identityInfo$info4$t === void 0 ? void 0 : _identityInfo$info4$t.Raw;
-    if (displayName && !displayName.startsWith('0x')) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      identity = displayName;
+
+/**
+  * @returns
+  * <p>
+  * [0] - identity
+  * </p>
+  * <p>
+  * [1] - isReasonable (isVerified)
+  * </p>
+  *  */
+async function parseIdentity(substrateApi, address, children) {
+  const compactResult = rs => {
+    const result = [];
+    if (rs) {
+      result.push(rs);
+    }
+    if (children) {
+      result.push(children);
+    }
+    if (result.length > 0) {
+      return result.join('/');
     } else {
-      identity = twitter || web || riot;
+      return undefined;
+    }
+  };
+  if (substrateApi.api.query.identity) {
+    let identity;
+    const _parent = await substrateApi.api.query.identity.superOf(address);
+    const parentInfo = _parent.toHuman();
+    if (parentInfo) {
+      const [parentAddress, {
+        Raw: data
+      }] = parentInfo;
+      const child = (0, _util.isHex)(data) ? (0, _util.hexToString)(data) : data;
+      if (!(0, _utils2.isSameAddress)(address, parentAddress)) {
+        const [rs, isReasonable] = await parseIdentity(substrateApi, parentAddress, child);
+        return [compactResult(rs), isReasonable];
+      }
+    }
+    const _identity = await substrateApi.api.query.identity.identityOf(address);
+    const identityInfo = _identity.toHuman();
+    if (identityInfo) {
+      var _identityInfo$info, _identityInfo$info$di, _identityInfo$info2, _identityInfo$info2$w, _identityInfo$info3, _identityInfo$info3$r, _identityInfo$info4, _identityInfo$info4$t;
+      const displayName = (_identityInfo$info = identityInfo.info) === null || _identityInfo$info === void 0 ? void 0 : (_identityInfo$info$di = _identityInfo$info.display) === null || _identityInfo$info$di === void 0 ? void 0 : _identityInfo$info$di.Raw;
+      const web = (_identityInfo$info2 = identityInfo.info) === null || _identityInfo$info2 === void 0 ? void 0 : (_identityInfo$info2$w = _identityInfo$info2.web) === null || _identityInfo$info2$w === void 0 ? void 0 : _identityInfo$info2$w.Raw;
+      const riot = (_identityInfo$info3 = identityInfo.info) === null || _identityInfo$info3 === void 0 ? void 0 : (_identityInfo$info3$r = _identityInfo$info3.riot) === null || _identityInfo$info3$r === void 0 ? void 0 : _identityInfo$info3$r.Raw;
+      const twitter = (_identityInfo$info4 = identityInfo.info) === null || _identityInfo$info4 === void 0 ? void 0 : (_identityInfo$info4$t = _identityInfo$info4.twitter) === null || _identityInfo$info4$t === void 0 ? void 0 : _identityInfo$info4$t.Raw;
+      const isReasonable = identityInfo.judgements.length > 0;
+      if (displayName && !displayName.startsWith('0x')) {
+        identity = displayName;
+      } else {
+        identity = twitter || web || riot;
+      }
+      return [compactResult(identity), isReasonable];
     }
   }
-  return identity;
+  return [undefined, false];
 }
 function getInflationParams(networkKey) {
   return _constants._KNOWN_CHAIN_INFLATION_PARAMS[networkKey] || _constants._SUBSTRATE_DEFAULT_INFLATION_PARAMS;
@@ -330,7 +371,7 @@ const getMaxValidatorErrorMessage = (chainInfo, max) => {
   });
 };
 exports.getMaxValidatorErrorMessage = getMaxValidatorErrorMessage;
-const getExistUnstakeErrorMessage = (chain, isStakeMore) => {
+const getExistUnstakeErrorMessage = (chain, type, isStakeMore) => {
   const label = getValidatorLabel(chain);
   if (!isStakeMore) {
     switch (label) {
@@ -339,7 +380,12 @@ const getExistUnstakeErrorMessage = (chain, isStakeMore) => {
       case 'Collator':
         return (0, _i18next.t)('You can unstake from a collator once');
       case 'Validator':
-        return (0, _i18next.t)('You can unstake from a validator once');
+        {
+          if (type === _KoniTypes.StakingType.POOLED) {
+            return (0, _i18next.t)('You can unstake from a pool once');
+          }
+          return (0, _i18next.t)('You can unstake from a validator once');
+        }
     }
   } else {
     switch (label) {
@@ -348,7 +394,12 @@ const getExistUnstakeErrorMessage = (chain, isStakeMore) => {
       case 'Collator':
         return (0, _i18next.t)('You cannot stake more for a collator you are unstaking from');
       case 'Validator':
-        return (0, _i18next.t)('You cannot stake more for a validator you are unstaking from');
+        {
+          if (type === _KoniTypes.StakingType.POOLED) {
+            return (0, _i18next.t)('You cannot stake more for a pool you are unstaking from');
+          }
+          return (0, _i18next.t)('You cannot stake more for a validator you are unstaking from');
+        }
     }
   }
 };

package/cjs/koni/api/tokens/evm/balance.js

@@ -10,6 +10,10 @@ exports.getEVMBalance = getEVMBalance;
 async function getEVMBalance(networkKey, addresses, evmApiMap) {
   const web3Api = evmApiMap[networkKey];
   return await Promise.all(addresses.map(async address => {
-    return await web3Api.api.eth.getBalance(address);
+    try {
+      return await web3Api.api.eth.getBalance(address);
+    } catch (e) {
+      return '0';
+    }
   }));
 }

package/cjs/koni/api/tokens/evm/transfer.js

@@ -11,6 +11,7 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _web = require("@subwallet/extension-base/koni/api/tokens/evm/web3");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _helper = require("@subwallet/extension-base/services/chain-service/helper");
+var _eth = require("@subwallet/extension-base/utils/eth");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -46,7 +47,8 @@ exports.handleTransferBalanceResult = handleTransferBalanceResult;
 async function getEVMTransactionObject(chainInfo, from, to, value, transferAll, evmApiMap) {
   const networkKey = chainInfo.slug;
   const web3Api = evmApiMap[networkKey];
-  const gasPrice = await web3Api.api.eth.getGasPrice();
+  const _price = await web3Api.api.eth.getGasPrice();
+  const gasPrice = (0, _eth.recalculateGasPrice)(_price, chainInfo.slug);
   const transactionObject = {
     gasPrice: gasPrice,
     to: to,
@@ -80,11 +82,12 @@ async function getERC20TransactionObject(assetAddress, chainInfo, from, to, valu
     return erc20Contract.methods.transfer(to, transferValue).encodeABI();
   }
   const transferData = generateTransferData(to, transferValue);
-  const [gasLimit, gasPrice] = await Promise.all([
+  const [gasLimit, _price] = await Promise.all([
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
   erc20Contract.methods.transfer(to, transferValue).estimateGas({
     from
   }), evmApi.api.eth.getGasPrice()]);
+  const gasPrice = (0, _eth.recalculateGasPrice)(_price, chainInfo.slug);
   const transactionObject = {
     gasPrice: gasPrice,
     gas: gasLimit,
@@ -98,14 +101,15 @@ async function getERC20TransactionObject(assetAddress, chainInfo, from, to, valu
   }
   return [transactionObject, transferValue];
 }
-async function getERC721Transaction(web3Api, contractAddress, senderAddress, recipientAddress, tokenId) {
+async function getERC721Transaction(web3Api, chain, contractAddress, senderAddress, recipientAddress, tokenId) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
   const contract = new web3Api.api.eth.Contract(_helper._ERC721_ABI, contractAddress);
-  const [gasLimit, gasPrice] = await Promise.all([
+  const [gasLimit, _price] = await Promise.all([
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
   contract.methods.safeTransferFrom(senderAddress, recipientAddress, tokenId).estimateGas({
     from: senderAddress
   }), web3Api.api.eth.getGasPrice()]);
+  const gasPrice = (0, _eth.recalculateGasPrice)(_price, chain);
   return {
     from: senderAddress,
     gasPrice,

package/cjs/koni/background/cron.js

@@ -115,8 +115,8 @@ class KoniCron {
     if (Object.keys(this.state.getSubstrateApiMap()).length !== 0 || Object.keys(this.state.getEvmApiMap()).length !== 0) {
       this.resetNft(currentAccountInfo.address);
       this.addCron('refreshNft', this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
-      this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_INTERVAL);
-      this.addCron('refreshPoolingSta             kingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
+      // this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
+      this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
       this.addCron('syncMantaPay', this.syncMantaPay, _constants.CRON_SYNC_MANTA_PAY);
     } else {
       this.setStakingRewardReady();

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

@@ -33,7 +33,6 @@ var _constants4 = require("@subwallet/extension-base/services/setting-service/co
 var _constants5 = require("@subwallet/extension-base/services/wallet-connect-service/constants");
 var _helpers2 = require("@subwallet/extension-base/services/wallet-connect-service/helpers");
 var _utils2 = require("@subwallet/extension-base/utils");
-var _address2 = require("@subwallet/extension-base/utils/address");
 var _eth = require("@subwallet/extension-base/utils/eth");
 var _parseTransaction2 = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _number = require("@subwallet/extension-base/utils/number");
@@ -546,7 +545,7 @@ class KoniExtension {
   subscribeAddresses(id, port) {
     const _cb = (0, _subscriptions.createSubscription)(id, port);
     const subscription = this.#koniState.keyringService.addressesSubject.subscribe(subjectInfo => {
-      const addresses = (0, _address2.convertSubjectInfoToAddresses)(subjectInfo);
+      const addresses = (0, _utils2.convertSubjectInfoToAddresses)(subjectInfo);
       _cb({
         addresses: addresses
       });
@@ -557,7 +556,7 @@ class KoniExtension {
     });
     const subjectInfo = this.#koniState.keyringService.addresses;
     return {
-      addresses: (0, _address2.convertSubjectInfoToAddresses)(subjectInfo)
+      addresses: (0, _utils2.convertSubjectInfoToAddresses)(subjectInfo)
     };
   }
   saveRecentAccount(_ref22) {
@@ -1779,7 +1778,7 @@ class KoniExtension {
     } = inputData;
     const contractAddress = params.contractAddress;
     const tokenId = params.tokenId;
-    const transaction = await (0, _transfer3.getERC721Transaction)(this.#koniState.getEvmApi(networkKey), contractAddress, senderAddress, recipientAddress, tokenId);
+    const transaction = await (0, _transfer3.getERC721Transaction)(this.#koniState.getEvmApi(networkKey), networkKey, contractAddress, senderAddress, recipientAddress, tokenId);
 
     // this.addContact(recipientAddress);
 
@@ -1930,7 +1929,8 @@ class KoniExtension {
               // null address
               from: address
             };
-            const gasPrice = await web3.api.eth.getGasPrice();
+            const _price = await web3.api.eth.getGasPrice();
+            const gasPrice = (0, _eth.recalculateGasPrice)(_price, networkKey);
             const gasLimit = await web3.api.eth.estimateGas(transaction);
             estimatedFee = (gasLimit * parseInt(gasPrice)).toString();
           } else {

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

@@ -119,7 +119,7 @@ class Mobile {
     if (storage) {
       const storageData = JSON.parse(storage);
       for (const key in storageData) {
-        localStorage.setItem(key, JSON.stringify(storageData[key]));
+        localStorage.setItem(key, storageData[key]);
       }
     }
     if (indexedDB) {