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

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/koni/background/handlers/State.js

@@ -32,7 +32,7 @@ import { SwapService } from '@subwallet/extension-base/services/swap-service';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
-import { isAccountAll, stripUrl, TARGET_ENV } from '@subwallet/extension-base/utils';
+import { isAccountAll, stripUrl, TARGET_ENV, wait } from '@subwallet/extension-base/utils';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { decodePair } from '@subwallet/keyring/pair/decode';
@@ -1204,17 +1204,34 @@ export default class KoniState {
       maxFeePerGas: autoFormatNumber(transactionParams.maxFeePerGas),
       data: transactionParams.data
     };
+    const getTransactionGas = async () => {
+      try {
+        transaction.gas = await web3.eth.estimateGas({
+          ...transaction
+        });
+      } catch (e) {
+        // @ts-ignore
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
+      }
+    };
 
     // Calculate transaction data
     try {
-      transaction.gas = await web3.eth.estimateGas({
-        ...transaction
-      });
+      await Promise.race([getTransactionGas(), wait(3000).then(async () => {
+        if (!transaction.gas) {
+          await this.chainService.initSingleApi(networkKey);
+          await getTransactionGas();
+        }
+      })]);
     } catch (e) {
       // @ts-ignore
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
     }
+    if (!transaction.gas) {
+      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS);
+    }
     let estimateGas;
 
     // TODO: Review, If not override, transaction maybe fail because fee too low

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.55-0",
+  "version": "1.1.57-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.57-0",
+    "@subwallet/extension-chains": "^1.1.57-0",
+    "@subwallet/extension-dapp": "^1.1.57-0",
+    "@subwallet/extension-inject": "^1.1.57-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.57-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/chain-service/index.d.ts

@@ -93,6 +93,7 @@ export declare class ChainService {
     autoEnableTokens(): Promise<void>;
     handleLatestData(): void;
     private initApis;
+    initSingleApi(slug: string): Promise<boolean>;
     private initApiForChain;
     private destroyApiForChain;
     enableChain(chainSlug: string): Promise<boolean>;

package/services/chain-service/index.js

@@ -609,6 +609,15 @@ export class ChainService {
       }
     }));
   }
