@subwallet/extension-base 1.1.53-0 → 1.1.53-beta.0

package/koni/background/handlers/Extension.js

@@ -3943,6 +3943,78 @@ export default class KoniExtension {
 
   /* Buy service */
 
+  /* Swap service */
+  async subscribeSwapPairs(id, port) {
+    const cb = createSubscription(id, port);
+    let ready = false;
+    await this.#koniState.swapService.waitForStarted();
+    const callback = rs => {
+      if (ready) {
+        cb(rs);
+      }
+    };
+    const subscription = this.#koniState.swapService.subscribeSwapPairs(callback);
+    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    ready = true;
+    return this.#koniState.swapService.getSwapPairs();
+  }
+  async handleSwapRequest(request) {
+    return this.#koniState.swapService.handleSwapRequest(request);
+  }
+  async getLatestSwapQuote(swapRequest) {
+    return this.#koniState.swapService.getLatestQuotes(swapRequest);
+  }
+  async validateSwapProcess(params) {
+    return this.#koniState.swapService.validateSwapProcess(params);
+  }
+  async handleSwapStep(inputData) {
+    const {
+      address,
+      process,
+      quote,
+      recipient
+    } = inputData;
+    if (!quote || !address || !process) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const isLastStep = inputData.currentStep + 1 === process.steps.length;
+    const swapValidations = await this.#koniState.swapService.validateSwapProcess({
+      address,
+      process,
+      selectedQuote: quote,
+      recipient
+    });
+    if (swapValidations.length > 0) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors(swapValidations);
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const {
+      chainType,
+      extrinsic,
+      extrinsicType,
+      transferNativeAmount,
+      txChain,
+      txData
+    } = await this.#koniState.swapService.handleSwapProcess(inputData);
+    return await this.#koniState.transactionService.handleTransaction({
+      address,
+      chain: txChain,
+      transaction: extrinsic,
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+      data: txData,
+      extrinsicType,
+      // change this depends on step
+      chainType,
+      resolveOnDone: !isLastStep,
+      transferNativeAmount
+    });
+  }
+  /* Swap service */
+
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
@@ -4472,6 +4544,19 @@ export default class KoniExtension {
       case 'pri(database.exportJson)':
         return this.#koniState.dbService.getExportJson();
       /* Database */
+
+      /* Swap service */
+      case 'pri(swapService.subscribePairs)':
+        return this.subscribeSwapPairs(id, port);
+      case 'pri(swapService.handleSwapRequest)':
+        return this.handleSwapRequest(request);
+      case 'pri(swapService.getLatestQuote)':
+        return this.getLatestSwapQuote(request);
+      case 'pri(swapService.validateSwapProcess)':
+        return this.validateSwapProcess(request);
+      case 'pri(swapService.handleSwapStep)':
+        return this.handleSwapStep(request);
+      /* Swap service */
       // Default
       default:
         throw new Error(`Unable to handle message of type ${type}`);

package/koni/background/handlers/State.d.ts

@@ -21,6 +21,7 @@ import { AuthUrls, MetaRequest, SignRequest } from '@subwallet/extension-base/se
 import SettingService from '@subwallet/extension-base/services/setting-service/SettingService';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
+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 { BalanceMap, EvmFeeInfo } from '@subwallet/extension-base/types';
@@ -71,6 +72,7 @@ export default class KoniState {
     readonly buyService: BuyService;
     readonly earningService: EarningService;
     readonly feeService: FeeService;
+    readonly swapService: SwapService;
     private generalStatus;
     private waitSleeping;
     private waitStarting;

package/koni/background/handlers/State.js

@@ -28,10 +28,11 @@ import SettingService from '@subwallet/extension-base/services/setting-service/S
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
 import { SUBSCAN_API_CHAIN_MAP } from '@subwallet/extension-base/services/subscan-service/subscan-chain-map';
+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';
@@ -104,6 +105,7 @@ export default class KoniState {
     this.transactionService = new TransactionService(this);
     this.earningService = new EarningService(this);
     this.feeService = new FeeService(this);
+    this.swapService = new SwapService(this);
     this.subscription = new KoniSubscription(this, this.dbService);
     this.cron = new KoniCron(this, this.subscription, this.dbService);
     this.logger = createLogger('State');
@@ -226,6 +228,7 @@ export default class KoniState {
     this.eventService.emit('chain.ready', true);
     await this.balanceService.init();
     await this.earningService.init();
+    await this.swapService.init();
     this.onReady();
     this.onAccountAdd();
     this.onAccountRemove();
@@ -1201,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
@@ -1396,7 +1416,7 @@ export default class KoniState {
     // Stopping services
     await Promise.all([this.cron.stop(), this.subscription.stop()]);
     await this.pauseAllNetworks(undefined, 'IDLE mode');
-    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.earningService.stop()]);
+    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.earningService.stop(), this.swapService.stop()]);
 
     // Complete sleeping
     sleeping.resolve();
@@ -1428,7 +1448,7 @@ export default class KoniState {
     }
 
     // Start services
-    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.balanceService.start(), this.earningService.start()]);
+    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.balanceService.start(), this.earningService.start(), this.swapService.start()]);
 
     // Complete starting
     starting.resolve();

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.53-0",
+  "version": "1.1.53-beta.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",
@@ -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,10 +1846,12 @@
     "@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": "^1.2.1",
     "@json-rpc-tools/utils": "^1.7.6",
     "@metamask/safe-event-emitter": "^2.0.0",
     "@metaverse-network-sdk/type-definitions": "^0.0.1-13",
