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

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.54-0",
+  "version": "1.1.56-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -44,6 +44,11 @@
       "require": "./cjs/background/errors/ProviderError.js",
       "default": "./background/errors/ProviderError.js"
     },
+    "./background/errors/SwapError": {
+      "types": "./background/errors/SwapError.d.ts",
+      "require": "./cjs/background/errors/SwapError.js",
+      "default": "./background/errors/SwapError.js"
+    },
     "./background/errors/SWError": {
       "types": "./background/errors/SWError.d.ts",
       "require": "./cjs/background/errors/SWError.js",
@@ -199,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",
@@ -249,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",
@@ -1355,6 +1360,31 @@
       "require": "./cjs/services/subscan-service/types.js",
       "default": "./services/subscan-service/types.js"
     },
+    "./services/swap-service": {
+      "types": "./services/swap-service/index.d.ts",
+      "require": "./cjs/services/swap-service/index.js",
+      "default": "./services/swap-service/index.js"
+    },
+    "./services/swap-service/handler/base-handler": {
+      "types": "./services/swap-service/handler/base-handler.d.ts",
+      "require": "./cjs/services/swap-service/handler/base-handler.js",
+      "default": "./services/swap-service/handler/base-handler.js"
+    },
+    "./services/swap-service/handler/chainflip-handler": {
+      "types": "./services/swap-service/handler/chainflip-handler.d.ts",
+      "require": "./cjs/services/swap-service/handler/chainflip-handler.js",
+      "default": "./services/swap-service/handler/chainflip-handler.js"
+    },
+    "./services/swap-service/handler/hydradx-handler": {
+      "types": "./services/swap-service/handler/hydradx-handler.d.ts",
+      "require": "./cjs/services/swap-service/handler/hydradx-handler.js",
+      "default": "./services/swap-service/handler/hydradx-handler.js"
+    },
+    "./services/swap-service/utils": {
+      "types": "./services/swap-service/utils.d.ts",
+      "require": "./cjs/services/swap-service/utils.js",
+      "default": "./services/swap-service/utils.js"
+    },
     "./services/transaction-service": {
       "types": "./services/transaction-service/index.d.ts",
       "require": "./cjs/services/transaction-service/index.js",
@@ -1560,11 +1590,31 @@
       "require": "./cjs/types/fee/index.js",
       "default": "./types/fee/index.js"
     },
+    "./types/fee/evm": {
+      "types": "./types/fee/evm.d.ts",
+      "require": "./cjs/types/fee/evm.js",
+      "default": "./types/fee/evm.js"
+    },
+    "./types/fee/fee": {
+      "types": "./types/fee/fee.d.ts",
+      "require": "./cjs/types/fee/fee.js",
+      "default": "./types/fee/fee.js"
+    },
     "./types/ordinal": {
       "types": "./types/ordinal.d.ts",
       "require": "./cjs/types/ordinal.js",
       "default": "./types/ordinal.js"
     },