+  async initSingleApi(slug) {
+    const chainInfoMap = this.getChainInfoMap();
+    const chainStateMap = this.getChainStateMap();
+    if (!chainStateMap[slug].active) {
+      return false;
+    }
+    await this.initApiForChain(chainInfoMap[slug]);
+    return true;
+  }
   async initApiForChain(chainInfo) {
     const {
       endpoint,

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/native-staking/relay-chain.js

@@ -44,13 +44,16 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     await defaultCallback();
     await substrateApi.isReady;
     const unsub = await ((_substrateApi$api$que = substrateApi.api.query.staking) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.currentEra(async _currentEra => {
-      var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
+      var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$cal, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
       if (cancel) {
         unsub();
         return;
       }
+      let maxNominations = ((_substrateApi$api$con = substrateApi.api.consts.staking) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.maxNominations) === null || _substrateApi$api$con2 === void 0 ? void 0 : _substrateApi$api$con2.toString()) || '16';
+      const _maxNominationsByNominationQuota = await ((_substrateApi$api$cal = substrateApi.api.call.stakingApi) === null || _substrateApi$api$cal === void 0 ? void 0 : _substrateApi$api$cal.nominationsQuota(0)); // todo: review param. Currently return constant for all param.
+      const maxNominationsByNominationQuota = _maxNominationsByNominationQuota === null || _maxNominationsByNominationQuota === void 0 ? void 0 : _maxNominationsByNominationQuota.toString();
+      maxNominations = maxNominationsByNominationQuota !== null && maxNominationsByNominationQuota !== void 0 ? maxNominationsByNominationQuota : maxNominations;
       const currentEra = _currentEra.toString();
-      const maxNominations = ((_substrateApi$api$con = substrateApi.api.consts.staking) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.maxNominations) === null || _substrateApi$api$con2 === void 0 ? void 0 : _substrateApi$api$con2.toString()) || '16'; // TODO
       const maxUnlockingChunks = substrateApi.api.consts.staking.maxUnlockingChunks.toString();
       const unlockingEras = substrateApi.api.consts.staking.bondingDuration.toString();
       const maxSupportedEras = substrateApi.api.consts.staking.historyDepth.toString();
@@ -139,9 +142,20 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       const validatorList = nominations.targets;
       await Promise.all(validatorList.map(async validatorAddress => {
         let nominationStatus = EarningStatus.NOT_EARNING;
-        const [[identity], _eraStaker] = await Promise.all([parseIdentity(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
-        const eraStaker = _eraStaker.toPrimitive();
-        const sortedNominators = eraStaker.others.sort((a, b) => {
+        let eraStakerOtherList = [];
+        let identity;
+        if (['kusama', 'polkadot', 'westend'].includes(this.chain)) {
+          // todo: review all relaychains later
+          const [[_identity], _eraStaker] = await Promise.all([parseIdentity(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress)]);
+          identity = _identity;
+          eraStakerOtherList = _eraStaker.flatMap(paged => paged[1].toPrimitive().others);
+        } else {
+          const [[_identity], _eraStaker] = await Promise.all([parseIdentity(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
+          identity = _identity;
+          const eraStaker = _eraStaker.toPrimitive();
+          eraStakerOtherList = eraStaker.others;
+        }
+        const sortedNominators = eraStakerOtherList.sort((a, b) => {
           return new BigN(b.value).minus(a.value).toNumber();
         });
         const topNominators = sortedNominators.map(nominator => {
@@ -283,7 +297,14 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     const maxEraRewardPointsEras = MaxEraRewardPointsEras;
     const endEraForPoints = parseInt(activeEra) - 1;
     let startEraForPoints = endEraForPoints - maxEraRewardPointsEras + 1;
-    const [_totalEraStake, _eraStakers, _minBond, _stakingRewards, _validators, ..._eraRewardPoints] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond(), ((_chainApi$api$query$s = chainApi.api.query.stakingRewards) === null || _chainApi$api$query$s === void 0 ? void 0 : _chainApi$api$query$s.data) && chainApi.api.query.stakingRewards.data(), chainApi.api.query.staking.validators.entries(), chainApi.api.query.staking.erasRewardPoints.multi([...Array(maxEraRewardPointsEras).keys()].map(i => i + startEraForPoints))]);
+    let _eraStakersPromise;
+    if (['kusama', 'polkadot', 'westend'].includes(this.chain)) {
+      // todo: review all relaychains later
+      _eraStakersPromise = chainApi.api.query.staking.erasStakersOverview.entries(parseInt(currentEra));
+    } else {
+      _eraStakersPromise = chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra));
+    }
+    const [_totalEraStake, _eraStakers, _minBond, _stakingRewards, _validators, ..._eraRewardPoints] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), _eraStakersPromise, chainApi.api.query.staking.minNominatorBond(), ((_chainApi$api$query$s = chainApi.api.query.stakingRewards) === null || _chainApi$api$query$s === void 0 ? void 0 : _chainApi$api$query$s.data) && chainApi.api.query.stakingRewards.data(), chainApi.api.query.staking.validators.entries(), chainApi.api.query.staking.erasRewardPoints.multi([...Array(maxEraRewardPointsEras).keys()].map(i => i + startEraForPoints))]);
     const eraRewardMap = {};
     for (const item of _eraRewardPoints[0]) {
       eraRewardMap[startEraForPoints] = item.toHuman();
@@ -309,11 +330,11 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;
     const maxNominatorRewarded = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
     const bnTotalEraStake = new BN(_totalEraStake.toString());
-    const eraStakers = _eraStakers;
     const rawMinBond = _minBond.toHuman();
     const minBond = rawMinBond.replaceAll(',', '');
     const totalStakeMap = {};
     const bnDecimals = new BN((10 ** decimals).toString());
+    const eraStakers = _eraStakers;
     for (const item of eraStakers) {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
       const rawValidatorInfo = item[0].toHuman();

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

@@ -158,9 +158,17 @@ 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) => {
+        let eraStakerOtherList = [];
+        if (['kusama', 'polkadot', 'westend'].includes(this.chain)) {
+          // todo: review all relaychains later
+          const _eraStaker = await substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress);
+          eraStakerOtherList = _eraStaker.flatMap(paged => paged[1].toPrimitive().others);
+        } else {
+          const _eraStaker = await substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress);
+          const eraStaker = _eraStaker.toPrimitive();
+          eraStakerOtherList = eraStaker.others;
+        }
+        const sortedNominators = eraStakerOtherList.sort((a, b) => {
           return new BigN(b.value).minus(a.value).toNumber();
         });
         const topNominators = sortedNominators.map(nominator => {

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/services/earning-service/utils/index.js

@@ -69,12 +69,12 @@ export async function parseIdentity(substrateApi, address, children) {
     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;
+      var _identityInfo$info, _identityInfo$info$di, _identityInfo$info2, _identityInfo$info2$w, _identityInfo$info3, _identityInfo$info3$r, _identityInfo$info4, _identityInfo$info4$t, _identityInfo$judgeme;
       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;
+      const isReasonable = ((_identityInfo$judgeme = identityInfo.judgements) === null || _identityInfo$judgeme === void 0 ? void 0 : _identityInfo$judgeme.length) > 0;
       if (displayName) {
         identity = isHex(displayName) ? hexToString(displayName) : displayName;
       } else {

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;

package/utils/fetchStaticCache.js

@@ -2,9 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import axios from 'axios';
+const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
+const branchName = process.env.BRANCH_NAME || 'koni-dev';
+const fetchTarget = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://static-cache.subwallet.app' : 'https://dev.sw-static-cache.pages.dev';
 export async function fetchStaticCache(slug, defaultData, timeout = 9000) {
   try {
-    const rs = await axios.get(`https://static-cache.subwallet.app/${slug}`, {
+    const rs = await axios.get(`${fetchTarget}/${slug}`, {
       timeout
     });
     return rs.data;