@@ -1816,7 +1873,7 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.54",
+    "@subwallet/chain-list": "0.2.55-beta.3",
     "@subwallet/extension-base": "^1.1.53-0",
     "@subwallet/extension-chains": "^1.1.53-0",
     "@subwallet/extension-dapp": "^1.1.53-0",
@@ -1857,4 +1914,4 @@
     "web3-eth-contract": "^1.10.0",
     "web3-utils": "^1.10.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

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>;
@@ -90,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

@@ -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) {
@@ -594,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/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;

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;

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-beta.3';
 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/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/relay-chain.js

@@ -3,10 +3,10 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BasicTxErrorType, ExtrinsicType, StakingTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
-import { calculateAlephZeroValidatorReturn, calculateChainStakedReturnV2, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getAvgValidatorEraReward, getCommission, getMaxValidatorErrorMessage, getMinStakeErrorMessage, getSupportedDaysByHistoryDepth } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { calculateAlephZeroValidatorReturn, calculateChainStakedReturnV2, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getAvgValidatorEraReward, getCommission, getMaxValidatorErrorMessage, getMinStakeErrorMessage, getSupportedDaysByHistoryDepth, getTopValidatorByPoints, getValidatorPointsMap } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
-import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
+import { _STAKING_CHAIN_GROUP, MaxEraRewardPointsEras } 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';
 import { balanceFormatter, formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
@@ -274,11 +274,23 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     if (!poolInfo || !poolInfo.statistic) {
       return Promise.reject(new TransactionError(BasicTxErrorType.INTERNAL_ERROR));
     }
-    const _era = await chainApi.api.query.staking.currentEra();
+    const [_era, _activeEraInfo] = await Promise.all([chainApi.api.query.staking.currentEra(), chainApi.api.query.staking.activeEra()]);
     const currentEra = _era.toString();
+    const activeEraInfo = _activeEraInfo.toPrimitive();
+    const activeEra = activeEraInfo.index;
     const allValidators = [];
     const validatorInfoList = [];
-    const [_totalEraStake, _eraStakers, _minBond, _stakingRewards, _validators] = 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()]);
+    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))]);
+    const eraRewardMap = {};
+    for (const item of _eraRewardPoints[0]) {
+      eraRewardMap[startEraForPoints] = item.toHuman();
+      startEraForPoints++;
+    }
+    const validatorPointsMap = getValidatorPointsMap(eraRewardMap);
+    const topValidatorList = getTopValidatorByPoints(validatorPointsMap);
 
     // filter blocked validators
     const validators = _validators;
@@ -309,6 +321,11 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       const rawValidatorStat = item[1].toHuman();
       const validatorAddress = rawValidatorInfo[1];
       if (!blockValidatorList.includes(validatorAddress)) {
+        var _validatorPointsMap$v;
+        let isTopQuartile = false;
+        if (topValidatorList.includes(validatorAddress)) {
+          isTopQuartile = true;
+        }
         const rawTotalStake = rawValidatorStat.total;
         const rawOwnStake = rawValidatorStat.own;
         const bnTotalStake = new BN(rawTotalStake.replaceAll(',', ''));
@@ -333,7 +350,9 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
           blocked: false,
           isVerified: false,
           minBond,
-          isCrowded: unlimitedNominatorRewarded ? false : nominatorCount > parseInt(maxNominatorRewarded)
+          isCrowded: unlimitedNominatorRewarded ? false : nominatorCount > parseInt(maxNominatorRewarded),
+          eraRewardPoint: ((_validatorPointsMap$v = validatorPointsMap[validatorAddress]) !== null && _validatorPointsMap$v !== void 0 ? _validatorPointsMap$v : BN_ZERO).toString(),
+          topQuartile: isTopQuartile
         });
       }
     }

package/services/event-service/types.d.ts

@@ -38,6 +38,7 @@ export interface EventRegistry {
     'buy.tokens.ready': [boolean];
     'buy.services.ready': [boolean];
     'earning.ready': [boolean];
+    'swap.ready': [boolean];
 }
 export declare type EventType = keyof EventRegistry;
 export declare const COMMON_RELOAD_EVENTS: EventType[];