+    "./types/service-base": {
+      "types": "./types/service-base.d.ts",
+      "require": "./cjs/types/service-base.js",
+      "default": "./types/service-base.js"
+    },
+    "./types/swap": {
+      "types": "./types/swap/index.d.ts",
+      "require": "./cjs/types/swap/index.js",
+      "default": "./types/swap/index.js"
+    },
     "./types/transaction": {
       "types": "./types/transaction.d.ts",
       "require": "./cjs/types/transaction.js",
@@ -1781,6 +1831,11 @@
     "./utils/staticData/crowdloanFunds.json": "./utils/staticData/crowdloanFunds.json",
     "./utils/staticData/marketingCampaigns.json": "./utils/staticData/marketingCampaigns.json",
     "./utils/staticData/termAndCondition.json": "./utils/staticData/termAndCondition.json",
+    "./utils/swap": {
+      "types": "./utils/swap.d.ts",
+      "require": "./cjs/utils/swap.js",
+      "default": "./utils/swap.js"
+    },
     "./utils/translate": {
       "types": "./utils/translate.d.ts",
       "require": "./cjs/utils/translate.js",
@@ -1791,38 +1846,40 @@
     "@acala-network/api": "^5.0.2",
     "@apollo/client": "^3.7.14",
     "@azns/resolver-core": "^1.4.0",
+    "@chainflip/sdk": "^1.3.0",
     "@equilab/api": "~1.14.25",
     "@ethereumjs/common": "^4.1.0",
     "@ethereumjs/tx": "^5.1.0",
     "@ethersproject/abi": "^5.7.0",
+    "@galacticcouncil/sdk": "^2.1.0",
     "@json-rpc-tools/utils": "^1.7.6",
     "@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.54",
-    "@subwallet/extension-base": "^1.1.54-0",
-    "@subwallet/extension-chains": "^1.1.54-0",
-    "@subwallet/extension-dapp": "^1.1.54-0",
-    "@subwallet/extension-inject": "^1.1.54-0",
-    "@subwallet/keyring": "^0.1.3",
-    "@subwallet/ui-keyring": "^0.1.3",
+    "@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",
     "@walletconnect/types": "^2.8.4",
     "@walletconnect/utils": "^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.54-0'
+  version: '1.1.56-0'
 };

package/services/balance-service/index.js

@@ -185,7 +185,8 @@ export class BalanceService {
       const chainInfoMap = this.state.chainService.getChainInfoMap();
       const evmApiMap = this.state.chainService.getEvmApiMap();
       const substrateApiMap = this.state.chainService.getSubstrateApiMap();
-      const unsub = subscribeBalance([address], [chain], [tSlug], assetMap, chainInfoMap, substrateApiMap, evmApiMap, result => {
+      let unsub = noop;
+      unsub = subscribeBalance([address], [chain], [tSlug], assetMap, chainInfoMap, substrateApiMap, evmApiMap, result => {
         const rs = result[0];
         if (rs.tokenSlug === tSlug) {
           hasError = false;
@@ -197,15 +198,17 @@ export class BalanceService {
           if (callback) {
             callback(balance);
           } else {
+            var _unsub;
             // Auto unsubscribe if no callback
-            unsub();
+            (_unsub = unsub) === null || _unsub === void 0 ? void 0 : _unsub();
           }
           resolve([unsub, balance]);
         }
       });
       setTimeout(() => {
         if (hasError) {
-          unsub();
+          var _unsub2;
+          (_unsub2 = unsub) === null || _unsub2 === void 0 ? void 0 : _unsub2();
           reject(new Error(t('Failed to get balance. Please check your internet connection or change your network endpoint')));
         }
       }, 9999);

package/services/base/types.d.ts

@@ -1,3 +1,4 @@
+import { OptimalProcessParams, OptimalProcessResult } from '@subwallet/extension-base/types/service-base';
 import { PromiseHandler } from '@subwallet/extension-base/utils/promise';
 export declare enum ServiceStatus {
     NOT_INITIALIZED = "not_initialized",
@@ -32,3 +33,6 @@ export interface CronServiceInterface {
     startCron: () => Promise<void>;
     stopCron: () => Promise<void>;
 }
+export interface ServiceWithProcessInterface {
+    generateOptimalProcess(params: OptimalProcessParams): Promise<OptimalProcessResult>;
+}

package/services/chain-service/constants.js

@@ -28,7 +28,7 @@ export const _BALANCE_CHAIN_GROUP = {
   kintsugi: ['kintsugi', 'interlay', 'kintsugi_test', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
-  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude', 'continuum_network'],
+  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'hydradx_rococo', 'pendulum', 'amplitude', 'continuum_network'],
   statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
@@ -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

@@ -23,6 +23,7 @@ export declare class ChainService {
     private assetRegistrySubject;
     private multiChainAssetMapSubject;
     private xcmRefMapSubject;
+    private swapRefMapSubject;
     private assetLogoMapSubject;
     private chainLogoMapSubject;
     private assetMapPatch;
@@ -31,7 +32,9 @@ export declare class ChainService {
     private assetSettingSubject;
     private logger;
     constructor(dbService: DatabaseService, eventService: EventService);
+    subscribeSwapRefMap(): Subject<Record<string, _AssetRef>>;
     get xcmRefMap(): Record<string, _AssetRef>;
+    get swapRefMap(): Record<string, _AssetRef>;
     getEvmApi(slug: string): import("./handler/EvmApi").EvmApi;
     getEvmApiMap(): Record<string, import("./handler/EvmApi").EvmApi>;
     getSubstrateApiMap(): Record<string, import("./handler/SubstrateApi").SubstrateApi>;
@@ -139,4 +142,5 @@ export declare class ChainService {
     getMetadataByHash(hash: string): import("dexie").PromiseExtended<IMetadataItem | undefined>;
     getSubscanChainMap(reverse?: boolean): Record<string, string>;
     get detectBalanceChainSlugMap(): Record<string, string>;
+    getFeeTokensByChain(chainSlug: string): string[];
 }

package/services/chain-service/index.js

@@ -9,7 +9,7 @@ import { MantaPrivateHandler } from '@subwallet/extension-base/services/chain-se
 import { SubstrateChainHandler } from '@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _ChainConnectionStatus, _CUSTOM_PREFIX, _NFT_CONTRACT_STANDARDS, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
-import { _isAssetAutoEnable, _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, fetchPatchData, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
+import { _isAssetAutoEnable, _isAssetCanPayTxFee, _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, fetchPatchData, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import AssetSettingStore from '@subwallet/extension-base/stores/AssetSetting';
 import { addLazy, fetchStaticData, filterAssetsByChainAndType, MODULE_SUPPORT } from '@subwallet/extension-base/utils';
 import { BehaviorSubject, Subject } from 'rxjs';
@@ -35,6 +35,7 @@ export class ChainService {
   assetRegistrySubject = new Subject();
   multiChainAssetMapSubject = new Subject();
   xcmRefMapSubject = new Subject();
+  swapRefMapSubject = new Subject();
   assetLogoMapSubject = new BehaviorSubject(AssetLogoMap);
   chainLogoMapSubject = new BehaviorSubject(ChainLogoMap);
   assetMapPatch = JSON.stringify({});
@@ -50,6 +51,7 @@ export class ChainService {
     this.chainStateMapSubject.next(this.dataMap.chainStateMap);
     this.assetRegistrySubject.next(this.dataMap.assetRegistry);
     this.xcmRefMapSubject.next(this.xcmRefMap);
+    this.swapRefMapSubject.next(this.swapRefMap);
     if (MODULE_SUPPORT.MANTA_ZK) {
       console.log('Init Manta ZK');
       this.mantaChainHandler = new MantaPrivateHandler(dbService);
@@ -58,6 +60,9 @@ export class ChainService {
     this.evmChainHandler = new EvmChainHandler(this);
     this.logger = createLogger('chain-service');
   }
+  subscribeSwapRefMap() {
+    return this.swapRefMapSubject;
+  }
 
   // Getter
   get xcmRefMap() {
@@ -69,6 +74,15 @@ export class ChainService {
     });
     return result;
   }
+  get swapRefMap() {
+    const result = {};
+    Object.entries(this.dataMap.assetRefMap).forEach(([key, assetRef]) => {
+      if (assetRef.path === _AssetRefPath.SWAP) {
+        result[key] = assetRef;
+      }
+    });
+    return result;
+  }
   getEvmApi(slug) {
     return this.evmChainHandler.getEvmApiByChain(slug);
   }
@@ -481,6 +495,7 @@ export class ChainService {
     });
     this.dataMap.assetRefMap = updatedAssetRefMap;
     this.xcmRefMapSubject.next(this.xcmRefMap);
+    this.swapRefMapSubject.next(this.swapRefMap);
     this.logger.log('Finished updating latest asset ref');
   }
   handleLatestPriceId(latestPriceIds) {
@@ -1610,4 +1625,9 @@ export class ChainService {
     }
     return result;
   }
+  getFeeTokensByChain(chainSlug) {
+    return Object.values(this.getAssetRegistry()).filter(chainAsset => {
+      return chainAsset.originChain === chainSlug && (chainAsset.assetType === _AssetType.NATIVE || _isAssetCanPayTxFee(chainAsset));
+    }).map(chainAsset => chainAsset.slug);
+  }
 }

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

@@ -51,14 +51,15 @@ export declare function _isSubstrateRelayChain(chainInfo: _ChainInfo): boolean;
 export declare function _isSubstrateParaChain(chainInfo: _ChainInfo): boolean;
 export declare function _getEvmAbiExplorer(chainInfo: _ChainInfo): string;
 export declare function _isAssetValuable(assetInfo: _ChainAsset): boolean;
-export declare function _getMultiChainAsset(assetInfo: _ChainAsset): string;
-export declare function _getAssetPriceId(assetInfo: _ChainAsset): string;
+export declare function _getMultiChainAsset(assetInfo?: _ChainAsset): string;
+export declare function _getAssetPriceId(assetInfo?: _ChainAsset): string;
+export declare function _getAssetName(assetInfo?: _ChainAsset): string;
 export declare function _getMultiChainAssetPriceId(multiChainAsset: _MultiChainAsset): string;
-export declare function _getAssetSymbol(assetInfo: _ChainAsset): string;
+export declare function _getAssetSymbol(assetInfo?: _ChainAsset): string;
 export declare function _getMultiChainAssetSymbol(multiChainAsset: _MultiChainAsset): string;
-export declare function _getAssetOriginChain(assetInfo: _ChainAsset): string;
+export declare function _getAssetOriginChain(assetInfo?: _ChainAsset): string;
 export declare function _getChainName(chainInfo: _ChainInfo): string;
-export declare function _getAssetDecimals(assetInfo: _ChainAsset): number;
+export declare function _getAssetDecimals(assetInfo?: _ChainAsset): number;
 export declare function _getBlockExplorerFromChain(chainInfo: _ChainInfo): string | undefined;
 export declare function _parseMetadataForSmartContractAsset(contractAddress: string): Record<string, string>;
 export declare function _isChainTestNet(chainInfo: _ChainInfo): boolean;
@@ -74,6 +75,7 @@ export declare function randomizeProvider(providers: Record<string, string>, exc
     providerKey: string;
     providerValue: string;
 };
+export declare function _isAssetCanPayTxFee(chainAsset: _ChainAsset): boolean;
 export declare function updateLatestChainInfo(currentDataMap: _DataMap, latestChainInfoList: _ChainInfo[]): {
     storedChainInfoList: IChain[];
     needUpdateChainApiList: _ChainInfo[];

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

@@ -280,6 +280,9 @@ export function _getMultiChainAsset(assetInfo) {
 export function _getAssetPriceId(assetInfo) {
   return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.priceId) || '';
 }
+export function _getAssetName(assetInfo) {
+  return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.name) || '';
+}
 export function _getMultiChainAssetPriceId(multiChainAsset) {
   return (multiChainAsset === null || multiChainAsset === void 0 ? void 0 : multiChainAsset.priceId) || '';
 }
@@ -290,13 +293,13 @@ export function _getMultiChainAssetSymbol(multiChainAsset) {
   return multiChainAsset.symbol;
 }
 export function _getAssetOriginChain(assetInfo) {
-  return assetInfo.originChain;
+  return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.originChain) || '';
 }
 export function _getChainName(chainInfo) {
   return chainInfo.name;
 }
 export function _getAssetDecimals(assetInfo) {
-  return assetInfo.decimals || 0;
+  return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.decimals) || 0;
 }
 export function _getBlockExplorerFromChain(chainInfo) {
   let blockExplorer;
@@ -395,6 +398,10 @@ export function randomizeProvider(providers, excludedKeys) {
     providerValue: selectedProviderValue
   };
 }
+export function _isAssetCanPayTxFee(chainAsset) {
+  var _ref, _chainAsset$metadata;
+  return (_ref = (_chainAsset$metadata = chainAsset.metadata) === null || _chainAsset$metadata === void 0 ? void 0 : _chainAsset$metadata.canPayTxFee) !== null && _ref !== void 0 ? _ref : false;
+}
 export function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
   const currentChainInfoMap = currentDataMap.chainInfoMap;
   const currentChainStateMap = currentDataMap.chainStateMap;

package/services/chain-service/utils/patch.js

@@ -5,7 +5,7 @@ import fetch from 'cross-fetch';
 const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
-const ChainListVersion = '0.2.54';
+const ChainListVersion = '0.2.55';
 export async function fetchPatchData(slug) {
   try {
     const fetchPromise = fetch(`${fetchDomain}/patch/${ChainListVersion}/${slug}`);

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

@@ -13,6 +13,7 @@ export declare const _STAKING_CHAIN_GROUP: {
     krest_network: string[];
     manta: string[];
 };
+export declare const MaxEraRewardPointsEras = 14;
 export declare const ST_LIQUID_TOKEN_ABI: Record<string, any>;
 export declare const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;
 export declare const MANTA_MIN_DELEGATION = 500;

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

@@ -18,6 +18,7 @@ export const _STAKING_CHAIN_GROUP = {
   krest_network: ['krest_network'],
   manta: ['manta_network']
 };
+export const MaxEraRewardPointsEras = 14;
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 export const ST_LIQUID_TOKEN_ABI = require("./abis/st_liquid_token_abi.json");

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/astar.js

@@ -242,11 +242,12 @@ export default class AstarNativeStakingPoolHandler extends BaseParaNativeStaking
     };
   }
   async subscribePoolPosition(useAddresses, resultCallback) {
+    var _substrateApi$api$que;
     let cancel = false;
     const substrateApi = await this.substrateApi.isReady;
     const defaultInfo = this.baseInfo;
     const chainInfo = this.chainInfo;
-    const unsub = await substrateApi.api.query.dappsStaking.ledger.multi(useAddresses, async ledgers => {
+    const unsub = await ((_substrateApi$api$que = substrateApi.api.query.dappsStaking) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.ledger.multi(useAddresses, async ledgers => {
       if (cancel) {
         unsub();
         return;
@@ -280,10 +281,10 @@ export default class AstarNativeStakingPoolHandler extends BaseParaNativeStaking
           }
         }));
       }
-    });
+    }));
     return () => {
       cancel = true;
-      unsub();
+      unsub && unsub();
     };
   }
 

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
           }