@subwallet/extension-base 1.1.55-0 → 1.1.56-0

package/background/KoniTypes.d.ts

@@ -159,7 +159,7 @@ export declare enum CrowdloanParaState {
     COMPLETED = "completed",
     FAILED = "failed"
 }
-export interface NftItem {
+export interface NftItem extends NftItemExtraInfo {
     id: string;
     chain: string;
     collectionId: string;
@@ -171,9 +171,16 @@ export interface NftItem {
     rarity?: string;
     description?: string;
     properties?: Record<any, any> | null;
+}
+interface NftItemExtraInfo {
     type?: _AssetType.ERC721 | _AssetType.PSP34 | RMRK_VER;
     rmrk_ver?: RMRK_VER;
     onChainOption?: any;
+    assetHubType?: AssetHubNftType;
+}
+export declare enum AssetHubNftType {
+    NFTS = "nfts",
+    UNIQUES = "uniques"
 }
 export interface NftCollection {
     collectionId: string;
@@ -1874,3 +1881,4 @@ export interface ApplicationMetadataType {
 }
 export declare type OSType = 'Mac OS' | 'iOS' | 'Windows' | 'Android' | 'Linux' | 'Unknown';
 export declare const MobileOS: OSType[];
+export {};

package/background/KoniTypes.js

@@ -38,6 +38,11 @@ export let CrowdloanParaState;
   CrowdloanParaState["COMPLETED"] = "completed";
   CrowdloanParaState["FAILED"] = "failed";
 })(CrowdloanParaState || (CrowdloanParaState = {}));
+export let AssetHubNftType;
+(function (AssetHubNftType) {
+  AssetHubNftType["NFTS"] = "nfts";
+  AssetHubNftType["UNIQUES"] = "uniques";
+})(AssetHubNftType || (AssetHubNftType = {}));
 export let ContractType;
 (function (ContractType) {
   ContractType["wasm"] = "wasm";

package/cjs/background/KoniTypes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WalletUnlockType = exports.TransferTxErrorType = exports.TransactionDirection = exports.ThemeNames = exports.StakingType = exports.StakingTxErrorType = exports.RuntimeEnvironment = exports.RMRK_VER = exports.ProviderErrorType = exports.NotificationType = exports.NETWORK_STATUS = exports.NETWORK_ERROR = exports.MobileOS = exports.MantaPayEnableMessage = exports.ExtrinsicType = exports.ExtrinsicStatus = exports.ExternalRequestPromiseStatus = exports.EvmProviderErrorType = exports.CrowdloanParaState = exports.ContractType = exports.ChainType = exports.ChainEditStandard = exports.CampaignDataType = exports.BasicTxWarningCode = exports.BasicTxErrorType = exports.BalanceErrorType = exports.AccountExternalErrorCode = exports.APIItemState = void 0;
+exports.WalletUnlockType = exports.TransferTxErrorType = exports.TransactionDirection = exports.ThemeNames = exports.StakingType = exports.StakingTxErrorType = exports.RuntimeEnvironment = exports.RMRK_VER = exports.ProviderErrorType = exports.NotificationType = exports.NETWORK_STATUS = exports.NETWORK_ERROR = exports.MobileOS = exports.MantaPayEnableMessage = exports.ExtrinsicType = exports.ExtrinsicStatus = exports.ExternalRequestPromiseStatus = exports.EvmProviderErrorType = exports.CrowdloanParaState = exports.ContractType = exports.ChainType = exports.ChainEditStandard = exports.CampaignDataType = exports.BasicTxWarningCode = exports.BasicTxErrorType = exports.BalanceErrorType = exports.AssetHubNftType = exports.AccountExternalErrorCode = exports.APIItemState = void 0;
 // Copyright 2019-2022 @polkadot/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 let RuntimeEnvironment;
@@ -47,6 +47,12 @@ exports.CrowdloanParaState = CrowdloanParaState;
   CrowdloanParaState["COMPLETED"] = "completed";
   CrowdloanParaState["FAILED"] = "failed";
 })(CrowdloanParaState || (exports.CrowdloanParaState = CrowdloanParaState = {}));
+let AssetHubNftType;
+exports.AssetHubNftType = AssetHubNftType;
+(function (AssetHubNftType) {
+  AssetHubNftType["NFTS"] = "nfts";
+  AssetHubNftType["UNIQUES"] = "uniques";
+})(AssetHubNftType || (exports.AssetHubNftType = AssetHubNftType = {}));
 let ContractType;
 exports.ContractType = ContractType;
 (function (ContractType) {

package/cjs/koni/api/nft/{statemint_nft → assethub_nft}/index.js

@@ -5,13 +5,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _nft = require("@subwallet/extension-base/koni/api/nft/nft");
 var _utils = require("@subwallet/extension-base/utils");
 var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-class StatemintNftApi extends _nft.BaseNftApi {
+class AssetHubNftsPalletApi extends _nft.BaseNftApi {
   // eslint-disable-next-line no-useless-constructor
   constructor(api, addresses, chain) {
     super(chain, api, addresses);
@@ -112,7 +113,8 @@ class StatemintNftApi extends _nft.BaseNftApi {
           image: tokenInfo && tokenInfo.image ? this.parseUrl(tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.image) : undefined,
           collectionId: this.parseTokenId(parsedClassId),
           chain: this.chain,
-          owner: address
+          owner: address,
+          assetHubType: _KoniTypes.AssetHubNftType.NFTS
         };
         params.updateItem(this.chain, parsedNft, address);
         const parsedCollection = {
@@ -140,4 +142,4 @@ class StatemintNftApi extends _nft.BaseNftApi {
     return 1;
   }
 }
-exports.default = StatemintNftApi;
+exports.default = AssetHubNftsPalletApi;

package/cjs/koni/api/nft/{statemine_nft → assethub_unique}/index.js

@@ -5,13 +5,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _nft = require("@subwallet/extension-base/koni/api/nft/nft");
 var _utils = require("@subwallet/extension-base/utils");
 var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-class StatemineNftApi extends _nft.BaseNftApi {
+class AssetHubUniquesPalletApi extends _nft.BaseNftApi {
   // eslint-disable-next-line no-useless-constructor
   constructor(api, addresses, chain) {
     super(chain, api, addresses);
@@ -112,7 +113,8 @@ class StatemineNftApi extends _nft.BaseNftApi {
           image: tokenInfo && tokenInfo.image ? this.parseUrl(tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.image) : undefined,
           collectionId: this.parseTokenId(parsedClassId),
           chain: this.chain,
-          owner: address
+          owner: address,
+          assetHubType: _KoniTypes.AssetHubNftType.UNIQUES
         };
         params.updateItem(this.chain, parsedNft, address);
         const parsedCollection = {
@@ -140,4 +142,4 @@ class StatemineNftApi extends _nft.BaseNftApi {
     return 1;
   }
 }
-exports.default = StatemineNftApi;
+exports.default = AssetHubUniquesPalletApi;

package/cjs/koni/api/nft/index.js

@@ -6,19 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.NftHandler = void 0;
 var _acala_nft = require("@subwallet/extension-base/koni/api/nft/acala_nft");
+var _assethub_unique = _interopRequireDefault(require("@subwallet/extension-base/koni/api/nft/assethub_unique"));
 var _bit = require("@subwallet/extension-base/koni/api/nft/bit.country");
 var _evm_nft = require("@subwallet/extension-base/koni/api/nft/evm_nft");
 var _karura_nft = require("@subwallet/extension-base/koni/api/nft/karura_nft");
 var _ordinal_nft = _interopRequireDefault(require("@subwallet/extension-base/koni/api/nft/ordinal_nft"));
 var _rmrk_nft = require("@subwallet/extension-base/koni/api/nft/rmrk_nft");
-var _statemine_nft = _interopRequireDefault(require("@subwallet/extension-base/koni/api/nft/statemine_nft"));
 var _unique_network_nft = require("@subwallet/extension-base/koni/api/nft/unique_network_nft");
 var _vara_nft = require("@subwallet/extension-base/koni/api/nft/vara_nft");
 var _wasm_nft = require("@subwallet/extension-base/koni/api/nft/wasm_nft");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/utils");
-var _statemint_nft = _interopRequireDefault(require("./statemint_nft"));
+var _assethub_nft = _interopRequireDefault(require("./assethub_nft"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -27,21 +27,21 @@ var _statemint_nft = _interopRequireDefault(require("./statemint_nft"));
 function createSubstrateNftApi(chain, substrateApi, addresses) {
   const [substrateAddresses] = (0, _utils2.categoryAddresses)(addresses);
   if (_constants._NFT_CHAIN_GROUP.acala.includes(chain)) {
-    return new _acala_nft.AcalaNftApi(substrateApi, substrateAddresses, chain);
+    return [new _acala_nft.AcalaNftApi(substrateApi, substrateAddresses, chain)];
   } else if (_constants._NFT_CHAIN_GROUP.karura.includes(chain)) {
-    return new _karura_nft.KaruraNftApi(substrateApi, substrateAddresses, chain);
+    return [new _karura_nft.KaruraNftApi(substrateApi, substrateAddresses, chain)];
   } else if (_constants._NFT_CHAIN_GROUP.rmrk.includes(chain)) {
-    return new _rmrk_nft.RmrkNftApi(substrateAddresses, chain);
+    return [new _rmrk_nft.RmrkNftApi(substrateAddresses, chain)];
   } else if (_constants._NFT_CHAIN_GROUP.statemine.includes(chain)) {
-    return new _statemine_nft.default(substrateApi, substrateAddresses, chain);
+    return [new _assethub_unique.default(substrateApi, substrateAddresses, chain), new _assethub_nft.default(substrateApi, substrateAddresses, chain)];
   } else if (_constants._NFT_CHAIN_GROUP.statemint.includes(chain)) {
-    return new _statemint_nft.default(substrateApi, substrateAddresses, chain);
+    return [new _assethub_unique.default(substrateApi, substrateAddresses, chain), new _assethub_nft.default(substrateApi, substrateAddresses, chain)];
   } else if (_constants._NFT_CHAIN_GROUP.unique_network.includes(chain)) {
-    return new _unique_network_nft.UniqueNftApi(chain, substrateAddresses);
+    return [new _unique_network_nft.UniqueNftApi(chain, substrateAddresses)];
   } else if (_constants._NFT_CHAIN_GROUP.bitcountry.includes(chain)) {
-    return new _bit.BitCountryNftApi(substrateApi, substrateAddresses, chain);
+    return [new _bit.BitCountryNftApi(substrateApi, substrateAddresses, chain)];
   } else if (_constants._NFT_CHAIN_GROUP.vara.includes(chain)) {
-    return new _vara_nft.VaraNftApi(chain, substrateAddresses);
+    return [new _vara_nft.VaraNftApi(chain, substrateAddresses)];
   }
   return null;
 }
@@ -114,9 +114,9 @@ class NftHandler {
           let [chain, chainInfo] = _ref;
           if ((0, _utils._isChainSupportNativeNft)(chainInfo)) {
             if (this.substrateApiMap[chain]) {
-              const handler = createSubstrateNftApi(chain, this.substrateApiMap[chain], substrateAddresses);
-              if (handler) {
-                this.handlers.push(handler);
+              const handlers = createSubstrateNftApi(chain, this.substrateApiMap[chain], substrateAddresses);
+              if (handlers && !!handlers.length) {
+                this.handlers.push(...handlers);
               }
             }
           }

package/cjs/koni/api/nft/nft.js

@@ -65,7 +65,7 @@ class BaseNftApi {
   }
   parseTokenId(tokenId) {
     if (tokenId.includes(',')) {
-      return tokenId.replace(',', '');
+      return tokenId.replaceAll(',', '');
     }
     return tokenId;
   }

package/cjs/koni/api/nft/transfer.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.acalaGetExtrinsic = acalaGetExtrinsic;
+exports.assetHubGetExtrinsic = assetHubGetExtrinsic;
 exports.getNftTransferExtrinsic = getNftTransferExtrinsic;
 exports.isRecipientSelf = isRecipientSelf;
 exports.rmrkGetExtrinsic = rmrkGetExtrinsic;
-exports.statemineGetExtrinsic = statemineGetExtrinsic;
-exports.statemintGetExtrinsic = statemintGetExtrinsic;
 exports.uniqueGetExtrinsic = uniqueGetExtrinsic;
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _config = require("@subwallet/extension-base/koni/api/nft/config");
 var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -64,21 +64,17 @@ async function uniqueGetExtrinsic(substrateApi, senderAddress, recipientAddress,
     return null;
   }
 }
-function statemineGetExtrinsic(substrateApi, senderAddress, recipientAddress, params) {
+function assetHubGetExtrinsic(substrateApi, senderAddress, recipientAddress, params) {
   try {
     const itemId = params.itemId;
     const collectionId = params.collectionId;
-    return substrateApi.api.tx.uniques.transfer(collectionId, itemId, recipientAddress);
-  } catch (e) {
-    console.error(e);
+    const nftType = params.assetHubType;
+    if (nftType === _KoniTypes.AssetHubNftType.NFTS) {
+      return substrateApi.api.tx.nfts.transfer(collectionId, itemId, recipientAddress);
+    } else if (nftType === _KoniTypes.AssetHubNftType.UNIQUES) {
+      return substrateApi.api.tx.uniques.transfer(collectionId, itemId, recipientAddress);
+    }
     return null;
-  }
-}
-function statemintGetExtrinsic(substrateApi, senderAddress, recipientAddress, params) {
-  try {
-    const itemId = params.itemId;
-    const collectionId = params.collectionId;
-    return substrateApi.api.tx.nfts.transfer(collectionId, itemId, recipientAddress);
   } catch (e) {
     console.error(e);
     return null;
@@ -99,9 +95,9 @@ async function getNftTransferExtrinsic(networkKey, substrateApi, senderAddress,
     case _config.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.opal:
       return await uniqueGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
     case _config.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.statemine:
-      return statemineGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
+      return assetHubGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
     case _config.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.statemint:
-      return statemintGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
+      return assetHubGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
     case _config.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.bitcountry:
       return acalaGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
     case _config.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.pioneer:

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.55-0'
+  version: '1.1.56-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -84,7 +84,8 @@ const _STAKING_ERA_LENGTH_MAP = {
   shiden: 24,
   shibuya: 24,
   bifrost_testnet: 0.5,
-  bifrost: 2,
+  bifrost: 13 * 600 / 3600,
+  // real blocktime of bifros ksm = 13s
   bifrost_dot: 24,
   ternoa: 24,
   calamari: 6,
@@ -101,7 +102,8 @@ const _STAKING_ERA_LENGTH_MAP = {
   goldberg_testnet: 24,
   manta_network: 6,
   krest_network: 4,
-  polimec: 6
+  polimec: 6,
+  enjin_relaychain: 24
 };
 exports._STAKING_ERA_LENGTH_MAP = _STAKING_ERA_LENGTH_MAP;
 const _EXPECTED_BLOCK_TIME = {
@@ -119,7 +121,19 @@ const _EXPECTED_BLOCK_TIME = {
   creditcoin: 12,
   vara_network: 3,
   goldberg_testnet: 20,
-  polimec: 12
+  polimec: 12,
+  bifrost: 13,
+  // expect 12 but actual 13
+  moonbeam: 12,
+  moonriver: 12,
+  moonbase: 6,
+  turing: 12,
+  turingStaging: 12,
+  bifrost_testnet: 3,
+  calamari: 12,
+  calamari_test: 12,
+  manta_network: 12,
+  enjin_relaychain: 6
 };
 exports._EXPECTED_BLOCK_TIME = _EXPECTED_BLOCK_TIME;
 const _PARACHAIN_INFLATION_DISTRIBUTION = {

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

@@ -137,27 +137,25 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
         });
       }
       if (hasUnstakingInfo) {
-        const _currentBlockInfo = await substrateApi.api.rpc.chain.getHeader();
-        const currentBlockInfo = _currentBlockInfo.toPrimitive();
-        const currentBlockNumber = currentBlockInfo.number;
+        const [_currentBlock, _currentTimestamp] = await Promise.all([substrateApi.api.query.system.number(), substrateApi.api.query.timestamp.now()]);
+        const currentBlock = _currentBlock.toPrimitive();
+        const currentTimestamp = _currentTimestamp.toPrimitive();
         const _blockPerRound = substrateApi.api.consts.parachainStaking.defaultBlocksPerRound.toString();
         const blockPerRound = parseFloat(_blockPerRound);
         for (const [unstakingBlock, unstakingAmount] of Object.entries(unstakingInfo)) {
           const blockDuration = (_constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _constants._STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
 
-          const isClaimable = parseInt(unstakingBlock) - currentBlockNumber < 0;
-          const remainingBlock = parseInt(unstakingBlock) - currentBlockNumber;
+          const isClaimable = parseInt(unstakingBlock) - currentBlock <= 0;
+          const remainingBlock = parseInt(unstakingBlock) - currentBlock;
           const waitingTime = remainingBlock * blockDuration;
-          // const currentTimestampMs = Date.now();
-          // const targetTimestampMs = currentTimestampMs + waitingTime * 60 * 60 * 1000;
-
+          const targetTimestampMs = remainingBlock * blockDuration * 3600 * 1000 + currentTimestamp;
           unstakingBalance = unstakingAmount.toString();
           unstakingList.push({
             chain: chainInfo.slug,
             status: isClaimable ? _types.UnstakingStatus.CLAIMABLE : _types.UnstakingStatus.UNLOCKING,
             claimable: unstakingAmount.toString(),
             waitingTime,
-            // targetTimestampMs: targetTimestampMs,
+            targetTimestampMs: targetTimestampMs,
             validatorAddress: undefined
           });
         }

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

@@ -144,7 +144,9 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
     const roundInfo = _roundInfo.toPrimitive();
     const currentRound = roundInfo.current;
     await Promise.all(delegatorState.delegations.map(async delegation => {
-      const [_delegationScheduledRequests, [identity], _collatorInfo] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (0, _utils2.parseIdentity)(substrateApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
+      const [_delegationScheduledRequests, [identity], _collatorInfo, _currentBlock, _currentTimestamp] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (0, _utils2.parseIdentity)(substrateApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner), substrateApi.api.query.system.number(), substrateApi.api.query.timestamp.now()]);
+      const currentBlock = _currentBlock.toPrimitive();
+      const currentTimestamp = _currentTimestamp.toPrimitive();
       const collatorInfo = _collatorInfo.toPrimitive();
       const minDelegation = collatorInfo === null || collatorInfo === void 0 ? void 0 : collatorInfo.lowestTopDelegationAmount.toString();
       const delegationScheduledRequests = _delegationScheduledRequests.toPrimitive();
@@ -156,22 +158,23 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
         for (const scheduledRequest of delegationScheduledRequests) {
           if ((0, _utils3.reformatAddress)(scheduledRequest.delegator, 0) === (0, _utils3.reformatAddress)(address, 0)) {
             // add network prefix
-            const isClaimable = scheduledRequest.whenExecutable - currentRound <= 0;
-            const remainingEra = scheduledRequest.whenExecutable - currentRound;
+            const isClaimable = scheduledRequest.whenExecutable - parseInt(currentRound) <= 0;
+            const remainingEra = scheduledRequest.whenExecutable - parseInt(currentRound);
             const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug];
             const claimable = Object.values(scheduledRequest.action)[0];
-            // const currentTimestampMs = Date.now();
-            // const targetTimestampMs = currentTimestampMs + waitingTime * 60 * 60 * 1000;
 
+            // noted: target timestamp in parachainStaking easily volatile if block time volatile
+            const targetBlock = remainingEra * parseInt(roundInfo.length) + parseInt(roundInfo.first);
+            const remainingBlock = targetBlock - currentBlock;
+            const targetTimestampMs = remainingBlock * _constants._EXPECTED_BLOCK_TIME[chainInfo.slug] * 1000 + currentTimestamp;
             unstakingMap[delegation.owner] = {
               chain: chainInfo.slug,
               status: isClaimable ? _types.UnstakingStatus.CLAIMABLE : _types.UnstakingStatus.UNLOCKING,
               validatorAddress: delegation.owner,
               claimable: claimable.toString(),
-              waitingTime
-              // targetTimestampMs: targetTimestampMs
+              waitingTime,
+              targetTimestampMs: targetTimestampMs
             };
-
             hasUnstaking = true;
             break; // only handle 1 scheduledRequest per collator
           }

package/cjs/services/earning-service/handlers/nomination-pool/index.js

@@ -166,11 +166,25 @@ class NominationPoolHandler extends _base.default {
     if (nominations) {
       const validatorList = nominations.targets;
       await Promise.all(validatorList.map(async validatorAddress => {
-        const _eraStaker = await substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress);
-        const eraStaker = _eraStaker.toPrimitive();
-        const sortedNominators = eraStaker.others.sort((a, b) => {
-          return new _bignumber.default(b.value).minus(a.value).toNumber();
-        });
+        let sortedNominators = [];
+        if (['kusama'].includes(this.chain)) {
+          // todo: hot fix for kusama first, we'll review all relaychains later
+          const _eraStaker = await substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress);
+          const eraStakerOtherList = [];
+          _eraStaker.forEach(paged => {
+            const pagedExposure = paged[1].toPrimitive();
+            eraStakerOtherList.push(...pagedExposure.others);
+          });
+          sortedNominators = eraStakerOtherList.sort((a, b) => {
+            return new _bignumber.default(b.value).minus(a.value).toNumber();
+          });
+        } else {
+          const _eraStaker = await substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress);
+          const eraStaker = _eraStaker.toPrimitive();
+          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, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator);

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

@@ -404,7 +404,6 @@ class EarningService {
     const removeKeys = [];
     chains && chains.length > 0 && Object.entries(this.yieldPositionSubject.getValue()).forEach(_ref => {
       let [key, value] = _ref;
-      console.log('removeYieldPositions', key, value.chain, chains.indexOf(value.chain) > -1);
       if (chains.indexOf(value.chain) > -1 && !removeKeys.includes(key)) {
         removeKeys.push(key);
       }

package/koni/api/nft/{statemint_nft → assethub_nft}/index.d.ts

@@ -1,6 +1,6 @@
 import { BaseNftApi, HandleNftParams } from '@subwallet/extension-base/koni/api/nft/nft';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-export default class StatemintNftApi extends BaseNftApi {
+export default class AssetHubNftsPalletApi extends BaseNftApi {
     constructor(api: _SubstrateApi | null, addresses: string[], chain: string);
     private getMetadata;
     /**

package/koni/api/nft/{statemint_nft → assethub_nft}/index.js

@@ -1,10 +1,11 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { AssetHubNftType } from '@subwallet/extension-base/background/KoniTypes';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
 import { isUrl } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
-export default class StatemintNftApi extends BaseNftApi {
+export default class AssetHubNftsPalletApi extends BaseNftApi {
   // eslint-disable-next-line no-useless-constructor
   constructor(api, addresses, chain) {
     super(chain, api, addresses);
@@ -105,7 +106,8 @@ export default class StatemintNftApi extends BaseNftApi {
           image: tokenInfo && tokenInfo.image ? this.parseUrl(tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.image) : undefined,
           collectionId: this.parseTokenId(parsedClassId),
           chain: this.chain,
-          owner: address
+          owner: address,
+          assetHubType: AssetHubNftType.NFTS
         };
         params.updateItem(this.chain, parsedNft, address);
         const parsedCollection = {

package/koni/api/nft/{statemine_nft → assethub_unique}/index.d.ts

@@ -1,6 +1,6 @@
 import { BaseNftApi, HandleNftParams } from '@subwallet/extension-base/koni/api/nft/nft';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-export default class StatemineNftApi extends BaseNftApi {
+export default class AssetHubUniquesPalletApi extends BaseNftApi {
     constructor(api: _SubstrateApi | null, addresses: string[], chain: string);
     private getMetadata;
     /**

package/koni/api/nft/{statemine_nft → assethub_unique}/index.js

@@ -1,10 +1,11 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { AssetHubNftType } from '@subwallet/extension-base/background/KoniTypes';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
 import { isUrl } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
-export default class StatemineNftApi extends BaseNftApi {
+export default class AssetHubUniquesPalletApi extends BaseNftApi {
   // eslint-disable-next-line no-useless-constructor
   constructor(api, addresses, chain) {
     super(chain, api, addresses);
@@ -105,7 +106,8 @@ export default class StatemineNftApi extends BaseNftApi {
           image: tokenInfo && tokenInfo.image ? this.parseUrl(tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.image) : undefined,
           collectionId: this.parseTokenId(parsedClassId),
           chain: this.chain,
-          owner: address
+          owner: address,
+          assetHubType: AssetHubNftType.UNIQUES
         };
         params.updateItem(this.chain, parsedNft, address);
         const parsedCollection = {

package/koni/api/nft/index.js

@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { AcalaNftApi } from '@subwallet/extension-base/koni/api/nft/acala_nft';
+import AssetHubUniquesPalletApi from '@subwallet/extension-base/koni/api/nft/assethub_unique';
 import { BitCountryNftApi } from '@subwallet/extension-base/koni/api/nft/bit.country';
 import { EvmNftApi } from '@subwallet/extension-base/koni/api/nft/evm_nft';
 import { KaruraNftApi } from '@subwallet/extension-base/koni/api/nft/karura_nft';
 import OrdinalNftApi from '@subwallet/extension-base/koni/api/nft/ordinal_nft';
 import { RmrkNftApi } from '@subwallet/extension-base/koni/api/nft/rmrk_nft';
-import StatemineNftApi from '@subwallet/extension-base/koni/api/nft/statemine_nft';
 import { UniqueNftApi } from '@subwallet/extension-base/koni/api/nft/unique_network_nft';
 // import UniqueNftApi from '@subwallet/extension-base/koni/api/nft/unique_nft';
 import { VaraNftApi } from '@subwallet/extension-base/koni/api/nft/vara_nft';
@@ -15,25 +15,25 @@ import { WasmNftApi } from '@subwallet/extension-base/koni/api/nft/wasm_nft';
 import { _NFT_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportWasmNft, _isSupportOrdinal } from '@subwallet/extension-base/services/chain-service/utils';
 import { categoryAddresses, targetIsWeb } from '@subwallet/extension-base/utils';
-import StatemintNftApi from "./statemint_nft/index.js";
+import AssetHubNftsPalletApi from "./assethub_nft/index.js";
 function createSubstrateNftApi(chain, substrateApi, addresses) {
   const [substrateAddresses] = categoryAddresses(addresses);
   if (_NFT_CHAIN_GROUP.acala.includes(chain)) {
-    return new AcalaNftApi(substrateApi, substrateAddresses, chain);
+    return [new AcalaNftApi(substrateApi, substrateAddresses, chain)];
   } else if (_NFT_CHAIN_GROUP.karura.includes(chain)) {
-    return new KaruraNftApi(substrateApi, substrateAddresses, chain);
+    return [new KaruraNftApi(substrateApi, substrateAddresses, chain)];
   } else if (_NFT_CHAIN_GROUP.rmrk.includes(chain)) {
-    return new RmrkNftApi(substrateAddresses, chain);
+    return [new RmrkNftApi(substrateAddresses, chain)];
   } else if (_NFT_CHAIN_GROUP.statemine.includes(chain)) {
-    return new StatemineNftApi(substrateApi, substrateAddresses, chain);
+    return [new AssetHubUniquesPalletApi(substrateApi, substrateAddresses, chain), new AssetHubNftsPalletApi(substrateApi, substrateAddresses, chain)];
   } else if (_NFT_CHAIN_GROUP.statemint.includes(chain)) {
-    return new StatemintNftApi(substrateApi, substrateAddresses, chain);
+    return [new AssetHubUniquesPalletApi(substrateApi, substrateAddresses, chain), new AssetHubNftsPalletApi(substrateApi, substrateAddresses, chain)];
   } else if (_NFT_CHAIN_GROUP.unique_network.includes(chain)) {
-    return new UniqueNftApi(chain, substrateAddresses);
+    return [new UniqueNftApi(chain, substrateAddresses)];
   } else if (_NFT_CHAIN_GROUP.bitcountry.includes(chain)) {
-    return new BitCountryNftApi(substrateApi, substrateAddresses, chain);
+    return [new BitCountryNftApi(substrateApi, substrateAddresses, chain)];
   } else if (_NFT_CHAIN_GROUP.vara.includes(chain)) {
-    return new VaraNftApi(chain, substrateAddresses);
+    return [new VaraNftApi(chain, substrateAddresses)];
   }
   return null;
 }
@@ -105,9 +105,9 @@ export class NftHandler {
         Object.entries(this.chainInfoMap).forEach(([chain, chainInfo]) => {
           if (_isChainSupportNativeNft(chainInfo)) {
             if (this.substrateApiMap[chain]) {
-              const handler = createSubstrateNftApi(chain, this.substrateApiMap[chain], substrateAddresses);
-              if (handler) {
-                this.handlers.push(handler);
+              const handlers = createSubstrateNftApi(chain, this.substrateApiMap[chain], substrateAddresses);
+              if (handlers && !!handlers.length) {
+                this.handlers.push(...handlers);
               }
             }
           }

package/koni/api/nft/nft.js

@@ -59,7 +59,7 @@ export class BaseNftApi {
   }
   parseTokenId(tokenId) {
     if (tokenId.includes(',')) {
-      return tokenId.replace(',', '');
+      return tokenId.replaceAll(',', '');
     }
     return tokenId;
   }

package/koni/api/nft/transfer.d.ts

@@ -3,6 +3,5 @@ export declare function isRecipientSelf(currentAddress: string, recipientAddress
 export declare function acalaGetExtrinsic(substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null;
 export declare function rmrkGetExtrinsic(substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null;
 export declare function uniqueGetExtrinsic(substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null>;
-export declare function statemineGetExtrinsic(substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null;
-export declare function statemintGetExtrinsic(substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null;
+export declare function assetHubGetExtrinsic(substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null;
 export declare function getNftTransferExtrinsic(networkKey: string, substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null>;

package/koni/api/nft/transfer.js

@@ -1,6 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { AssetHubNftType } from '@subwallet/extension-base/background/KoniTypes';
 import { SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME } from '@subwallet/extension-base/koni/api/nft/config';
 import { reformatAddress } from '@subwallet/extension-base/utils';
 export function isRecipientSelf(currentAddress, recipientAddress) {
@@ -52,21 +53,17 @@ export async function uniqueGetExtrinsic(substrateApi, senderAddress, recipientA
     return null;
   }
 }
-export function statemineGetExtrinsic(substrateApi, senderAddress, recipientAddress, params) {
+export function assetHubGetExtrinsic(substrateApi, senderAddress, recipientAddress, params) {
   try {
     const itemId = params.itemId;
     const collectionId = params.collectionId;
-    return substrateApi.api.tx.uniques.transfer(collectionId, itemId, recipientAddress);
-  } catch (e) {
-    console.error(e);
+    const nftType = params.assetHubType;
+    if (nftType === AssetHubNftType.NFTS) {
+      return substrateApi.api.tx.nfts.transfer(collectionId, itemId, recipientAddress);
+    } else if (nftType === AssetHubNftType.UNIQUES) {
+      return substrateApi.api.tx.uniques.transfer(collectionId, itemId, recipientAddress);
+    }
     return null;
-  }
-}
-export function statemintGetExtrinsic(substrateApi, senderAddress, recipientAddress, params) {
-  try {
-    const itemId = params.itemId;
-    const collectionId = params.collectionId;
-    return substrateApi.api.tx.nfts.transfer(collectionId, itemId, recipientAddress);
   } catch (e) {
     console.error(e);
     return null;
@@ -87,9 +84,9 @@ export async function getNftTransferExtrinsic(networkKey, substrateApi, senderAd
     case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.opal:
       return await uniqueGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
     case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.statemine:
-      return statemineGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
+      return assetHubGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
     case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.statemint:
-      return statemintGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
+      return assetHubGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
     case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.bitcountry:
       return acalaGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
     case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.pioneer:

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.55-0",
+  "version": "1.1.56-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -204,6 +204,16 @@
       "require": "./cjs/koni/api/nft/acala_nft/index.js",
       "default": "./koni/api/nft/acala_nft/index.js"
     },
+    "./koni/api/nft/assethub_nft": {
+      "types": "./koni/api/nft/assethub_nft/index.d.ts",
+      "require": "./cjs/koni/api/nft/assethub_nft/index.js",
+      "default": "./koni/api/nft/assethub_nft/index.js"
+    },
+    "./koni/api/nft/assethub_unique": {
+      "types": "./koni/api/nft/assethub_unique/index.d.ts",
+      "require": "./cjs/koni/api/nft/assethub_unique/index.js",
+      "default": "./koni/api/nft/assethub_unique/index.js"
+    },
     "./koni/api/nft/bit.country": {
       "types": "./koni/api/nft/bit.country/index.d.ts",
       "require": "./cjs/koni/api/nft/bit.country/index.js",
@@ -254,16 +264,6 @@
       "require": "./cjs/koni/api/nft/rmrk_nft/index.js",
       "default": "./koni/api/nft/rmrk_nft/index.js"
     },
-    "./koni/api/nft/statemine_nft": {
-      "types": "./koni/api/nft/statemine_nft/index.d.ts",
-      "require": "./cjs/koni/api/nft/statemine_nft/index.js",
-      "default": "./koni/api/nft/statemine_nft/index.js"
-    },
-    "./koni/api/nft/statemint_nft": {
-      "types": "./koni/api/nft/statemint_nft/index.d.ts",
-      "require": "./cjs/koni/api/nft/statemint_nft/index.js",
-      "default": "./koni/api/nft/statemint_nft/index.js"
-    },
     "./koni/api/nft/transfer": {
       "types": "./koni/api/nft/transfer.d.ts",
       "require": "./cjs/koni/api/nft/transfer.js",
@@ -1856,28 +1856,28 @@
     "@metamask/safe-event-emitter": "^2.0.0",
     "@metaverse-network-sdk/type-definitions": "^0.0.1-13",
     "@oak-foundation/types": "^0.0.23",
-    "@polkadot/api": "^10.11.2",
+    "@polkadot/api": "^10.12.4",
     "@polkadot/api-base": "^10.11.2",
-    "@polkadot/api-contract": "^10.11.2",
-    "@polkadot/api-derive": "^10.11.2",
-    "@polkadot/apps-config": "^0.133.1",
+    "@polkadot/api-contract": "^10.12.4",
+    "@polkadot/api-derive": "^10.12.4",
+    "@polkadot/apps-config": "^0.135.1",
     "@polkadot/hw-ledger": "^12.6.2",
     "@polkadot/networks": "^12.6.2",
-    "@polkadot/phishing": "^0.22.1",
-    "@polkadot/rpc-provider": "^10.11.2",
-    "@polkadot/types": "^10.11.2",
-    "@polkadot/types-augment": "^10.11.2",
-    "@polkadot/ui-settings": "^3.6.4",
+    "@polkadot/phishing": "^0.22.4",
+    "@polkadot/rpc-provider": "^10.12.4",
+    "@polkadot/types": "^10.12.4",
+    "@polkadot/types-augment": "^10.12.4",
+    "@polkadot/ui-settings": "^3.6.5",
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
-    "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.55",
-    "@subwallet/extension-base": "^1.1.55-0",
-    "@subwallet/extension-chains": "^1.1.55-0",
-    "@subwallet/extension-dapp": "^1.1.55-0",
-    "@subwallet/extension-inject": "^1.1.55-0",
+    "@substrate/connect": "^0.8.9",
+    "@subwallet/chain-list": "0.2.56",
+    "@subwallet/extension-base": "^1.1.56-0",
+    "@subwallet/extension-chains": "^1.1.56-0",
+    "@subwallet/extension-dapp": "^1.1.56-0",
+    "@subwallet/extension-inject": "^1.1.56-0",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@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.55-0'
+  version: '1.1.56-0'
 };

package/services/chain-service/constants.js

@@ -71,7 +71,8 @@ export const _STAKING_ERA_LENGTH_MAP = {
   shiden: 24,
   shibuya: 24,
   bifrost_testnet: 0.5,
-  bifrost: 2,
+  bifrost: 13 * 600 / 3600,
+  // real blocktime of bifros ksm = 13s
   bifrost_dot: 24,
   ternoa: 24,
   calamari: 6,
@@ -88,7 +89,8 @@ export const _STAKING_ERA_LENGTH_MAP = {
   goldberg_testnet: 24,
   manta_network: 6,
   krest_network: 4,
-  polimec: 6
+  polimec: 6,
+  enjin_relaychain: 24
 };
 export const _EXPECTED_BLOCK_TIME = {
   // in seconds
@@ -105,7 +107,19 @@ export const _EXPECTED_BLOCK_TIME = {
   creditcoin: 12,
   vara_network: 3,
   goldberg_testnet: 20,
-  polimec: 12
+  polimec: 12,
+  bifrost: 13,
+  // expect 12 but actual 13
+  moonbeam: 12,
+  moonriver: 12,
+  moonbase: 6,
+  turing: 12,
+  turingStaging: 12,
+  bifrost_testnet: 3,
+  calamari: 12,
+  calamari_test: 12,
+  manta_network: 12,
+  enjin_relaychain: 6
 };
 export const _PARACHAIN_INFLATION_DISTRIBUTION = {
   moonbeam: {

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

@@ -130,27 +130,25 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
         });
       }
       if (hasUnstakingInfo) {
-        const _currentBlockInfo = await substrateApi.api.rpc.chain.getHeader();
-        const currentBlockInfo = _currentBlockInfo.toPrimitive();
-        const currentBlockNumber = currentBlockInfo.number;
+        const [_currentBlock, _currentTimestamp] = await Promise.all([substrateApi.api.query.system.number(), substrateApi.api.query.timestamp.now()]);
+        const currentBlock = _currentBlock.toPrimitive();
+        const currentTimestamp = _currentTimestamp.toPrimitive();
         const _blockPerRound = substrateApi.api.consts.parachainStaking.defaultBlocksPerRound.toString();
         const blockPerRound = parseFloat(_blockPerRound);
         for (const [unstakingBlock, unstakingAmount] of Object.entries(unstakingInfo)) {
           const blockDuration = (_STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
 
-          const isClaimable = parseInt(unstakingBlock) - currentBlockNumber < 0;
-          const remainingBlock = parseInt(unstakingBlock) - currentBlockNumber;
+          const isClaimable = parseInt(unstakingBlock) - currentBlock <= 0;
+          const remainingBlock = parseInt(unstakingBlock) - currentBlock;
           const waitingTime = remainingBlock * blockDuration;
-          // const currentTimestampMs = Date.now();
-          // const targetTimestampMs = currentTimestampMs + waitingTime * 60 * 60 * 1000;
-
+          const targetTimestampMs = remainingBlock * blockDuration * 3600 * 1000 + currentTimestamp;
           unstakingBalance = unstakingAmount.toString();
           unstakingList.push({
             chain: chainInfo.slug,
             status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
             claimable: unstakingAmount.toString(),
             waitingTime,
-            // targetTimestampMs: targetTimestampMs,
+            targetTimestampMs: targetTimestampMs,
             validatorAddress: undefined
           });
         }

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

@@ -4,7 +4,7 @@
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 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 { _EXPECTED_BLOCK_TIME, _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';
@@ -137,7 +137,9 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
     const roundInfo = _roundInfo.toPrimitive();
     const currentRound = roundInfo.current;
     await Promise.all(delegatorState.delegations.map(async delegation => {
-      const [_delegationScheduledRequests, [identity], _collatorInfo] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), parseIdentity(substrateApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
+      const [_delegationScheduledRequests, [identity], _collatorInfo, _currentBlock, _currentTimestamp] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), parseIdentity(substrateApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner), substrateApi.api.query.system.number(), substrateApi.api.query.timestamp.now()]);
+      const currentBlock = _currentBlock.toPrimitive();
+      const currentTimestamp = _currentTimestamp.toPrimitive();
       const collatorInfo = _collatorInfo.toPrimitive();
       const minDelegation = collatorInfo === null || collatorInfo === void 0 ? void 0 : collatorInfo.lowestTopDelegationAmount.toString();
       const delegationScheduledRequests = _delegationScheduledRequests.toPrimitive();
@@ -149,22 +151,23 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
         for (const scheduledRequest of delegationScheduledRequests) {
           if (reformatAddress(scheduledRequest.delegator, 0) === reformatAddress(address, 0)) {
             // add network prefix
-            const isClaimable = scheduledRequest.whenExecutable - currentRound <= 0;
-            const remainingEra = scheduledRequest.whenExecutable - currentRound;
+            const isClaimable = scheduledRequest.whenExecutable - parseInt(currentRound) <= 0;
+            const remainingEra = scheduledRequest.whenExecutable - parseInt(currentRound);
             const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chainInfo.slug];
             const claimable = Object.values(scheduledRequest.action)[0];
-            // const currentTimestampMs = Date.now();
-            // const targetTimestampMs = currentTimestampMs + waitingTime * 60 * 60 * 1000;
 
+            // noted: target timestamp in parachainStaking easily volatile if block time volatile
+            const targetBlock = remainingEra * parseInt(roundInfo.length) + parseInt(roundInfo.first);
+            const remainingBlock = targetBlock - currentBlock;
+            const targetTimestampMs = remainingBlock * _EXPECTED_BLOCK_TIME[chainInfo.slug] * 1000 + currentTimestamp;
             unstakingMap[delegation.owner] = {
               chain: chainInfo.slug,
               status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
               validatorAddress: delegation.owner,
               claimable: claimable.toString(),
-              waitingTime
-              // targetTimestampMs: targetTimestampMs
+              waitingTime,
+              targetTimestampMs: targetTimestampMs
             };
-
             hasUnstaking = true;
             break; // only handle 1 scheduledRequest per collator
           }

package/services/earning-service/handlers/nomination-pool/index.js

@@ -158,11 +158,25 @@ export default class NominationPoolHandler extends BasePoolHandler {
     if (nominations) {
       const validatorList = nominations.targets;
       await Promise.all(validatorList.map(async validatorAddress => {
-        const _eraStaker = await substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress);
-        const eraStaker = _eraStaker.toPrimitive();
-        const sortedNominators = eraStaker.others.sort((a, b) => {
-          return new BigN(b.value).minus(a.value).toNumber();
-        });
+        let sortedNominators = [];
+        if (['kusama'].includes(this.chain)) {
+          // todo: hot fix for kusama first, we'll review all relaychains later
+          const _eraStaker = await substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress);
+          const eraStakerOtherList = [];
+          _eraStaker.forEach(paged => {
+            const pagedExposure = paged[1].toPrimitive();
+            eraStakerOtherList.push(...pagedExposure.others);
+          });
+          sortedNominators = eraStakerOtherList.sort((a, b) => {
+            return new BigN(b.value).minus(a.value).toNumber();
+          });
+        } else {
+          const _eraStaker = await substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress);
+          const eraStaker = _eraStaker.toPrimitive();
+          sortedNominators = eraStaker.others.sort((a, b) => {
+            return new BigN(b.value).minus(a.value).toNumber();
+          });
+        }
         const topNominators = sortedNominators.map(nominator => {
           return nominator.who;
         }).slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator);

package/services/earning-service/service.js

@@ -396,7 +396,6 @@ export default class EarningService {
   async removeYieldPositions(chains, addresses) {
     const removeKeys = [];
     chains && chains.length > 0 && Object.entries(this.yieldPositionSubject.getValue()).forEach(([key, value]) => {
-      console.log('removeYieldPositions', key, value.chain, chains.indexOf(value.chain) > -1);
       if (chains.indexOf(value.chain) > -1 && !removeKeys.includes(key)) {
         removeKeys.push(key);
       }

package/types/yield/info/pallet.d.ts

@@ -9,6 +9,10 @@ export interface PalletStakingExposureItem {
     who: string;
     value: number;
 }
+export interface SpStakingExposurePage {
+    pageTotal: number;
+    others: PalletStakingExposureItem[];
+}
 export interface PalletStakingExposure {
     total: number;
     own: number;