@subwallet/extension-base 1.1.55-0 → 1.1.57-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/koni/background/handlers/State.js

@@ -1227,17 +1227,34 @@ 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.EvmProviderError(_KoniTypes.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(), (0, _utils3.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.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
     }
+    if (!transaction.gas) {
+      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS);
+    }
     let estimateGas;
 
     // TODO: Review, If not override, transaction maybe fail because fee too low

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.57-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/chain-service/index.js

@@ -631,6 +631,15 @@ 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/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/native-staking/relay-chain.js

@@ -51,13 +51,16 @@ class RelayNativeStakingPoolHandler extends _base.default {
     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();
@@ -146,9 +149,20 @@ class RelayNativeStakingPoolHandler extends _base.default {
       const validatorList = nominations.targets;
       await Promise.all(validatorList.map(async validatorAddress => {
         let nominationStatus = _types.EarningStatus.NOT_EARNING;
-        const [[identity], _eraStaker] = await Promise.all([(0, _utils3.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([(0, _utils3.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([(0, _utils3.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 _bignumber.default(b.value).minus(a.value).toNumber();
         });
         const topNominators = sortedNominators.map(nominator => {
@@ -290,7 +304,14 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const maxEraRewardPointsEras = _constants2.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();
@@ -316,11 +337,11 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;
     const maxNominatorRewarded = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
     const bnTotalEraStake = new _util.BN(_totalEraStake.toString());
-    const eraStakers = _eraStakers;
     const rawMinBond = _minBond.toHuman();
     const minBond = rawMinBond.replaceAll(',', '');
     const totalStakeMap = {};
     const bnDecimals = new _util.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/cjs/services/earning-service/handlers/nomination-pool/index.js

@@ -166,9 +166,17 @@ 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) => {
+        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 _bignumber.default(b.value).minus(a.value).toNumber();
         });
         const topNominators = sortedNominators.map(nominator => {

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

@@ -81,12 +81,12 @@ 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 = (0, _util.isHex)(displayName) ? (0, _util.hexToString)(displayName) : displayName;
       } else {

package/cjs/utils/fetchStaticCache.js

@@ -9,10 +9,13 @@ var _axios = _interopRequireDefault(require("axios"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+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';
 async function fetchStaticCache(slug, defaultData) {
   let timeout = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 9000;
   try {
-    const rs = await _axios.default.get(`https://static-cache.subwallet.app/${slug}`, {
+    const rs = await _axios.default.get(`${fetchTarget}/${slug}`, {
       timeout
     });
     return rs.data;

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;
     /**