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

package/background/KoniTypes.d.ts

@@ -8,7 +8,6 @@ import { CrowdloanContributionsResponse } from '@subwallet/extension-base/servic
 import { SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
 import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
 import { BalanceJson, BuyServiceInfo, BuyTokenInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, RequestGetYieldPoolTargets, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseEarlyValidateYield, ResponseGetYieldPoolTargets, SubmitYieldStepData, TokenApproveData, UnlockDotTransactionNft, UnstakingStatus, ValidateYieldProcessParams, YieldPoolInfo, YieldPositionInfo, YieldValidationStatus } from '@subwallet/extension-base/types';
-import { SwapErrorType, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapTxData, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
 import { InjectedAccount, InjectedAccountWithMeta, MetadataDefBase } from '@subwallet/extension-inject/types';
 import { KeyringPair$Json, KeyringPair$Meta } from '@subwallet/keyring/types';
 import { KeyringOptions } from '@subwallet/ui-keyring/options/types';
@@ -387,7 +386,6 @@ export declare enum ExtrinsicType {
     UNSTAKE_STDOT = "earn.unstake_stdot",
     UNSTAKE_VMANTA = "earn.unstake_vmanta",
     TOKEN_APPROVE = "evm.token_approve",
-    SWAP = "swap",
     EVM_EXECUTE = "evm.execute",
     UNKNOWN = "unknown"
 }
@@ -429,7 +427,6 @@ export interface ExtrinsicDataTypeMap {
     [ExtrinsicType.TOKEN_APPROVE]: TokenApproveData;
     [ExtrinsicType.EVM_EXECUTE]: TransactionConfig;
     [ExtrinsicType.CROWDLOAN]: any;
-    [ExtrinsicType.SWAP]: SwapTxData;
     [ExtrinsicType.UNKNOWN]: any;
 }
 export declare enum ExtrinsicStatus {
@@ -573,7 +570,7 @@ export declare enum TransferTxErrorType {
     TRANSFER_ERROR = "TRANSFER_ERROR",
     RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT = "RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT"
 }
-export declare type TransactionErrorType = BasicTxErrorType | TransferTxErrorType | StakingTxErrorType | YieldValidationStatus | SwapErrorType;
+export declare type TransactionErrorType = BasicTxErrorType | TransferTxErrorType | StakingTxErrorType | YieldValidationStatus;
 export declare enum BasicTxWarningCode {
     NOT_ENOUGH_EXISTENTIAL_DEPOSIT = "notEnoughExistentialDeposit"
 }
@@ -1851,11 +1848,6 @@ export interface KoniRequestSignatures {
     'pri(database.export)': [null, string];
     'pri(database.import)': [string, boolean];
     'pri(database.exportJson)': [null, DexieExportJsonStructure];
-    'pri(swapService.subscribePairs)': [null, SwapPair[], SwapPair[]];
-    'pri(swapService.handleSwapRequest)': [SwapRequest, SwapRequestResult];
-    'pri(swapService.handleSwapStep)': [SwapSubmitParams, SWTransactionResponse];
-    'pri(swapService.getLatestQuote)': [SwapRequest, SwapQuoteResponse];
-    'pri(swapService.validateSwapProcess)': [ValidateSwapProcessParams, TransactionError[]];
 }
 export interface ApplicationMetadataType {
     version: string;

package/background/KoniTypes.js

@@ -95,7 +95,6 @@ export let ExtrinsicType;
   ExtrinsicType["UNSTAKE_STDOT"] = "earn.unstake_stdot";
   ExtrinsicType["UNSTAKE_VMANTA"] = "earn.unstake_vmanta";
   ExtrinsicType["TOKEN_APPROVE"] = "evm.token_approve";
-  ExtrinsicType["SWAP"] = "swap";
   ExtrinsicType["EVM_EXECUTE"] = "evm.execute";
   ExtrinsicType["UNKNOWN"] = "unknown";
 })(ExtrinsicType || (ExtrinsicType = {}));

package/background/errors/TransactionError.js

@@ -4,7 +4,6 @@
 import { SWError } from '@subwallet/extension-base/background/errors/SWError';
 import { BasicTxErrorType, StakingTxErrorType, TransferTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
 import { YieldValidationStatus } from '@subwallet/extension-base/types';
-import { SwapErrorType } from '@subwallet/extension-base/types/swap';
 import { detectTranslate } from '@subwallet/extension-base/utils';
 import { t } from 'i18next';
 
@@ -100,14 +99,6 @@ const defaultErrorMap = {
   [YieldValidationStatus.NOT_ENOUGH_MIN_JOIN_POOL]: {
     message: detectTranslate('Not enough min earning amount'),
     code: undefined
-  },
-  [SwapErrorType.QUOTE_TIMEOUT]: {
-    message: detectTranslate('Quote timeout'),
-    code: undefined
-  },
-  [SwapErrorType.INVALID_RECIPIENT]: {
-    message: detectTranslate('Invalid recipient'),
-    code: undefined
   }
 };
 export class TransactionError extends SWError {

package/cjs/background/KoniTypes.js

@@ -109,7 +109,6 @@ exports.ExtrinsicType = ExtrinsicType;
   ExtrinsicType["UNSTAKE_STDOT"] = "earn.unstake_stdot";
   ExtrinsicType["UNSTAKE_VMANTA"] = "earn.unstake_vmanta";
   ExtrinsicType["TOKEN_APPROVE"] = "evm.token_approve";
-  ExtrinsicType["SWAP"] = "swap";
   ExtrinsicType["EVM_EXECUTE"] = "evm.execute";
   ExtrinsicType["UNKNOWN"] = "unknown";
 })(ExtrinsicType || (exports.ExtrinsicType = ExtrinsicType = {}));

package/cjs/background/errors/TransactionError.js

@@ -7,7 +7,6 @@ exports.TransactionError = void 0;
 var _SWError = require("@subwallet/extension-base/background/errors/SWError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _types = require("@subwallet/extension-base/types");
-var _swap = require("@subwallet/extension-base/types/swap");
 var _utils = require("@subwallet/extension-base/utils");
 var _i18next = require("i18next");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -105,14 +104,6 @@ const defaultErrorMap = {
   [_types.YieldValidationStatus.NOT_ENOUGH_MIN_JOIN_POOL]: {
     message: (0, _utils.detectTranslate)('Not enough min earning amount'),
     code: undefined
-  },
-  [_swap.SwapErrorType.QUOTE_TIMEOUT]: {
-    message: (0, _utils.detectTranslate)('Quote timeout'),
-    code: undefined
-  },
-  [_swap.SwapErrorType.INVALID_RECIPIENT]: {
-    message: (0, _utils.detectTranslate)('Invalid recipient'),
-    code: undefined
   }
 };
 class TransactionError extends _SWError.SWError {

package/cjs/koni/api/staking/bonding/utils.js

@@ -24,9 +24,7 @@ exports.getParaCurrentInflation = getParaCurrentInflation;
 exports.getStakingAvailableActionsByChain = getStakingAvailableActionsByChain;
 exports.getStakingAvailableActionsByNominator = getStakingAvailableActionsByNominator;
 exports.getSupportedDaysByHistoryDepth = getSupportedDaysByHistoryDepth;
-exports.getTopValidatorByPoints = getTopValidatorByPoints;
 exports.getValidatorLabel = getValidatorLabel;
-exports.getValidatorPointsMap = getValidatorPointsMap;
 exports.getWithdrawalInfo = getWithdrawalInfo;
 exports.getYieldAvailableActionsByPosition = getYieldAvailableActionsByPosition;
 exports.getYieldAvailableActionsByType = getYieldAvailableActionsByType;
@@ -235,13 +233,13 @@ function getYieldAvailableActionsByPosition(yieldPosition, yieldPoolInfo, unclai
   const result = [];
   if ([_types.YieldPoolType.NATIVE_STAKING, _types.YieldPoolType.NOMINATION_POOL].includes(yieldPoolInfo.type)) {
     result.push(YieldAction.STAKE);
-    const bnActiveStake = new _bignumber.default(yieldPosition.activeStake);
-    if (yieldPosition.activeStake && bnActiveStake.gt('0')) {
+    const bnActiveStake = new _util.BN(yieldPosition.activeStake);
+    if (yieldPosition.activeStake && bnActiveStake.gt(_util.BN_ZERO)) {
       result.push(YieldAction.UNSTAKE);
       const isAstarNetwork = _constants2._STAKING_CHAIN_GROUP.astar.includes(yieldPosition.chain);
       const isAmplitudeNetwork = _constants2._STAKING_CHAIN_GROUP.amplitude.includes(yieldPosition.chain);
-      const bnUnclaimedReward = new _bignumber.default(unclaimedReward || '0');
-      if ((yieldPosition.type === _types.YieldPoolType.NOMINATION_POOL || isAmplitudeNetwork) && bnUnclaimedReward.gt('0') || isAstarNetwork) {
+      const bnUnclaimedReward = new _util.BN(unclaimedReward || '0');
+      if ((yieldPosition.type === _types.YieldPoolType.NOMINATION_POOL || isAmplitudeNetwork) && bnUnclaimedReward.gt(_util.BN_ZERO) || isAstarNetwork) {
         result.push(YieldAction.CLAIM_REWARD);
       }
     }
@@ -254,8 +252,8 @@ function getYieldAvailableActionsByPosition(yieldPosition, yieldPoolInfo, unclai
     }
   } else if (yieldPoolInfo.type === _types.YieldPoolType.LIQUID_STAKING) {
     result.push(YieldAction.START_EARNING);
-    const activeBalance = new _bignumber.default(yieldPosition.activeStake);
-    if (activeBalance.gt('0')) {
+    const activeBalance = new _util.BN(yieldPosition.activeStake || '0');
+    if (activeBalance.gt(_util.BN_ZERO)) {
       result.push(YieldAction.UNSTAKE);
     }
     const hasWithdrawal = yieldPosition.unstakings.some(unstakingInfo => unstakingInfo.status === _types.UnstakingStatus.CLAIMABLE);
@@ -389,33 +387,6 @@ function getSupportedDaysByHistoryDepth(erasPerDay, maxSupportedEras) {
     return 15;
   }
 }
-function getValidatorPointsMap(eraRewardMap) {
-  // mapping store validator and totalPoints
-  const validatorTotalPointsMap = {};
-  Object.values(eraRewardMap).forEach(info => {
-    const individual = info.individual;
-    Object.entries(individual).forEach(_ref => {
-      let [validator, rawPoints] = _ref;
-      const points = rawPoints.replaceAll(',', '');
-      if (!validatorTotalPointsMap[validator]) {
-        validatorTotalPointsMap[validator] = new _bignumber.default(points);
-      } else {
-        validatorTotalPointsMap[validator] = validatorTotalPointsMap[validator].plus(points);
-      }
-    });
-  });
-  return validatorTotalPointsMap;
-}
-function getTopValidatorByPoints(validatorPointsList) {
-  const sortValidatorPointsList = Object.fromEntries(Object.entries(validatorPointsList).sort((a, b) => a[1].minus(b[1]).toNumber()).reverse());
-
-  // keep 50% first validator
-  const entries = Object.entries(sortValidatorPointsList);
-  const endIndex = Math.ceil(entries.length / 2);
-  const top50PercentEntries = entries.slice(0, endIndex);
-  const top50PercentRecord = Object.fromEntries(top50PercentEntries);
-  return Object.keys(top50PercentRecord);
-}
 const getMinStakeErrorMessage = (chainInfo, bnMinStake) => {
   const tokenInfo = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
   const number = (0, _number.formatNumber)(bnMinStake.toString(), tokenInfo.decimals || 0, _number.balanceFormatter);

package/cjs/koni/background/handlers/Extension.js

@@ -4047,78 +4047,6 @@ class KoniExtension {
 
   /* Buy service */
 
-  /* Swap service */
-  async subscribeSwapPairs(id, port) {
-    const cb = (0, _subscriptions.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.TransactionError(_KoniTypes.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) {
@@ -4648,19 +4576,6 @@ 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/cjs/koni/background/handlers/State.js

@@ -32,7 +32,6 @@ var _SettingService = _interopRequireDefault(require("@subwallet/extension-base/
 var _DatabaseService = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/DatabaseService"));
 var _subscanService = require("@subwallet/extension-base/services/subscan-service");
 var _subscanChainMap = require("@subwallet/extension-base/services/subscan-service/subscan-chain-map");
-var _swapService = require("@subwallet/extension-base/services/swap-service");
 var _transactionService = _interopRequireDefault(require("@subwallet/extension-base/services/transaction-service"));
 var _walletConnectService = _interopRequireDefault(require("@subwallet/extension-base/services/wallet-connect-service"));
 var _AccountRef = _interopRequireDefault(require("@subwallet/extension-base/stores/AccountRef"));
@@ -112,7 +111,6 @@ class KoniState {
     this.transactionService = new _transactionService.default(this);
     this.earningService = new _service.default(this);
     this.feeService = new _service2.default(this);
-    this.swapService = new _swapService.SwapService(this);
     this.subscription = new _subscription.KoniSubscription(this, this.dbService);
     this.cron = new _cron.KoniCron(this, this.subscription, this.dbService);
     this.logger = (0, _util.logger)('State');
@@ -236,7 +234,6 @@ 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();
@@ -1227,34 +1224,17 @@ 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 {
-      await Promise.race([getTransactionGas(), (0, _utils3.wait)(3000).then(async () => {
-        if (!transaction.gas) {
-          await this.chainService.initSingleApi(networkKey);
-          await getTransactionGas();
-        }
-      })]);
+      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);
     }
-    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
@@ -1439,7 +1419,7 @@ 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(), this.swapService.stop()]);
+    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.earningService.stop()]);
 
     // Complete sleeping
     sleeping.resolve();
@@ -1472,7 +1452,7 @@ 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(), this.swapService.start()]);
+    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.balanceService.start(), this.earningService.start()]);
 
     // Complete starting
     starting.resolve();

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

package/cjs/services/balance-service/index.js

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

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

@@ -39,7 +39,7 @@ 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', 'hydradx_rococo', 'pendulum', 'amplitude', 'continuum_network'],
+  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', '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/cjs/services/chain-service/index.js

@@ -42,7 +42,6 @@ class ChainService {
   assetRegistrySubject = new _rxjs.Subject();
   multiChainAssetMapSubject = new _rxjs.Subject();
   xcmRefMapSubject = new _rxjs.Subject();
-  swapRefMapSubject = new _rxjs.Subject();
   assetLogoMapSubject = new _rxjs.BehaviorSubject(_chainList.AssetLogoMap);
   chainLogoMapSubject = new _rxjs.BehaviorSubject(_chainList.ChainLogoMap);
   assetMapPatch = JSON.stringify({});
@@ -58,7 +57,6 @@ 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 (_utils2.MODULE_SUPPORT.MANTA_ZK) {
       console.log('Init Manta ZK');
       this.mantaChainHandler = new _MantaPrivateHandler.MantaPrivateHandler(dbService);
@@ -67,9 +65,6 @@ class ChainService {
     this.evmChainHandler = new _EvmChainHandler.EvmChainHandler(this);
     this.logger = (0, _logger.logger)('chain-service');
   }
-  subscribeSwapRefMap() {
-    return this.swapRefMapSubject;
-  }
 
   // Getter
   get xcmRefMap() {
@@ -82,16 +77,6 @@ class ChainService {
     });
     return result;
   }
-  get swapRefMap() {
-    const result = {};
-    Object.entries(this.dataMap.assetRefMap).forEach(_ref2 => {
-      let [key, assetRef] = _ref2;
-      if (assetRef.path === _types._AssetRefPath.SWAP) {
-        result[key] = assetRef;
-      }
-    });
-    return result;
-  }
   getEvmApi(slug) {
     return this.evmChainHandler.getEvmApiByChain(slug);
   }
@@ -215,11 +200,11 @@ class ChainService {
     return this.getChainStatusMap()[key];
   }
   getActiveChains() {
-    return Object.entries(this.dataMap.chainStateMap).filter(_ref3 => {
-      let [, chainState] = _ref3;
+    return Object.entries(this.dataMap.chainStateMap).filter(_ref2 => {
+      let [, chainState] = _ref2;
       return (0, _utils._isChainEnabled)(chainState);
-    }).map(_ref4 => {
-      let [key] = _ref4;
+    }).map(_ref3 => {
+      let [key] = _ref3;
       return key;
     });
   }
@@ -379,8 +364,8 @@ class ChainService {
     (0, _utils2.addLazy)('updateChainConnectionStatus', () => {
       const chainStatusMap = this.getChainStatusMap();
       let update = false;
-      Object.entries(this.connectionStatusQueueMap).forEach(_ref5 => {
-        let [slug, status] = _ref5;
+      Object.entries(this.connectionStatusQueueMap).forEach(_ref4 => {
+        let [slug, status] = _ref4;
         if (chainStatusMap[slug]) {
           if (chainStatusMap[slug].connectionStatus !== status) {
             chainStatusMap[slug].connectionStatus = status;
@@ -512,13 +497,12 @@ 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) {
     let isUpdated = false;
-    Object.entries(latestPriceIds).forEach(_ref6 => {
-      let [slug, priceId] = _ref6;
+    Object.entries(latestPriceIds).forEach(_ref5 => {
+      let [slug, priceId] = _ref5;
       if (this.dataMap.assetRegistry[slug] && this.dataMap.assetRegistry[slug].priceId !== priceId) {
         isUpdated = true;
         this.dataMap.assetRegistry[slug].priceId = priceId;
@@ -597,8 +581,8 @@ class ChainService {
     }
   }
   handleLatestData() {
-    this.fetchLatestAssetData().then(_ref7 => {
-      let [latestAssetInfo, latestAssetLogoMap] = _ref7;
+    this.fetchLatestAssetData().then(_ref6 => {
+      let [latestAssetInfo, latestAssetLogoMap] = _ref6;
       this.eventService.waitAssetReady.then(() => {
         this.handleLatestAssetData(latestAssetInfo, latestAssetLogoMap);
       }).catch(console.error);
@@ -606,8 +590,8 @@ class ChainService {
     this.fetchLatestChainData().then(latestChainInfo => {
       this.handleLatestChainData(latestChainInfo);
     }).catch(console.error);
-    this.fetchLatestAssetRef().then(_ref8 => {
-      let [latestAssetRef, latestAssetRefMap] = _ref8;
+    this.fetchLatestAssetRef().then(_ref7 => {
+      let [latestAssetRef, latestAssetRefMap] = _ref7;
       this.handleLatestAssetRef(latestAssetRef, latestAssetRefMap);
     }).catch(console.error);
     this.fetchLatestPriceIdsData().then(latestPriceIds => {
@@ -617,12 +601,12 @@ class ChainService {
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
     const chainStateMap = this.getChainStateMap();
-    await Promise.all(Object.entries(chainInfoMap).filter(_ref9 => {
+    await Promise.all(Object.entries(chainInfoMap).filter(_ref8 => {
       var _chainStateMap$slug;
-      let [slug] = _ref9;
+      let [slug] = _ref8;
       return (_chainStateMap$slug = chainStateMap[slug]) === null || _chainStateMap$slug === void 0 ? void 0 : _chainStateMap$slug.active;
-    }).map(_ref10 => {
-      let [, chainInfo] = _ref10;
+    }).map(_ref9 => {
+      let [, chainInfo] = _ref9;
       try {
         return this.initApiForChain(chainInfo);
       } catch (e) {
@@ -631,15 +615,6 @@ 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,
@@ -974,8 +949,8 @@ class ChainService {
       }
 
       // Fill in the missing chainState and storageData (new chains never before seen)
-      Object.entries(mergedChainInfoMap).forEach(_ref11 => {
-        let [slug, chainInfo] = _ref11;
+      Object.entries(mergedChainInfoMap).forEach(_ref10 => {
+        let [slug, chainInfo] = _ref10;
         if (!(slug in this.dataMap.chainStateMap)) {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],

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

@@ -55,7 +55,6 @@ var _exportNames = {
   _isAssetValuable: true,
   _getMultiChainAsset: true,
   _getAssetPriceId: true,
-  _getAssetName: true,
   _getMultiChainAssetPriceId: true,
   _getAssetSymbol: true,
   _getMultiChainAssetSymbol: true,
@@ -79,7 +78,6 @@ var _exportNames = {
 exports._checkSmartContractSupportByChain = _checkSmartContractSupportByChain;
 exports._generateCustomProviderKey = _generateCustomProviderKey;
 exports._getAssetDecimals = _getAssetDecimals;
-exports._getAssetName = _getAssetName;
 exports._getAssetOriginChain = _getAssetOriginChain;
 exports._getAssetPriceId = _getAssetPriceId;
 exports._getAssetSymbol = _getAssetSymbol;
@@ -441,9 +439,6 @@ function _getMultiChainAsset(assetInfo) {
 function _getAssetPriceId(assetInfo) {
   return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.priceId) || '';
 }
-function _getAssetName(assetInfo) {
-  return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.name) || '';
-}
 function _getMultiChainAssetPriceId(multiChainAsset) {
   return (multiChainAsset === null || multiChainAsset === void 0 ? void 0 : multiChainAsset.priceId) || '';
 }
@@ -454,13 +449,13 @@ function _getMultiChainAssetSymbol(multiChainAsset) {
   return multiChainAsset.symbol;
 }
 function _getAssetOriginChain(assetInfo) {
-  return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.originChain) || '';
+  return assetInfo.originChain;
 }
 function _getChainName(chainInfo) {
   return chainInfo.name;
 }
 function _getAssetDecimals(assetInfo) {
-  return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.decimals) || 0;
+  return assetInfo.decimals || 0;
 }
 function _getBlockExplorerFromChain(chainInfo) {
   let blockExplorer;

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

@@ -12,7 +12,7 @@ var _crossFetch = _interopRequireDefault(require("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.55-beta.3';
+const ChainListVersion = '0.2.54';
 async function fetchPatchData(slug) {
   try {
     const fetchPromise = (0, _crossFetch.default)(`${fetchDomain}/patch/${ChainListVersion}/${slug}`);

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._STAKING_CHAIN_GROUP = exports.ST_LIQUID_TOKEN_ABI = exports.MaxEraRewardPointsEras = exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = exports.MANTA_MIN_DELEGATION = void 0;
+exports._STAKING_CHAIN_GROUP = exports.ST_LIQUID_TOKEN_ABI = exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = exports.MANTA_MIN_DELEGATION = void 0;
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -24,11 +24,9 @@ const _STAKING_CHAIN_GROUP = {
   krest_network: ['krest_network'],
   manta: ['manta_network']
 };
-exports._STAKING_CHAIN_GROUP = _STAKING_CHAIN_GROUP;
-const MaxEraRewardPointsEras = 14;
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
-exports.MaxEraRewardPointsEras = MaxEraRewardPointsEras;
+exports._STAKING_CHAIN_GROUP = _STAKING_CHAIN_GROUP;
 const ST_LIQUID_TOKEN_ABI = require('./abis/st_liquid_token_abi.json');
 exports.ST_LIQUID_TOKEN_ABI = ST_LIQUID_TOKEN_ABI;
 const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;

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

@@ -250,12 +250,11 @@ class AstarNativeStakingPoolHandler extends _basePara.default {
     };
   }
   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$que = substrateApi.api.query.dappsStaking) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.ledger.multi(useAddresses, async ledgers => {
+    const unsub = await substrateApi.api.query.dappsStaking.ledger.multi(useAddresses, async ledgers => {
       if (cancel) {
         unsub();
         return;
@@ -289,10 +288,10 @@ class AstarNativeStakingPoolHandler extends _basePara.default {
           }
         }));
       }
-    }));
+    });
     return () => {
       cancel = true;
-      unsub && unsub();
+      unsub();
     };
   }